gentoo resync : 12.03.2021

9 files changed, 307 insertions, 74 deletions

diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 3312307491a8..c1c304faf3e2 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -3,8 +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-0003-change-C-standard-to-c-14.patch 1961 BLAKE2B faa9a935b50b5ae05d79658c236e7662626624cb752637e3643105a8558ff0135435543c2fe0080aaecc702240f7c48ae516b17d7ce20dfda0f98923eb30e8b6 SHA512 aa64ed7eca1c49ffd7e6d0a67206033ea360e6fb3d8ef31a02617393624f6f0eb6021ab5d3b8f6ce147559e49575f99745d7ed6e566c0eb3376af00bc188f5d8
 AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c
-AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3
+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-0001-fix-to-find-lib3mf-2.patch 1317 BLAKE2B f8e42492d2a85fc8ac3c9c6dd985c786051e2e398c875bfff2796229d269947ed7a00306511f02881d15ceb4cad6e45e7cacb43950e25311a8f8a5be0ac89dd2 SHA512 71ef3b68183175796c1bda50e9a65da9770d0fb1fcd6b6ce60e52efede2e11322e487cf363b8af6418bd7e59ddb5add5abfde5c84d09feca7ddca0c84672f017
 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13
-EBUILD openscad-2019.05-r4.ebuild 2367 BLAKE2B 4a9b006bc60734400c5a36eecf6442abbfe7e9c2cc350288512c076e1ae6df57221e6dc276ddc42e09f482760f7f33b8f07c369e42c83c6dfe2aa33579d522a6 SHA512 147a412cf8b13459737d9f296a55d7c59d5ad92075fb5a747b7a05a5914d200a9ab7ff69888ec464b1797871ef0ba63b069f58b980556170624f6d04479c3f57
-EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77
-MISC metadata.xml 1131 BLAKE2B 5ac140803c4f9b522ccb4649a1247323a10d397885c0ae780379483832dc85a6c4d50ee3cf6c85dced42aa0debcaa559039f7c911eda7630cbd11a13c3440c96 SHA512 1f5a48746b34e61dd451ec8bd6fb9b3678ce9901e4ca8784dac19eeaea5e7e1bc636b6d9c528bf06af1aed1fb37a5d1e6b190b465b6170cd713f494874e8a807
+DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
+EBUILD openscad-2019.05-r5.ebuild 2370 BLAKE2B c467ccc9cc544545b780d915611f04e5db32bbd6eb106d140c45400bdc9979ee55459e1fcce1286c3b95b9b043b001fdbb40af24ad97684c1693f4cc7a7fbc46 SHA512 9b525433b12e4d125cb568032fca3d1b8a7ab699b4887e7b84172776973d965861046c6b1fa7c19439118220bd0cb585bf5f6ae81f51700cbe7d8c6aacab7b11
+EBUILD openscad-2021.01.ebuild 2314 BLAKE2B a9b9faf82fa7212da43685b7feec011d7cadf983a4da8141820ab06423d21734c377be62e426f86d090b39092f4976f03aaebcdf2d3669552f897065ef5fb73a SHA512 a9f2d5affe0d715fc22641c71f034383428012f0ec4f77711db20684e7dcce26c26f4609b050402e76a0e7e78a88c7c619bbfebe7036a99375d31fd62c442700
+EBUILD openscad-9999.ebuild 2711 BLAKE2B 8ffeccfc4b473f47f7d787ec8c942d91b483aa9ee73e104a40c117c5bd35304c810b397f46438c879e416739b8586c35ba5af76f6c4fea92e37fdaef47294aac SHA512 c74b01903711779da96d591b11ef346279b3f8958c96d2c71b17fc65094e42a3b1e684666cd30883d5ea5ec6dd50bea59550911f9a1460cb399f9ec101b3a8f4
+MISC metadata.xml 1402 BLAKE2B df38615dd73f29faad439e184a2cb6a85cc3ffddf17e3bc1d1bd82e6cb44c2a65c27ebc351d21dd7bd63448bdb5d9d4013eeb8a357b6d8a9ac7c8cac870e7bcd SHA512 bfe1861a4e2d50805f21eeb2ddec537a623175bb8fb4b782d54b0ec669000cc9ed0627fc1fdb5ecb7550396f3e3328a7c06b0def031d6ee70cb3bcb0b20d6763
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 000000000000..6de581078d27
--- /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 000000000000..1995bd6e0ac4
--- /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/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
new file mode 100644
index 000000000000..0ca19d33646b
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,36 @@
+From 15bf93ab04e6fd61507f138bcfc6f9c770d9479b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 11 Feb 2021 23:14:31 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+Lib3mf-2 uses lowercase name for it's pkg-config file.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ cmake/Modules/FindLib3MF.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
+index 7a1ee285..b062c09c 100644
+--- a/cmake/Modules/FindLib3MF.cmake
++++ b/cmake/Modules/FindLib3MF.cmake
+@@ -15,14 +15,14 @@ message(STATUS "Searching for lib3mf.")
+ # We still fall back to the rest of detection code here.
+ # Travis CI Ubuntu Trusty environment has some issue with pkg-config
+ # not finding the version.
+-pkg_check_modules(LIB3MF lib3MF)
++pkg_check_modules(LIB3MF lib3mf)
+ 
+ # default to uppercase for 1.0 library name
+ set(LIB3MF_LIB "3MF")
+ 
+ # some distribution packages are missing version information for 2.0
+ if (LIB3MF_VERSION STREQUAL "" AND LIB3MF_FOUND)
+-  if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/lib3mf_implicit.hpp")
++  if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/Bindings/Cpp/lib3mf_implicit.hpp")
+     set(LIB3MF_VERSION "2.0.0")
+   endif()
+ endif()
+-- 
+2.30.1
+
diff --git a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index ca21b9322e8e..000000000000
--- a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 17 May 2020 21:38:45 +0200
-Subject: [PATCH] [Gentoo-specific] Disable ccache building
-
-On Gentoo we use a USE flag to determine whether to use
-ccache for building or not.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- openscad.pro | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index cc7f3569..8fbd3a5b 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -208,10 +208,10 @@ mdi {
-   DEFINES += ENABLE_MDI
- }
- 
--system("ccache -V >/dev/null 2>/dev/null") {
--  CONFIG += ccache
--  message("Using ccache")
--}
-+#system("ccache -V >/dev/null 2>/dev/null") {
-+#  CONFIG += ccache
-+#  message("Using ccache")
-+#}
- 
- include(common.pri)
- 
--- 
-2.26.2
-
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 75aa20b67f16..3ccb815587c6 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -24,6 +24,16 @@
 	<flag name="ccache">
 		Use <pkg>dev-util/ccache</pkg> to speed up rebuilds
 	</flag>
