bump to 2.20.0 and clean up old revision

Package-Manager: portage-2.1.4

5 files changed, 64 insertions, 49 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/Manifest b/gnome-base/librsvg/Manifest
index 4cf67dbefdcf..68183c52f921 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX librsvg-2.15.90-die-gtk-doc-die.patch 581 RMD160 94e7da4d6260daebd5e7b298911d1888f234ce91 SHA1 fe31e163db3afbe028b6499a20301c5278ab3966 SHA256 b85d7c1b58905258c75fd86a360a0ba2eebd5d530793d359e4be7913fffb2201
 MD5 83cc3db2d44688434536e2470020a2af files/librsvg-2.15.90-die-gtk-doc-die.patch 581
 RMD160 94e7da4d6260daebd5e7b298911d1888f234ce91 files/librsvg-2.15.90-die-gtk-doc-die.patch 581
@@ -12,32 +15,40 @@ RMD160 abfb6af1fd08aab3fafacd19c1c216a3420f7115 files/librsvg-2.16.1-uninit.patc
 SHA256 b2fea4b59407fff1ccf1474412acf2296d43cf9b83a35abba6acb65a8ad45a0b files/librsvg-2.16.1-uninit.patch 765
 DIST librsvg-2.16.1.tar.bz2 423624 RMD160 27d293693d050a8a326311b4b0b5366baf400573 SHA1 3e7d9020341dee0b0bc9b4d7b70f38e77d92e0e2 SHA256 2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69
 DIST librsvg-2.18.2.tar.bz2 461122 RMD160 df154e6a3c74a406a5d6435a82611b3d204f147f SHA1 9e3017817708025737e53b60fe3bfa813e670e02 SHA256 ff30a5f1a99c61caebcdce9f59417b3f7a0dbed15c6786368f4a4a1d05c67eb1
+DIST librsvg-2.20.0.tar.bz2 463714 RMD160 76e657bce620ee677298110de9e8eedf2e39430e SHA1 906877feaa189606caa012cc51706cc7daef9fb4 SHA256 f980a58e766c42eb0d9d942fd2068f02aa19e68c7e57f822de60b739da1a1fb0
 EBUILD librsvg-2.16.1-r2.ebuild 2050 RMD160 7761caa34189aae722aad3ce34f54e77657daea6 SHA1 8fbfb28cb0998fc9972b4f6123de2a307d56f016 SHA256 c4bb1e589500731058f955cc3fcddd9581b8e3c2fc0bd0611d571ad7a608e395
 MD5 7c25e2941f17dce1a3428c92c7efc927 librsvg-2.16.1-r2.ebuild 2050
 RMD160 7761caa34189aae722aad3ce34f54e77657daea6 librsvg-2.16.1-r2.ebuild 2050
 SHA256 c4bb1e589500731058f955cc3fcddd9581b8e3c2fc0bd0611d571ad7a608e395 librsvg-2.16.1-r2.ebuild 2050
-EBUILD librsvg-2.16.1.ebuild 1867 RMD160 229f5bee7fd9d2eb338019b65c98ec196e1c57bb SHA1 2de6f08479da82c6910edbaffbe8b5589cee0e48 SHA256 7829df42e72bbcb993fd613e357be74d5fc518a344b9e2a5f97a173fc22dc260
-MD5 cf4e946b5e92c6f2f18b3748fdb0f5e3 librsvg-2.16.1.ebuild 1867
-RMD160 229f5bee7fd9d2eb338019b65c98ec196e1c57bb librsvg-2.16.1.ebuild 1867
-SHA256 7829df42e72bbcb993fd613e357be74d5fc518a344b9e2a5f97a173fc22dc260 librsvg-2.16.1.ebuild 1867
 EBUILD librsvg-2.18.2.ebuild 1671 RMD160 5777219641cb2e07697510e7fb72791d491651c7 SHA1 2d56c2aa2aa18069718d91a3bcb9e6c3db85c3eb SHA256 56e99e4daea42efdb318e2b7b2843ba6e1233ee654cc02a9c3c2f788485adab3
 MD5 6becb4643ecd4f40a3e6f419cbf32555 librsvg-2.18.2.ebuild 1671
 RMD160 5777219641cb2e07697510e7fb72791d491651c7 librsvg-2.18.2.ebuild 1671
 SHA256 56e99e4daea42efdb318e2b7b2843ba6e1233ee654cc02a9c3c2f788485adab3 librsvg-2.18.2.ebuild 1671
