Version bump. Add explicit deps on glib and pango and slots for tiff and libpng.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 143 insertions, 20 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index acb8c6c76090..45b8e9a37b6f 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.37 2013/02/07 22:25:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.38 2013/02/09 21:15:34 radhermit Exp $
+
+*darktable-1.1.3 (09 Feb 2013)
+
+  09 Feb 2013; Tim Harder <radhermit@gentoo.org> +darktable-1.1.3.ebuild,
+  darktable-9999.ebuild:
+  Version bump. Add explicit deps on glib and pango and slots for tiff and
+  libpng.
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> darktable-1.1.1.ebuild,
   darktable-1.1.2.ebuild, darktable-1.1.2-r1.ebuild:
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index a7bf2ada35ec..bcbcadf08642 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -11,29 +11,25 @@ AUX darktable-1.1-opencl-kernels.patch 247 SHA256 764a7f47a6d09f21bb79885d63b3d1
 DIST darktable-1.0.5.tar.gz 2568221 SHA256 0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd SHA512 52b532a07a029355a3e689971f15bf5c1a28a587419b5fae40aa342f724d3c15b4ceb557354ad46d4ca7f6e951e9b8de5ac15ccf0c4fa41a85249d5a41972cfb WHIRLPOOL 8e189a8c1bae068a170c2c0a38fba63bbeba006a004109fc0c7e8f985f5149c09b864a569580d295dc3c03694d395b8fe87fc86eb996c0697e9677cf69478e8e
 DIST darktable-1.1.1.tar.gz 3422916 SHA256 ba299ba4903718f5696de7cace80c0374dec4c7a41df90a560c47a419a3d354c SHA512 7a525adce3b6bf97c1c7a4fc1553854fb822f6ef80d4487c5ea919f3d78e5dbe8f0c0c3bb8d01b6a6220e91e1aa5055fcf8deb0adfa771b2c9bb6a900299c297 WHIRLPOOL 8d10bce112bc7921d7d42e97edeb66351d21dcd3425dfe9575da65bc58ff28426fd65690f91066588f904b98804d08028293f9e19556f8a56a2bb950e4316c87
 DIST darktable-1.1.2.tar.gz 3432009 SHA256 225ebf1bd2ca4cf06aa609f2eda55cb0894ae69bdf4db25fd97b2503c28e1765 SHA512 d4c9edd0e0a6962776e38dbcb58ebcad806f745c5a4938052df0e52cad242318bdb9d747b060b76cafb6c549198506af6e1c71956681c0afbbd2bb1fef609584 WHIRLPOOL e24b23b87e129c7cfad7b20fda96bf683d90458b477c28c2e8e75e7defad9388878f4dfc4340c5a0c6f1eb80e924343bb349817a0704362cd2a9644cdde04d81
