gentoo resync : 16.02.1018

3 files changed, 45 insertions, 56 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 33922d73ba71..e80923f09a22 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -5,9 +5,10 @@ DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4
 DIST darktable-2.6.0.tar.xz 3358508 BLAKE2B 1d6dc414d0f5c7dc1340ce1db229e5f4629534e6ccc3d4f017dea87a1e33d897ee8d73affece22311bbb27338075e48384b86b9aece83cbd6c582f761226a863 SHA512 066a8766edf3d961b2995bd681c9be65ae118f650a34da3c87c9096b76586c4a949b4c620993bcba3e7cd29f255c19dad9c2e205ed413c309398b4bc606eb73b
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
+DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
 EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079
 EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
-EBUILD darktable-2.6.0.ebuild 3981 BLAKE2B a8dbadf93a0040703484e6b26c928bf102c4fa0f1139725efbe0caabb91efcf8408bee170f31c37aab8bee673312f54832b33dfcadb9fe273cba2471a53994b6 SHA512 4b3d972502223ac711a8d08142b0d05780306084ec156e788b3f7c2cf8b6c2c72b1b4b62cd0077939725a48cbb128cb56c0c809d472f978830a64cbe1c843ff9
-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
diff --git a/media-gfx/darktable/darktable-2.6.0.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild
index ffb8b344bd5f..741a54b7187c 100644
--- a/media-gfx/darktable/darktable-2.6.0.ebuild
+++ b/media-gfx/darktable/darktable-2.6.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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.4.0"
+DOC_PV="2.6.0"
 MY_PV="${PV/_/}"
 MY_P="${P/_/.}"
 
@@ -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 ea7f114839a9..dce04128d375 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
-}