Revbump to merge facebook and picasa support under the web-services use flag. Remove old.

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

5 files changed, 31 insertions, 23 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 8edd44cf85e6..f8aa1991193c 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.42 2013/04/08 01:09:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.43 2013/04/08 17:03:38 radhermit Exp $
+
+*darktable-1.2-r1 (08 Apr 2013)
+
+  08 Apr 2013; Tim Harder <radhermit@gentoo.org> -darktable-1.2.ebuild,
+  +darktable-1.2-r1.ebuild, darktable-9999.ebuild, metadata.xml:
+  Revbump to merge facebook and picasa support under the web-services use flag.
+  Remove old.
 
 *darktable-1.2 (08 Apr 2013)
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 9974b70843f2..62e02484b9af 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -10,18 +10,18 @@ DIST darktable-usermanual-1.2.pdf 10016945 SHA256 d82a2de84cbcbfee30f86b22ca5f7c
 EBUILD darktable-1.1.2-r1.ebuild 2989 SHA256 b31004dfe6caa3d0d5495722b30222406112c0dcf986e127fa59f049f7cba64e SHA512 e4ce54c4ca67448a7336f0f490c03beccc9674587664d141a06753be05d191390347b62eae5a55481de5dd59894f6c17160af8f5e106f557a51e18aa741a2cdb WHIRLPOOL 36493ae71d39af79d90525f6fb579b3b47edef01dec0c5169e8f3fd2651b07f038498351664cd124bb118299f4092e5ec4a3002534fd04fdd430855f627a3f21
 EBUILD darktable-1.1.3.ebuild 3036 SHA256 c41f307aa3a33347cb5522d582a4493f05ee14f6e0ad88680c543be674534d12 SHA512 1bdb32402a355ae859b0818bd3198490b950c5b5cea8feaad9d92e060e8471708cb4917717015cf702074ae1f756f5adc48d6eeb972eb0e420d436e5c22ecc1d WHIRLPOOL 51d19ad1aca2d4f7d9559c45eb7dad7dd6fd82f6aefa43a8d55ea8088d6f3c293eafa9b943de9b49983df9783b8dfa771d7fa9130920a6af78966ef797f6af95
 EBUILD darktable-1.1.4.ebuild 3036 SHA256 a4bd471b70d7c8ac9d7b46fda165400331e6f5b7f9f53509ce658ff9753018c6 SHA512 b1f190d28eede6ef61320f25d826cafada48ca1ef91831d50e2b604b067d5fb4ee42c83be165e265c4d999c72b3bed2d815c943e127797a1dbdb2ac18508d3dd WHIRLPOOL 56d833114151d1cafb08abcb3bd4d0f2825dc52122b8eda04765ab9a7858bbca5c9819ab04f3d89a66f0b6e5c6f3857a66011a55288bc5acb4243bc4f0151f9e
