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

[Markus Meier]

commit:     7fa7f4aeddd82a70ba9446add9f88c7ed8327a16
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 12:05:13 2017 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 12:05:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa7f4ae

media-gfx/darktable: update dependencies and migrate to xdg-utils

- bug #642204
- bug #642186

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-gfx/darktable/darktable-2.4.0.ebuild | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index e61d402bf8e..3f0453270d4 100644
--- a/media-gfx/darktable/darktable-2.4.0.ebuild
+++ b/media-gfx/darktable/darktable-2.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils pax-utils eutils
 
 DOC_PV="2.2.0"
 MY_PV="${PV/_/}"
@@ -39,9 +39,8 @@ CDEPEND="
 	media-libs/tiff:0
 	net-libs/libsoup:2.4
 	net-misc/curl
+	sys-libs/zlib:=
 	virtual/jpeg:0
-	virtual/glu
-	virtual/opengl
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.14:3
 	x11-libs/pango
@@ -51,13 +50,9 @@ CDEPEND="
 	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	gphoto2? ( media-libs/libgphoto2:= )
 	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
 	libsecret? ( >=app-crypt/libsecret-0.18 )
-	opencl? (
-		sys-devel/clang:4=
-		sys-devel/llvm:4=
-		virtual/opencl
-	)
+	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:0= )
 	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
@@ -68,7 +63,11 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	opencl? (
+		>=sys-devel/clang-4
+		>=sys-devel/llvm-4
+	)"
 
 S="${WORKDIR}/${P/_/~}"
 
@@ -132,7 +131,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	elog "when updating from the currently stable 1.6 series,"
 	elog "please bear in mind that your edits will be preserved during this process,"
@@ -143,5 +142,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }