Version Bump

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

4 files changed, 104 insertions, 5 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index d445f59ac6e4..29bbafb88f2d 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.15 2011/05/06 15:28:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.16 2011/06/01 15:31:25 jlec Exp $
+
+*shotwell-0.10 (01 Jun 2011)
+
+  01 Jun 2011; Justin Lecher <jlec@gentoo.org> +files/0.10-ldflags.patch,
+  +shotwell-0.10.ebuild:
+  Version Bump
 
 *shotwell-0.9.3 (06 May 2011)
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index b314c55016c1..9cab5c351a6e 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.10-ldflags.patch 1223 RMD160 9eb78d092161abc1f92c35dfc24db717a54881ee SHA1 f090c571beef1a5ba8b05389d1e9c8a9807a3252 SHA256 84ed8a02deee8cbb049b156e8646af54bb844523220eb704fac405aab111bed7
 AUX 0.9.1-ldflags.patch 1063 RMD160 2fbaac4618d2e5b8719abd57404e93e69ef623d7 SHA1 8a0ab5389adbe299433b8def23ea7f581db5e7ed SHA256 efebdfe64f28c48412a11eef6b7e6a68f01d8e75a76360990db46e55694cbaed
+DIST shotwell-0.10.tar.bz2 1481758 RMD160 1b6c8a666ed5cb49c5a6ad98fcb7ba922c37bf4e SHA1 c3216a5f0fced8b27dfb1e34f9d7bebef66a3b9a SHA256 ef236f4d253f0c7da02aac64bb7b187cb54eb158905153e587cfad6031c68bfd
 DIST shotwell-0.7.2.tar.bz2 1064127 RMD160 4b9e6abfda6fb479a7cb376340c226fa10357e86 SHA1 892ae852e990ab9815108b41b8151ee7ef7f11d9 SHA256 8b4139407d59badcbe13e23db070e0a0709ecc0f9ad806335888382eebf5dfa3
 DIST shotwell-0.8.1.tar.bz2 1317586 RMD160 56f1ad906a42ac6ae945a3cbd75a1d769452c718 SHA1 b26b222e35a16d2ccbe9590853d66f2e99e9c9f6 SHA256 9403342300ae987ab86be342ba77d75c89aaa3ed0dd4afb1fef505bde7fb5efc
 DIST shotwell-0.9.1.tar.bz2 1456462 RMD160 801a1714246b51d76d0c432e7aa6b1838103d0c1 SHA1 e3d1b4e175352184a2c46da08f7a6ce53939b534 SHA256 cfb3e7ce285e7041a34da9536c4cfcf391fcdaa1074f1dc991ea669be4aa233e
 DIST shotwell-0.9.2.tar.bz2 1457781 RMD160 1d9f15b2b2cbc057c18fdd1979effa70feed16c6 SHA1 7a2a90c74a49e0e4b96a70eb83d2a80df4ea6fa3 SHA256 d664d3cbabacba54a55ab866bc61cf1a9fe052255a1fe873ecbf09ab76104b2e
 DIST shotwell-0.9.3.tar.bz2 1462225 RMD160 ec4317999922f2e709e2060c555694255f924cad SHA1 e0bfba6eb408cfb6fa133e1cc929b2f03c710250 SHA256 d0ed21138bb4299306460e3d7bb162d45a5e21a0aacf224f8fb3790a368919d9
