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

[Markus Meier]

commit:     c44b2f41397a75fac2b150c3a99fe89b0b490e24
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 19:21:57 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 19:21:57 2016 +0000
URL:        https://gitweb.gentoo.org/dev/maekke.git/commit/?id=c44b2f41

media-gfx/darktable: sync with main tree

Package-Manager: portage-2.3.0
Manifest-Sign-Key: 0x363AF1F7765A9D02

 media-gfx/darktable/Manifest                       |  36 +++--
 media-gfx/darktable/darktable-2.0.1-r1.ebuild      | 148 ---------------------
 media-gfx/darktable/darktable-2.0.2-r1.ebuild      | 148 ---------------------
 media-gfx/darktable/darktable-2.0.2.ebuild         | 147 --------------------
 ...rktable-2.0.1.ebuild => darktable-2.0.4.ebuild} |   0
 5 files changed, 16 insertions(+), 463 deletions(-)

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 01675b8..16d1d83 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,35 +2,31 @@
 Hash: SHA256
 
 DIST darktable-1.6.9.tar.xz 3124940 SHA256 0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512 c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492 WHIRLPOOL 0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
-DIST darktable-2.0.1.tar.xz 2927028 SHA256 4d0e76eb42b95418ab59c17bff8aac660f5348b082aabfb3113607c67e87830b SHA512 457122dcc3b1ddf8d604cf57f46213511d4f64a241d742cdfb2985fb6c9a4e2f27eee1f77819d14e2e8dcea574db21119c1264779d92ce98066f441daae99adb WHIRLPOOL 7870d724379eb556979224d392a505de592143f27b4f70ae7d7a757e5b96f8e1cdc9dae11cfac2e0e29a865cc339e5c97c0b4b6f45be6e49e5ab73eaa6ac4547
-DIST darktable-2.0.2.tar.xz 2963072 SHA256 75ea6354eb08aab8f25315a2de14c68dc6aad6ee5992061beea624afc7912400 SHA512 428973615703206d6097ab3f9028269903ecbf8447f11ad79c2e83303e63b992bb0fb4c11a21e830c56355203dff5342c9dc8ff556839962145da8d5e76f512d WHIRLPOOL efc14be6600b72f54f431c149f605a7cf0baf26af8ea8a033e52e5db83ec465c9470ced600984ab6351d013556168bd318828e2484c6d1d0c7c1044dbe64b267
 DIST darktable-2.0.3.tar.xz 2974456 SHA256 a03e5c1d786799e63c8b4a9f32e9e6f27b3a7d7ab0bbbb7753a516e630490345 SHA512 e48c40df0d56dabe09a41e3b595cd621ecec1f118158f253f2c200e09edfa199ca4e8853153fe9fe4c2ea8df3c75bd97bd5c2dfa165ccf0d7601d8443df90112 WHIRLPOOL ce10feb4de4793760624a0d033a42c4fabaf155938eb344cf09c14c278fdc5d7b94816f893065c937e908489f4f092cbd78c9b0ee7f466dd79eeca406d230f77
+DIST darktable-2.0.4.tar.xz 3013676 SHA256 80e448622ff060bca1d64bf6151c27de34dea8fe6b7ddb708e1e3526a5961e62 SHA512 ed43c4a61ec4768a5879b2fddc21245fa988bf49a4bf1ecae51a9fb9cf17d6672e9804ed754fee9eb67834e1d9d210ffaf3aaf1cddc1b7c2ac77bcf215b5dc74 WHIRLPOOL 5e7ab15ee9479f380903cae101b1722402f221acf23b720b8fe5428c561bb8d77bbb3b98af710d100077c8b4121416f8f6318331046d18c6ee1f8d1599707b57
 DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256 f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512 39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02 WHIRLPOOL 49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
 EBUILD darktable-1.6.9.ebuild 4044 SHA256 64e225979eae85cfa5a1022aad47e063416c5ac70be9355a40158b68c29014ac SHA512 21f6d7274ee3bebc6f8ef753cb1958b4f7666c207d1b8febfbd15f4f4c14d713969516d778be5904265c7a7e3860170397f9f36e3069943f101e2043aa348cf0 WHIRLPOOL 4e0a6ac38e0fcae7134f876a1e4650a2cc27658140772d43fcacc604674a9eace7d3b7d691f64e3ba96010c6798bea869c7756294266c5e420da1ea532ffba1b
