Take maintainership with permission from Andreas, remove old and bump to 0.10.1

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

10 files changed, 23 insertions, 365 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 327801853e4b..0da765895608 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,15 @@
 # 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.18 2011/06/10 09:09:20 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.19 2011/06/23 10:37:01 angelos Exp $
+
+*shotwell-0.10.1 (23 Jun 2011)
+
+  23 Jun 2011; Christoph Mende <angelos@gentoo.org> -files/0.9.1-ldflags.patch,
+  -shotwell-0.7.2.ebuild, -shotwell-0.8.1.ebuild, -shotwell-0.9.1.ebuild,
+  -shotwell-0.9.1-r1.ebuild, -shotwell-0.9.2.ebuild, -shotwell-0.9.3.ebuild,
+  +shotwell-0.10.1.ebuild, metadata.xml:
+  Take maintainership with permission from Andreas, remove old and bump to
+  0.10.1
 
   10 Jun 2011; Christoph Mende <angelos@gentoo.org> shotwell-0.7.2.ebuild,
   shotwell-0.8.1.ebuild, shotwell-0.9.1.ebuild, shotwell-0.9.1-r1.ebuild,
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index d41a804013cd..d36a752a7d54 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -2,26 +2,16 @@
 Hash: SHA256
 
 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.1.tar.bz2 1483679 RMD160 44cccbebf4f1bf024229da9afbcc6d4db510be96 SHA1 abd6e771168910943101b62d76f7768a49e69be9 SHA256 f6ef4782780af201402afeaf8f9484d5579cedff75fbf07b22587bb7cef69893
 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.1.ebuild 1706 RMD160 89d5323cbd5cbd9be129c4997d70f5de3e21344b SHA1 fc76f288d6d1758caaf1f0c683bed060da1b948b SHA256 50949c8bf9e6fdb4ec8f83de3d6c5ca4f220a657090ce37203feb36c631f1f63
 EBUILD shotwell-0.10.ebuild 1723 RMD160 205eafbc9f47932cc7d5593a2ea760061510b3d7 SHA1 48d3c20db0c995e97ed0892062c7679500e9f75b SHA256 b31f3c55a3d11344a051552ea5836868326aff9531e82b9e8d6b24f851432968
-EBUILD shotwell-0.7.2.ebuild 1502 RMD160 a9ba18cbc2d6941fc0ddd6025f009c738ed494c3 SHA1 b9c4773d4bb4a789c00226271bd98adf8e99c2e8 SHA256 196aff7440d207c5b4b0cd50e186ff7a11958789612af702b7ab8377afe22733
-EBUILD shotwell-0.8.1.ebuild 1553 RMD160 43ca3c28c37147435ac11d221686e0ad8a40276c SHA1 f83d4839058d93ba30a3a85a662287bee418518f SHA256 583eda135f08d51cc759642db1e19caf464b61e7fcc66564b1de0900860ef798
-EBUILD shotwell-0.9.1-r1.ebuild 1751 RMD160 4dbec2004001a85e21c3233ba57a5f0b3c2f6dfb SHA1 0c0e0633484e00a1869686708ccab0b81d1a7fe4 SHA256 db552d5cd414e838822ab33cc47ff8f3f882176519ebb91cc34f8713f5fd24f0
-EBUILD shotwell-0.9.1.ebuild 1645 RMD160 1a589808349a1b2249ea20820404925f4c85e2c2 SHA1 bc0dd741d149a17835ce4cf54e56214f655a5798 SHA256 b35e7a8b2f09d224ee6805a17e044131fb410db8e3aeaf4f92fa5e817a72fa67
-EBUILD shotwell-0.9.2.ebuild 1748 RMD160 1ce38203ddc5b3151584b956301035d504411543 SHA1 713f4ea7d9ee5d0f5cfa933e91520d3ca674d62a SHA256 46e77bd2c119374c01e9fbddb0566ee8914b65db06aa777f3025a4d577ad809e
-EBUILD shotwell-0.9.3.ebuild 1748 RMD160 eda6f139cfdac3bdc269c7e3ad7c57bc45b388bc SHA1 e0c41562165b8ef37259a526209541852a77048f SHA256 ccdc1581a0fba50827654bab2815020a2e5dfe7765f62072ffcc3bd86a18f05d
-MISC ChangeLog 3098 RMD160 41e6ea45d0e4555312d5505e08758cf2ef57e9d4 SHA1 ab9cfa8e9e2f64ef4593a59f08467317aaaeda8e SHA256 60f476026347c471af6920aff27d168327282932ae6dea23ef6a5599d9dcf7e6
-MISC metadata.xml 716 RMD160 88c07e7d694d01c8e383721008c46d5e4c64e0b1 SHA1 bccc91bf5588465da9f5065b899edd4c36dbc769 SHA256 82568b3ae3779e3935f77da29b67b08af480dcac4417f2f6eec9785abd99a2a9
+MISC ChangeLog 3487 RMD160 72553ef570cfed166bed0b527f2155d91bea2374 SHA1 b775f71e4abb5c33ad2358d91e483b6daf6b63aa SHA256 d7092d0155bca8304c8fda85129009ce0e2680683b078c104f1312765f651106
+MISC metadata.xml 559 RMD160 7401908d71c9cb6774d73efd5147400b26abf9a9 SHA1 33c34915641d1174b6a945ddee2680b81674394b SHA256 62028c58796cd83bc8e6c552a98830ca8ed22f852b1708eddae549e2f6ecd791
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3x30cACgkQmWq1bYTyC0ODtgD+PZJ/H6RiR1hY2f1dw1s6J5/v
-ufogh/MuVz5ZikMPFQkA/1MlshGeaguTjQSG5y6BWGWll5LKbnfvnONY8Z1s0Ox8
-=0AOO
+iF4EAREIAAYFAk4DF1MACgkQmWq1bYTyC0OttQEAjkRBn9PmATE8ILggDx35zyOq
+kAs/96xMASKJ/3POJ8kBALgJfjelVjhwPQPGQTukQ4F1udPqe4xgs/7OGH0F00Nn
+=NWz9
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/files/0.9.1-ldflags.patch b/media-gfx/shotwell/files/0.9.1-ldflags.patch
deleted file mode 100644
index 09cf321fe16e..000000000000
--- a/media-gfx/shotwell/files/0.9.1-ldflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- Makefile |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b62ebfd..1c57ff1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -614,7 +614,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)
--	$(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 $@
- 
- $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLUGINS_DIR)
- 	@
-@@ -639,5 +639,5 @@ 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 $@
- 
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index 44c3096733e5..3d7dbab61089 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -3,13 +3,8 @@
 <pkgmetadata>
 	<herd>graphics</herd>
 	<maintainer>
-		<email>hollow@gentoo.org</email>
-		<name>Benedikt Böhm</name>
-	</maintainer>
-	<maintainer>
-		<email>nutz@noova.de</email>
-		<name>Andreas Nüßlein</name>
-		<description>Proxy maintainer. Please CC on bugs.</description>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
 	</maintainer>
 	<longdescription lang="en">
 	Shotwell is a digital photo organizer designed for the GNOME desktop
diff --git a/media-gfx/shotwell/shotwell-0.9.2.ebuild b/media-gfx/shotwell/shotwell-0.10.1.ebuild
index e84ac2ba5836..c8e98593b5f8 100644
--- a/media-gfx/shotwell/shotwell-0.9.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.10.1.ebuild
@@ -1,10 +1,8 @@
 # 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.9.2.ebuild,v 1.2 2011/06/10 09:09:20 angelos Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.10.1.ebuild,v 1.1 2011/06/23 10:37:01 angelos Exp $
 
+EAPI=4
 inherit gnome2 versionator eutils multilib toolchain-funcs
 
 MY_PV=$(get_version_component_range 1-2)
@@ -24,7 +22,6 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=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
@@ -38,7 +35,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 DEPEND="${RDEPEND}
 	>=dev-lang/vala-0.11.7:0.12"
 
-DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
+DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
 
 pkg_setup() {
 	tc-export CC
@@ -50,7 +47,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/0.9.1-ldflags.patch
+	epatch "${FILESDIR}"/0.10-ldflags.patch
 	gnome2_src_prepare
 
 	sed -e 's/valac/valac-0.12/' -i plugins/Makefile.plugin.mk || die
diff --git a/media-gfx/shotwell/shotwell-0.7.2.ebuild b/media-gfx/shotwell/shotwell-0.7.2.ebuild
deleted file mode 100644
index a96b4686a095..000000000000
--- a/media-gfx/shotwell/shotwell-0.7.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.7.2.ebuild,v 1.5 2011/06/10 09:09:20 angelos Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator eutils
-
-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/libgee-0.5.0
-	>=dev-libs/libunique-1.0.0:1
-	>=dev-libs/libxml2-2.6.32:2
-	>=gnome-base/gconf-2.22.0:2
-	>=media-libs/libexif-0.6.16
-	>=media-libs/libgphoto2-2.4.2
-	>=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.14.4:2
-	>=media-libs/libraw-0.9.0
-	>=media-libs/gexiv2-0.2.0
-	media-libs/lcms:2"
-DEPEND="${RDEPEND}
-	>=dev-lang/vala-0.9.5:0.10"
-
-DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-desktop-update
-		--disable-icon-update"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	sed -e 's/valac/valac-0.10/' -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
-}
diff --git a/media-gfx/shotwell/shotwell-0.8.1.ebuild b/media-gfx/shotwell/shotwell-0.8.1.ebuild
deleted file mode 100644
index 8936e5dca2e8..000000000000
--- a/media-gfx/shotwell/shotwell-0.8.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.8.1.ebuild,v 1.5 2011/06/10 09:09:20 angelos Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator eutils
-
-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/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/libexif-0.6.16
-	>=media-libs/libgphoto2-2.4.2
-	>=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
-	>=media-libs/libraw-0.9.0
-	>=media-libs/gexiv2-0.2.0
-	>=dev-libs/json-glib-0.7.6
-	media-libs/lcms:2
-	media-libs/gstreamer:0.10"
-DEPEND="${RDEPEND}
-	>=dev-lang/vala-0.9.7:0.10"
-
-DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-desktop-update
-		--disable-icon-update"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	sed -e 's/valac/valac-0.10/' -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
-}
diff --git a/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild b/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild
deleted file mode 100644
index 6ba8bfe9112a..000000000000
--- a/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.9.1-r1.ebuild,v 1.2 2011/06/10 09:09:20 angelos 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-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
-	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
-}
diff --git a/media-gfx/shotwell/shotwell-0.9.1.ebuild b/media-gfx/shotwell/shotwell-0.9.1.ebuild
deleted file mode 100644
index 339fbb6e5bdd..000000000000
--- a/media-gfx/shotwell/shotwell-0.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.9.1.ebuild,v 1.3 2011/06/10 09:09:20 angelos Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator eutils
-
-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-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() {
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-desktop-update
-		--disable-icon-update"
-}
-
-src_prepare() {
-	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
-}
diff --git a/media-gfx/shotwell/shotwell-0.9.3.ebuild b/media-gfx/shotwell/shotwell-0.9.3.ebuild
deleted file mode 100644
index 335f282036b2..000000000000
--- a/media-gfx/shotwell/shotwell-0.9.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.9.3.ebuild,v 1.2 2011/06/10 09:09:20 angelos 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-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}"/0.9.1-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
-}