version bump, bug #496138

- add webp support
- lua support disabled, as it requires masked dev-lang/lua-5.2
- respect LINGUAS, bug #403037

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0x072AD062

5 files changed, 180 insertions, 25 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 7e4a42c7ce9d..dee8c5c9a890 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.52 2014/01/12 11:25:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.53 2014/01/21 20:35:00 maekke Exp $
+
+*darktable-1.4 (21 Jan 2014)
+
+  21 Jan 2014; Markus Meier <maekke@gentoo.org> +darktable-1.4.ebuild,
+  darktable-9999.ebuild, metadata.xml:
+  version bump, bug #496138
+  - add webp support
+  - lua support disabled, as it requires masked dev-lang/lua-5.2
+  - respect LINGUAS, bug #403037
 
   12 Jan 2014; Markus Meier <maekke@gentoo.org> darktable-1.2.3.ebuild,
   darktable-9999.ebuild:
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index b09a05308c73..d6b67973b0eb 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,23 +6,26 @@ DIST darktable-1.2.1.tar.xz 2273260 SHA256 b1756295dfda78fc828603033a58f233ced19
 DIST darktable-1.2.2.tar.xz 2307300 SHA256 12902e8c3ef185d2167ce3a5f9d11eddde763c5a3cb0e9267f4b470a252fc859 SHA512 d8ec6535119eb0a275efd13c53ec218d08c50595a7417ededf7766208fdbaf44296fbd9044d91f92521d910aff6a5df0ae97a63f87027f972443dabdddb0878e WHIRLPOOL 5ab068c82cbc0c9503a08af2a19e7a2cff9e522b55a6984ad8012ed621bdb2be0ce6dbef48409814b35328401dd1b7d8ddb779117de08a0738e390e9bd34cee7
 DIST darktable-1.2.3.tar.xz 2348864 SHA256 686b62e020c13e64d18c9b465742ddec8604cfee36e06c8858301735c29f7316 SHA512 abd01ecadfd54504e90b50181cc84991e623379d003c445134f60c067e35acb93db2cbdb3a4324d8d4545bde84edff116c2241fcf514b372cf57afeb04e6f58f WHIRLPOOL 1a66753618a1c6d261f2456e8d915bea34e592e7045133f00122425955c0190bb74ba7341420a540b717d670ebcdcf975a7feefd0baa4294e0c006889c5e0ff5
 DIST darktable-1.2.tar.xz 2399856 SHA256 dc52582b5c5dfbd22e936f1d441e192a4aa53ac6533fe2c53aaa59433ccd5450 SHA512 3a0e10bfeeade0225c7f07a0419a7c7f6f99d6e6a81618e63edf42a00ba3ffa1699c221ade61626f2a1c49e66d275b4351f6dcdb4db8786e6d28b36b68c5758e WHIRLPOOL dc45e15927f015e6c6fcd1e277d46cdeb6efcf5d3eb8b3cf25ccb4a9448f55774022fc1ac1d613251c957a337438c7f7abd1fda53d1ae10d79575f44bb6c9b08
+DIST darktable-1.4.tar.xz 2791544 SHA256 2d5f2e44ffd71789d268cb72e789225bf3f8bce5d85095a411ea658527c5c9dd SHA512 3261d75b591eb91df9b144207dc81c35579c758e90c52717f749accada0e7229e942994112714f1f18b4254e8a248c9a7d35c6a14764e76378cd4d616078e9b8 WHIRLPOOL 572d3ccead3d9cf247899f5dfabfea308ac15c42c65ccc5a6c0f2f6425115f961ff7c8acf29b2e3ac8674b7bcb6aaf7be26de86e85a5435391fd29837faa523c
 DIST darktable-usermanual-1.1.2.pdf 8513151 SHA256 a33d4e7bb87c8d7f748f99badb12bd923ba798d205bbddbac85a648d6c9d866f SHA512 1e2b22fc8fb4db7b99dfc8b228310951b04d52a42781f8f83f96ce2e86b24ddc1d3075b246a4d9e73f566a0b57999582daf40f04fd166ab979f8abebe6582275 WHIRLPOOL 5c9733bc155e93fc6c475f93af7246a7123a9257e4ffe1da057845a7d2d9bd4c29a5d61ea172acdb7739abb466c7325502d73b72cbe03d7f4553118bfee5c6f2
 DIST darktable-usermanual-1.2.1.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
 DIST darktable-usermanual-1.2.2.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
 DIST darktable-usermanual-1.2.3.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
 DIST darktable-usermanual-1.2.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
