Non-maintainer Version Bump, #381765; thanks Christoph Brill for the patch

Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

4 files changed, 108 insertions, 7 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 890c60471aef..6115e4d6c51a 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.21 2011/07/09 21:39:58 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.22 2011/09/05 08:35:28 jlec Exp $
+
+*shotwell-0.11.0 (05 Sep 2011)
+
+  05 Sep 2011; Justin Lecher <jlec@gentoo.org> +files/0.11.0-ldflags.patch,
+  +shotwell-0.11.0.ebuild:
+  Non-maintainer Version Bump, #381765; thanks Christoph Brill for the patch
 
   09 Jul 2011; Christoph Mende <angelos@gentoo.org> -shotwell-0.10.ebuild,
   shotwell-0.10.1.ebuild, +files/shotwell-0.10.1-libraw-config.patch:
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index f3d134de0385..d728888d7549 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.10-ldflags.patch 1223 RMD160 9eb78d092161abc1f92c35dfc24db717a54881ee SHA1 f090c571beef1a5ba8b05389d1e9c8a9807a3252 SHA256 84ed8a02deee8cbb049b156e8646af54bb844523220eb704fac405aab111bed7
+AUX 0.11.0-ldflags.patch 1139 RMD160 e0e73d17e759aa17c97b6254086ea92f43ce2fed SHA1 b1eb84490f5d7038318770c7b0066e2b7cf243f3 SHA256 43cdc9d1031c88beb556eb1f6e12d0e4e7b9697c50c4b8422eb98208a2819580
 AUX shotwell-0.10.1-libraw-config.patch 661 RMD160 3430d8191b72136c80a8fd46d8bfc8c0c5c9dc60 SHA1 dd0c98b309079394a975702ecd2fdc70819b95c1 SHA256 4d4588b0185599776b73753453ec445e19e748f822c271cea433504924f44d8f
 DIST shotwell-0.10.1.tar.bz2 1483679 RMD160 44cccbebf4f1bf024229da9afbcc6d4db510be96 SHA1 abd6e771168910943101b62d76f7768a49e69be9 SHA256 f6ef4782780af201402afeaf8f9484d5579cedff75fbf07b22587bb7cef69893
+DIST shotwell-0.11.0.tar.bz2 1569868 RMD160 532c552ce0a4c3e9504ad9522b30e650ad0dd854 SHA1 5dc030e7ec085bae45beda98631c5b8eb504d413 SHA256 06ef80014e5236cf58d9e479db18a5279ab2e9c6d7bb64b237fc203c54ad7ae8
 EBUILD shotwell-0.10.1.ebuild 1766 RMD160 2643b36a5bebc0fe25f0266a6ac79f33b54fb972 SHA1 ba435c3f9b80d97d63203ec9183a244521e99f69 SHA256 2a4910835d686fb0c29db60b9a3691b6deab3e3975d941c1a624ac3117dfd4af
-MISC ChangeLog 3825 RMD160 1aaf2fef73fc7362dc84c2d0623adecb626e8a14 SHA1 6585059f5277015f4b5fbd42a3e17d3039e4ab41 SHA256 9311c6e25e328375edfc16d5eb648da33ebd225f690a6e3622a128a8b528d201
+EBUILD shotwell-0.11.0.ebuild 1776 RMD160 32cde371ff6ed2305760c5070a3cd8cdef5267dd SHA1 bbdc4a9d1c01c7e7f7cd29624a4650579607a2bb SHA256 61a3d8db3c4492cab1f253e5ad10ff87c5e58253a63cb65b3aa6aeea22fef2f3
+MISC ChangeLog 4035 RMD160 dd12405cf35523dc83ae5ecb0e043f01be5ab910 SHA1 4bfca8cf61c5b9a86c48d4612f1182b4d125f99b SHA256 3456be471a77123903d60c8c123f70408d6883d425d6085c6e403d456cf0e96e
 MISC metadata.xml 559 RMD160 7401908d71c9cb6774d73efd5147400b26abf9a9 SHA1 33c34915641d1174b6a945ddee2680b81674394b SHA256 62028c58796cd83bc8e6c552a98830ca8ed22f852b1708eddae549e2f6ecd791
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4YyrMACgkQmWq1bYTyC0NJLQD7BW1DwQ1B5nQ4SsYD6kYWvrWl
-aMDlodnTR+ecHLjRixcA/12dcPKCHqaMnEvRozQUXjLPqBivsGsqfGg8BIfz48Uo
-=PHnk
+iEYEAREKAAYFAk5kidYACgkQgAnW8HDreRbY/wCg0lQqQRDFw2rTBFOKNYLt0m7b
+R9AAoKv76+MhtY9ugkygPJw+RHGYWEyl
+=8RBQ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/files/0.11.0-ldflags.patch b/media-gfx/shotwell/files/0.11.0-ldflags.patch
new file mode 100644
index 000000000000..c10cd8b978dc
--- /dev/null
+++ b/media-gfx/shotwell/files/0.11.0-ldflags.patch
@@ -0,0 +1,25 @@
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a3c0122..34f074d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -676,7 +676,7 @@ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
+ 	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
+ 
+ $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
+-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
+ 	glib-compile-schemas misc
+ 
+ $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
+@@ -705,7 +705,7 @@ docs:
+ glade: lib$(PROGRAM).so
+ 
+ lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
+-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
+ 
+ .PHONY: pkgcheck
+ pkgcheck:
diff --git a/media-gfx/shotwell/shotwell-0.11.0.ebuild b/media-gfx/shotwell/shotwell-0.11.0.ebuild
new file mode 100644
index 000000000000..20b2da98df96
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.11.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.11.0.ebuild,v 1.1 2011/09/05 08:35:28 jlec Exp $
+
+EAPI=4
+GCONF_DEBUG="no"
+inherit gnome2 versionator eutils multilib toolchain-funcs
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="http://www.yorba.org/shotwell/"
+SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/dbus-glib-0.80
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.5.0
+	>=dev-libs/libunique-1:1
+	>=dev-libs/libxml2-2.6.32:2
+	>=gnome-base/gconf-2.22.0:2
+	>=media-libs/gexiv2-0.2.0
+	media-libs/gstreamer:0.10
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16
+	>=media-libs/libgphoto2-2.4.2
+	>=media-libs/libraw-0.9.0
+	>=net-libs/libsoup-2.26.0:2.4
+	>=net-libs/webkit-gtk-1.1.5:2
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	>=x11-libs/gtk+-2.18.0:2"
+DEPEND="${RDEPEND}
+	>=dev-lang/vala-0.11.7:0.12"
+
+DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
+
+pkg_setup() {
+	tc-export CC
+	G2CONF="${G2CONF}
+		--disable-schemas-install
+		--disable-desktop-update
+		--disable-icon-update
+		--lib=$(get_libdir)"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PV}-ldflags.patch
+# \
+#		"${FILESDIR}"/${P}-libraw-config.patch
+	gnome2_src_prepare
+
+	sed -e 's/valac/valac-0.12/' -i plugins/Makefile.plugin.mk || die
+	sed -e 's/valac/valac-0.12/' -i Makefile || die
+}
+
+src_install() {
+#	# This is needed so that gnome2_gconf_savelist() works correctly.
+#	insinto /etc/gconf/schemas
+#	doins misc/shotwell.schemas || die "install gconf schema failed"
+	gnome2_src_install
+}