New release: 2.12.6, using the 'nsplugin' flag instead of 'mozilla'

Package-Manager: portage-2.0.53_rc3

6 files changed, 86 insertions, 27 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 46594bb29bee..378d20b7c407 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.85 2005/09/30 17:30:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.86 2005/10/08 12:29:02 leonardop Exp $
+
+*librsvg-2.12.6 (08 Oct 2005)
+
+  08 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/librsvg-2.12.6-plugin_checks.patch, -librsvg-2.12.3.ebuild,
+  +librsvg-2.12.6.ebuild:
+  New version. Use gecko-sdk to build the browser plugin, and replace the
+  'mozilla' USE flag with 'nsplugin'.
 
 *librsvg-2.12.3 (30 Sep 2005)
 
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index ca841c7071a1..2833cf22a07d 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d2eb4a680b0c46d8a1feabd646e56a80 librsvg-2.12.3.ebuild 1813
-MD5 4bd76fdf498f73f383ff25d7aa630d34 librsvg-1.0.3.ebuild 925
-MD5 da30d0380f4c786dc50f0762ed4eb62f ChangeLog 10051
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 349f9dbe7f6b83ece07dd3baae7cabcf librsvg-2.9.5.ebuild 1546
-MD5 ad1626c62d8fcb067ab258d76056afaa files/digest-librsvg-2.12.3 67
+MD5 5e427e163b5584010120035249adc52a ChangeLog 10350
 MD5 70f6afa0baffe29c6c4ab43dccbd0435 files/digest-librsvg-1.0.3 65
+MD5 7fe88168a6e05602c03df3acc7ea614b files/digest-librsvg-2.12.6 67
 MD5 254740116b1b3ccf3e4013c37c610459 files/digest-librsvg-2.9.5 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPXamomPajV0RnrERAvnFAJsGTYzQcAJmm4wTJ1N1ARBjKRmoewCcDQi2
-dHSGVeon5/KrjwmIRditjnc=
-=SNAe
------END PGP SIGNATURE-----
+MD5 28420185ee1b4c292fe5c45b2c8d1f76 files/librsvg-2.12.6-plugin_checks.patch 1914
+MD5 4bd76fdf498f73f383ff25d7aa630d34 librsvg-1.0.3.ebuild 925
+MD5 53f609cb6e03c619f33a060fce2043ca librsvg-2.12.6.ebuild 2075
+MD5 349f9dbe7f6b83ece07dd3baae7cabcf librsvg-2.9.5.ebuild 1546
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.12.3 b/gnome-base/librsvg/files/digest-librsvg-2.12.3
deleted file mode 100644
index 5e1497ef4e45..000000000000
--- a/gnome-base/librsvg/files/digest-librsvg-2.12.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 437e9419ff214a1f6ad1a5ba119f12fd librsvg-2.12.3.tar.bz2 396000
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.12.6 b/gnome-base/librsvg/files/digest-librsvg-2.12.6
new file mode 100644
index 000000000000..3bf2321263fa
--- /dev/null
+++ b/gnome-base/librsvg/files/digest-librsvg-2.12.6
@@ -0,0 +1 @@
+MD5 9fc253702e9ac7d68caa4a7adcaf3755 librsvg-2.12.6.tar.bz2 396894
diff --git a/gnome-base/librsvg/files/librsvg-2.12.6-plugin_checks.patch b/gnome-base/librsvg/files/librsvg-2.12.6-plugin_checks.patch
new file mode 100644
index 000000000000..4d856ec5365d
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.12.6-plugin_checks.patch
@@ -0,0 +1,49 @@
+diff -NurdB librsvg-2.12.6/configure.in librsvg-2.12.6-patched/configure.in
+--- librsvg-2.12.6/configure.in	2005-10-06 21:32:34.000000000 -0500
++++ librsvg-2.12.6-patched/configure.in	2005-10-07 22:30:14.000000000 -0500
+@@ -321,18 +321,37 @@
+ 			 test_mozilla_plugin="$enableval")
+ 
+ if test "x$test_mozilla_plugin" != "xno"; then
+-   if test -z "$MOZILLA_CONFIG"; then
+-      AC_PATH_PROGS(MOZILLA_CONFIG, mozilla-config firefox-config, no)
++   AC_MSG_CHECKING([which gecko to use])
++
++   AC_ARG_WITH([mozilla],
++      AS_HELP_STRING([--with-mozilla],[Which gecko engine to use (default: autodetect)]))
++
++   GECKOS="gecko-sdk firefox mozilla-firefox seamonkey mozilla"
++   gecko=$with_mozilla
++
++   if test "x$gecko" = "x"; then
++      dnl Autodetect gecko
++      for g in $GECKOS; do
++         if $PKG_CONFIG --exists $g-plugin; then
++            gecko=$g
++            break;
++         fi
++      done
++   elif ! $PKG_CONFIG --exists $gecko-plugin; then
++      AC_MSG_ERROR([Gecko "$gecko" not found])
+    fi
+ 
+-   if test "x$MOZILLA_CONFIG" != "xno"; then
+-      _mozilla_include_dir=`$MOZILLA_CONFIG --cflags|sed 's/-I\(.*\) .*/\1/'`
+-      MOZILLA_CFLAGS="-I$_mozilla_include_dir/plugin -I$_mozilla_include_dir/java -I$_mozilla_include_dir/nspr"
+-   else
+-	PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, build_mozilla_plugin=yes, 
+-			[AC_MSG_WARN([mozilla-config not found. Mozilla/Netscape plugin will not be built])])
++   if test "x$gecko" = "x"; then
++      AC_MSG_ERROR([No gecko found])
++   elif ! ( echo "$GECKOS" | egrep "(^| )$gecko(\$| )" > /dev/null); then
++      AC_MSG_ERROR([Unknown gecko "$gecko" specified])
+    fi
+ 
++   AC_MSG_RESULT([$gecko])
++
++   PKG_CHECK_MODULES(MOZILLA, $gecko-plugin, build_mozilla_plugin=yes, 
++      [AC_MSG_WARN([gecko toolkit not found. Mozilla/Netscape plugin will not be built])])
++
+    if test "x$MOZILLA_CFLAGS" != "x"; then
+       build_mozilla_plugin=yes
+    fi
diff --git a/gnome-base/librsvg/librsvg-2.12.3.ebuild b/gnome-base/librsvg/librsvg-2.12.6.ebuild
index 3dc20e802fbc..6d12bc81ad5f 100644
--- a/gnome-base/librsvg/librsvg-2.12.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.12.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.12.3.ebuild,v 1.1 2005/09/30 17:30:34 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.12.6.ebuild,v 1.1 2005/10/08 12:29:02 leonardop Exp $
 
