Version bump for Gnome 2.32. Remove old.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 27 insertions, 56 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 0d42ac9beb2d..090899975604 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.226 2010/10/17 14:46:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.227 2010/11/08 21:21:25 pacho Exp $
+
+*librsvg-2.32.0 (08 Nov 2010)
+
+  08 Nov 2010; Pacho Ramos <pacho@gentoo.org> -librsvg-2.31.0.ebuild,
+  -files/librsvg-2.31.0-skip-automagic.patch, +librsvg-2.32.0.ebuild:
+  Version bump for Gnome 2.32. Remove old.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> librsvg-2.26.3.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index f3f86588a042..623857837265 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,13 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX librsvg-2.22.3-fix-segfault-with-firefox.patch 538 RMD160 e52da5a491d8b2a93b264a4d79b8a19307635dce SHA1 b773d7e022725f8bdc00707bfb8b5a3098d8e1a5 SHA256 bcd27c5d3662525cbc9df31c0f3bd4c36d7dc85c7ee867f9dd129cce233db2d7
 AUX librsvg-2.26.2-choosable-tools.patch 2372 RMD160 e1b842cd8eab8bec5affa8ad6dc12fc12bdd5311 SHA1 d6861edc02adaa50a40cb14a979dc1f51a332757 SHA256 6b29bd95e6c61619cd6cde778a38149db318e21315457b6ab7637d4ce1de0f7a
-AUX librsvg-2.31.0-skip-automagic.patch 1053 RMD160 678481806d2912bff7ec99d3cf5e77b8776156e5 SHA1 1c8c9018f5efd86fa4878d02c4d23b1e5fde1f18 SHA256 03a4002c203196db8a59912817fa8db68fa9eaf011351efa2e297d4e1bb50f6f
 DIST librsvg-2.26.0.tar.bz2 477499 RMD160 9e8197519e4e48f736e6bb65d2993478b0f64451 SHA1 61044be4bcd5945f5711f788e1aa303a80b69e32 SHA256 fdcab5f0d86198d8cbd4ffe5b333076f75e707f6d7e4af5e87a8644ff7533bea
 DIST librsvg-2.26.2.tar.bz2 485744 RMD160 701d82a76a384aedb3ab1dcf7be589149ab456b8 SHA1 3c529b5e28a8924fa95d74814dd63b53182c903c SHA256 e82fb920901e211a54cff5df88c327bedec8565b324e2f529f428f492361c60f
 DIST librsvg-2.26.3.tar.bz2 511876 RMD160 14f51ae7997d8137e618ee117ef7980fc0ffe52c SHA1 ef0063eaa9e638364cc8ff142aadef8a267b7af5 SHA256 c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5
-DIST librsvg-2.31.0.tar.bz2 514232 RMD160 c155e68855d7582e53f6b5d4183a6dd26023a994 SHA1 e95fde763313bef0f235c87d76975d190f348044 SHA256 320b61ef5e6d65624f3733a83134df012a4156ed7f7ae38a6ed19febe1bfa732
+DIST librsvg-2.32.0.tar.bz2 516660 RMD160 9d89f333544d8eb66698c94602ea93ac3ba01157 SHA1 252727b948a29b36dae0022e0c620538bcb158f8 SHA256 e0f6f936dab583de317cc0c36a48f80bdb9c93775225ee84140c7e5e3f841068
 EBUILD librsvg-2.26.0.ebuild 1888 RMD160 875bacded459c11c7cdb6da8553141bb6e8b650f SHA1 7f500d61a7c198923526d3f8c90230dcfc56f0b7 SHA256 e2b42e4b7acc7db9105e0ca03c580f391338062d8fbd56da59b2cf952ae8c07e
 EBUILD librsvg-2.26.2.ebuild 1974 RMD160 c137b51dab2c0ad8eea7639ac14dd3fcf04e56d2 SHA1 18a1e86392411c21911d9f174d6ebc11d43ebb30 SHA256 e1a5eb20228b9cd388e403b21f9b27a6551c3f878470fd5c354cafe149e1b64b
 EBUILD librsvg-2.26.3.ebuild 1789 RMD160 2a609114df81a27a49335b5c8af17ffbaf2c3709 SHA1 fd138f20de94a93cffabd174720db5579e42ca82 SHA256 7dbb55d362e9274707f94aacfeec7b94575cd4791aa0844cf15a04fc8713ea19