+DIST darktable-1.1.3.tar.xz 2226896 SHA256 d9d26f3ca1ae8f833f00f12b3e927cdc807cd3662c5ea8d1c0c55fe4555cfaf9 SHA512 9521a8635375c470080089f1658fe7936d57dbc61bf6f3f54bbbae243fec2ca51b9c8d2cad868747d93f0a9fef6eeb1865fa0e0d2b5a613404c20e57ffb45735 WHIRLPOOL 87d8a96174b4bae94c7d3f5e91864cefeaa903b7420840c4d6ed3afbb1b7ebebdecfd7765dea9952888e18bc3f0060de4aea962feaf786247ef2da452112dd13
 DIST darktable-usermanual-1.1.1.pdf 8399829 SHA256 037e27a41aa4d0e2c2db3ae13bee47a2b6ec6195d953341ae637ad8495874552 SHA512 bbf3748c0c678ea84bbe57000c3b894e76b2bdf111faf9296e31b6776364757a19ecacd32d1e4edc248b6a9a00d19862a4e443e88a63707b269afe52f157a08a WHIRLPOOL 2ccfa5bf497358bc241de6e37b22d56c7718b107b78a109691d58267b7e75f29a98214444e36ee9ebf1b885231e224ba74ca0a4cf27053a14470084e240bd5a5
 DIST darktable-usermanual-1.1.2.pdf 8513151 SHA256 a33d4e7bb87c8d7f748f99badb12bd923ba798d205bbddbac85a648d6c9d866f SHA512 1e2b22fc8fb4db7b99dfc8b228310951b04d52a42781f8f83f96ce2e86b24ddc1d3075b246a4d9e73f566a0b57999582daf40f04fd166ab979f8abebe6582275 WHIRLPOOL 5c9733bc155e93fc6c475f93af7246a7123a9257e4ffe1da057845a7d2d9bd4c29a5d61ea172acdb7739abb466c7325502d73b72cbe03d7f4553118bfee5c6f2
 EBUILD darktable-1.0.5.ebuild 2500 SHA256 f8db6938a8155063ec3bacd7adc14faa2d9dd3c87061ea6933b75b8944ab30c2 SHA512 7d42960cb7758e02e875306409d8f78977adcdc188134e6fc74bf3dde7e04fcf8b57a8e5c3e04c84ac98fb4dcf59a749b0fac2dc224aef344384e5e3256c9e10 WHIRLPOOL c0414f8022fcd3b6829cae6c4845f58fa53b90e3ca14fa314422e162fcc8e9fe0a00670636bb0aeaba63114e2d8593ebb1f5c4d161409c50440fd1a9cfa63f31
 EBUILD darktable-1.1.1.ebuild 2666 SHA256 671d4a0767fcdd55c0029d5ea5a1b9fc873da72399a7a04c97f868de9959a187 SHA512 5422841372200a70b5c87aa712b903502599cf28f05ac57a01198cf3d45dad8057d56ddc0874c7ad011d5a1525af086179e5102902e072c79cf98c6d880eaf7e WHIRLPOOL 19e4a9ce1be533439f3094069c168741cbd214380a15db60f1bffaac521e14e8502c80007a0b9a495fadfae573c81229a1b7b739f0080ede0a9c10bb6a5ae05b
 EBUILD darktable-1.1.2-r1.ebuild 2989 SHA256 b31004dfe6caa3d0d5495722b30222406112c0dcf986e127fa59f049f7cba64e SHA512 e4ce54c4ca67448a7336f0f490c03beccc9674587664d141a06753be05d191390347b62eae5a55481de5dd59894f6c17160af8f5e106f557a51e18aa741a2cdb WHIRLPOOL 36493ae71d39af79d90525f6fb579b3b47edef01dec0c5169e8f3fd2651b07f038498351664cd124bb118299f4092e5ec4a3002534fd04fdd430855f627a3f21
 EBUILD darktable-1.1.2.ebuild 2986 SHA256 0c6b11e5a2856a9ecf62c310458ed1879ea6da152facb71219538ffd15f977c9 SHA512 fa61f6284ba81edf1f15a4b0f678977aa7a7b068f1d8e172393c5b4e235aefb1228fb67e089de0384d8d7c47d037b766801400bb2576e6d303603514dd1917cf WHIRLPOOL c1220932626af7649a364837fd72b3d578201cec642092fda1f4edb49ee20cb393db1b0020df88ae43e78f95c8f6d6302a50339d8e8ea2febedd482295754029
