Version bump, bug #306719. Remove unneeded gnome-vfs dependency. Clean up old revisions.

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

4 files changed, 37 insertions, 21 deletions

diff --git a/gnome-extra/gnome-web-photo/ChangeLog b/gnome-extra/gnome-web-photo/ChangeLog
index d120a1de13ee..048618a9e992 100644
--- a/gnome-extra/gnome-web-photo/ChangeLog
+++ b/gnome-extra/gnome-web-photo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-web-photo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/ChangeLog,v 1.3 2010/02/08 17:44:15 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/ChangeLog,v 1.4 2010/03/08 23:40:02 eva Exp $
+
+*gnome-web-photo-0.9 (08 Mar 2010)
+
+  08 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-web-photo-0.8.ebuild, gnome-web-photo-0.8-r1.ebuild,
+  +gnome-web-photo-0.9.ebuild, metadata.xml:
+  Version bump, bug #306719. Remove unneeded gnome-vfs dependency. Clean up
+  old revisions.
 
 *gnome-web-photo-0.8-r1 (08 Feb 2010)
 
diff --git a/gnome-extra/gnome-web-photo/gnome-web-photo-0.8-r1.ebuild b/gnome-extra/gnome-web-photo/gnome-web-photo-0.8-r1.ebuild
index a04fb8b3d116..e0a47942f5fa 100644
--- a/gnome-extra/gnome-web-photo/gnome-web-photo-0.8-r1.ebuild
+++ b/gnome-extra/gnome-web-photo/gnome-web-photo-0.8-r1.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/gnome-extra/gnome-web-photo/gnome-web-photo-0.8-r1.ebuild,v 1.1 2010/02/08 17:44:15 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/gnome-web-photo-0.8-r1.ebuild,v 1.2 2010/03/08 23:40:02 eva Exp $
 
 inherit autotools gnome2
 
@@ -15,7 +15,6 @@ IUSE="jpeg"
 RDEPEND=">=dev-libs/glib-2.6.0
 		>=x11-libs/gtk+-2.6.3
 		>=dev-libs/libxml2-2.6.12
-		>=gnome-base/gnome-vfs-2.9.2
 		media-libs/libpng
 		gnome-base/gconf
 		jpeg? ( media-libs/jpeg )
diff --git a/gnome-extra/gnome-web-photo/gnome-web-photo-0.8.ebuild b/gnome-extra/gnome-web-photo/gnome-web-photo-0.9.ebuild
index a3122e133a2a..b58aeda96c10 100644
--- a/gnome-extra/gnome-web-photo/gnome-web-photo-0.8.ebuild
+++ b/gnome-extra/gnome-web-photo/gnome-web-photo-0.9.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/gnome-web-photo-0.8.ebuild,v 1.2 2010/01/11 13:53:45 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/gnome-web-photo-0.9.ebuild,v 1.1 2010/03/08 23:40:02 eva Exp $
 
-inherit gnome2
+EAPI="2"
+
+inherit autotools gnome2
 
 DESCRIPTION="a tool to generate images and thumbnails from HTML files"
 HOMEPAGE="ftp://ftp.gnome.org/pub/gnome/sources/gnome-web-photo"
@@ -12,19 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="jpeg"
 
-RDEPEND=">=dev-libs/glib-2.6.0
-		>=x11-libs/gtk+-2.6.3
-		>=dev-libs/libxml2-2.6.12
-		>=gnome-base/gnome-vfs-2.9.2
-		media-libs/libpng
-		gnome-base/gconf
-		jpeg? ( media-libs/jpeg )
-		net-libs/xulrunner"
+RDEPEND=">=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6.3
+	>=dev-libs/libxml2-2.6.12
+	media-libs/libpng
+	gnome-base/gconf
+	jpeg? ( media-libs/jpeg )
+	net-libs/xulrunner"
 DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19"
+	>=dev-util/pkgconfig-0.19
+	sys-devel/gettext"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
 
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable jpeg)"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Compatibility with xulrunner-1.9.2, per bug #303897
+	epatch "${FILESDIR}/${PN}-0.8-libxul-compat.patch"
+
+	eautoreconf
+}
diff --git a/gnome-extra/gnome-web-photo/metadata.xml b/gnome-extra/gnome-web-photo/metadata.xml
index 70c1a144782c..2869616d866c 100644
--- a/gnome-extra/gnome-web-photo/metadata.xml
+++ b/gnome-extra/gnome-web-photo/metadata.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+	<herd>gnome</herd>
+	<maintainer>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
 </pkgmetadata>