Version bump. Add graphicsmagick/jpeg2k use flags and update the desktop mime database on install. Add pax_kernel use flag to work around hardened issue (bug #448692 by prometheanfire).

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

5 files changed, 162 insertions, 16 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 6e8bff16fa48..d0815b667079 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/darktable
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.32 2012/12/19 19:15:46 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.33 2013/01/12 18:36:25 radhermit Exp $
+
+*darktable-1.1.2 (12 Jan 2013)
+
+  12 Jan 2013; Tim Harder <radhermit@gentoo.org> +darktable-1.1.2.ebuild,
+  darktable-9999.ebuild, metadata.xml:
+  Version bump. Add graphicsmagick/jpeg2k use flags and update the desktop mime
+  database on install. Add pax_kernel use flag to work around hardened issue
+  (bug #448692 by prometheanfire).
 
   19 Dec 2012; Tim Harder <radhermit@gentoo.org> darktable-9999.ebuild,
   metadata.xml:
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 05d7c3f64eb7..f7c002d29b44 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -10,20 +10,22 @@ AUX darktable-1.1-cflags.patch 1873 SHA256 70fc3b64fe2f3c31dd58bc414a555c4d65832
 AUX darktable-1.1-opencl-kernels.patch 247 SHA256 764a7f47a6d09f21bb79885d63b3d154db67a0febe78e95e6ab29f8791c76d1f SHA512 73952dca22fbfb4680205c6bb180117fd820931152ae9999622555acc6c7cfd77e9dc2f565f6969a2deed2144611a45c7bb4d46d29f7bed8415309367593a0c2 WHIRLPOOL e8c203f19e62a7214f2347b5e54c1a1785054ccb54c4927f7ed4404265cac191ea71978b767bfc8fff8df64224d49e6974d365efc4c72f2de3da89d5e11ddbdf
 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-usermanual-1.1.1.pdf 8399829 SHA256 037e27a41aa4d0e2c2db3ae13bee47a2b6ec6195d953341ae637ad8495874552 SHA512 bbf3748c0c678ea84bbe57000c3b894e76b2bdf111faf9296e31b6776364757a19ecacd32d1e4edc248b6a9a00d19862a4e443e88a63707b269afe52f157a08a WHIRLPOOL 2ccfa5bf497358bc241de6e37b22d56c7718b107b78a109691d58267b7e75f29a98214444e36ee9ebf1b885231e224ba74ca0a4cf27053a14470084e240bd5a5
 EBUILD darktable-1.0.5.ebuild 2500 SHA256 f8db6938a8155063ec3bacd7adc14faa2d9dd3c87061ea6933b75b8944ab30c2 SHA512 7d42960cb7758e02e875306409d8f78977adcdc188134e6fc74bf3dde7e04fcf8b57a8e5c3e04c84ac98fb4dcf59a749b0fac2dc224aef344384e5e3256c9e10 WHIRLPOOL c0414f8022fcd3b6829cae6c4845f58fa53b90e3ca14fa314422e162fcc8e9fe0a00670636bb0aeaba63114e2d8593ebb1f5c4d161409c50440fd1a9cfa63f31
 EBUILD darktable-1.1.1.ebuild 2683 SHA256 d3639f558841ac62cca956670f8baeaf02f1d0ab2fa756c6a5a79d9a8b01ecf4 SHA512 3418f20080b935574837485f63a8047ccd9b5cec6abc9ae7bded2b99efc275e4713fdb4b52ce677db5a257ff4d03ab65124c28ece1a7d71f9abd90a7eed80578 WHIRLPOOL 1557a6fd95bde798d3e16ec323ced5156f358a570ef540bb1794d607e9b32630030adf700bafc74f44a5c8e7d5d16e87754532ac24086f3ed9dbf28f1aab430e
-EBUILD darktable-9999.ebuild 2535 SHA256 ef1d51457b8f27afdb8e424beb01ffc4905694f733a134ac78cfd64d9a4ec717 SHA512 84cca2d9705bbf3e504a705a25ec415d34e84305a47a33a6fbab342c2936f3938d3807c6f9c6b0951ce1c5e4b1f61e057635a6aeadbdff678c9917ea9bcb4aa2 WHIRLPOOL 80837ca872bc44cb9e20cf46f3d38b0ea3629532e908ace4d0ff22c8a44209a1e717316795843075a4cb1ad18f6c9a1342dacbdbd491a3031b80f6c8e96559a2
-MISC ChangeLog 6220 SHA256 ff28acb3284bf49fa949cacdb830e9150348a5eee3272dd07de413b0017ab043 SHA512 f963fb22c6ccd3535dc7375defc139b8b02e97b7ccc08b1b24005a891dfc7995b777c96fe206abbd771e388298a3ed1092310585a10bcfc5ea03993615288dd8 WHIRLPOOL b8deb1a1b9c01324e575a6f197b22c51176e275d9826420380620c7daf6cf295ad98238c86d3937349c4c4c17d1d5829d88b0c6588a4b730d4c04646cea99a44
-MISC metadata.xml 970 SHA256 c45910addcc7d82a9cf6b53e4eb4cedb6aa09a1b404a9516407527f5c4cbc85a SHA512 d06fd3e3163abe9450dd9b7bc59b0d3967e41ec3ef5d16f8512ef8f52e68cf9920b3e4e5f6fd3608e5d7571463c80dace50fc044c829f2ce353058b90adf35a6 WHIRLPOOL 117d1db5a94ac2ff03a08828c3eccd6248cc5107f2afb1c446b76653a6b91303d849296f74bd85dcb961875f45fe262abeadb1e98c97bb0115fa5f287f72bd11
+EBUILD darktable-1.1.2.ebuild 3200 SHA256 c9e6f522b54728231b6bd71342c5c35e1cb8e6031b40938c52c0ecb9d7873acf SHA512 d952b890774de4e25dbf54abd7e5bc434e8c0682b4dd49792c737e019a5a250b5cb98e11806a2827be3a40cd3280719b1c6280c2ada0f0a2a0a13aa2af5e12d3 WHIRLPOOL 23cc6ccbdaa5c822a8b35313bfaea1646e54c152076418f11531cb192113a89f7dcd7174b85f2014ff1aab3afb7bfa724e65499b3246a63ec66ab389a52f7f67
+EBUILD darktable-9999.ebuild 3060 SHA256 800b6b71681c12422819d5d55d95b797240ae87d20968545e11ef484c0ffaade SHA512 8a3ce27b9d7af1023881782af2126c4595ff079c5add4cb4c2bdcd065708c6af6e3ed382ceda4c12ebcb86f9f5738d30930a0e1b9754e624024a391b6ff240b8 WHIRLPOOL a668104b7386fd37b4539d4fd99af52675e05860c908b535a7e87ce603d0857c0ea08280ecf15d06561d8fa84581b22079d8946bee66fb92f389e9b2832e9a40
+MISC ChangeLog 6558 SHA256 e1e07c0acf14bb70f12ae7d21719390f2a4e1b44a1ad41ed2d18c9f315d9a60c SHA512 06e26e673b795a08da78342d2df56ec82b18215a44223e2a1ed821661b43a502aa4bf1b912017717b63c3b82b537954c13805e2381c4825d49a7a1bef15efe23 WHIRLPOOL c7e6f332feee488b4e703fa53fb85b7df557237da0aa0c1b2a850ced9122af0550b78cb7be4979e16b4ee9847f01b6ce3728acb5f9b8356e0175c69162332830
+MISC metadata.xml 1048 SHA256 ec368b5aa921fe7a1d4cf9e2739475af497fe3b3014a7c25163be36b78aa6cc4 SHA512 a133b1c39b5f018cb9afddda6dbd80a628611419c385146e5e1e7339cb180991ccfdb7cf4a1b69e3d07f7727db26e0ebd484d304c3352291a99764b499703b8a WHIRLPOOL e89235504e82052b90ce857f05560c7080b3ad536f6c5c1423c823b425f314905de8a4808b0da639954297513b50ae43567a4018a6b372598682a223f2f3ba7a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0hJnAAoJEEqz6FtPBkyjlFEH/i/Ug73/+TT4IYSSeRWm9zRh
-eD0rar6KpCY7jfip+WkVB3wun23KM13aNieUMWOYl35J5RMnQY0q2QdhO+6HsJVD
-sxSknrDAr25mwx84ylenEh9EDefJKoA2zNpQjnP0wkquPcJvTQLuNiq476ezhWQt
-4COA9/Vbcs/Y/FyuezijDYHHuTVUrA/ep4zeO6ZDgmlkOtuNyYvi0XiM9nAuSd3F
-hKbZi/Sj10BSl4E4JSPODZGpArSCgb5SD8ERXblUPu9eFfWv4dl+JsOak32INzH6
-aRD7AAXta6rnouU6aNZW65hQoa02vCz09ydKimS/xi9C1ehwZDuov2ViQHeX4zY=
-=pxpT
+iQEcBAEBCAAGBQJQ8a0uAAoJEEqz6FtPBkyj+l4H/3YI9E4RMI9SzzUiw/+hG5sf
+osA3cuLRIuR12IdqWjq36zOHPL48m1yc1ETup98MeXOVUlNTm/jyte8p6WtlzVBD
+6z49TWAbID7Etmj54+W4sctdzV9OUDI7gKsPWuqG9uwNhsLQcQgtey11lyKyzLmR
+Kyc/VbZAUkhjipU/RKfpgMuUfPcekqolg7HWg3aksJxqQUk0DbLJ1YUQwzq052VN
+21y/5wg4vRFD0XHXz9iIpxelHBvmdjMNRj8QOYPQJYusiLQpPwje3dteYbPLB/ki
+rdkRIQ8Gj0/eNsxBgLCVoHr6x4jpISsOg5ix3VgLy6gN5WlUAY+1dPuTTXkcV0Y=
+=szRc
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.1.2.ebuild b/media-gfx/darktable/darktable-1.1.2.ebuild
new file mode 100644
index 000000000000..9458766365a9
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.1.2.ebuild
@@ -0,0 +1,120 @@
+# 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.2.ebuild,v 1.1 2013/01/12 18:36:25 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.gz
+	doc? ( mirror://sourceforge/${PN}/${PN}-usermanual-1.1.1.pdf )"
+
+LICENSE="GPL-3 CCPL-Attribution-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colord doc facebook flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
+nls opencl openmp pax_kernel +rawspeed +slideshow"
+
+RDEPEND="
+	dev-db/sqlite:3
+	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 )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg2k? ( media-libs/openjpeg )
+	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
+	media-libs/openexr
+	media-libs/tiff
+	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"
+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 graphicsmagick GRAPHICSMAGICK)
+		$(cmake-utils_use_use jpeg2k OPENJPEG)
+		$(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-1.1.1.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 b5966c3a8b81..2a38d0fa3e5e 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.4 2012/12/19 19:15:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.5 2013/01/12 18:36:25 radhermit Exp $
 
 EAPI="5"
 
-inherit cmake-utils toolchain-funcs gnome2-utils git-2 eutils
+inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime git-2 pax-utils eutils
 
 EGIT_REPO_URI="git://github.com/darktable-org/darktable.git"
 
@@ -15,7 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="colord facebook flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
-nls opencl openmp +rawspeed +slideshow"
+nls opencl openmp pax_kernel +rawspeed +slideshow"
 
 RDEPEND="
 	dev-db/sqlite:3
@@ -91,14 +91,29 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+
+	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/metadata.xml b/media-gfx/darktable/metadata.xml
index e78c0b77cb72..6251beedd193 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geo">Enable geotagging support</flag>
 		<flag name="opencl">Enable opencl support</flag>
+		<flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>
 		<flag name="rawspeed">Enable the rawspeed backend</flag>
 		<flag name="slideshow">Build the opengl slideshow viewer</flag>
 	</use>