-EBUILD librsvg-2.31.0.ebuild 2062 RMD160 51ffbe4f9eee6762ce581098a814742e3b7d2b1d SHA1 30401fc347f9fafd90701f595b2153c0c0fdebc7 SHA256 08c20feefff8c13c7ed1a3bd9477a587a71826d03ab53ad87bedf3aec447f14f
-MISC ChangeLog 28215 RMD160 dbc727632b55e2ab0939041bc39dd16966c8188a SHA1 f619831936dab3b5ebb61f00369d7fa087cbbe1f SHA256 c2f373bba8ac999a2ca0e90464abac056ed82ecb01b439522032749385fb8951
+EBUILD librsvg-2.32.0.ebuild 1699 RMD160 0e1ada043c0f5c1fa55d4958984426a8e326d01c SHA1 4c30e9029555f8a399fdd19279d82c0b18b96c67 SHA256 ad95656b7691bbe65d5cd014dae0a16f4141774ac1a0fdbe364bff9699fbca41
+MISC ChangeLog 28428 RMD160 8ecc901884c7c5117100a6ca74c985f9baa70f3f SHA1 7a6f9d1f9a38a8aa571bcb46f22f653233c2cc1a SHA256 052e6c9d37339cf7494e880de970f0b9e671295ff55203b98daf2c9d9ab343a7
 MISC metadata.xml 224 RMD160 f5f4831e7844c3bf2c25dd076673fdd9a3d1031a SHA1 fda8c1df897460ba96e15e7e661c4f266860cf26 SHA256 e1333ec0c96a03ada3a7b313d1c0903f39e103a7ef4b33275ab2c6f0087c5208
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzYadoACgkQCaWpQKGI+9SgWACfUlqifuZcWJJgY2sXDJKUYtGL
+egUAnRi8NRStxV4uEqo82ul33GxDoDFd
+=Ufa/
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/files/librsvg-2.31.0-skip-automagic.patch b/gnome-base/librsvg/files/librsvg-2.31.0-skip-automagic.patch
deleted file mode 100644
index 6127be4557f9..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.31.0-skip-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -240,9 +240,20 @@ have_gtk_3=no
- GTK2_BINARY_VERSION=
- GTK3_BINARY_VERSION=
- 
-+AC_ARG_WITH([gtk2],
-+  [AS_HELP_STRING([--with-gtk2],[Build against gtk-2 (default=auto)])],
-+  [],[with_gtk2=auto])
-+AC_ARG_WITH([gtk3],
-+  [AS_HELP_STRING([--with-gtk3],[Build against gtk-3 (default=auto)])],
-+  [],[with_gtk3=auto])
-+
- if test "x$enable_gtk_theme" = "xyes" -o "x$enable_pixbuf_loader" = "xyes"; then
--  PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= $GTK2_REQUIRED],[have_gtk_2=yes],[have_gtk_2=no])
--  PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
-+  AS_IF([test "x$with_gtk2" = "xno"],
-+    [have_gtk_2=no],
-+    [PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= $GTK2_REQUIRED],[have_gtk_2=yes],[have_gtk_2=no])])
-+  AS_IF([test "x$with_gtk3" = "xno"],
-+    [have_gtk_3=no],
-+    [PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])])
- 
-   if test "$have_gtk_2" = "yes"; then
-      GTK2_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`"
diff --git a/gnome-base/librsvg/librsvg-2.31.0.ebuild b/gnome-base/librsvg/librsvg-2.32.0.ebuild
index b88c3f99ed3b..5e4710c297ae 100644
--- a/gnome-base/librsvg/librsvg-2.31.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.32.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.31.0.ebuild,v 1.4 2010/09/25 14:56:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.32.0.ebuild,v 1.1 2010/11/08 21:21:25 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2 multilib eutils autotools
+inherit gnome2 multilib
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
@@ -13,11 +13,11 @@ HOMEPAGE="http://librsvg.sourceforge.net/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +gtk tools" # +gtk3
+IUSE="doc +gtk tools"
 
 RDEPEND=">=media-libs/fontconfig-1.0.1
 	>=media-libs/freetype-2
-	>=dev-libs/glib-2.24
+	>=dev-libs/glib-2.24:2
 	>=x11-libs/cairo-1.2
 	>=x11-libs/pango-1.10
 	>=dev-libs/libxml2-2.4.7
@@ -25,39 +25,20 @@ RDEPEND=">=media-libs/fontconfig-1.0.1
 	|| ( x11-libs/gdk-pixbuf
 		x11-libs/gtk+:2 )
 	gtk? ( >=x11-libs/gtk+-2.16:2 )"
-#	gtk3? ( >=x11-libs/gtk+-2.90:3 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12
-	>=dev-util/gtk-doc-am-1.13
 	doc? ( >=dev-util/gtk-doc-1 )"
 # >=dev-util/gtk-doc-am-1.13 needed by eautoreconf
 
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
 pkg_setup() {
 	# croco is forced on to respect SVG specification
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable tools)
+		$(use_enable gtk gtk-theme)
 		--with-croco
-		--enable-pixbuf-loader
-		$(use_with gtk gtk2)
-		--without-gtk3"
-#		$(use_with gtk3)"
-#	if use gtk || use gtk3; then
-	if use gtk; then
-		G2CONF="${G2CONF} --enable-gtk-theme"
-	else
-		G2CONF="${G2CONF} --disable-gtk-theme"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}"/${P}-skip-automagic.patch
-
-	eautoreconf
+		--enable-pixbuf-loader"
+	DOCS="AUTHORS ChangeLog README NEWS TODO"
 }
 
 src_install() {