version bump, bug #327013

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 66 insertions, 5 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index b3885efb1446..649d89c35ce3 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.3 2010/05/30 06:20:04 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.4 2010/08/22 07:30:17 hollow Exp $
+
+*shotwell-0.6.1 (22 Aug 2010)
+
+  22 Aug 2010; Benedikt Böhm <hollow@gentoo.org> shotwell-0.5.2.ebuild,
+  +shotwell-0.6.1.ebuild, metadata.xml:
+  version bump, bug #327013
 
 *shotwell-0.5.2 (30 May 2010)
 
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index 8f4056d08d60..44c3096733e5 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>graphics</herd>
 	<maintainer>
 		<email>hollow@gentoo.org</email>
 		<name>Benedikt Böhm</name>
 	</maintainer>
 	<maintainer>
-		<email>nutz@unfoog.de</email>
+		<email>nutz@noova.de</email>
 		<name>Andreas Nüßlein</name>
 		<description>Proxy maintainer. Please CC on bugs.</description>
 	</maintainer>
diff --git a/media-gfx/shotwell/shotwell-0.5.2.ebuild b/media-gfx/shotwell/shotwell-0.5.2.ebuild
index 388ea1016087..17c3dfbad05a 100644
--- a/media-gfx/shotwell/shotwell-0.5.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.5.2.ebuild,v 1.1 2010/05/30 06:20:04 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.5.2.ebuild,v 1.2 2010/08/22 07:30:17 hollow Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -30,7 +30,7 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=sys-fs/udev-145[extras]
 	>=x11-libs/gtk+-2.14.4:2"
 DEPEND="${RDEPEND}
-	>=dev-lang/vala-0.8"
+	=dev-lang/vala-0.8*"
 
 DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
 
diff --git a/media-gfx/shotwell/shotwell-0.6.1.ebuild b/media-gfx/shotwell/shotwell-0.6.1.ebuild
new file mode 100644
index 000000000000..e37a92e83613
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.6.1.ebuild,v 1.1 2010/08/22 07:30:17 hollow 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
+	>=dev-libs/libxml2-2.6.32
+	>=gnome-base/gconf-2.22.0
+	>=media-libs/libexif-0.6.16
+	>=media-libs/libgphoto2-2.4.2
+	>=net-libs/libsoup-2.26.0
+	>=net-libs/webkit-gtk-1.1.5
+	>=sys-fs/udev-145[extras]
+	>=x11-libs/gtk+-2.14.4:2
+	>=media-libs/libraw-0.9.0
+	>=media-libs/gexiv2-0.1.0"
+DEPEND="${RDEPEND}
+	=dev-lang/vala-0.8*"
+
+DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libraw.patch" || die "libraw patch failed."
+	mv vapi/libraw{,_r}.vapi || die "renaming libraw.vapi failed"
+}
+
+pkg_setup() {
+	G2CONF="--disable-schemas-install
+		--disable-desktop-update
+		--disable-icon-update"
+}
+
+src_install() {
+	# This is needed so that gnome2_gconf_savelist() works correctly.
+	insinto "${EPREFIX}"/etc/gconf/schemas
+	doins misc/shotwell.schemas || die "install gconf schema failed"
+	gnome2_src_install
+}