bump to 2.20.0 and clean up old revision

(Portage version: 2.1.4)

4 files changed, 42 insertions, 38 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 7241893d4f8c..c3ae244cbab7 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.164 2007/11/29 05:23:52 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.165 2008/01/20 10:35:10 eva Exp $
+
+*librsvg-2.20.0 (20 Jan 2008)
+
+  20 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -librsvg-2.16.1.ebuild, +librsvg-2.20.0.ebuild:
+  bump to 2.20.0 and clean up old revision
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> librsvg-2.18.2.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.16.1 b/gnome-base/librsvg/files/digest-librsvg-2.16.1
deleted file mode 100644
index 1b7bd6ad85a3..000000000000
--- a/gnome-base/librsvg/files/digest-librsvg-2.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 37e046571097ff7ce77ae6e07f096324 librsvg-2.16.1.tar.bz2 423624
-RMD160 27d293693d050a8a326311b4b0b5366baf400573 librsvg-2.16.1.tar.bz2 423624
-SHA256 2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69 librsvg-2.16.1.tar.bz2 423624
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.20.0 b/gnome-base/librsvg/files/digest-librsvg-2.20.0
new file mode 100644
index 000000000000..54bacffcf8fb
--- /dev/null
+++ b/gnome-base/librsvg/files/digest-librsvg-2.20.0
@@ -0,0 +1,3 @@
+MD5 14cc098b68e72ee6a8cdd55edc1ea1b4 librsvg-2.20.0.tar.bz2 463714
+RMD160 76e657bce620ee677298110de9e8eedf2e39430e librsvg-2.20.0.tar.bz2 463714
+SHA256 f980a58e766c42eb0d9d942fd2068f02aa19e68c7e57f822de60b739da1a1fb0 librsvg-2.20.0.tar.bz2 463714
diff --git a/gnome-base/librsvg/librsvg-2.16.1.ebuild b/gnome-base/librsvg/librsvg-2.20.0.ebuild
index 122fc0d870c9..0cb3be2f7cb9 100644
--- a/gnome-base/librsvg/librsvg-2.16.1.ebuild
+++ b/gnome-base/librsvg/librsvg-2.20.0.ebuild
@@ -1,32 +1,50 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.16.1.ebuild,v 1.14 2007/09/14 11:46:44 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.20.0.ebuild,v 1.1 2008/01/20 10:35:10 eva Exp $
 
-inherit multilib gnome2 eutils
+inherit gnome2 multilib
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc gnome zlib"
 
-RDEPEND=">=media-libs/fontconfig-1.0.1
+RDEPEND="
+	>=media-libs/fontconfig-1.0.1
 	>=x11-libs/gtk+-2.6
 	>=dev-libs/glib-2.12
 	>=dev-libs/libxml2-2.4.7
 	>=x11-libs/cairo-1.2
 	>=x11-libs/pango-1.2
-	>=dev-libs/libcroco-0.6.1
 	>=media-libs/freetype-2
-	gnome? ( >=gnome-base/gnome-vfs-2 )
-	zlib? ( >=gnome-extra/libgsf-1.6 )"
+	zlib? ( >=gnome-extra/libgsf-1.6 )
+	>=dev-libs/libcroco-0.6.1
+	gnome? (
+		>=gnome-base/gnome-vfs-2
+		>=gnome-base/libgnomeprint-2.2
+		>=gnome-base/libgnomeprintui-2.2
+	)"
+
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-0.9 )"
+	>=dev-util/pkgconfig-0.12
+	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+DOCS="AUTHORS ChangeLog README NEWS TODO"
+
+pkg_setup() {
+	# FIXME: USEify croco support (?)
+	G2CONF="${G2CONF}
+		$(use_with zlib svgz)
+		$(use_enable gnome gnome-vfs)
+		$(use_enable gnome gnome-print)
+		--disable-mozilla-plugin
+		--with-croco
+		--enable-pixbuf-loader
+		--enable-gtk-theme"
+}
 
 set_gtk_confdir() {
 	# An arch specific config directory is used on multilib systems
@@ -34,31 +52,11 @@ set_gtk_confdir() {
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
 }
 
-pkg_setup() {
-	G2CONF="--enable-gtk-theme --enable-pixbuf-loader \
-			--disable-mozilla-plugin --with-croco \
-			--disable-gnome-print \
-			$(use_enable gnome gnome-vfs) \
-			$(use_with zlib svgz)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Still fails even with disable-gtk-doc
-	if ! use doc; then
-		epatch ${FILESDIR}/${PN}-2.15.90-die-gtk-doc-die.patch
-	fi
-}
-
 src_install() {
-	gnome2_src_install plugindir=/usr/$(get_libdir)/nsbrowser/plugins/
+	gnome2_src_install
 
 	# remove gdk-pixbuf loaders (#47766)
-	rm -fr ${D}/etc
-
-	# remove plugins dir since we disable the plugin
-	rm -fr ${D}/usr/lib/nsbrowser
+	rm -fr "${D}/etc"
 }
 
 pkg_postinst() {