-EBUILD darktable-9999.ebuild 3020 SHA256 189f724adb239836fda3b2013bb0310de77a0fb88e04724412cadff8bded8916 SHA512 327ea1c0c873920e6b74db8d3e6bfdb8f86225c99f77be2bb8971ed39b59bd32d1963ef42b5306b88b881256628af77c864b9553ded6e5190e1984f0f22812d1 WHIRLPOOL ce9b83418582b5d29a32b2e09391880fd0fd7259ddc5d30bbe998b5ecafdfe855c45c6be548a1a21d09363c7f048a9e5f58f04448f42d1af35db99f2b55fc2f6
-MISC ChangeLog 7147 SHA256 dd54d519b05d6b77759dbe4238b58fdb67463accb8a183870ac9672cd359e1db SHA512 798776e0ef08c48ee29486a0a1fc14f273d7b4431d432cf2a39468031db2013ab115aa8e9344feecc9c08c2d4965626fb4da00993437082ebe0790771b329dbc WHIRLPOOL f1fc39d5d9130955cc1a027e7c3b2b5fff242e63877711fee7ee5c4eaadc66e9aa04e363aea3fa6a40aa546807b59714da964812c0aa9cf02004beccf525d544
+EBUILD darktable-1.1.3.ebuild 3036 SHA256 4daeddd7796df9e927a3f41fcdaa88b73eb044d514b197c4c607485029157d5f SHA512 168ad1b057bed3024387cb5e472f54fa15acb4908f69fee7308d1661b6e293c3d812d6bf0b6dc65381bf8c48beea4c5e72755688ca06ed131b239bcc999ffebc WHIRLPOOL 3c368771644de951183ad73d8d5ccbedac52b062b60aee72016444006c5d02f8e05cd9b5e9852b2ffa333e8208fa94d09869c354a7ec0f13afacf3be9665371c
+EBUILD darktable-9999.ebuild 3064 SHA256 f6f458fff4c783eec7b65bf4a4ce616b31c5149c2a21472bde4243f0cdd65c5d SHA512 2cf0e6fa85b7b3955d4ee02a2d11996c3dd1f198de646eecbf13ac7df691ecbdfb1c8881f44e088ce6ccf758cd4c76735b3a8b2d3074b1459f2b851b32c5cfac WHIRLPOOL 6cd0fc5b0cbcfd24f04a7edda819a891151706aeb49b6f18ceb6fc844163eca37b657ffc706959005ff9ebed70bd9bd3d751c64cea3993e7f20b17ba0fb9ba3d
+MISC ChangeLog 7370 SHA256 55983ddd9627cf02f23164b6473c7ba77b53c3d1a7e2edfd84de926c9954cd2e SHA512 5986f137cb067feb2187c4653beb13f1cdd2052dc23eb531c6118d3eec78d9b32bc2dae92ed5b8c467677e0d631a6ef5331f48aa258f045e4b10ca83de33d69b WHIRLPOOL b0341b7cd6011d92ba682e86a40779549dcd4fe2e9d4a1dbf34493d22a3d8044c629adb7f0121093b4aeefbdbd2277ce3b67c65cf333b5a250af4b5a3c6f8e25
 MISC metadata.xml 1048 SHA256 ec368b5aa921fe7a1d4cf9e2739475af497fe3b3014a7c25163be36b78aa6cc4 SHA512 a133b1c39b5f018cb9afddda6dbd80a628611419c385146e5e1e7339cb180991ccfdb7cf4a1b69e3d07f7727db26e0ebd484d304c3352291a99764b499703b8a WHIRLPOOL e89235504e82052b90ce857f05560c7080b3ad536f6c5c1423c823b425f314905de8a4808b0da639954297513b50ae43567a4018a6b372598682a223f2f3ba7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFCrRAAoJEDxpGckxwJCBPJUP+waSgTorg9Euqnm9olQ5rK7X
