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

Package-Manager: portage-2.1_pre4-r1

5 files changed, 33 insertions, 88 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/Manifest b/gnome-base/librsvg/Manifest
index 7294df8569e7..4ba23be7ed82 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,11 +1,27 @@
-MD5 6a2afa410337c212467133d180eb25cb ChangeLog 11542
+MD5 6c46614ba9e7c9e096dd7df1082983af ChangeLog 11718
+RMD160 6c8580da3c7192408132b5ef9238c1639b93a56c ChangeLog 11718
+SHA256 eff15ec633206af904868141ab3745bce6bc4fff1e858c8784862303456d0fd5 ChangeLog 11718
 MD5 70f6afa0baffe29c6c4ab43dccbd0435 files/digest-librsvg-1.0.3 65
-MD5 7fe88168a6e05602c03df3acc7ea614b files/digest-librsvg-2.12.6 67
+RMD160 7a73fcb26f816750653213c8ea8e8c651d7adab5 files/digest-librsvg-1.0.3 65
+SHA256 4012e6fdad3fabe8f633b9bb576c996bb0901fdf5630d765b4d33d45d9ab9656 files/digest-librsvg-1.0.3 65
 MD5 ed5724478614267f8579c9eeb93ca393 files/digest-librsvg-2.12.7 67
+RMD160 23e9b3e4f5940493fd34306bf48d961270ffc5cb files/digest-librsvg-2.12.7 67
+SHA256 7d07099b60ecc4e85ae1ea3bf53df5d4cd75328c2c7ad0d92f4cbdc12ae08350 files/digest-librsvg-2.12.7 67
 MD5 254740116b1b3ccf3e4013c37c610459 files/digest-librsvg-2.9.5 66
+RMD160 a4df3219334f928b524ddafc93f7ab6dd5d395f4 files/digest-librsvg-2.9.5 66
+SHA256 5b7f99d03223e0a599e8c24864c92903b809586d05406774a7e643116cd1e907 files/digest-librsvg-2.9.5 66
 MD5 28420185ee1b4c292fe5c45b2c8d1f76 files/librsvg-2.12.6-plugin_checks.patch 1914
+RMD160 ef689c287f6c07b2f4ef3b6f3113643e0666d5bb files/librsvg-2.12.6-plugin_checks.patch 1914
+SHA256 be750dc701433a534eae98eb670311ceb7ebacf7f6a9fc58b5a4ca4681490f8d files/librsvg-2.12.6-plugin_checks.patch 1914
 MD5 4bd76fdf498f73f383ff25d7aa630d34 librsvg-1.0.3.ebuild 925
-MD5 6926ddb9810ac66da663a350499fb9ce librsvg-2.12.6.ebuild 2064
-MD5 78f84a74bfdf0a7103444d59c6cf547c librsvg-2.12.7.ebuild 2667
+RMD160 403fc0b24d269bd5f5200973aa15aecece1b35bd librsvg-1.0.3.ebuild 925
+SHA256 91bc190632fc25eb14da88efb6775f1056ab8ab944ebb66eeffaced9d6d6bcc8 librsvg-1.0.3.ebuild 925
+MD5 05b2806b6c5084db83531cbc97441447 librsvg-2.12.7.ebuild 2811
+RMD160 9d08c8ab5ce6772e933ab913607b11ee58a68411 librsvg-2.12.7.ebuild 2811
+SHA256 dbea96598ce96eccfccf917bbd613e1c148f63e290875f74bd190273d4002014 librsvg-2.12.7.ebuild 2811
 MD5 349f9dbe7f6b83ece07dd3baae7cabcf librsvg-2.9.5.ebuild 1546
+RMD160 e369ef0527e2122350a21051a3bb48ba81b4f138 librsvg-2.9.5.ebuild 1546
+SHA256 15dc4209bd63d453c86e751ca924c6a76fcaec5f56d31e430b065045eed9f738 librsvg-2.9.5.ebuild 1546
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
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"