Add librsvg-2.31.0 with the new pixbuf format used by gdk-pixbuf

(Portage version: 2.1.9.10/cvs/Linux x86_64)

3 files changed, 101 insertions, 1 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index d58305c71387..bea4c3097282 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.220 2010/09/11 18:24:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.221 2010/09/24 22:51:13 nirbheek Exp $
+
+*librsvg-2.31.0 (24 Sep 2010)
+
+  24 Sep 2010; <nirbheek@gentoo.org> +librsvg-2.31.0.ebuild,
+  +files/librsvg-2.31.0-skip-automagic.patch:
+  Add librsvg-2.31.0 with the new pixbuf format used by gdk-pixbuf
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> librsvg-2.26.3.ebuild:
   Marked ppc for bug #324077.
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
new file mode 100644
index 000000000000..6127be4557f9
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.31.0-skip-automagic.patch
@@ -0,0 +1,25 @@
+--- 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.31.0.ebuild
new file mode 100644
index 000000000000..25ff67a45a95
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.31.0.ebuild
@@ -0,0 +1,69 @@
+# 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.1 2010/09/24 22:51:13 nirbheek Exp $
+
+EAPI="3"
+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 tools" # +gtk3
+
+RDEPEND=">=media-libs/fontconfig-1.0.1
+	>=media-libs/freetype-2
+	>=dev-libs/glib-2.24
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pango-1.10
+	>=dev-libs/libxml2-2.4.7
+	>=dev-libs/libcroco-0.6.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)
+		--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
+}
+
+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"
+}