+EBUILD shotwell-0.10.ebuild 1712 RMD160 e47b0ed18df5dcad4e645b92f9b84b429335838b SHA1 8f5a93a190c28c990f351e63b48628e710164550 SHA256 edb3ca3c101ad217ea560842377864604c575aaee7bfb85243c573338902add6
 EBUILD shotwell-0.7.2.ebuild 1471 RMD160 dc7f5cc33f631825372c81f53eb3b4995b0813a7 SHA1 e35e2c46c3308b3b6a498b621e30829eb9f7e425 SHA256 9cf46af3f09224384f73fb97599c3a33b09156d1a3876b4f02e8d29d2c39fe2a
 EBUILD shotwell-0.8.1.ebuild 1520 RMD160 84dd4e57e25b1aa797b530d577ad83822352d068 SHA1 a19796731ad57f8c14c215c2eb611de982e96446 SHA256 c39e2b1a59e5d7c2d80fc6a9b64822e41a71d25272a758a8dc145cf8569a2048
 EBUILD shotwell-0.9.1-r1.ebuild 1716 RMD160 487af4cd706db475c7fa22218ccba85b8cff98db SHA1 96949e5ceb6fceec54c2d1964014628d1e6be6bf SHA256 0638d059dcc4fcb6254890dacbe413a69a0974329e31f80e7a12e754dae9e51b
 EBUILD shotwell-0.9.1.ebuild 1612 RMD160 2e2eeb8fdc0713177f189998c610f3ce1039a6a3 SHA1 a8e5b628e4d922463fbd01f50bcb9de2f9bf16a0 SHA256 19463281b9412ab8243c1e8d073676558eeb853ee0bf7ac6c54e4ab1b84b1c4e
 EBUILD shotwell-0.9.2.ebuild 1713 RMD160 a2ef22df366585a387ddd7254d7a5037e1b28179 SHA1 218fdf417eca62f998652290997dee3c38519ef4 SHA256 024df7a70ad71e4a1348ba229c554add617d71a8d40afac67f738c3d035baf6b
 EBUILD shotwell-0.9.3.ebuild 1713 RMD160 623bc20de2ded086f3c970e46aa8ae49003e5c65 SHA1 9bd090afe72780c273d8a25f0b141bbbe86010f4 SHA256 441d7327e90fe0b86e459f83bcc9c1684c005eb3e66dff4819521359143228fa
-MISC ChangeLog 2577 RMD160 462f1d1e618c1fdba88abaeb8c6cf5465a66b131 SHA1 84030cfa73aca98a78b4c3722768f894718bb590 SHA256 3bb758fd2d6fdb6eb90938effcb00ca71d1511cbb42d472820599bafcbd965d8
+MISC ChangeLog 2722 RMD160 18ac64519f2cdbe1d355d08862289316a633b2d2 SHA1 4c18dab04bd42c030b759ee28b06cc788e65f5cb SHA256 36307f9296ffc5eca6fc22a5d8273852310b013e9b2d556c1e4facd004af124f
 MISC metadata.xml 716 RMD160 88c07e7d694d01c8e383721008c46d5e4c64e0b1 SHA1 bccc91bf5588465da9f5065b899edd4c36dbc769 SHA256 82568b3ae3779e3935f77da29b67b08af480dcac4417f2f6eec9785abd99a2a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3EE7IACgkQgAnW8HDreRZqgACfdLKzPbw+Vxx644RuELu6cf8d
-S7YAnj61SUBBMMt2L1brVb87qC4GKxq1
-=HxED
+iEYEARECAAYFAk3mW1IACgkQgAnW8HDreRapwQCeIJUAEzkWHNw7k8P6wFaiqiWM
+FLsAoIoPanCCf2QKtOwhVvMBOZKRDrEh
+=8qxd
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/files/0.10-ldflags.patch b/media-gfx/shotwell/files/0.10-ldflags.patch
new file mode 100644
index 000000000000..9ba105473db5
--- /dev/null
+++ b/media-gfx/shotwell/files/0.10-ldflags.patch
@@ -0,0 +1,25 @@
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c1e5c30..31e8190 100644
+--- a/Makefile
++++ b/Makefile
+@@ -657,7 +657,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 $@
+ 
+ $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
+ 	$(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg))
+@@ -685,7 +685,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.10.ebuild b/media-gfx/shotwell/shotwell-0.10.ebuild
new file mode 100644
index 000000000000..9e8ca5c5bc6b
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.10.ebuild
@@ -0,0 +1,65 @@
+# 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.10.ebuild,v 1.1 2011/06/01 15:31:25 jlec Exp $
+
+EAPI="2"
+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
+	gnome-base/gnome-vfs: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-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
+	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
+}