-EBUILD darktable-1.2.ebuild 3217 SHA256 409454ac12ca0503db12a6b4905823132be25d8ed71401f7fe432ac4f8580f78 SHA512 6f8609f9796c47fbf5c6f9ee34e1358b882538f424d82714b436743c3c3f6afd245eabd917651f2337777497a8059c12d1aa03130fa95341c284e0dbd44d01de WHIRLPOOL cfc19af9531f4b15bc3cfa0d5be86dbf2fc2a383c37b8483e6f196644b4d5342d99126cfce2af568995e0644390ce7d9d2c3e0d98c91f1e3d65b5e3782b37804
-EBUILD darktable-9999.ebuild 3064 SHA256 f6f458fff4c783eec7b65bf4a4ce616b31c5149c2a21472bde4243f0cdd65c5d SHA512 2cf0e6fa85b7b3955d4ee02a2d11996c3dd1f198de646eecbf13ac7df691ecbdfb1c8881f44e088ce6ccf758cd4c76735b3a8b2d3074b1459f2b851b32c5cfac WHIRLPOOL 6cd0fc5b0cbcfd24f04a7edda819a891151706aeb49b6f18ceb6fc844163eca37b657ffc706959005ff9ebed70bd9bd3d751c64cea3993e7f20b17ba0fb9ba3d
-MISC ChangeLog 8190 SHA256 8c2dd9a861e0943de9c155259346af691ff76e816896c062597595e56387bd33 SHA512 8d368dac9d46c90cb217a8823af4f8bdd46f890740097d479ab58b091027aeceee6903ba0d69af7c96425805d037084ef6d9c38998a40a07e53f9f05c552dbc5 WHIRLPOOL 569ab132aeeafe75286e1a8d1fbaf47d12649fe16f57fb1001528c5ceb1425ff6e934ab419f1af84c438272cf94c7e8ba88ce0d726b2d1452e24d0fa04b86c63
-MISC metadata.xml 1048 SHA256 ec368b5aa921fe7a1d4cf9e2739475af497fe3b3014a7c25163be36b78aa6cc4 SHA512 a133b1c39b5f018cb9afddda6dbd80a628611419c385146e5e1e7339cb180991ccfdb7cf4a1b69e3d07f7727db26e0ebd484d304c3352291a99764b499703b8a WHIRLPOOL e89235504e82052b90ce857f05560c7080b3ad536f6c5c1423c823b425f314905de8a4808b0da639954297513b50ae43567a4018a6b372598682a223f2f3ba7a
+EBUILD darktable-1.2-r1.ebuild 3232 SHA256 51cd2ab7107c35c14b58981f9e6f25d93756b31567f0fa42cecb6820701da63c SHA512 ec445beb9a0eff90ff57896f344951c2bf618c135fc1951c25d0581056acb30ee6f6f11aa6c5440674bf6ae1141811b3bcb180b3c9eb393a0df9030c3cba2d7d WHIRLPOOL 8464e4e5702f126f02903b22f65dd6d3f90a0f140cd7f269b893d5039b00f1aa1f74ba7e31af0e6e76f8923da8255b37906a3967465eeff4abd12d835526d63b
+EBUILD darktable-9999.ebuild 3074 SHA256 a8d10b17f12474fbd1e34bb9b3a3c09c6e13f7fcb8d42ab78e6ea8b7b51ef4f8 SHA512 9833b04513003ce440d976556ca71a2567652f7bf371c0e66243b1896e5bbad5ad3a5f11a4ad49858671b73a5502f5d619ebe27f986d3d1c8fd35c89b1cda661 WHIRLPOOL 0f90f450e236d9da84a04532f9ed364e37e051406878db44a38bd8ce181504f06cc9aef33f1aabfa7cdb87fee09642ff462528d1b55a43371049279ae53f2386
+MISC ChangeLog 8455 SHA256 fece931872692bbd13a717808eeba6ea9de52c153eeae3aa9c785340cbdb6b3c SHA512 c55a74ed5a82452f8e686572994be719c038ac3dcc3dac447071822f133950d1c67f7a89bf0c76d89d42b716f605a8b7bf64e79f802806fbf04b33487633e7b2 WHIRLPOOL ef001e5ea8447eaab51707f10bc5038e45ab99d3287370e16408e06e53f5983ba12b80b9b81109d15035b5e8eff5b7e17617a151c21916af8313417ff7549061
+MISC metadata.xml 1139 SHA256 a6511be8e6a25bd0d8215755d6d85608db9ccd6837d233adf2c7375e1a746648 SHA512 8421de683b224297fda0fdf58d86331612125d783d88cb226d77f2cf2ce62757a3c46cf1aee0608191b92daf42dda375c1bfd8441db2bd9f5bcec38b322249cf WHIRLPOOL c44f8af331d9ea5269287052ad95a8e27502d379fc5de5072d8c956e8e82959eb70157a812db8c5d1f25cb66a28962ed3ad0de125bf86f8b24fb81eda4c73151
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRYhjZAAoJEEqz6FtPBkyjq50H/3hxldUfMkamCOvO4177sru/
-OgbSBBR5IbokbQo6KubR/4VU/m7eapf/5xAMZ+OYOUyT90n9Jcnmg8hzY2/OPb88
-wanah6iKfwJ2tW3NHWmTV1ME7vYb7xdRxEW8lxMK4bwVSXCIDOJ5mRxmwjB3TUfk
-Dw/U3KqatnuwnqnXOULLkT3gMBbKPU5RDI1OPRY2/J/O60fJYm5lOLnm7+BGnn4X
-RjqqySDCf5S/zw/CybhxZzbM1qhKwwrtvUC9AczWkdtHUwIASfBkrtQzHuLUOJVf
-KYIL97q7iLcWPLldqZSUA314wCLo5j4P271hW4Y13dhkD1bSRcK2MR1pELdFF8U=
-=idTU
+iQEcBAEBCAAGBQJRYvhrAAoJEEqz6FtPBkyjkHIIAKh8Wo1c2Go275BxrWfXztqP
+sJF+lT9hPbR1pziFhk9uMgyBdBBzocmOBU4Dt2Kkw7ks1lzEDuhHCCQItZcybykl
+VwGwGSfRzlJzFuBYDIX89MJo8+QpQ48lqKOm27ok0APy/BRPARbEtstnqTQk/hZg
+1Gia51X1nh5pCrHvEgCcjYrZCsuaCgNSYcm3KjmRp3Xzm+0S0drCRmw/tSbguVXD
+CLoBSJkssNrVqW2O36DCteTafSTGKRCTOFXqRh11dO6vHP1RT9mXczGxeGOChTcu
+kH5Zbfh0mTBu27JyiiTWSGGbXCHIfcp7abkmGpEhXrYM0n+PDW9oMd4+9cFImxc=
+=+ko4
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.2.ebuild b/media-gfx/darktable/darktable-1.2-r1.ebuild
index 43a165751378..6ad84d5b0d2c 100644
--- a/media-gfx/darktable/darktable-1.2.ebuild
+++ b/media-gfx/darktable/darktable-1.2-r1.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-1.2.ebuild,v 1.1 2013/04/08 01:09:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.2-r1.ebuild,v 1.1 2013/04/08 17:03:38 radhermit Exp $
 
 EAPI=5
 