-MISC ChangeLog 20060 RMD160 19e6692a44274a5dab18668036c8fee7f72df63b SHA1 84b9ef1f228ac68d84b94c6dca2e61c50be0e51f SHA256 d49943091ed9478a31fb5929274584bb3004b19cb763220e413bd6b3125ef206
-MD5 4fd7a4858da62a82a911c9cbf83be2ad ChangeLog 20060
-RMD160 19e6692a44274a5dab18668036c8fee7f72df63b ChangeLog 20060
-SHA256 d49943091ed9478a31fb5929274584bb3004b19cb763220e413bd6b3125ef206 ChangeLog 20060
+EBUILD librsvg-2.20.0.ebuild 1693 RMD160 0be4c9272cfbe6361845201afdeab739b78294ed SHA1 e7a39eb23a7d5add759c2697220944dc7b5473ae SHA256 84d51b8f9377a1413a63302d3094c6d43df1d0950c063250b40a8287a5c113ec
+MD5 609dab34d572482ce489e55dc69a1033 librsvg-2.20.0.ebuild 1693
+RMD160 0be4c9272cfbe6361845201afdeab739b78294ed librsvg-2.20.0.ebuild 1693
+SHA256 84d51b8f9377a1413a63302d3094c6d43df1d0950c063250b40a8287a5c113ec librsvg-2.20.0.ebuild 1693
+MISC ChangeLog 20239 RMD160 c08dc80bb8bd140a4ad8fe34a8d9f63e7c7e2ede SHA1 8d475a1a3bd8ebe8ce206ed39d3104d1b48514c9 SHA256 6a4a49dd0830ff2da272916334d7943e30a86e2d1bec2d9896978bd39cad626d
+MD5 e2185f82c1b58437149968acb4b51a64 ChangeLog 20239
+RMD160 c08dc80bb8bd140a4ad8fe34a8d9f63e7c7e2ede ChangeLog 20239
+SHA256 6a4a49dd0830ff2da272916334d7943e30a86e2d1bec2d9896978bd39cad626d ChangeLog 20239
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 ab99525f3daaac5586f216d17dfa3dde files/digest-librsvg-2.16.1 247
-RMD160 ce4d7ae96c7ec8cd9d22a11d2f9ce377e27baf88 files/digest-librsvg-2.16.1 247
-SHA256 f6489e69f2820d8401eec1ae48aeac109aeaccde26dfb0681895322fe151f787 files/digest-librsvg-2.16.1 247
 MD5 ab99525f3daaac5586f216d17dfa3dde files/digest-librsvg-2.16.1-r2 247
 RMD160 ce4d7ae96c7ec8cd9d22a11d2f9ce377e27baf88 files/digest-librsvg-2.16.1-r2 247
 SHA256 f6489e69f2820d8401eec1ae48aeac109aeaccde26dfb0681895322fe151f787 files/digest-librsvg-2.16.1-r2 247
 MD5 46f627ce1f4bf68d4cb11d48bde4f1f1 files/digest-librsvg-2.18.2 247
 RMD160 5588c9f364f5592182990e7aaa71814464d4d81e files/digest-librsvg-2.18.2 247
 SHA256 be9a321b3fed4c0bc8f5d2e90c2910516a8da722de23a19392f16e25d015adce files/digest-librsvg-2.18.2 247
+MD5 0b9c9cf37b374f9008b3420ca933f435 files/digest-librsvg-2.20.0 247
+RMD160 d7b1100f2edf8c5dfefefa99468e2381d60b9b63 files/digest-librsvg-2.20.0 247
+SHA256 4b83a4eaa6eda06fc66950d75fe95598dfc687efc637cb841c9ec90ba25e1b23 files/digest-librsvg-2.20.0 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeTI/EACgkQ1fmVwcYIWAZfywCfSC5o4S5XKMgvYtCllhuP4VOd
+074An32IW7ob6t5m/rzRJ+o6xAWfYUjq
+=pv10
+-----END PGP SIGNATURE-----
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() {