media-gfx/darktable: sync with main tree

Signed-off-by: Markus Meier <maekke@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Manifest-Sign-Key: 0x5159C1E7219C0A2C

3 files changed, 55 insertions, 67 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 301c9c0..db350b1 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -12,25 +12,25 @@ DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f450
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
 EBUILD darktable-2.4.3.ebuild 3995 BLAKE2B e2370f60fe14ac2dd23a7f4af41a0caddeda14dc4b605c855f3d8592a5980425732bbe55b9faaf89cd2f9e72ff168637b4a91d831629d85efd80930561a7cd26 SHA512 3dffd3c2d42fc4bf43b87ef0ab1b4e5778bc7682d52236aa7cf208ee2b6b3b9997c2e067e063053027fff74138fd9cd2c6b11d779f1f41fa2d725ace607cba42
 EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
-EBUILD darktable-2.6.0.ebuild 3981 BLAKE2B c7af443162b923a51bab5d1f9f15e226d707dcf126dde42b57c18ead23bce2e1c157ca1626d8d62021745910bb52a61680467b1ed4478e7a494416c02a3822c9 SHA512 92d64b1564c84ca79e0183b06fcd666fdf63d57fe2ec7d9d442d25633a1146492dab638f9dee943f1e899f22a45a15f1497fc0836df577d4fc0d281f63a05943
-EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
+EBUILD darktable-2.6.0.ebuild 3812 BLAKE2B 1385ece8bd15d05c952d35d3d66745ab48eb112c8a5d06c76d54e68af0982ee1a1a60140f9dc8c408c376d0943ca9f42dc0fe78512af3df0da69f75ada994555 SHA512 a973df309f430724d8dfa81ef372d7d19ad963ca442fe343b8e758c6704bcb49aedb4b5908ba0876359b31175941939cdad0f01132d278402e246762bdd0ef77
+EBUILD darktable-9999.ebuild 3212 BLAKE2B 091af0fd15369c39bee3d1cf075f552ecb5f048a2db4f620438a2a9f57ef0939e4e2e17eb6ea3ac4e174d28b2bc11c23358843a1dcd682d273c33ac3a11a5f62 SHA512 92d9be516d34c3b40f55186b58bbedcb94b020806e71ea2e3c1f68f275dc0e06b2aa42d3d3968e8fd0273e9718f1be336a62bfa3cc8ec460459d2aa81f62f145
 MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEErJcI5lTqgnns7I/6UVnB5yGcCiwFAlxVqnxfFIAAAAAALgAo
+iQKTBAEBCAB9FiEErJcI5lTqgnns7I/6UVnB5yGcCiwFAlxy/K1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEFD
 OTcwOEU2NTRFQTgyNzlFQ0VDOEZGQTUxNTlDMUU3MjE5QzBBMkMACgkQUVnB5yGc