+	<flag name="gamepad">
+		Add support for gamepads through <pkg>dev-qt/qtgamepad</pkg>
+	</flag>
+	<flag name="headless">
+		Build a binary without GUI
+	</flag>
+	<flag name="spacenav">
+		Add support for space navigator devices through
+		<pkg>dev-libs/libspnav</pkg>
+	</flag>
 </use>
 <upstream>
 	<remote-id type="github">openscad/openscad</remote-id>
diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r5.ebuild
index 32ad22bf16f5..66fb9b68a87a 100644
--- a/media-gfx/openscad/openscad-2019.05-r4.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r5.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
 	media-libs/freetype
 	>=media-libs/glew-2.0.0:0=
 	media-libs/harfbuzz:=
-	media-libs/lib3mf
+	<media-libs/lib3mf-2
 	sci-mathematics/cgal:=
 	>=x11-libs/qscintilla-2.10.3:=
 	emacs? ( >=app-editors/emacs-23.1:* )
diff --git a/media-gfx/openscad/openscad-2021.01.ebuild b/media-gfx/openscad/openscad-2021.01.ebuild
new file mode 100644
index 000000000000..5a5a5f2805dc
--- /dev/null
+++ b/media-gfx/openscad/openscad-2021.01.ebuild
@@ -0,0 +1,110 @@
+# 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="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
+	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 )
+
+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 = ${EROOT}/usr" "CONFIG += ccache" "${PN}.pro"
+	else
+		eqmake5 "PREFIX = ${EROOT}/usr" "${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
+}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index a718d9a9a8ac..433200d96c25 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -1,49 +1,58 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit elisp-common git-r3 qmake-utils xdg
+inherit cmake elisp-common git-r3 xdg
 
 SITEFILE="50${PN}-gentoo.el"
 
 DESCRIPTION="The Programmers Solid 3D CAD Modeller"
 HOMEPAGE="https://www.openscad.org/"
