media-gfx/shotwell: Version BUmp and fix deps, #491732; thanks Mark R. Pariente for the patch

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 135 insertions, 20 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index deb110fb13ca..467bd91818ee 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.62 2013/10/26 13:59:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.63 2013/11/20 11:24:36 jlec Exp $
+
+*shotwell-0.15.1 (20 Nov 2013)
+
+  20 Nov 2013; Justin Lecher <jlec@gentoo.org> shotwell-0.15.0.ebuild,
+  +shotwell-0.15.1.ebuild:
+  Version BUmp and fix deps, #491732; thanks Mark R. Pariente for the patch
 
   26 Oct 2013; Justin Lecher <jlec@gentoo.org> shotwell-0.15.0.ebuild:
   Update deps, thanks Mao PU for the patch; #489464
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 75dde314720c..6a37b3b6a6a0 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -8,26 +8,28 @@ DIST shotwell-0.13.1.tar.xz 1497664 SHA256 e548c3274410e0696ffcd051eabd38ca2a507
 DIST shotwell-0.14.0.tar.xz 1523280 SHA256 0529a41bf9fce01d9f1a6d96e9c4b184c6f26de8356b20abd2b9e19e1f4062b5 SHA512 ec1c082a9de3e898fa14c23dffdb248f34cf2bf27556730891ad3274ca0efec84617b334b3d16dc1edaa05df257a61df0f592ea55d9f34dfb15e36ae8f18b320 WHIRLPOOL 08551c47a3924f135bfdfda7a27f3e10972f09acf4bf19e6c9349b05ae4734c6e87eb1ff85055f85c31ecd608e9f17062eaba3fd58a8c2d14121869944af43db
 DIST shotwell-0.14.1.tar.xz 1624784 SHA256 045c4833e23374b649e735661cedbbff8368624b6719547013db2c21c8402fef SHA512 cefc5130b7fd5bd2b7d7889c5ebba01e9a447e885ece8353e42cd4cd515c068722d2460a2cdf31a94824605091c06042e086986aff8fe2dd0b589ad2a2dce20b WHIRLPOOL b900737e101e6e85b2ab8ecb40162e9bdd5878642350bb634c5fcb3d72c4599463b4514523405bd210d9d73a619f0ea1e1afbed3bff225837979a82c9863dc99
 DIST shotwell-0.15.0.tar.xz 1676992 SHA256 ece985360c6b5b4fc090b513bc844f0f17754b236b86cf559f36a2d8a5298a1d SHA512 50f6faff46ec3b64ee200c8c9ea5944d7fcb48da554f745ab2a1205390abfc423562b381e6bac7cc30ab8e09dc69c22167fc1c8ac0438d482cfb24512f8e1ace WHIRLPOOL 9571e7b067e6f603a974b12ec12c566fe69ed56cabbd94d8cc3c02473bea38aa0d5eaae46e0020afef297c7f8c445f4e88b0d235d72c73a769e41e9162498272
+DIST shotwell-0.15.1.tar.xz 1676428 SHA256 eb48a0398774f172feaa4461146cc81a99540147bd8751c1e2091b21d4c20b8b SHA512 e660e6afe49e8fe51e4021899b8a56bc81a2e606769f4a7720146220cea1007960574dd6f1890d0decb9da79ed4d9b29b6f70ad7b2be0169d44689324fcc647a WHIRLPOOL 749b4e9505fcd6ad196d4a60873e1a80cf40c6b770f99d9df6303a63231fa407d86efed7710d8f42afc3fc131b5804b696f58a6c582a1b9194ebe8ef822efaaa
 EBUILD shotwell-0.13.1-r2.ebuild 2358 SHA256 6d498d092c76e70f75c361d224e6aea51e922ed27f63870fd36d9f9a1a883a5f SHA512 26d1c7e66430ecbe2e72ce8fdf92947ba0a08def957eca13bd8d3d4aa82d22531c8fd84e295f764bbe17049d06f7af244e3e75ed884019a8acd2bfcba35eb665 WHIRLPOOL 5d18cc2431350754b3e35b6c6fe0d2ee86ac66ff3d288ae22920ce9af31896e5b3221edceca0e9aad54faf9a4fc3ae04f99f0a34bddcaff1c9044f966da5f555
 EBUILD shotwell-0.14.0-r1.ebuild 2374 SHA256 469806b1b5b1af7a1f8546b52d5d0374ca8391907b9cee6694240c96d6cf97f2 SHA512 baa81ef7c09f22dc45ba11cd0392b0d1905c5ede62e87ba6165507e199539095b1f36987f43ea4964c525a105cce9611b6755fd3f43af0d9dd07063888655fbc WHIRLPOOL 1d108f836b57759300362b77372be500ea053cffd9f90239dbbf5e61db0fb0280b66f48fcdf27a1c1941c6caaf0874fd1748e02188507bcde966c7719f9b9e96
 EBUILD shotwell-0.14.1.ebuild 2415 SHA256 4660e83222bbf71810a03f70741ee366568cf6e96ac3749be78bf63b3c70da64 SHA512 885d26316c66e4849976911db942b1794a585f2151b7bcf1f43740d9bd033d5ad275a5435ea5e324d72599eef634cb36ce84d82b837c07ddff191197cdd1916f WHIRLPOOL 4e51d5d096667d4446943b838d11a826ff0ba4b099b70a56ecb4c7afcb40e966ed152455f9be02890eedbf46907a674db8315d639ef9b4a40bf078a1cb35e803
