media-gfx/shotwell: EAPI bumpd and usage of subslots for libgphoto2, #455500

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

4 files changed, 114 insertions, 5 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 82de4109d8be..7bc7cf3cc33a 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.48 2013/02/02 22:44:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.49 2013/02/05 07:34:08 jlec Exp $
+
+*shotwell-0.13.1-r2 (05 Feb 2013)
+
+  05 Feb 2013; Justin Lecher <jlec@gentoo.org> shotwell-0.13.1-r1.ebuild,
+  +shotwell-0.13.1-r2.ebuild:
+  EAPI bumpd and usage of subslots for libgphoto2, #455500
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> shotwell-0.13.1.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index abcae5c12c6f..dcb7b27fc403 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX shotwell-0.13.1-gst-1.0.patch 10251 SHA256 6f8ba6762f9e6d353881896b61a9ef2a6abe3956e2efd9c23dd58027cf9893c4 SHA512 0bd436765d4e77f65ff452853fd722e6da74ec67a226e68c698b3e3b7756dfacfb917713d324df6f4f79fee28c07b0439b70f394e479fa2600393e2d1030c324 WHIRLPOOL c6ba5930c7c9ccf874d59bc59f1567602b0c81cfdb384d8f2343813c2e93aca72333d220bd8559a087df83ea96a0ea5e2b4b3e45eaebf6ff7650bad4421a8083
 AUX shotwell-0.13.1-ldflags.patch 1142 SHA256 d7fe75551807d7998c9494c9c065c611f98dbfd8db2b09bed8a1430048063b12 SHA512 036a99134afb69ab8f7ded853aec427f5c3289cab753c1796be71e75544ae18fdd628a82c628c1f6939c852c6abaf3b2841b4155fdb4831a8c091bdc5761d5c3 WHIRLPOOL 088c4fa519c32d36f663411468daa0b5547855d3d744f148282ea86c5743a4601669f2b82a9d5581a1dc34dfce3b001ee55810a96515e1db6316985857a1ed3b
 DIST shotwell-0.12.3.tar.bz2 1649746 SHA256 1388f0ea5a27e1c1a1ab33302c6304cca1fadfb649aa879d11e406c7ede15601 SHA512 5b375e2dcc033ea8dadefdbaf4aaad4d6f9723e91dfab0717031f37bfbd5ea2121e73783e5ae467af56cc3796e0b8b06cfc42bf3ee236daa87dfba974163f620 WHIRLPOOL 95c993406a3af4f30fbd8bbb858d375d61b339b5133aff5ad6e77bbf66e358afb9c2f51f19e788f35ed6f38fea36154180077ad35f5948e980b156644f06bd61
 DIST shotwell-0.13.1.tar.xz 1497664 SHA256 e548c3274410e0696ffcd051eabd38ca2a507031f36b7203c1e68966815fa735 SHA512 947d1b430ae346925e035870d33c6de51e12c7d1a7a9611826ee8ad6c8175eb1f7a67a7a31ae7ac60477f32611c3aa4fd8551a2528165549663df900f16dfbae WHIRLPOOL ca2b08c0c6c2c4c2a119a1ca0026e70ed362b76c692724094f7ebbfaf9cd9351e013e4f3502a72c57780d8ad62d3d3c66361bdccb5ccc913bc508d91df128235
 EBUILD shotwell-0.12.3.ebuild 1884 SHA256 5874b52d774fbbf0af6bd1ae35c63deb0b93941a984a06df7aa83b5740550545 SHA512 da9c48744f9b0f6a8515a68f06aa38989eaa6c7729b1199801d7e20c5f1f7bf742f058256e32d3a7a3835389f474557dfbeaddf9e69990490b69b8ba06bfa35d WHIRLPOOL 7425d0ecfc4cc2578a6916a67a6dc3e9cd16a3c6d7dd20b8545156aa17bc19e8fc939bcc21b566c6e913be421e55859e471a4734b036946ee4bf7dc4e30229bc
-EBUILD shotwell-0.13.1-r1.ebuild 2297 SHA256 5da10e02a68394e486649cc9b8d7bca49c723d4dd4fc0d1d14865ca6d8cd1d5d SHA512 7fb6e9f92cff14aa019ba763b2b99414b5816c6fc4e44befa27e577af738911b836253a866187ba9d33419d5818b3a6eae56ab232df5fc0dc4202d0c1f55d021 WHIRLPOOL 277371f95e7d8da1214d9dba9298bcab54c0aed3197b30282c80ed17bf54178812384a7029ce46e28601f16192f780763ef5b8127c4f02f583a94470bac5c146
+EBUILD shotwell-0.13.1-r1.ebuild 2298 SHA256 42f31af814048b71af36aca424a99000abb6a1a2244a0cbcb2239aa35c157f64 SHA512 304063eb6c55cd4409bb2573cf8818b9301333bbccfbc9e2a51de9d2720b52dcee62eefebd3717992d36fa9063782880f4560e69db90c0ef4c106e3c9d2a64a3 WHIRLPOOL 0012a7eeb5cc893e08f5d6ab89345a3b455d1e55ff356c9b8beaa3e4cb067a8035f2389b170cdb5203d5ee1a4b6b5beae0aadb9f509a3a89214cde0421d3eec6
+EBUILD shotwell-0.13.1-r2.ebuild 2300 SHA256 9351d6f2292673b8d94bb29147226e868f1cf3c26e63640421f46e26c8ba92c6 SHA512 a80eaa1d8c66fb260dfcd2c865d7861cbb1f28e61753cd040dbb0eed90fa3a8a1d6174dd72aff8f4556c0b75c31f9f38fb024de997e4733a4147eaf4dd421a6d WHIRLPOOL 504267a3394fc8c0479338042d929b242cf8b76badda5f0da11d6ecf5bc63e71bf4732c957f4a13563bdd42f255b2e68920ebe7c8776fd9528ddcb340a77bad8
 EBUILD shotwell-0.13.1.ebuild 2257 SHA256 d0e4b309a6ecfbfe1da939aad31e4924893cd35b0253d5618a2cf42021aca98f SHA512 9d334af4db8b17072173e21db8c8773debd7e8ad26d1bc1e4309e52d286f26d57b22580e73721d073f5fbebe764c3e95b924ea96774c9421982aeb777fe69c73 WHIRLPOOL 8c6df55c6bebdae88bd1109343181fa40558b9214e1b461b87a3aeb9e36cd3f178a9fdadbe5c0ffd92e3ef34c1050a43be6d86042d0313eb6bcb887bd27cb12b