-CiwpvQ/9Gy2L/bYqUfezuCBffkRzTXB1FkkisLczAZ+E899R5wr6Sn+PRxT1ZBz7
-KwbrONOyJz3NOV3kZw6RQiHFY37CN/oE76DFWFFwiUrzvGKrXB/DIF9Sy25l6fOT
-jtzY1lkJTE5lwy0DA0FqOIvbn6CMR4E/hWrkzxipwLa+39gmEOXAQYOSvzwOX8tJ
-/QgkQZVApoUg/rH8VbG+cPLxtB4fSOywcQuZ9pISQcvHAZoLjk/155VolLDyKqZK
-xW+Y1qXSpjN2LsUyLZqBAkQNQo0l7ORRE0E1HN7at/x6QZKdQHFBqYDPLfYH7Pz7
-Sod2CD5QmyCyYSOsTllupM03JP0TyOMc5QNM2ez2I6KNtJJjM/Ihavz9Lfx1OCPC
-0gg0KDr65iohVQB/6VRlHDx5OVE1NV3sxpEqBkBlRUueooksnGunNJSTJECjHMYg
-NbIwN7rWxPt7iAcG4Ag4/V1cpD+MGDyQ0ojRw4ZCNo5DZuVumnng/2IMdehi/BJI
-NsdGMYi1Wgx/9wK49BY1r6ycN/jJJ14mXRbfcGIiokXqu9Bwl8HU04VE8GNGtLLN
-HkFQ2IV2APtdjHjOsDJZaRo511/1j/pd3Bs8ejyIGiu+w5TFF07CP9MElKyM2Rm9
-vu/El5xXEGfXbeO+uN08/GTxWts8Yslt7Y2wbM8qBJhqrqglDuA=
-=Gtnv
+CixYYw//e7eZ02eI27Tnf7eaK7duo32XUwgbJkPHZjqVSS9PHYCWSXQ7g68wW7wz
+dPhSwgmDy7D5daZZMn0c95zcKy6zbWbn5+LW7Xgq97BkXo3//kNTxKGR62I/bnTx
+JnKyJWEWTKWue8pzlLualJdDEJUOmGkzwH7d3d9PhK6fUKnXgoSUGZ3zlm9xfuh/
+4Z4U0ce9plIFzH8zf2LHTCS+qJfFHsNteTqF+QX3i6SG3eZPWXxZXb8BP8esX/Yj
+bnL5Bp6SKiPdzDyDofLBX5Vz2bNnCEhLgaG9HrSkN5CAXOreTTGFbuZTuVwL4kuy
+rQl0Of9VIL5cFSed2uModONosgSgeZyIPwpKCtwmHPWFkn/QoY53Q0RgkAArVIUu
+ls+rS++0o61iyiA6jfnStydpPDwDRaV/5OfK4CF50G1VEFa6EG/TMSPLiVDc6Lwi
+XcPigT/kd96mH+EfBw24hcbfCg/+HZiF7VV8fs1ZS4XLOSCD3GKM74CEaCO07c4N
+GBnbSvuTqO+kfI7/6isO2ogFI5yW2XDoTSooM1RTHN8WLV0hsJ411l1CLY2WTr1h
+WIdqzqu6E9u/gGXw39MR1NfaAY3wTAwwtCK6IFdkfqh9Ug+5GNrNpFq+78Rf0iLk
+74wlsWuKQT2R3AKHj2Ezjiqz2Xw+2qBTXOBvn3tYJkR/kRxf/cs=
+=yTxd
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-2.6.0.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild
index 9a99606..741a54b 100644
--- a/media-gfx/darktable/darktable-2.6.0.ebuild
+++ b/media-gfx/darktable/darktable-2.6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
+inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
 
 DOC_PV="2.6.0"
 MY_PV="${PV/_/}"
@@ -26,7 +26,12 @@ ${LANGS// / l10n_}"
 # sse3 support is required to build darktable
 REQUIRED_USE="cpu_flags_x86_sse3"
 
-CDEPEND="
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/json-glib
 	dev-libs/libxml2:2
@@ -54,17 +59,17 @@ CDEPEND="
 	jpeg2k? ( media-libs/openjpeg:2= )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
 	opencl? (
 		>=sys-devel/clang-4
 		>=sys-devel/llvm-4
-	)"
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
 
 PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch )
 
@@ -85,7 +90,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_PRINT=$(usex cups)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
 		-DCUSTOM_CFLAGS=ON
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
@@ -111,7 +115,9 @@ src_install() {
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	for lang in ${LANGS} ; do
-		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
+		if ! use l10n_${lang}; then
+			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+		fi
 	done
 
 	if use pax_kernel && use opencl ; then
@@ -124,13 +130,8 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	elog "when updating from the currently stable 1.6 series,"
 	elog "please bear in mind that your edits will be preserved during this process,"
@@ -138,8 +139,3 @@ pkg_postinst() {
 	echo
 	ewarn "It will not be possible to downgrade!"
 }
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index ea7f114..dce0412 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils flag-o-matic git-r3 gnome2-utils pax-utils toolchain-funcs versionator xdg-utils
+inherit cmake-utils flag-o-matic git-r3 pax-utils toolchain-funcs xdg
 
 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
 
@@ -22,7 +22,12 @@ ${LANGS// / l10n_}"
 # sse3 support is required to build darktable
 REQUIRED_USE="cpu_flags_x86_sse3"
 
-CDEPEND="
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/json-glib
 	dev-libs/libxml2:2
@@ -50,17 +55,17 @@ CDEPEND="
 	jpeg2k? ( media-libs/openjpeg:2= )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	webp? ( media-libs/libwebp:0= )
+"
+DEPEND="${COMMON_DEPEND}
 	opencl? (
 		>=sys-devel/clang-4
 		>=sys-devel/llvm-4
-	)"
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
+"
 
 pkg_pretend() {
 	if use openmp ; then
@@ -77,7 +82,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_PRINT=$(usex cups)
-		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
 		-DCUSTOM_CFLAGS=ON
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
@@ -103,7 +107,9 @@ src_install() {
 	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
 
 	for lang in ${LANGS} ; do
-		use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
+		if ! use l10n_${lang}; then
+			rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
+		fi
 	done
 
 	if use pax_kernel && use opencl ; then
@@ -115,17 +121,3 @@ src_install() {
 		eqawarn "please open a bug."
 	fi
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}