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

(Portage version: 2.1.9.50/cvs/Linux x86_64)

6 files changed, 125 insertions, 74 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/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>