Update media-gfx/openscad to 2021.01.

4 files changed, 190 insertions, 1 deletions

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 7d8d838..16286f1 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -3,9 +3,12 @@ AUX openscad-2019.05-0001-Fix-build-with-boost-1.73.patch 827 BLAKE2B 3450919d7c
 AUX openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch 820 BLAKE2B abfa2f4067dca1bdd2a1169cb3d9e1b4a804fa27bf8ec3a6a98106861713a3273f401a4e51c2fb8afab397b6326960609ae2700d0755b3b819ede749bc202b5e SHA512 87031a2f1b132434b349ead74e1e6d247f51ed48b0f2f8970dc99d9c47a441022ea169728302f680142325888433f07f4888a52727b31fda8e26e28d8b5d2100
 AUX openscad-2019.05-optional-dbus.patch 375 BLAKE2B f11d44df4575556a78d06d6adb6db71f659f0b04619af471c40975f08a26ecc6dde922e91a959247f258804f3f7f1e8b0bd40c160f4cafe89d05706fa4d00a83 SHA512 f472bf0b19e02cb64e423c842894380226042f02149d528ea34a167600a6e1d6ef404e99bf8c9ba683e79684fe890b12add1c0f6188bc3b03c06a96408371f28
 AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
+AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892
+AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b
 AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
+DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
 EBUILD openscad-2019.05-r2.ebuild 1683 BLAKE2B c301142b828cb4999fd4b095c14333477a5b86f17a7889845f2acc779941412dc39d7c32b850d8c358fd92aca734312b0942409da3fcebd2f24ab06b700315b1 SHA512 32ca3512105ceb3bd66ab13bb0c4808ca875c30f85b2cce338cb5a79fe0ad296f152af9588b60a48871f4193eb1cf62ec62572ab52a0a1862839fbe083835b58
-EBUILD openscad-2019.05-r3.ebuild 2068 BLAKE2B c9d48ee8d7dbfca6cee6fb4c0d762b75389bc27b60d07ffeb5fc4ecc0097cd9a7f9a2fba3e3af8825301ba79edb5bdb26e4ee6d1d6adcef96f24a1d8275467dd SHA512 3afa92ce2fa1b3a80e8e7979a1ecb6e6c2e47584ab3231b7d76f9a04395b8964f81d991932ac1eb24dd84032e2551416bf39f2bbf1b07a226ef1dcdeb2efd7ae
+EBUILD openscad-2021.01.ebuild 2442 BLAKE2B 8daf329e5238455ec24e564c878b52d94597a2c47d7ef06d81e144f4561955611457cb204cafb1769829274436dee7ab33176f94c3d801136c400837726db9c5 SHA512 c78cf23b6c57314cac9d8f16ae62e0f84a91522151c04e57b0eb8201bb18cd03211a51feb0e0613c7408e0291434677aedd3aa15a3bb5ff54e0e0f1d0eaa9227
 EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
 MISC metadata.xml 1123 BLAKE2B d182b2b81115ec212b553802174d5305dd37af439aaafb25dd05368b1431b960cb4e35e65bec0519438e9c1ed767124fc686e293d07e5d44807bbf4ca8d74ea2 SHA512 10fda921c2d18d8e3a12d986cd2de9eebf47d9d2f843381b4ea2874d2483a42b84c6aa6c216ceb4c1ecf4183bbc8d43d7202bafbfcddc15de1bcd6b0f297f29c
diff --git a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
new file mode 100644
index 0000000..6de5810
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
@@ -0,0 +1,32 @@
+From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 28 Feb 2021 16:51:30 +0100
+Subject: [PATCH] [Gentoo specific] Disable ccache building
+
+On Gentoo, we use a USE flag to determine whether ccache
+should be used for building.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ openscad.pro | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/openscad.pro b/openscad.pro
+index b76ca76..678e08d 100755
+--- a/openscad.pro
++++ b/openscad.pro
+@@ -211,11 +211,6 @@ mdi {
+   DEFINES += ENABLE_MDI
+ }
+ 
+-system("ccache -V >/dev/null 2>/dev/null") {
+-  CONFIG += ccache
+-  message("Using ccache")
+-}
+-
+ include(common.pri)
+ 
+ # mingw has to come after other items so OBJECT_DIRS will work properly
+-- 
+2.30.1
+
diff --git a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
new file mode 100644
index 0000000..1995bd6
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,43 @@
+From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 6 Mar 2021 22:59:17 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+The pkgconfig file for lib3mf has been renamed in case
+for lib3mf-2 versions.
+This patch uses the news names.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ features/lib3mf.prf | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/features/lib3mf.prf b/features/lib3mf.prf
+index 2c512da..47be364 100644
+--- a/features/lib3mf.prf
++++ b/features/lib3mf.prf
+@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) {
+ }
+ 
+ isEmpty(LIB3MF_INCLUDEPATH) {
+-  LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF")
+-  LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF")
++  LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf")
++  LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf")
+   !isEmpty(LIB3MF_CFLAGS) {
+     ENABLE_LIB3MF=yes
+   }
+@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) {
+ }
+ 
+ isEmpty(LIB3MF_LIBPATH) {
+-  LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF")
+-  LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF")
++  LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf")
++  LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf")
+   !isEmpty(LIB3MF_LIBS) {
+     ENABLE_LIB3MF=yes
+   }
+-- 
+2.30.1
+
diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
new file mode 100644
index 0000000..8cbe856
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp-common qmake-utils xdg
+
+SITEFILE="50${PN}-gentoo.el"
+
+DESCRIPTION="The Programmers Solid 3D CAD Modeller"
+HOMEPAGE="https://www.openscad.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 x86"
+IUSE="dbus emacs"
+# tests are not fully working and need cmake which isn't yet
+# officially supported.
+RESTRICT="test"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/double-conversion:=
+	dev-libs/glib:2
+	dev-libs/gmp:0=
+	dev-libs/hidapi
+	dev-libs/libspnav
+	dev-libs/libxml2
+	dev-libs/libzip:=
+	dev-libs/mpfr:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dbus? ( dev-qt/qtdbus:5 )
+	dev-qt/qtgui:5[-gles2-only]
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
+	media-gfx/opencsg
+	media-libs/fontconfig
+	media-libs/freetype
+	>=media-libs/glew-2.0.0:0=
+	media-libs/harfbuzz:=
+	media-libs/lib3mf
+	sci-mathematics/cgal:=
+	x11-libs/cairo
+	>=x11-libs/qscintilla-2.10.3:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
+	"${FILESDIR}/${PN}-2019.05-optional-dbus.patch" )
+
+src_prepare() {
+	default
+	if has_version ">=media-libs/lib3mf-2"; then
+		eapply "${FILESDIR}/${P}-0002-fix-to-find-lib3mf-2.patch"
+	fi
+}
+
+src_configure() {
+	if has ccache ${FEATURES}; then
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" DISABLE_DBUS=$(usex dbus 0 1) "${PN}.pro"
+	else
+		eqmake5 "PREFIX = ${ESYSROOT}/usr" DISABLE_DBUS=$(usex dbus 0 1) "${PN}.pro"
+	fi
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile contrib/*.el
+	fi
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		elisp-install ${PN} contrib/*.el contrib/*.elc
+	fi
+
+	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}