Fix automagic gtk+ dependency (bug #371290 by Michał Górny), remove old.

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

7 files changed, 134 insertions, 83 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index e9058b167a2d..365bb200538c 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.238 2011/04/10 09:34:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.239 2011/06/26 16:44:18 pacho Exp $
+
+  26 Jun 2011; Pacho Ramos <pacho@gentoo.org> -librsvg-2.26.3.ebuild,
+  librsvg-2.34.0.ebuild, +librsvg-2.34.0-r1.ebuild,
+  +files/librsvg-2.34.0-automagic-gtk.patch:
+  Fix automagic gtk+ dependency (bug #371290 by Michał Górny), remove old.
+
+*librsvg-2.34.0-r1 (26 Jun 2011)
+
+  26 Jun 2011; Pacho Ramos <pacho@gentoo.org> -librsvg-2.26.3.ebuild,
+  librsvg-2.34.0.ebuild, +librsvg-2.34.0-r1.ebuild,
+  +files/librsvg-2.34.0-automagic-gtk.patch:
+  Fix automagic gtk+ dependency (bug #371290 by Michał Górny), remove old.
 
   10 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> librsvg-2.34.0.ebuild:
   Punt useless libtool file.
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index ad7e37086b83..1d90d54c6f35 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST librsvg-2.26.3.tar.bz2 511876 RMD160 14f51ae7997d8137e618ee117ef7980fc0ffe52c SHA1 ef0063eaa9e638364cc8ff142aadef8a267b7af5 SHA256 c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5
+AUX librsvg-2.34.0-automagic-gtk.patch 1420 RMD160 8b1740121a13ef1edaef44f6c6293f140432ab71 SHA1 91fd1a8713fe1296b30e2e3281cd72087c96ae4b SHA256 56e63ee0f4bd9baea7244fddc18622e88902bf0ccbfa18700c111157b05e4ef7
 DIST librsvg-2.32.1.tar.bz2 517170 RMD160 ac039d36667854292f2326aaadec9de6ea2873b6 SHA1 2762cfa3a4e9c9ee845c7f23a824dbd13583ebf0 SHA256 91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2f853ccf876d334
 DIST librsvg-2.34.0.tar.bz2 516994 RMD160 02638bcf084156e4e209a325a20e99d2e88e9fd8 SHA1 59e01568a6b201fc45828a76b942f790859cddeb SHA256 9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd
-EBUILD librsvg-2.26.3.ebuild 1796 RMD160 876a425a813acab1b26668e5f8213842b4d243a0 SHA1 46093bc38fe9c892710b62f59f488bff5101511d SHA256 7f11613ad28fbd186521e5fadc34ffaa8e43bddedbe686236ac3ece3d7d795a4
 EBUILD librsvg-2.32.1.ebuild 1697 RMD160 9f08a81f5472fcb282a073a2a083e9552c804fe8 SHA1 ef33bcc4c64715f2f8eb4bbc0b5db5bdc4e4d3b8 SHA256 4820d94c6015c5953d36369ba6a0e35c7e572729546166eb7ebe478849b57b92
-EBUILD librsvg-2.34.0.ebuild 1573 RMD160 75340eb951fde36c1efa70e511d66931d62ae970 SHA1 7654514db059505e839ea581cc74f2d7005a5441 SHA256 4d87b4eaff03e31bb847a48189fb595813774b1690e2c1e9cb2715497e490c20
-MISC ChangeLog 29998 RMD160 5dd8aa9edcc36a299c47f520c987bc2dfc031d46 SHA1 2db09876c123bddbec50dbfc759d5c8723c5a985 SHA256 4b144900cf7de31ae82464e296393d9b1de27a9bbd58a10f30b57b8b353e3bc3
-MISC metadata.xml 224 RMD160 f5f4831e7844c3bf2c25dd076673fdd9a3d1031a SHA1 fda8c1df897460ba96e15e7e661c4f266860cf26 SHA256 e1333ec0c96a03ada3a7b313d1c0903f39e103a7ef4b33275ab2c6f0087c5208
+EBUILD librsvg-2.34.0-r1.ebuild 1924 RMD160 03e9487e66dc4ffe7ccb9a3fd9985ac81befb043 SHA1 1b1dfac8bf01c7eb53656c9d18fab29e50af37a1 SHA256 4670131799c92fb07d3abaef07293ca02114e501b924626cda7a6dec9a418aa1
+EBUILD librsvg-2.34.0.ebuild 1722 RMD160 bd96338b1f9ae1a533159a5b161e072f0f8fdf0b SHA1 a5078ee18d38ba83f69a3613a17c68ff4807f449 SHA256 f0804a52a98439a667498e983b8a11ea724afc1619322c9563c1f4e6ce5c821e
+MISC ChangeLog 30518 RMD160 c61775dfcfce004e347c12591b01f742c713f570 SHA1 0427f47aa0a8c62705e3d5e8829445d53e52f3e8 SHA256 ebdf4794150fc468d4270d528aa80f3e9c26ff70aea433ab4a13f7c0c653daf9
+MISC metadata.xml 276 RMD160 52ef94c7407f4f59a15e5c785947fe01d685215a SHA1 852d1ba1e66651444d421f371b17267705a9e894 SHA256 7fe041dc0de35f5a0dbc687d6fc073b651d920b2ec25b45b4a91a8cb0d9e763d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2heZwACgkQXkR9YqOcLPG83AEAjLYw6VEjpjn+y1rpJGGch44y
-iGNIxrJuN68Go5tzZ10BAKgkcllFC8V632EvESuS1w6r2Ukor8uwkLCkmk7GWHy6
-=snbF
+iEYEARECAAYFAk4HYekACgkQCaWpQKGI+9R/tgCfW9RJk2QNMYKR98ZL2abyj9l1
+pdQAn0h614ysKi4iSM6PYe/KP6WuDnAh
+=G5kG
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch b/gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch
new file mode 100644
index 000000000000..f516e2983c10
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.34.0-automagic-gtk.patch
@@ -0,0 +1,33 @@
+--- configure.in.old	2011-06-22 13:44:43.000000000 +0200
++++ configure.in	2011-06-23 15:12:46.000000000 +0200
+@@ -235,14 +235,28 @@
+   [],[enable_gtk_theme=yes])
+ AC_MSG_RESULT([$enable_gtk_theme])
+ 
++AC_MSG_CHECKING([which gtk+ version to compile against])
++AC_ARG_WITH([gtk],
++  [AS_HELP_STRING([--with-gtk=2.0|3.0|both],[which gtk+ version to compile against (default: 2.0)])],
++  [case "$with_gtk" in
++     2.0|3.0|both) ;;
++     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
++   esac],
++  [with_gtk=2.0])
++AC_MSG_RESULT([$with_gtk])
++
+ have_gtk_2=no
+ have_gtk_3=no
+ GTK2_BINARY_VERSION=
+ GTK3_BINARY_VERSION=
+ 
+ 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])
++case "$with_gtk" in
++  2.0) PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= $GTK2_REQUIRED],[have_gtk_2=yes],[have_gtk_2=no]);;
++  3.0) PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no]);;
++  both) 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]);;
++esac
+ 
+   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.26.3.ebuild b/gnome-base/librsvg/librsvg-2.26.3.ebuild
deleted file mode 100644
index 36edd1a93d8a..000000000000
--- a/gnome-base/librsvg/librsvg-2.26.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.26.3.ebuild,v 1.11 2011/03/16 10:52:40 nirbheek Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc tools zlib"
-
-RDEPEND=">=media-libs/fontconfig-1.0.1
-	>=media-libs/freetype-2
-	>=x11-libs/gtk+-2.16:2
-	>=dev-libs/glib-2.15.4:2
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pango-1.10
-	>=dev-libs/libxml2-2.4.7:2
-	>=dev-libs/libcroco-0.6.1
-	zlib? ( >=gnome-extra/libgsf-1.6 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12
-	doc? ( >=dev-util/gtk-doc-1 )"
-# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf, feel free to drop it when not run it
-
-DOCS="AUTHORS ChangeLog README NEWS TODO"
-
-pkg_setup() {
-	# croco is forced on to respect SVG specification
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable tools)
-		$(use_with zlib svgz)
-		--with-croco
-		--enable-pixbuf-loader
-		--enable-gtk-theme"
-}
-
-set_gtk_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="${EROOT}etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR="${GTK2_CONFDIR:-${EROOT}etc/gtk-2.0}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# remove gdk-pixbuf loaders (#47766)
-	rm -fr "${ED}etc"
-}
-
-pkg_postinst() {
-	set_gtk_confdir
-	gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-}
-
-pkg_postrm() {
-	set_gtk_confdir
-	gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-}
diff --git a/gnome-base/librsvg/librsvg-2.34.0-r1.ebuild b/gnome-base/librsvg/librsvg-2.34.0-r1.ebuild
new file mode 100644
index 000000000000..6c02de326dd9
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.34.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.0-r1.ebuild,v 1.1 2011/06/26 16:44:18 pacho Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib eutils autotools
+
+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 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc +gtk gtk3 tools"
+
+RDEPEND=">=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2
+	>=dev-libs/glib-2.24:2
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pango-1.10
+	>=dev-libs/libxml2-2.4.7:2
+	>=dev-libs/libcroco-0.6.1
+	|| ( x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2 )
+	gtk? ( >=x11-libs/gtk+-2.16:2 )
+	gtk3? ( >=x11-libs/gtk+-2.90.0:3 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12
+	doc? ( >=dev-util/gtk-doc-1.13 )"
+# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf
+
+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 gtk && ! use gtk3 && G2CONF+=" --with-gtk=2.0"
+	use gtk && use gtk3 && G2CONF+=" --with-gtk=both"
+	! use gtk && use gtk3 && G2CONF+=" --with-gtk=3.0 --enable-gtk-theme"
+
+	DOCS="AUTHORS ChangeLog README NEWS TODO"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix automagic gtk+ dependency, bug #371290
+	epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch"
+	eautoreconf
+}
+
+pkg_postinst() {
+	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+}
+
+pkg_postrm() {
+	gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+}
diff --git a/gnome-base/librsvg/librsvg-2.34.0.ebuild b/gnome-base/librsvg/librsvg-2.34.0.ebuild
index 03e987ee9405..1caaf3635275 100644
--- a/gnome-base/librsvg/librsvg-2.34.0.ebuild
+++ b/gnome-base/librsvg/librsvg-2.34.0.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.0.ebuild,v 1.2 2011/04/10 09:34:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.34.0.ebuild,v 1.3 2011/06/26 16:44:18 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
 GCONF_DEBUG="no"
 
-inherit gnome2 multilib
+inherit gnome2 multilib eutils autotools
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
@@ -37,13 +39,17 @@ pkg_setup() {
 		$(use_enable tools)
 		$(use_enable gtk gtk-theme)
 		--with-croco
-		--enable-pixbuf-loader"
+		--enable-pixbuf-loader
+		--with-gtk=2.0"
 	DOCS="AUTHORS ChangeLog README NEWS TODO"
 }
 
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name '*.la' -exec rm -f {} +
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix automagic gtk+ dependency, bug #371290
+	epatch "${FILESDIR}/${PN}-2.34.0-automagic-gtk.patch"
+	eautoreconf
 }
 
 pkg_postinst() {
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
index becd44344985..03a9d4f3fc9b 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
+	<flag name="gtk3">Build with gtk+-3 support</flag>
 	<flag name="tools">Build miscellaneous tools</flag>
 </use>
 </pkgmetadata>