-MISC ChangeLog 7769 SHA256 2e016465f0d56f463a516fc335ce8beb3da7c38dac7da0b98ba2935ddebd4e0f SHA512 fa7cd113074b35cbe1e49925b29e40cc380b67543f00ba72610696c73faf01f7d5f8af72fd102f8b51e19158dbf9924ece6a38331787e5f0bd5925a4907ac301 WHIRLPOOL a97f0c19edb2bdc93e3ca20dad33faeb21c66a5955a1cef1de67286a42c9661510d6f1bae55500a5a9661b1b2ca95519e4ee935e7bb3bcff7e5d8cfb3dfb9c70
+MISC ChangeLog 7969 SHA256 05ba72596e7ff124a75d3a7000ae90c1d05cf35d4f39a3062f4a24bd355e36c4 SHA512 b318514d2c97a299c6a6153f3e1197d47664666ce63a2ae07373db0e67bcf8cccab36f636f8b74a070d7458d8b1ca4042cfb09b2d615245c2c37ced18fa52d43 WHIRLPOOL 444e83ad4171d23f51273bce44fd6eb612a953833724e1344beb8430bbd9980eb24c1a968010a674e628ff671383e375ace659c4128c46f60b4960d070c37e68
 MISC metadata.xml 665 SHA256 d7ed9e0a0af566d5e6891e77c0b69c49df16b5d291f0126243892a3ec36aaedf SHA512 4bc0078d47452551bc043e9fb6d1774db44b9b2cf67ee581e9cdeeffb86b198c13753c7595638e1feedc9c876457d1d5393d064d6535f1b2283bcec43c861300 WHIRLPOOL e3bd5f1dc118225520d15e289e901c686478707b39e4aff702ae0d33ad7005f158874686d7d49ce2e5f18faeb920e612a109c0c9e6f4bd737a24b58578e7c088
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEQtfEACgkQgAnW8HDreRacJwCfcvuuXyo6qieeeiICvN+0PNPp
+ZMAAn1g4JYScLEklSNsExXJDpMZO6TaI
+=HLBL
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/shotwell-0.13.1-r1.ebuild b/media-gfx/shotwell/shotwell-0.13.1-r1.ebuild
index 59a68818c242..e769f95e1d52 100644
--- a/media-gfx/shotwell/shotwell-0.13.1-r1.ebuild
+++ b/media-gfx/shotwell/shotwell-0.13.1-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/shotwell/shotwell-0.13.1-r1.ebuild,v 1.1 2013/01/12 19:41:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.13.1-r1.ebuild,v 1.2 2013/02/05 07:34:08 jlec Exp $
 
 EAPI=4
 
@@ -53,7 +53,7 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
 
-# This probabl comes from libraries that
+# This probably comes from libraries that
 # shotwell-video-thumbnailer links to.
 # Nothing we can do at the moment. #435048
 QA_FLAGS_IGNORED="/usr/bin/${PN}-video-thumbnailer"
diff --git a/media-gfx/shotwell/shotwell-0.13.1-r2.ebuild b/media-gfx/shotwell/shotwell-0.13.1-r2.ebuild
new file mode 100644
index 000000000000..29766bc22dc9
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.13.1-r2.ebuild
@@ -0,0 +1,92 @@
+# 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.13.1-r2.ebuild,v 1.1 2013/02/05 07:34:08 jlec Exp $
+
+EAPI=5
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+LANGS="ar ast bg bn ca cs da de el en_GB es et eu fi fr gl he hi hr hu ia id it ja kk
+ko lt lv mk nb nl pa pl pt pt_BR ro ru sk sl sr sv ta te ta_IN te_IN th tr uk vi zh_CN zh_TW"
+
+for x in ${LANGS}; 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.5.0:0
+	>=dev-libs/libunique-3.0.0:3
+	>=dev-libs/libxml2-2.6.32:2
+	>=media-libs/gexiv2-0.3.92
+	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.14.0
+	>=net-libs/libsoup-2.26.0:2.4
+	net-libs/rest:0.7
+	net-libs/webkit-gtk:3
+	virtual/udev[gudev]
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	sys-devel/m4"
+
+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/bin/${PN}-video-thumbnailer"
+
+pkg_setup() {
+	tc-export CC
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--disable-desktop-update
+		--disable-icon-update
+		--lib=$(get_libdir)"
+}
+
+src_prepare() {
+	vala_src_prepare
+	sed \
+		-e 's|CFLAGS :|CFLAGS +|g' \
+		-i plugins/Makefile.plugin.mk || die
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-gst-1.0.patch
+}
+
+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
+}