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

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

9 files changed, 16 insertions, 348 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/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
-}