-inherit multilib gnome2
+inherit eutils multilib gnome2
 
 DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
 HOMEPAGE="http://librsvg.sourceforge.net/"
@@ -10,7 +10,7 @@ HOMEPAGE="http://librsvg.sourceforge.net/"
 LICENSE="LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc gnome mozilla zlib"
+IUSE="doc gnome nsplugin zlib"
 
 RDEPEND=">=media-libs/fontconfig-1.0.1
 	>=x11-libs/gtk+-2
@@ -22,7 +22,7 @@ RDEPEND=">=media-libs/fontconfig-1.0.1
 	media-libs/freetype
 	>=dev-libs/libcroco-0.6
 	zlib? ( >=gnome-extra/libgsf-1.6 )
-	mozilla? ( >=www-client/mozilla-1.7.3 )
+	nsplugin? ( >=net-libs/gecko-sdk-1.7.3 )
 	gnome? ( >=gnome-base/gnome-vfs-2 )"
 # libgnomeprint dependencies are not necessary
 
@@ -42,11 +42,22 @@ set_gtk_confdir() {
 pkg_setup() {
 	# FIXME : USEify croco support (?)
 	G2CONF="--with-croco \
-		--enable-pixbuf-loader               \
-		--enable-gtk-theme                   \
-		$(use_with zlib svgz)                \
-		$(use_enable gnome gnome-vfs)        \
-		$(use_enable mozilla mozilla-plugin)"
+		--enable-pixbuf-loader                \
+		--enable-gtk-theme                    \
+		$(use_enable gnome gnome-vfs)         \
+		$(use_enable nsplugin mozilla-plugin) \
+		$(use_with zlib svgz)                 \
+		$(use_with nsplugin mozilla gecko-sdk)"
+}
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	# Provide gecko toolkit autodetection and --with-mozilla switch.
+	epatch ${FILESDIR}/${PN}-2.12.6-plugin_checks.patch
+
+	autoconf || die "autoconf failed"
 }
 
 src_install() {