+SRC_URI=""
 EGIT_REPO_URI="https://github.com/openscad/openscad.git"
 
-LICENSE="GPL-2"
+# Code is GPL-3+, MCAD library is LGPL-2.1
+LICENSE="GPL-3+ LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="ccache emacs"
-RESTRICT="test"
+IUSE="cairo dbus emacs gamepad headless spacenav"
+RESTRICT="test" # 32 out 1300+ tests fail
+
+REQUIRED_USE="
+	headless? ( !dbus !gamepad !spacenav )
+"
 
 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
-	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/glew:0=
 	media-libs/harfbuzz:=
 	media-libs/lib3mf
 	sci-mathematics/cgal:=
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
+	virtual/opengl
+	cairo? ( x11-libs/cairo )
+	emacs? ( app-editors/emacs:* )
+	!headless? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+		x11-libs/qscintilla:=
+		dbus? ( dev-qt/qtdbus:5 )
+		gamepad? ( dev-qt/qtgamepad:5 )
+	)
+	spacenav? ( dev-libs/libspnav )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -52,27 +61,45 @@ BDEPEND="
 	sys-devel/flex
 	sys-devel/gettext
 	virtual/pkgconfig
-	ccache? ( dev-util/ccache )
 "
 
-src_prepare() {
-	default
+DOCS=(
+	RELEASE_NOTES.md
+	doc/TODO.txt
+	doc/contributor_copyright.txt
+	doc/hacking.md
+	doc/testing.txt
+)
 
-	# fix path prefix
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	# disable ccache
-	if ! use ccache; then
-		eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
+src_prepare() {
+	if has_version ">=media-libs/lib3mf-2"; then
+		eapply "${FILESDIR}/${P}-0001-fix-to-find-lib3mf-2.patch"
 	fi
+	cmake_src_prepare
 }
 
 src_configure() {
-	eqmake5 "${PN}.pro"
+	local mycmakeargs=(
+		-DCLANG_TIDY=OFF
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_SPNAV=$(usex spacenav)
+		-DENABLE_TESTS=OFF
+		-DHEADLESS=$(usex headless)
+		-DUSE_CCACHE=OFF
+	)
+
+	if use !headless; then
+		mycmakeargs+=(
+			-DENABLE_GAMEPAD=$(usex gamepad)
+			-DENABLE_QTDBUS=$(usex dbus)
+		)
+	fi
+
+	cmake_src_configure
 }
 
 src_compile() {
-	default
+	cmake_src_compile
 
 	if use emacs ; then
 		elisp-compile contrib/*.el
@@ -80,24 +107,30 @@ src_compile() {
 }
 
 src_install() {
-	emake install INSTALL_ROOT="${D}"
+	DOCS+=( doc/*.pdf )
+	cmake_src_install
+
+	mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
+	ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
+
+	rm -r "${ED}"/usr/share/openscad/libraries/MCAD/.{git,gitignore} || die
 
 	if use emacs; then
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 		elisp-install ${PN} contrib/*.el contrib/*.elc
 	fi
-
-	einstalldocs
 }
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }