Version bump, clean up

(Portage version: 2.1.10.31/cvs/Linux x86_64)

4 files changed, 9 insertions, 120 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 93f5f77cab4a..0927cbc56dcb 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.29 2011/10/20 17:14:30 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.30 2011/11/11 16:20:30 angelos Exp $
+
+*shotwell-0.11.6 (10 Nov 2011)
+
+  10 Nov 2011; Christoph Mende <angelos@gentoo.org> -shotwell-0.10.1.ebuild,
+  -shotwell-0.11.1.ebuild, -shotwell-0.11.2.ebuild, +shotwell-0.11.6.ebuild:
+  Version bump, clean up
 
 *shotwell-0.11.5 (20 Oct 2011)
 
diff --git a/media-gfx/shotwell/shotwell-0.10.1.ebuild b/media-gfx/shotwell/shotwell-0.10.1.ebuild
deleted file mode 100644
index e8e858d0ee55..000000000000
--- a/media-gfx/shotwell/shotwell-0.10.1.ebuild
+++ /dev/null
@@ -1,59 +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.10.1.ebuild,v 1.5 2011/09/17 08:43:27 angelos 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: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}"/0.10-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
-}
diff --git a/media-gfx/shotwell/shotwell-0.11.1.ebuild b/media-gfx/shotwell/shotwell-0.11.1.ebuild
deleted file mode 100644
index 841a1e185e4c..000000000000
--- a/media-gfx/shotwell/shotwell-0.11.1.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.11.1.ebuild,v 1.2 2011/09/17 08:43:27 angelos 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: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-compile
-		--disable-desktop-update
-		--disable-icon-update
-		--lib=$(get_libdir)"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/0.11.0-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
-}
diff --git a/media-gfx/shotwell/shotwell-0.11.2.ebuild b/media-gfx/shotwell/shotwell-0.11.6.ebuild
index f35e960d6688..dc82a03d9765 100644
--- a/media-gfx/shotwell/shotwell-0.11.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.11.6.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2011/10/04 18:19:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.11.6.ebuild,v 1.1 2011/11/11 16:20:30 angelos Exp $
 
 EAPI=4
 GCONF_DEBUG="no"
@@ -49,7 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libraw-0.14.patch
+	epatch "${FILESDIR}"/${PN}-0.11.2-libraw-0.14.patch
 }
 
 src_compile() {