Fix logic regarding the browser plugin (bug #112635). Removing old ebuild.

(Portage version: 2.1_pre4-r1)

4 files changed, 13 insertions, 84 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index e3054d1fd01b..07239c78d8e5 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.96 2006/02/03 15:46:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.97 2006/02/16 04:22:14 leonardop Exp $
+
+  16 Feb 2006; Leonardo Boshell <leonardop@gentoo.org>
+  librsvg-2.12.7.ebuild:
+  Fix logic regarding the browser plugin (bug #112635). Patch provided by
+  Daniel Nilsson.
 
   03 Feb 2006; Guy Martin <gmsoft@gentoo.org> librsvg-2.12.7.ebuild:
   Stable on hppa.
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.12.6 b/gnome-base/librsvg/files/digest-librsvg-2.12.6
deleted file mode 100644
index 3bf2321263fa..000000000000
--- a/gnome-base/librsvg/files/digest-librsvg-2.12.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9fc253702e9ac7d68caa4a7adcaf3755 librsvg-2.12.6.tar.bz2 396894
diff --git a/gnome-base/librsvg/librsvg-2.12.6.ebuild b/gnome-base/librsvg/librsvg-2.12.6.ebuild
deleted file mode 100644
index c518306ef9f5..000000000000
--- a/gnome-base/librsvg/librsvg-2.12.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.6.ebuild,v 1.2 2005/10/11 01:35:00 allanonjl Exp $
-
-inherit eutils multilib gnome2
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="http://librsvg.sourceforge.net/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc gnome nsplugin zlib"
-
-RDEPEND=">=media-libs/fontconfig-1.0.1
-	>=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=media-libs/libart_lgpl-2.3.10
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/pango-1.2
-	>=dev-libs/popt-1.5
-	media-libs/freetype
-	>=dev-libs/libcroco-0.6
-	zlib? ( >=gnome-extra/libgsf-1.6 )
-	nsplugin? ( >=net-libs/gecko-sdk-1.7.3 )
-	gnome? ( >=gnome-base/gnome-vfs-2 )"
-# libgnomeprint dependencies are not necessary
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-
-set_gtk_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-pkg_setup() {
-	# FIXME : USEify croco support (?)
-	G2CONF="--with-croco \
-		--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() {
-	gnome2_src_install plugindir=${D}/usr/$(get_libdir)/nsbrowser/plugins/
-
-	# remove gdk-pixbuf loaders (#47766)
-	rm -fr ${D}/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.12.7.ebuild b/gnome-base/librsvg/librsvg-2.12.7.ebuild
index 2f784ed2f428..bf4bd71827b8 100644
--- a/gnome-base/librsvg/librsvg-2.12.7.ebuild
+++ b/gnome-base/librsvg/librsvg-2.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.12.7.ebuild,v 1.9 2006/02/03 15:46:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.12.7.ebuild,v 1.10 2006/02/16 04:22:14 leonardop Exp $
 
 inherit eutils multilib gnome2
 
@@ -48,9 +48,12 @@ pkg_setup() {
 		$(use_with zlib svgz)"
 
 	if use nsplugin && ( \
-		built_with_use net-libs/gecko-sdk mozsvg || \
-		built_with_use www-client/mozilla-firefox mozsvg || \
-		built_with_use www-client/mozilla mozsvg ); then
+		( has_version net-libs/gecko-sdk && \
+		  built_with_use net-libs/gecko-sdk mozsvg ) || \
+		( has_version www-client/mozilla-firefox && \
+		  built_with_use www-client/mozilla-firefox mozsvg ) || \
+		( has_version www-client/mozilla && \
+		  built_with_use www-client/mozilla mozsvg ) ); then
 
 		ewarn "A SVG plugin for mozilla-compatible browsers is already present"
 		ewarn "in your system. To avoid replacing the old plug-in, librsvg"