-EBUILD shotwell-0.15.0.ebuild 2802 SHA256 7c7fe45e8f05ec909b8fd5e7287b9dd5420ce6c81ca3a01d5a211593eee98aea SHA512 e9cebc7616e9ec8d85f59aa870a3fac363d8a754bec759c04308abced210e591fc2621ba97e80f0e77124c24db2f6b1b2f4dae43978dc1fa4ca82d0db350423a WHIRLPOOL 358e1c3955ddc7662ca44de0116af8de951871f513654bcd1ca9308011ed2ff8ec6aa216528a962f054935926ec5798a2ec75a10c1bcd3aaf18fe80c14843e32
-MISC ChangeLog 9856 SHA256 0f9f1fc3279396a487d45d2d9a302c93f1bf74fbc1e41cd784808be74aa3297e SHA512 8408ccd1310287e09df653bbcac57ab7f0bd38225b06de5ef2a752192e5078c671e53e2f05b00d81585f8aa44925e65d93d7d7e98a9c6a53f072a94fd599249c WHIRLPOOL 38515c56e6806daf0a0f750a5479dca1072311e8ab90e03a9e3e55edc55f9b562781ee51770609c69a3964096ac6ae00aff6f180cc82a96d0fbe0c3b371e944e
+EBUILD shotwell-0.15.0.ebuild 2805 SHA256 3a7b0e240bf63944b691e32c5c3bf718e591aae1ac1b9ff40c620e0ec431a407 SHA512 726b83ec57534a6cbf574c29e9c667d47965ad9737383b08ced828ba278aa0a9b70fbc1b8715a9330cb5ba747ed6f0c3686495ef2027bb76859f4897d4dcfa13 WHIRLPOOL b10a807d467dc99617c6447f22e6ef22a39a893e35098f25db063ec1b7e9cbae0be47bc6159b0d253f53ddb12a7dc65aa0c1c60c313d1ddfb44e32151870e797
+EBUILD shotwell-0.15.1.ebuild 2805 SHA256 95d52c26d1ad0da427cb150de9ea988347e6ebfdecaef412452690a45b49ddd1 SHA512 9f9c52daffaa21836a6aa58626805c3283e91366059c9abb9139da9e2b0568dcf30b3c027bd400f909be28141017278674437b46add6641bf27b15421f832388 WHIRLPOOL 34c94c8c9a498bc76b2133d23a32aa2a96012ca2795f112bf318703a7a2d11ebc7e05a6dc88d5ccf23825b7b638143dd1d84e3d29999bd0337eea41bcc2b04af
+MISC ChangeLog 10063 SHA256 49a165a325d5266b2577efa680f0afd159f936fc67f676b445814d2c840ad00e SHA512 d8280b3259610ddafc451e282dd04b2d28692419593aac771964e103121145255b9aed30a4f79e8b10b07b1e12ad8338a8afe70b9095aa326b5a832016483b59 WHIRLPOOL 7575188b6b10b135587bd7d91af62781c203cdbb28bcd4d4d2ed0bba7eaf279f6dcb7c1d68f772de168815c0ef7db2953c91922ec2dff3b8742610ca05416d16
 MISC metadata.xml 665 SHA256 d7ed9e0a0af566d5e6891e77c0b69c49df16b5d291f0126243892a3ec36aaedf SHA512 4bc0078d47452551bc043e9fb6d1774db44b9b2cf67ee581e9cdeeffb86b198c13753c7595638e1feedc9c876457d1d5393d064d6535f1b2283bcec43c861300 WHIRLPOOL e3bd5f1dc118225520d15e289e901c686478707b39e4aff702ae0d33ad7005f158874686d7d49ce2e5f18faeb920e612a109c0c9e6f4bd737a24b58578e7c088
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSa8rIAAoJELnU8jG9FVirpPAP/AolOVI7wVVDO6t13AwYxKT0
-TKoTusmxGC4n05YBVeCWBAXmdm4eEGfR7gLgNoQJ0vfHy0lzI6kBByXnkeHSldZF
-fD+wdDy0nrg9/eGku0XU6WJN/fkqXtSbONefz4KD8KDSnzV/kuRqvWTR10k4jbxA
-xy0g5bEX6j74hqMLUQ9WKeDjUQtJt+bO0Evzaojq1ECQm2MLSSb1Uw8Hn1cyPTyl
-0g5kJaqj+vT5IO0TEdaWPofAiKuEXvXYJEyWfp0gEUquIWcjH2rYI3oAMZIc05Mq
-YZCoUA9mi85ERU63Spo4xSTnVcV4CTqDbWa9Nu1Kgjuuk7weYYlR3hSk40rC31RJ
-71FdKiHgkY3uqYJdOrONxSFUlYOf9zos7u7Xe+rIqF8xf3IVg2S2iuSKPJ0cqQ73
-OS13nh8P60YlJJPgVicdYVyzDrvf0wGX5oz7vC+yc/YvZOA/zSA5rr+wEbgvp4gx
-cPO8s5+4c3D69LlG1IEqhvWEM00nk86YKAgC3/k9CG0XKZY+3kgQWD+Gi9VQzMkK
-CDU2M7+KzG/UCH25EgAc7CtWQ3TH4bsC26M7eXLX4CCvOkliNOqmAvAWSSpckoFj
-K1PgMl5/lYe3cHjtQIYXa5+k3aMRmnN28L6cT+Ca7LND3Bk9NWe4KaCb0YUVBW76
-meBi6vcOFE+/QsWipNn2
-=AWr6
+iQIcBAEBCgAGBQJSjJv1AAoJELnU8jG9FVirxgkP/R6d7qSxqnTrozT8H5Y4q80g
+xO4JW/PH1+AGdeA7A0l4y3pPLhhpxVPwxFDGlIbh6IeoVWsc6HIUNfTSiV5CDjWZ
+B4SED3Geljtf1Jdi/+Jm6z1Jvs+WUc8el7Zpjg8YoKiGe9WoT8JqFZB2Gm3Hljjw
+WIoCOxiAPJTTAA93kT2M6ENkb4xIpJC/1Cvwy8ZY5eghswuajkuEaxP9t08ymMIl
+rrs5N4I1byNTebpv9m1Nm54TWdMyDO3RwabJ+97OHeI9kZH6Tuid9so6oaY5pKSh
+Tf66gZ8IWm2SU/2wN+yudDof9VKoO3iTQn2UdWN5L2NBqqfRcoYNzIvfZ71SRoh8
+YdK5qWFX/Ub1A/VEnuZC7e53FfaUcRJFbW+odHOnBtwt/5eJirtsGjiS8xBFR9uC
+JyTpmlLMneyjASWNPz/41wfDwN8CFMezkxYub07NssGSG2yffj7w1ghCMkhhDbvE
+cT/OZzBM3m1+CYzjQSBkxowAoI86wZVSeonirw6tsV5pXsQzdePygxDwE77q0fMw
+FEWraIB5HhjZfO2v4JxEB0Bwr5RQ7Oo0j47EBmlejp0kmZksAq7Z2gzaWy9nYl63
+pNdOx6Z/85QeyU5If7midAh0uenIztXfeO93P7T6FIuwkgH2zTs9+UeFdh1pnzxt
+zorlOfuVLzzdShrJ1l04
+=DTiv
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/shotwell-0.15.0.ebuild b/media-gfx/shotwell/shotwell-0.15.0.ebuild
index 1c1bd53c98b7..ae84734d13b8 100644
--- a/media-gfx/shotwell/shotwell-0.15.0.ebuild
+++ b/media-gfx/shotwell/shotwell-0.15.0.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/shotwell/shotwell-0.15.0.ebuild,v 1.2 2013/10/26 13:59:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.15.0.ebuild,v 1.3 2013/11/20 11:24:36 jlec Exp $
 
 EAPI=5
 