@@ -14,15 +14,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 LICENSE="GPL-3 CC-BY-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"
+IUSE="colord doc flickr geo gnome-keyring gphoto2 graphicsmagick
+jpeg2k kde nls opencl openmp pax_kernel +rawspeed +slideshow web-services"
 
 CDEPEND="
 	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 )
@@ -44,6 +43,7 @@ CDEPEND="
 		virtual/opengl
 	)
 	virtual/jpeg
+	web-services? ( dev-libs/json-glib )
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
@@ -71,7 +71,6 @@ src_prepare() {
 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)
@@ -83,6 +82,7 @@ src_configure() {
 		$(cmake-utils_use_use openmp OPENMP)
 		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
 		$(cmake-utils_use_build slideshow SLIDESHOW)
+		$(cmake-utils_use_use web-services GLIBJSON)
 		-DCUSTOM_CFLAGS=ON
 		-DINSTALL_IOP_EXPERIMENTAL=ON
 		-DINSTALL_IOP_LEGACY=ON
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 98015192fc8d..edc08d6d7bf8 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,8 +1,8 @@
 # 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.7 2013/02/09 21:15:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-9999.ebuild,v 1.8 2013/04/08 17:03:38 radhermit Exp $
 
-EAPI="5"
+EAPI=5
 
 inherit cmake-utils toolchain-funcs gnome2-utils fdo-mime git-2 pax-utils eutils
 
@@ -14,15 +14,14 @@ HOMEPAGE="http://www.darktable.org/"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="colord facebook flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
-nls opencl openmp pax_kernel +rawspeed +slideshow"
+IUSE="colord flickr geo gnome-keyring gphoto2 graphicsmagick jpeg2k kde
+nls opencl openmp pax_kernel +rawspeed +slideshow web-services"
 
 CDEPEND="
 	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 )
@@ -44,6 +43,7 @@ CDEPEND="
 		virtual/opengl
 	)
 	virtual/jpeg
+	web-services? ( dev-libs/json-glib )
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:2
@@ -71,7 +71,6 @@ src_prepare() {
 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)
@@ -83,6 +82,7 @@ src_configure() {
 		$(cmake-utils_use_use openmp OPENMP)
 		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
 		$(cmake-utils_use_build slideshow SLIDESHOW)
+		$(cmake-utils_use_use web-services GLIBJSON)
 		-DCUSTOM_CFLAGS=ON
 		-DINSTALL_IOP_EXPERIMENTAL=ON
 		-DINSTALL_IOP_LEGACY=ON
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 6251beedd193..987489639478 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -16,6 +16,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="web-services">Add support for uploading photos to facebook and picasa</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">darktable-org/darktable</remote-id>