Version bump (bug #475590), add squish use flag.

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

5 files changed, 144 insertions, 10 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 90a88d8aaf21..bc9e44f4553d 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2013/06/13 12:28:27 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.48 2013/07/03 09:43:13 radhermit Exp $
+
+*darktable-1.2.2 (03 Jul 2013)
+
+  03 Jul 2013; Tim Harder <radhermit@gentoo.org> +darktable-1.2.2.ebuild,
+  darktable-9999.ebuild, metadata.xml:
+  Version bump (bug #475590), add squish use flag.
 
   13 Jun 2013; Michael Weber <xmw@gentoo.org> darktable-1.2-r1.ebuild,
   darktable-1.2.1.ebuild, darktable-9999.ebuild:
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 7fe63cf3490c..482cf997b8e2 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -3,20 +3,27 @@ Hash: SHA256
 
 DIST darktable-1.1.4.tar.xz 2231272 SHA256 fb6bc7d5a672b1b493921e80aae8cff2a94e66da7acee9e2cdbd83fa11ececaf SHA512 6ab94c4d49697fc32727ab6f62a37ea56b40968e29a737863640b486054116e21596c440432a81e41368957d9b2eca34ff466b1e0ba494091f4fee97c6350b80 WHIRLPOOL 2813334c4f5e84adf7917e63c4342532fbcb97630885e49957aba017365db516ceda4278eb7d873bcf45f1353bf9b523d178c1bbf913be7910b1ce9081266a21
 DIST darktable-1.2.1.tar.xz 2273260 SHA256 b1756295dfda78fc828603033a58f233ced1908b8a50ec97d2e600d6eacf8e2a SHA512 d9e36ebd9d6b452a645a0b510ec54cc51694a29c90e1ca4435ac5cd1591c048092bab39820a5a733622ed3ce5400c5320e6e828c5fc3964aa8e2b0e77ebc03ff WHIRLPOOL 756d2e4a37d17069364769043c708924b1f9f78a3a4784b3683df09e29ee43b4543c8a1ae75876a98c4cf7c6ea67a5b4d9c5421641eca3fd6b4be61cb22386dc
+DIST darktable-1.2.2.tar.xz 2307300 SHA256 12902e8c3ef185d2167ce3a5f9d11eddde763c5a3cb0e9267f4b470a252fc859 SHA512 d8ec6535119eb0a275efd13c53ec218d08c50595a7417ededf7766208fdbaf44296fbd9044d91f92521d910aff6a5df0ae97a63f87027f972443dabdddb0878e WHIRLPOOL 5ab068c82cbc0c9503a08af2a19e7a2cff9e522b55a6984ad8012ed621bdb2be0ce6dbef48409814b35328401dd1b7d8ddb779117de08a0738e390e9bd34cee7
 DIST darktable-1.2.tar.xz 2399856 SHA256 dc52582b5c5dfbd22e936f1d441e192a4aa53ac6533fe2c53aaa59433ccd5450 SHA512 3a0e10bfeeade0225c7f07a0419a7c7f6f99d6e6a81618e63edf42a00ba3ffa1699c221ade61626f2a1c49e66d275b4351f6dcdb4db8786e6d28b36b68c5758e WHIRLPOOL dc45e15927f015e6c6fcd1e277d46cdeb6efcf5d3eb8b3cf25ccb4a9448f55774022fc1ac1d613251c957a337438c7f7abd1fda53d1ae10d79575f44bb6c9b08
 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.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c08292b3de6faf54ad130252ddd47d7574a SHA512 f9de8e0bf47eb5a0f84f6abf32f55e87d4275c1dc6447f1a6cfa5b5442f98239d48f377ab760803d07542e9120e25e9ba1d2959575899116b8bb6b1138402ef1 WHIRLPOOL 1e5fe61b7c7c8a63e693f2b748c25f0559ad38ad6b7fdf06564167792be6a833c695825c62a353f4c52abde53a044be3bdb4bc0c737039ebc48c5cf5c9bb417e
 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-9999.ebuild 3070 SHA256 e40b73b3255f87e27984b77189de0691864325ec479c21dc16b55d65a807b750 SHA512 2609b3e94b269bb085346d49219e16a0d2198abce39172539653bd8f0a3eefe54a1ae5a01a5839dda474a4ba9e5bd8f4a8a441ab1ca756d17fb1d5927c745325 WHIRLPOOL 7b74acc637510b39d71b9a2fe4ba100398bd69af5b51130d97f843c183bbff2b8596858978ec17dc9c0fc3a6a6d17f41d48cbde46e3249cd9cb795e48077923c
-MISC ChangeLog 8967 SHA256 2bfd85df07fd2629d02eeba78ee1890cafe3521175cb14fefded2a58c5606c09 SHA512 6f92a4a8259c79b0a4cff5be1e0a34310e889a9c382c5dc419f7cc50fb92323bb94e9393cdfd038f14960348edcd3076e00aa606a6c790a733470b8a69b9408e WHIRLPOOL f4723e4b0c5ae7d90a8e8df0e200d4167f80ae446c94dfbb57fdad5f3b310424f95a138d45e334b9f2a5789f8d68ca64bb258cb5a161994478cafcff50beb698
-MISC metadata.xml 1049 SHA256 9a4a7037384f2ea6c9849bf3828fae67cfc5ebb9f978896dfb3a69e2f3720bdc SHA512 d64580941ff564e18b9000abf6da071eb16aa11c387b1d2bf2442b3d381f6a862a74291bc44ff9c7b8f48b7ceacf5adcede4a76b60aab8d8d4fe0677bbf52d07 WHIRLPOOL 4ef96782982ddcd308a26b6d372b326af0a466dcae6ba54bec44291e9780e2efa06dbb7c770748c726df202c20e84fe7851a327073388d2f3e4a9d649b1151ba
+EBUILD darktable-1.2.2.ebuild 3282 SHA256 27155af50e6786529aae0602d48891d1a6604261669f6164f18fad783c5aba98 SHA512 46240b85ecd449a2d37852c8919c85c76b71c33c9a124663e2205e93f5deeb89197f1d6bd40ddcad09078516417b038eab2f48e30e0375dad4dac7d6bf5e8348 WHIRLPOOL d6bd2ea90a1797af0ad9ab915be3f407ca5a8e4dbe14e4865066ad368ed4f28487fe3088f9cf3b58771d216caf8cb8ccf23812129108f93b126ab020f0ed8439
+EBUILD darktable-9999.ebuild 3112 SHA256 0af16d1c9f18a57a9c667cb2c375427d3681c846fc5e0f087b2f124a3d7b124f SHA512 a2d643de1764abce608a19de1c3c8b6060dcf62347ee1f55ccde658cd75df07b3840099298f0b11a85644fb53050fd6f826eb6f725b92b24ded894647d433787 WHIRLPOOL efc380dad4c06a38968fac39e95acd4ed3c0ddb7ec3fc04359f7ec737cd44194d64ce778079c9c9f74d31b09beba73317c92dd602fc96429135221985927a3b0
+MISC ChangeLog 9170 SHA256 0210731e7f714e00e3fcd98b97c6c091663563b7ec5d404cf41bef9eea2ad1fd SHA512 1e691ad8300e1dcff5a2dfb6fe3ff43c276b445d2aa64296c8d623ec2994cb98ba89d5a7f575d716eb3f169ec877448820e1fe664417ae496d300f57fd49ffc0 WHIRLPOOL c88a5bea615a7de32fc69391b4069285ab910938ef33dc14aa17dc2ea2aa1af6a4d8499d3e3304d4ba03de1d318512ef5a6fb72c54ac4048c2dfe8e7e26f2116
+MISC metadata.xml 1121 SHA256 b2d6c40dc326c84b5ce856745519a04627df08ca73cba7e92322c4c7f98c6ea7 SHA512 0469616de1eaccb16762d2d9aed4428bf980761ccd02da1096be0a9dfb4b92294d6cc370718b9ba5de09b44484b538a578983996f93a2b7508d9e908fc86c05d WHIRLPOOL 25665e87a9db93c9856de5ff2f301f3bd3ace0de94d65c1d747b1c08dcaca737db7033cf8b02c7ec5224006a9db2011a2d7fc372c9a31487fe4dfff797ba3cd5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG5uu8ACgkQknrdDGLu8JBxtwD9GQMMrW7tHn0lojdgx6u1XyW3
-dFB8v/1sfU0hLkmHOEEA/j7h7wFosH+TtKJrVa9qM2q/5dd3aaq4iGqoLB/+saOw
-=+1gy
+iQEcBAEBCAAGBQJR0/I1AAoJEEqz6FtPBkyjEj4H/3wixFxn6+keISLNeRv+7dbo
+uoz+AmqajflXwsL3leRxIV1hYPi59Mens/KWbTBQGdiHEJVQxLq2P3Ybmt7omGIY
+5lRhzup3AvLgc7y6fQZWWuYnudUf8iM5uPJYX3ispXiV/C4X6cV4OTm7y6waTdA2
+7AzyZgNc+6cSi9iU6Yhl8OujSFzIv7diJGaXE718kkYseSxh3FBpf6nwVnRVNjbN
+ls3QiemNyc4rVDJk804XkUSNYd/ZLb3vkeSTkEdCVJQNJKQCbxYvQOAmQgObm/cF
+X+Xfwxmp/3bAu4kyYqSDIptFdxDr0hQc+HTAjQ5zHHVSQctwtOk8bjngZ05rxWo=
+=Tq7E
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.2.2.ebuild b/media-gfx/darktable/darktable-1.2.2.ebuild
new file mode 100644
index 000000000000..cd8912402f3d
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.2.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.2.2.ebuild,v 1.1 2013/07/03 09:43:13 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}/${PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${PV}.pdf )"
+
+LICENSE="GPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
+nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services"
+
+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-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
+	web-services? ( dev-libs/json-glib )
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango"
+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)
+		-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 31d57f220c2b..a60780d07300 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.9 2013/06/13 12:28:27 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.10 2013/07/03 09:43:13 radhermit Exp $
 
 EAPI=5
 
@@ -13,9 +13,8 @@ HOMEPAGE="http://www.darktable.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="colord flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
-nls opencl openmp pax_kernel +rawspeed +slideshow web-services"
+nls opencl openmp pax_kernel +rawspeed +slideshow +squish web-services"
 
 CDEPEND="
 	dev-db/sqlite:3
@@ -81,6 +80,7 @@ src_configure() {
 		$(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)
 		-DCUSTOM_CFLAGS=ON
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 4da6e33def5f..5de9b5c15194 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -12,6 +12,7 @@
 		<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>
+		<flag name="squish">Enable thumbnail compression via libsquish</flag>
 		<flag name="web-services">Add support for uploading photos to facebook and picasa</flag>
 	</use>
 	<upstream>