[gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/

[Andreas Sturmlechner]

commit:     e7dfedbdd050275ac4b7bef20cf76b244e142778
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 20:54:52 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 23:07:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7dfedbd

media-gfx/darktable: Switch from gnome2-utils to xdg, EAPI-7 bump

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/darktable/darktable-2.6.0.ebuild | 40 ++++++++++++----------------
 media-gfx/darktable/darktable-9999.ebuild  | 42 ++++++++++++------------------
 2 files changed, 33 insertions(+), 49 deletions(-)

diff --git a/media-gfx/darktable/darktable-2.6.0.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild
index 73fbe302925..15acacacaad 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 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)
@@ -124,13 +128,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 +137,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 f0209f39d59..60e7af7a717 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.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 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)
@@ -115,17 +119,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
-}