gentoo resync : 30.12.2017

3 files changed, 12 insertions, 157 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index ab48e775be4d..27887f32bc24 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,9 +1,7 @@
-DIST darktable-2.2.4.tar.xz 3083400 BLAKE2B 1b8c79157c4ff6e966c20588d47094dc9a0a3c77d70a6326c24d85e089bc58e8eda5c46653c12a9263c56deff2411a48e8cd82d66624598772e08bbe6b6c3f6c SHA512 4231bcbbf975fb9cd73d3a9e4ab1a05ebd1c58e681f776896b252bb245529d89bfd34d05c1a6dcf0d6a9a190898eaaa495084906f92bfb1aa8bb2ca0cf84eb9d
 DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b
 DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
-EBUILD darktable-2.2.4.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556
 EBUILD darktable-2.2.5.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556
-EBUILD darktable-2.4.0.ebuild 3942 BLAKE2B 259f0c9865fd8ba394a79ba5adf333d7e8f3ff3cba9a56a838d1a734821b90f6f91932bb57d33885c10f9cd27b1081eda8f44e72a31a48d5d95ccc590c0634a1 SHA512 2b68258a47c4ed8a66793385c7daf809688c36c7547ffc6684f60c19410235652c9e3c5175b1e3f96c92981c3fe56ddac283cb6cf3a85d912ec487d577be8e40
+EBUILD darktable-2.4.0.ebuild 3935 BLAKE2B 280b4223cac7cd99849ecc4aea7661616290ed8f84017df0fb8db79a75d9e3feded2998c34a43df7a727408cffbb698687e693c03611f159154e400b2d1a146c SHA512 4f18f241bcc825b337f3ee90f5e2fe727ee01be3fc1d308f1b7169b42c6b4650ccc8e7d24844f3b17b179b1d0d3bb2b1a1b0b9a7179b6631687cc6c51762c79d
 EBUILD darktable-9999.ebuild 3296 BLAKE2B 9a1410977c2093469a7324098787189364cf5bdd7b6e67c415dd54b608dc2db6f7bc7efe591f907c66a32600e5d5329022d1bcd539c6a5bdc8c14c5f23c3254f SHA512 2c04ee7ccc6a191bbeb0a75212e027838f6a5f4cdeeeff5ac638cd36cbf10e221d0d0a4ff58344723c8694b01dfde4c2774ba51d54a9c19c61565180fd8d6a62
 MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88
diff --git a/media-gfx/darktable/darktable-2.2.4.ebuild b/media-gfx/darktable/darktable-2.2.4.ebuild
deleted file mode 100644
index 6c47755767e9..000000000000
--- a/media-gfx/darktable/darktable-2.2.4.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DOC_PV="2.2.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
-
-# sse3 support is required to build darktable
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-CDEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-libs/pugixml:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	virtual/jpeg:0
-	virtual/glu
-	virtual/opengl
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	libsecret? ( >=app-crypt/libsecret-0.18 )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	kwallet? ( || (
-		>=kde-frameworks/kwallet-5.34.0-r1
-		kde-apps/kwalletd:4
-	) )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake-utils_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)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex libsecret)
-		-DUSE_LUA=OFF
-		-DUSE_MAP=$(usex geo)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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/-/_}
-	done
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_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,"
-	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild
index e61d402bf8e5..3f0453270d40 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
 }