-EBUILD darktable-2.0.1-r1.ebuild 4140 SHA256 79b1e5d6b171fd9f0bacfe87a6fc4a6c6f3343a6f18834f371357456bb86f024 SHA512 c93e80f6e0c9fca3d7d5adeebbcee65c0ba67b9057c4b7fc44acd186c86c98f523246fbc9bea089a555915daae16b18729fae389abf0a1a103e796f1d921aaea WHIRLPOOL 37217504d2ba230c1cbf761d9a5344b8dccb8f490bd1b7a498419bfee377dad008ea29c266041782ec4cab7cc4c3887e6b370871ce2488c2b01af1bff1916cf6
-EBUILD darktable-2.0.1.ebuild 4073 SHA256 3af887c59cad21bbd9001b19376d178d7f62082d6e0a2c6f4d06f6119306d72a SHA512 a360ad2851dc80add67405f4de86518937bd786272a3086ce4288b940894089a2c94d64a773410d1aefd9dd6a72498205216275b490e53bdbbc11056d12da810 WHIRLPOOL 7aff7a79aae66c1acd1c8d0b3b7d138db867b6c478d88f959a1d6b108636f5399ea0e5b0c3d1aab692a553642fe1816736fd833a0f19b198d41b2c7443bf03ec
-EBUILD darktable-2.0.2-r1.ebuild 4140 SHA256 79b1e5d6b171fd9f0bacfe87a6fc4a6c6f3343a6f18834f371357456bb86f024 SHA512 c93e80f6e0c9fca3d7d5adeebbcee65c0ba67b9057c4b7fc44acd186c86c98f523246fbc9bea089a555915daae16b18729fae389abf0a1a103e796f1d921aaea WHIRLPOOL 37217504d2ba230c1cbf761d9a5344b8dccb8f490bd1b7a498419bfee377dad008ea29c266041782ec4cab7cc4c3887e6b370871ce2488c2b01af1bff1916cf6
-EBUILD darktable-2.0.2.ebuild 4073 SHA256 3af887c59cad21bbd9001b19376d178d7f62082d6e0a2c6f4d06f6119306d72a SHA512 a360ad2851dc80add67405f4de86518937bd786272a3086ce4288b940894089a2c94d64a773410d1aefd9dd6a72498205216275b490e53bdbbc11056d12da810 WHIRLPOOL 7aff7a79aae66c1acd1c8d0b3b7d138db867b6c478d88f959a1d6b108636f5399ea0e5b0c3d1aab692a553642fe1816736fd833a0f19b198d41b2c7443bf03ec
 EBUILD darktable-2.0.3-r1.ebuild 4140 SHA256 79b1e5d6b171fd9f0bacfe87a6fc4a6c6f3343a6f18834f371357456bb86f024 SHA512 c93e80f6e0c9fca3d7d5adeebbcee65c0ba67b9057c4b7fc44acd186c86c98f523246fbc9bea089a555915daae16b18729fae389abf0a1a103e796f1d921aaea WHIRLPOOL 37217504d2ba230c1cbf761d9a5344b8dccb8f490bd1b7a498419bfee377dad008ea29c266041782ec4cab7cc4c3887e6b370871ce2488c2b01af1bff1916cf6
 EBUILD darktable-2.0.3.ebuild 4073 SHA256 3af887c59cad21bbd9001b19376d178d7f62082d6e0a2c6f4d06f6119306d72a SHA512 a360ad2851dc80add67405f4de86518937bd786272a3086ce4288b940894089a2c94d64a773410d1aefd9dd6a72498205216275b490e53bdbbc11056d12da810 WHIRLPOOL 7aff7a79aae66c1acd1c8d0b3b7d138db867b6c478d88f959a1d6b108636f5399ea0e5b0c3d1aab692a553642fe1816736fd833a0f19b198d41b2c7443bf03ec
+EBUILD darktable-2.0.4.ebuild 4073 SHA256 3af887c59cad21bbd9001b19376d178d7f62082d6e0a2c6f4d06f6119306d72a SHA512 a360ad2851dc80add67405f4de86518937bd786272a3086ce4288b940894089a2c94d64a773410d1aefd9dd6a72498205216275b490e53bdbbc11056d12da810 WHIRLPOOL 7aff7a79aae66c1acd1c8d0b3b7d138db867b6c478d88f959a1d6b108636f5399ea0e5b0c3d1aab692a553642fe1816736fd833a0f19b198d41b2c7443bf03ec
 EBUILD darktable-9999.ebuild 3642 SHA256 4746429c6a19d4c874997424dd4bcbb92926efccd3ce369cf4e648f47899a4d3 SHA512 f134a726a29ba724f2358e0839835b1cbdda6ee300f768098793087fbaee38e986ad564f4bf212a61433dd418e5cb2268041c7ae0494ed419765e0b973e4838c WHIRLPOOL e825bb274600c7c029429471bb9eb5081d03738981d16afed63180be00bc7527b210c668ea5fa98dc5f9adcb586459f6ee1a3da4e1b69663a8e60617d296b5cb
 MISC metadata.xml 1279 SHA256 327b6d53c04bf8d88767be7bde1ba1e92079df3ca8423ea16d915edf435ee0e2 SHA512 3c5f67e3f01b97dc152b76bc206487c50bf6ae8acdaeb40f23891e714f3a939ad70ae471ac30db1f1c6458408fdfca0f77c4daaa53241289e5f5c5bff7ac2189 WHIRLPOOL cecb738c4fc2223c084a3e6045595c7663bc5595cd69c8e107e5268025b63c90dc4d1cd264abf66d6716f8eaa3ae6a9db251a4b2892ff4ea22c5f676d0591d6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJW+uZdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJXfVpNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3
-QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8X40P/Rs2REQYK46k38BxLnXU1lws
-ZIvFSHRJqNB7/EzlIbXMIA8MLo7L7U0kaio7aqevNLHdHD1s9mBk6Bx7k+6/im83
-5XUVOU313vSpTkX/VK8lfCi/VVKp82U9LEaA6bsLHn92YctZUCYcik7itGZPzrQf
-/headzs1UZ0vaa7uorwIOCTXEf5Rbd4Y64wV+DYgj7aqUqZDP51g4Ae5kfEwSgg/
-Sg2g5aqwQvcVfvEnC0FrQAupj08qKcl7WDG5Ma9bVDJTBeAjubc/1lJCegTuOQE6
-2oLuxLNxVgVWbJ7Bk6D0BggR5HbPRTEQ2lqNOW0dT92TEDI2hSOYpl41VdVXeRTv
-5C3US14RfKOx/lbLb6hYcitG7rKL4Kd6rQ31/hdyAOiVHWpWtsm37EeIprWpW9oz
-2pSv793fWVPY4PpTaGRLN5eYNlVluy5+PyuHKNpCcEkaS2xx+IlXGYbdZGDQbLU3
-RCxYKnTBT42gsO+uTDNGPlFLHSegVFkQxxZglpdJqNZ2nwvunUJP2xZpL6enQMBj
-LyDiF2ADuNZKwkvbpjTvHYYZY8SaznmZQYsg4UAU3ECqKoMJSytix3ZArSjtwgcl
-YEXOKJZEyn5EPY5mrEwF8VPIrt2+59HOUaePQSrHwTk8OzUcDmt3s9Rnn/HFizUn
-gBr4jKeRhnYSioIP9LJg
-=8x6Y
+QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8ctcP/3y2oqg6KwBHNiKaTa5iGnrR
+35nuZoS+gNRAm1hILp1r9DhfRdukBCAcRFVYp97V1zZoxejIF8FfEkP5uvIAIIta
+NhrCxx9Kn4iz6aGoViOIhHcmlSH6Pr3lKmEssc76Gx3JPvurHo1n6X0YqT3wqggF
+EginXzrTINvZmKqFeXspTjpV5V22VjpFLxo573rgOp+++hF5hItM/2RW/ja23gM9
+grThDZvafvNsvSrBqybBpPNlCEgRVY5Fh+hTshddfLidbpRBlmBKIUA3dhXZsgOM
+fumBKOmFpeFGpT9y9MeTI2ZUIwqnBohWAurwg94dDuWdkfm0FExgNHtudX8ZlmbO
+IAqqZ0kjbjdqbk6NTFR5tP0K7cJba/MGio11voo4mcACL1S1fCmtGMxV7tVYV4mG
+l860eqTZKeLOSje1QUrAa4FzaaqYqn+UlCC9JA/Pj0OeyngPbm1Xpj+qumjE2Kzn
+EDBsnj/quEVzRczDxcWL6hmP1FOuwBucdRol5QlXEQCubV+hefm0Vh2OXk0x3OU3
+5/XXnHYeKA0QojhXKHwU85WsNW+HdYgiUb7U1tul5Gn6vrwO5rU2Lb0bCtXUXZlX
+2g5gIynItDXlJFYX7XFnHkPvAQUIwxLTX1z4Mj6d6rribVjK0CVJQOlXmcv23qzj
+hJhljxpy2JxKkSoDQSu3
+=0fI/
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/darktable/darktable-2.0.1-r1.ebuild b/media-gfx/darktable/darktable-2.0.1-r1.ebuild
deleted file mode 100644
index 3b2c390..0000000
--- a/media-gfx/darktable/darktable-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DOC_PV="1.6.0"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${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 el es fr it ja nl pl pt_BR pt_PT ru sk sq 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 kde libsecret
-nls opencl openmp openexr pax_kernel +slideshow webp
-${LANGS// / linguas_}"
-
-# 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=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-misc/curl
-	virtual/jpeg:0
-	x11-libs/cairo
-	x11-libs/gtk+: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.0.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= )
-	slideshow? (
-		media-libs/libsdl
-		virtual/glu
-		virtual/opengl
-	)
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	x11-themes/gtk-engines:2
-	kde? ( kde-apps/kwalletd:4 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-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
-
-	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" \
-		-i doc/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_build cups PRINT)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use geo GEO)
-		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use kde KWALLET)
-		$(cmake-utils_use_use libsecret LIBSECRET)
-		$(cmake-utils_use_use nls NLS)
-		$(cmake-utils_use_use opencl OPENCL)
-		$(cmake-utils_use_use openexr OPENEXR)
-		$(cmake-utils_use_use openmp OPENMP)
-		$(cmake-utils_use_build slideshow SLIDESHOW)
-		$(cmake-utils_use_use webp WEBP)
-		-DUSE_LUA=OFF
-		-DCUSTOM_CFLAGS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	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 linguas_${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 "There 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.0.2-r1.ebuild b/media-gfx/darktable/darktable-2.0.2-r1.ebuild
deleted file mode 100644
index 3b2c390..0000000
--- a/media-gfx/darktable/darktable-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DOC_PV="1.6.0"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${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 el es fr it ja nl pl pt_BR pt_PT ru sk sq 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 kde libsecret
-nls opencl openmp openexr pax_kernel +slideshow webp
-${LANGS// / linguas_}"
-
-# 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=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-misc/curl
-	virtual/jpeg:0
-	x11-libs/cairo
-	x11-libs/gtk+: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.0.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= )
-	slideshow? (
-		media-libs/libsdl
-		virtual/glu
-		virtual/opengl
-	)
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	x11-themes/gtk-engines:2
-	kde? ( kde-apps/kwalletd:4 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-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
-
-	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" \
-		-i doc/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_build cups PRINT)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use geo GEO)
-		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use kde KWALLET)
-		$(cmake-utils_use_use libsecret LIBSECRET)
-		$(cmake-utils_use_use nls NLS)
-		$(cmake-utils_use_use opencl OPENCL)
-		$(cmake-utils_use_use openexr OPENEXR)
-		$(cmake-utils_use_use openmp OPENMP)
-		$(cmake-utils_use_build slideshow SLIDESHOW)
-		$(cmake-utils_use_use webp WEBP)
-		-DUSE_LUA=OFF
-		-DCUSTOM_CFLAGS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	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 linguas_${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 "There 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.0.2.ebuild b/media-gfx/darktable/darktable-2.0.2.ebuild
deleted file mode 100644
index 942f885..0000000
--- a/media-gfx/darktable/darktable-2.0.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
-
-DOC_PV="1.6.0"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${PV}/${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 el es fr it ja nl pl pt_BR pt_PT ru sk sq sv uk"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr gphoto2 graphicsmagick jpeg2k kde libsecret
-nls opencl openmp openexr pax_kernel +slideshow webp
-${LANGS// / linguas_}"
-
-# 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=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-misc/curl
-	virtual/jpeg:0
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	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= )
-	slideshow? (
-		media-libs/libsdl
-		virtual/glu
-		virtual/opengl
-	)
-	webp? ( media-libs/libwebp:0= )"
-RDEPEND="${CDEPEND}
-	x11-themes/gtk-engines:2
-	kde? ( kde-apps/kwalletd:4 )"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-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
-
-	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
-		-e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
-		-e "s:LICENSE::" \
-		-i doc/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use colord COLORD)
-		$(cmake-utils_use_build cups PRINT)
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
-		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use kde KWALLET)
-		$(cmake-utils_use_use libsecret LIBSECRET)
-		$(cmake-utils_use_use nls NLS)
-		$(cmake-utils_use_use opencl OPENCL)
-		$(cmake-utils_use_use openexr OPENEXR)
-		$(cmake-utils_use_use openmp OPENMP)
-		$(cmake-utils_use_build slideshow SLIDESHOW)
-		$(cmake-utils_use_use webp WEBP)
-		-DUSE_GEO=OFF
-		-DUSE_LUA=OFF
-		-DCUSTOM_CFLAGS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	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 linguas_${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 "There 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.0.1.ebuild b/media-gfx/darktable/darktable-2.0.4.ebuild
similarity index 100%
rename from media-gfx/darktable/darktable-2.0.1.ebuild
rename to media-gfx/darktable/darktable-2.0.4.ebuild