+DIST darktable-usermanual-1.4.pdf 11861765 SHA256 3b604e8de32488c4c9294ee19df2b3bc41f060fc4721a1c5f661b25c52f5b054 SHA512 c94e134137778d57822c1b0e1b876bc0358f2c32bf7978e518c32ae600af60f74f95f6c49ed6c07ff0aa4e035d6108000ceaedda39a900afd0de46632f4c3fd3 WHIRLPOOL 29db2f68cde6b7a2a1ce78a81deb1173a5cbaa643b6593ee8a5b7a55aef9156ed11a3f048f253f0ce47a3f08b37b9f4630f117797be4b15368882a9366f8d6f9
 EBUILD darktable-1.1.4.ebuild 3036 SHA256 a4bd471b70d7c8ac9d7b46fda165400331e6f5b7f9f53509ce658ff9753018c6 SHA512 b1f190d28eede6ef61320f25d826cafada48ca1ef91831d50e2b604b067d5fb4ee42c83be165e265c4d999c72b3bed2d815c943e127797a1dbdb2ac18508d3dd WHIRLPOOL 56d833114151d1cafb08abcb3bd4d0f2825dc52122b8eda04765ab9a7858bbca5c9819ab04f3d89a66f0b6e5c6f3857a66011a55288bc5acb4243bc4f0151f9e
 EBUILD darktable-1.2-r1.ebuild 3228 SHA256 b4554a32884e3238b367d82b2da95ead47f35ce9949bfee1e4efabb83b3e25a3 SHA512 385bfba4eb1bfe6aaef5b5f8b817f51a15bfb914cdfae5c215ac81f8a84da3af8479ca36dbc4409466d44f73d5a5d6c39dbbdc740d04e93470415135671df361 WHIRLPOOL 91e59a908db5ffd980b9403eacdc1105d5cdb9ecb5a7cd6dbfafac16112718693eb1ec7d3ac6632e58a36ccb648c8c8c93af985be24dbcfbaf77e107bb343ccf
 EBUILD darktable-1.2.1.ebuild 3229 SHA256 d9dd4bf7a2c255ff2059d725b0b8b88847b04a6be48b0b93e2bc34dfc1e1d57a SHA512 f94c0a8d33ccf0cbc531161316a58ad1ed80a3a126ad64808058c6aaf02a18945bfc62f4340c24368df8ee673304694db9bb264cc4dfbf0429595676104c48f5 WHIRLPOOL cb79e9a575477b0c2c28427457b1f3a18db3894f321040c5d84ad2a845e7a101e8121596d7efb658e0134daed76bacf9a0dc2850094acfb4bb51cda070a91a76
 EBUILD darktable-1.2.2.ebuild 3282 SHA256 27155af50e6786529aae0602d48891d1a6604261669f6164f18fad783c5aba98 SHA512 46240b85ecd449a2d37852c8919c85c76b71c33c9a124663e2205e93f5deeb89197f1d6bd40ddcad09078516417b038eab2f48e30e0375dad4dac7d6bf5e8348 WHIRLPOOL d6bd2ea90a1797af0ad9ab915be3f407ca5a8e4dbe14e4865066ad368ed4f28487fe3088f9cf3b58771d216caf8cb8ccf23812129108f93b126ab020f0ed8439
 EBUILD darktable-1.2.3.ebuild 3282 SHA256 093be5e60effae34ada29d09585c9cb346b744a9d5504cbf2b27bd6cf4812fb3 SHA512 2f9ab65f9a65633c0c1465e4138204ea09d571c337215001b70e6474305f1d1561e21750684a35ab8ad90ff259e3accd9030034ff5f429760c74fb78eea9bfac WHIRLPOOL 73257016c61839fc2b218c2b28567691bbd78ede62d973d0ffcbaabf683d3f001bf6ae6e08e8c8d9d777db7f8ac69dcb96792246f623edbdfe28c0e5b3688d00
-EBUILD darktable-9999.ebuild 3112 SHA256 5773ade74d948a54d2a192ed74f6f07d7f9545f8280de2b1547c234588f7a55a SHA512 7b2b97f3c3e3e6727e0632cbb5461b909ab1667c15accd3089756a5205995b663d94a84015a1a1a67298deb376ad202afb62b3cd5f55469153b2738db50e7126 WHIRLPOOL 5a2a41f70e1f914cace41deea9171ceff0a1713d75316220b159a05b6f1754f811a5f166022004cd39c60f2be16d3dd1c8023f52cc7f8736bf72e5cb693c6353
-MISC ChangeLog 9622 SHA256 c48c6f2ecb27fcef7b51de2b22eb6898710a680d553ea0d9b3ddeef818381375 SHA512 6bb16ea2b79500d90b7853c5f5f030ba84ea1ba0d2953f4f73e715bd601f6a60436c7fc2ea23e30bcc93cdc9fc4449aeadb1a5f5d0027761b41de1f9d974f08e WHIRLPOOL d3081df53f98886d887645410ab9a37a5c0411b34475fc6f81e50a70f1651980719dee4d831e99d62453558522c862fc9d5fc0370fc381270f09c0fb2436aea8
-MISC metadata.xml 1214 SHA256 56f24afdca88b9323701d109ce90bea644f09e0ec8aa753fd31b5233da3462eb SHA512 a5812ce4db447cd724209ce9fd779d48a1f279b6d978edc1b3842d382809ca720304d7a87d93eac914f800666f2d2cc6483ff27fb3ba1076f57178b31e871cdd WHIRLPOOL 6aa2a8da4a7f44ea49916aae5187ea7a6a272b242442e472e3bc93ef7e1a926133ae7a7b0e1502d89fa71eaf64aaa7076475914bfe694c2d0cc704139efdf17d
+EBUILD darktable-1.4.ebuild 3610 SHA256 a80f1ced356c1370504fc53e2e933ae5ca53c54680245e487a2f8fdcbdbacd51 SHA512 1d4f4282ebde38971bcc2672091d78e66ca4ba03aaec35730c8b20e248fd758b55ce6f7069dee33d70e124f1ac6024a3ab3c5ea714741f183328b68242a8637f WHIRLPOOL f47e78e63bf4279b647d0dce380153d65af47e75f9ab053cb86e9b1cf98c1d2b6e88fbb05295c0d5490090d1d58801c5539287a2eff9cd0bd3572d34066e568e
+EBUILD darktable-9999.ebuild 3479 SHA256 b647253a348c05eddbccf79b8cc49a3952fb25ebafa44bbb95e03693cd30c6be SHA512 5eda58c598c73ee2dc53f34088e068f82fd6ba23e26bb44e00aa39a4bec0b5a3cc88099715e505e54831ec3d9bd4a66810c57c43684f494e4a00959ae9071686 WHIRLPOOL 1fa416fc747cf5f286f11895a15c931754a9be0612b3844391d576bd5aeb50656dfe7cb8a31260082ee390320e8f65d0c2d6dd3c638034ef06cf7db772cdd1b0
+MISC ChangeLog 9910 SHA256 5dd6c14e5dc7182aa378f76dd55c35496c8110a27de24e01448b9044fb2fca70 SHA512 e6a59ceb8b10c7171c58abd9e78dd3203b025f1bd4b93a101df04a4980e369be75ed1315f7d1b88cbcbed1911f56fe5c57655a48d8086373affe8b778f5bf80a WHIRLPOOL 4eae1ad80e9323fb7d47a01f64bc44d29eec9bdc24960937bbf9e18826a442270701238d1602d29b8b60385b3902bb0b49b37c1c5be3917e4b251c06a368c1b7
+MISC metadata.xml 1268 SHA256 5571c28d8453c20cc9974239602d955cec07a1b1986a345d18f389cc7737672c SHA512 a97bd9f3fc0080ed965852c800882049bff13632b05e4dd9585ca3e173da56e445b82e2c96fb857639069071106a930eb23fd3997245bb1c3d81f982032fdd3e WHIRLPOOL 77924d501edfa8e688f41fdbaba0cce0cf82a16e05925c62be0baeddc982f669520359773281de454d50a641dba0e11198997d01701179a47faa46fd15ed0690
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLSfUQACgkQkKaRLQcq0GKfwQCcDjnBRdrCOM+yhEK9UfxTNiJr
-tIsAn0uACWMaVDGEiAINpurseTOIQuoC
-=+5/f
+iEYEAREIAAYFAlLe26cACgkQkKaRLQcq0GLZVgCfY4f8bNHpeh1BayAPgvIOPZ28
+b9cAnjk5pcA5OnG/Xmj/Uck/qFIgudWo
+=9IGP
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.4.ebuild b/media-gfx/darktable/darktable-1.4.ebuild
new file mode 100644
index 000000000000..31e3d766ac12
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.4.ebuild,v 1.1 2014/01/21 20:35:00 maekke Exp $
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://www.darktable.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+	doc? ( mirror://sourceforge/${PN}/${PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
+nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services webp
+${LANGS// / linguas_}"
+
+CDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2:2
+	gnome-base/librsvg:2
+	media-gfx/exiv2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3
+	media-libs/libpng:0=
+	media-libs/openexr:0=
+	media-libs/tiff:0
+	net-misc/curl
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	colord? ( x11-misc/colord:0= )
+	flickr? ( media-libs/flickcurl )
+	geo? ( net-libs/libsoup:2.4 )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	opencl? ( virtual/opencl )
+	slideshow? (
+		media-libs/libsdl
+		virtual/glu
+		virtual/opengl
+	)
+	web-services? ( dev-libs/json-glib )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${CDEPEND}
+	kde? ( kde-base/kwalletd )"
+DEPEND="${CDEPEND}
+	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() {
+	sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
+		-e "s:LICENSE::" \
+		-i doc/CMakeLists.txt || die
+
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use colord COLORD)
+		$(cmake-utils_use_use flickr FLICKR)
+		$(cmake-utils_use_use geo GEO)
+		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
+		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
+		$(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
+		$(cmake-utils_use_use jpeg2k OPENJPEG)
+		$(cmake-utils_use_use nls NLS)
+		$(cmake-utils_use_use opencl OPENCL)
+		$(cmake-utils_use_use openmp OPENMP)
+		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
+		$(cmake-utils_use_use squish SQUISH)
+		$(cmake-utils_use_build slideshow SLIDESHOW)
+		$(cmake-utils_use_use web-services GLIBJSON)
+		$(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-${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
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index cde552102b1e..8a4b6912a895 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.11 2014/01/12 11:25:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.12 2014/01/21 20:35:00 maekke Exp $
 
 EAPI=5
 
@@ -10,43 +10,49 @@ EGIT_REPO_URI="git://github.com/darktable-org/darktable.git"
 
 DESCRIPTION="A virtual lighttable and darkroom for photographers"
 HOMEPAGE="http://www.darktable.org/"
+SRC_URI=""
 
-LICENSE="GPL-3"
+LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
-IUSE="colord flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
-nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services"
+KEYWORDS=""
+LANGS=" cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
+# TODO add lua once dev-lang/lua-5.2 is unmasked
+IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
+nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services webp
+${LANGS// / linguas_}"
 
 CDEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/glib-2.28:2
 	dev-libs/libxml2:2
-	colord? ( x11-misc/colord )
-	flickr? ( media-libs/flickcurl )
-	geo? ( net-libs/libsoup:2.4 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
 	gnome-base/librsvg:2
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	media-gfx/exiv2[xmp]
+	media-gfx/exiv2:0=[xmp]
 	media-libs/lcms:2
 	>=media-libs/lensfun-0.2.3
 	media-libs/libpng:0=
-	media-libs/openexr
+	media-libs/openexr:0=
 	media-libs/tiff:0
 	net-misc/curl
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+	colord? ( x11-misc/colord:0= )
+	flickr? ( media-libs/flickcurl )
+	geo? ( net-libs/libsoup:2.4 )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	gphoto2? ( media-libs/libgphoto2:= )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg:0 )
 	opencl? ( virtual/opencl )
 	slideshow? (
 		media-libs/libsdl
 		virtual/glu
 		virtual/opengl
 	)
-	virtual/jpeg
 	web-services? ( dev-libs/json-glib )
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango"
+	webp? ( media-libs/libwebp:0= )"
 RDEPEND="${CDEPEND}
 	kde? ( kde-base/kwalletd )"
 DEPEND="${CDEPEND}
@@ -83,6 +89,8 @@ src_configure() {
 		$(cmake-utils_use_use squish SQUISH)
 		$(cmake-utils_use_build slideshow SLIDESHOW)
 		$(cmake-utils_use_use web-services GLIBJSON)
+		$(cmake-utils_use_use webp WEBP)
+		-DUSE_LUA=OFF
 		-DCUSTOM_CFLAGS=ON
 		-DINSTALL_IOP_EXPERIMENTAL=ON
 		-DINSTALL_IOP_LEGACY=ON
@@ -93,6 +101,10 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
+	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"
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index eb20bbd88025..ab4636d43516 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="slideshow">Build the opengl slideshow viewer</flag>
 		<flag name="squish">Enable thumbnail compression via libsquish</flag>
 		<flag name="web-services">Add support for uploading photos to facebook and picasa</flag>
+		<flag name="webp">Enable WebP export support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">darktable-org/darktable</remote-id>