@@ -37,13 +37,13 @@ done
 RDEPEND="
 	>=dev-db/sqlite-3.5.9:3
 	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/glib-2.33.0:2
+	>=dev-libs/glib-2.30.0:2
 	>=dev-libs/json-glib-0.7.6
-	>=dev-libs/libgee-0.8.0:0.8
+	>=dev-libs/libgee-0.8.5:0.8
 	>=dev-libs/libxml2-2.6.32:2
 	>=dev-util/desktop-file-utils-0.13
 	gnome-base/dconf
-	>=media-libs/gexiv2-0.5
+	>=media-libs/gexiv2-0.4.90
 	media-libs/gst-plugins-base:1.0
 	media-libs/gst-plugins-good:1.0
 	media-libs/gstreamer:1.0
diff --git a/media-gfx/shotwell/shotwell-0.15.1.ebuild b/media-gfx/shotwell/shotwell-0.15.1.ebuild
new file mode 100644
index 000000000000..e79d8864e195
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.15.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.15.1.ebuild,v 1.1 2013/11/20 11:24:36 jlec Exp $
+
+EAPI=5
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.20"
+VALA_MAX_API_VERSION="0.22"
+
+inherit eutils gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="http://yorba.org/shotwell/"
+SRC_URI="http://www.yorba.org/download/${PN}/stable/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+CORE_SUPPORTED_LANGUAGES="
+	ia hi te fr de it es pl et sv sk lv pt bg bn nl da zh_CN
+	el ru pa hu en_GB uk ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR
+	eu he mk ta vi or km af as gu kn ml mr af_ZA bn_IN id_ID ky nn_NO ta_IN te_IN "
+
+EXTRAS_SUPPORTED_LANGUAGES="
+	fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru pa hu en_GB uk
+	ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR eu he mk te ta eo or hi
+	as kn ml mr bn_IN gu id_ID nn_NO vi"
+
+for x in ${CORE_SUPPORTED_LANGUAGES} ${EXTRAS_SUPPORTED_LANGUAGES}; do
+	IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/dbus-glib-0.80
+	>=dev-libs/glib-2.30.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.8.5:0.8
+	>=dev-libs/libxml2-2.6.32:2
+	>=dev-util/desktop-file-utils-0.13
+	gnome-base/dconf
+	>=media-libs/gexiv2-0.4.90
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16:=
+	>=media-libs/libgphoto2-2.4.2:=
+	>=media-libs/libraw-0.13.2:=
+	>=net-libs/libsoup-2.26.0:2.4
+	>=net-libs/rest-0.7:0.7
+	>=net-libs/webkit-gtk-1.4:3
+	>=virtual/udev-145[gudev]
+	>=x11-libs/gtk+-3.6.0:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=sys-devel/m4-1.4.13"
+
+DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+pkg_setup() {
+	tc-export CC
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--disable-desktop-update
+		--disable-icon-update
+		--prefix=/usr
+		--lib=$(get_libdir)"
+}
+
+src_prepare() {
+	vala_src_prepare
+	sed \
+		-e 's|CFLAGS :|CFLAGS +|g' \
+		-i plugins/Makefile.plugin.mk || die
+	epatch \
+		"${FILESDIR}"/${PN}-0.13.1-ldflags.patch
+}
+
+src_configure() {
+	./configure \
+		${G2CONF} \
+		|| die
+}
+
+src_compile() {
+	local valaver="$(vala_best_api_version)"
+	emake VALAC="$(type -p valac-${valaver})"
+}
+
+src_install() {
+	gnome2_src_install
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			find "${D}"/usr/share/locale/${x} -type f -exec rm {} \;
+		fi
+	done
+}