-tErkAjy7N5lEFuapUGEPlifhEohL9OI/T+Rx1RxjmEOer+vjwspUEtygNeaYz9sS
-p20X5FSMyx9Y/WHLiKw8kd2H4y2MjQwbxTS7S1h7TJh/syUBPU/YMehvkakHkcXN
-BuzrtUihVejkLd/nFS6KA0kvwOJNu4x+Bm7rf/UTNevH+sZmB/UHr2WRRpOk4xLY
-bRhy4l/qjRDu4BnFbTTDdlzkqSJ1hDwKNiOdJ+vw8cnqEvYsf+c75iy0aL2a3OIF
-Z5ykrO2tzPT+WEjUUkuf14DIRhllIKu2inzvU+L47MYh72c/YuKY47/119Eh5tHq
-lE6ddKmwsb5rrsdsF1461gUlfJqWTKOoHPTI0vvvcW7P+ikuW56RjQigVECEXfuf
-pvJwp4ubOy4kkPjNjfyE3/LuY0vgFu/5KyTrygTDezza0PxxFazd+ePjjXWtXSyp
-UeTNzza8VWtSS/PAelVQitcTL6EvwL69jZQhcqQFZPhnXoNIbroX1kRzi1y/9i4M
-kSup5nnqfdMxhdxPjeJUUEC0GXmniNnQhmWY5d31vDNm35mYXCaavF9dEYYZXvcs
-UGwNBajSddvT8UNW4FBRfN9CkeqaCWEKohOKFCkR3vQuhBCIKIrnJ7pqX26bzFAa
-CLTupYhaSh9/kE3vVyVJ
-=qJpE
+iQEcBAEBCAAGBQJRFrx6AAoJEEqz6FtPBkyjK60IAKLwEp6XOIlTEBunW0OPMOCu
+P2sKw8gtl8yBtpCcPdBuEGAtV4ERJ0ILmvpwSA7mOG3hcRDFYh+xHWQOv5Ga3cRQ
+2mZjyoi8QksrIzaL3NooQlkurH/SBmWVtdfGhz5LLKcYbJrGuJqBGCW5yY0UXFVC
+MDkiKPR75H5jivd3FiLa7fI6TE8yh+I4gIe0DuSvbVZAfE72tOwlZwIQL/aRmYox
+1vReZZqItHyKhHGYDYrm1aYTmGiASRJ4Rm7fKkJF6AZG6hepDUFqVG9rq2bMEoYE
+sM0M3dFAO8AoaPaJ8hpEmOyEXi9JQtCsPihDbhliK3u/L/5y/GRxB18+Kmf8hyE=
+=q785
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.1.3.ebuild b/media-gfx/darktable/darktable-1.1.3.ebuild
new file mode 100644
index 000000000000..a4bf7dfae809
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.1.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.1.3.ebuild,v 1.1 2013/02/09 21:15:34 radhermit 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}/${PN}-usermanual-1.1.2.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colord doc facebook flickr geo gnome-keyring gphoto2 kde
+nls opencl openmp pax_kernel +rawspeed +slideshow"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.28:2
+	dev-libs/libxml2:2
+	colord? ( x11-misc/colord )
+	facebook? ( dev-libs/json-glib )
+	flickr? ( media-libs/flickcurl )
+	geo? ( net-libs/libsoup:2.4 )
+	gnome-keyring? ( gnome-base/gnome-keyring )
+	gnome-base/librsvg:2
+	gphoto2? ( media-libs/libgphoto2 )
+	kde? (
+		dev-libs/dbus-glib
+		kde-base/kwalletd
+	)
+	media-gfx/exiv2[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3
+	media-libs/libpng:0
+	media-libs/openexr
+	media-libs/tiff:0
+	net-misc/curl
+	opencl? ( virtual/opencl )
+	slideshow? (
+		media-libs/libsdl
+		virtual/glu
+		virtual/opengl
+	)
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	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 facebook GLIBJSON)
+		$(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 kde KWALLET)
+		$(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_build slideshow SLIDESHOW)
+		-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
+
+	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 703d192e4cff..98015192fc8d 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.6 2013/01/24 02:32:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.7 2013/02/09 21:15:34 radhermit Exp $
 
 EAPI="5"
 
@@ -19,6 +19,7 @@ nls opencl openmp pax_kernel +rawspeed +slideshow"
 
 CDEPEND="
 	dev-db/sqlite:3
+	>=dev-libs/glib-2.28:2
 	dev-libs/libxml2:2
 	colord? ( x11-misc/colord )
 	facebook? ( dev-libs/json-glib )
@@ -32,9 +33,9 @@ CDEPEND="
 	media-gfx/exiv2[xmp]
 	media-libs/lcms:2
 	>=media-libs/lensfun-0.2.3
-	media-libs/libpng
+	media-libs/libpng:0
 	media-libs/openexr
-	media-libs/tiff
+	media-libs/tiff:0
 	net-misc/curl
 	opencl? ( virtual/opencl )
 	slideshow? (
@@ -45,7 +46,8 @@ CDEPEND="
 	virtual/jpeg
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2"
+	x11-libs/gtk+:2
+	x11-libs/pango"
 RDEPEND="${CDEPEND}
 	kde? ( kde-base/kwalletd )"
 DEPEND="${CDEPEND}