remove nsplugin useflag and disable mozilla plugin since its present by default in new firefox.

(Portage version: 2.1.1_pre2-r2)
 (Unsigned Manifest commit)

5 files changed, 13 insertions, 206 deletions

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 645cfc4103ce..49e5e86a3da2 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -3,22 +3,17 @@ MD5 28420185ee1b4c292fe5c45b2c8d1f76 files/librsvg-2.12.6-plugin_checks.patch 19
 RMD160 ef689c287f6c07b2f4ef3b6f3113643e0666d5bb files/librsvg-2.12.6-plugin_checks.patch 1914
 SHA256 be750dc701433a534eae98eb670311ceb7ebacf7f6a9fc58b5a4ca4681490f8d files/librsvg-2.12.6-plugin_checks.patch 1914
 DIST librsvg-1.0.3.tar.gz 213368 RMD160 829965c16b1c1c10d2624a7ae757da39d4f65234 SHA256 d5e04b1599fcb9f830f0ccd3ae1f4b41349c0bc8483c6083875079bd75f387bb
-DIST librsvg-2.12.7.tar.bz2 396901 RMD160 b7a1e61a61d1ebf595478e0bb904774d38fe92f6 SHA256 b2b351675547c9d4a33b8dd6d51063ce024bcdc834ff057bcb5d1c62ab0ed781
-DIST librsvg-2.14.3.tar.bz2 415420 RMD160 cbb8f663c9a74c059af7bda7776d94005b3cc64c SHA1 d3d76c74363ed72a3435caffe8b0da5449c93018 SHA256 1fe9d73067f6be070ca5fc0bc3b06e6439947b8037acbb9a2116bf94b3acd2e7
+DIST librsvg-2.12.7.tar.bz2 396901 RMD160 b7a1e61a61d1ebf595478e0bb904774d38fe92f6 SHA1 2dbb387bca326d44c24348bd48b39b12bd3ab365 SHA256 b2b351675547c9d4a33b8dd6d51063ce024bcdc834ff057bcb5d1c62ab0ed781
 DIST librsvg-2.14.4.tar.bz2 415862 RMD160 9e294f1a2e146bf30e1bde72838b8316506c9da2 SHA1 9314f0d44dbfe672dc1f1a65b66821593c3bf1ce SHA256 877f016487042eedc78c472bddd008fe70e17837374ede50726445eb8f5872d5
-DIST librsvg-2.9.5.tar.bz2 392785 RMD160 5c7d6ad1a543b4880d7c3bb02da7126ed9f5aa5e SHA256 33a5ae2cf0a4056d46f0f09d4bd464ccfa7fa8768a1f03833e2fad5081b9bba2
+DIST librsvg-2.9.5.tar.bz2 392785 RMD160 5c7d6ad1a543b4880d7c3bb02da7126ed9f5aa5e SHA1 502338a1b42ec36fbca895b97a166e398e7e3018 SHA256 33a5ae2cf0a4056d46f0f09d4bd464ccfa7fa8768a1f03833e2fad5081b9bba2
 EBUILD librsvg-1.0.3.ebuild 969 RMD160 3bd07eed459347f1ae281da3d098ec2ee4677ade SHA1 0fe02033e8ed2ec581485d2ece877e97326778e4 SHA256 23179072ac85d8bcba14535101d8f1fe4de61639bceb0e91a043afee9d175fc1
 MD5 4d7b4604af9b2be7fea60445828f9975 librsvg-1.0.3.ebuild 969
 RMD160 3bd07eed459347f1ae281da3d098ec2ee4677ade librsvg-1.0.3.ebuild 969
 SHA256 23179072ac85d8bcba14535101d8f1fe4de61639bceb0e91a043afee9d175fc1 librsvg-1.0.3.ebuild 969
-EBUILD librsvg-2.12.7.ebuild 2872 RMD160 14c5814c32359d6f2049e9185943c05262c95b92 SHA1 a8a032f8aa3b76de97e629ca050d209ca758decb SHA256 99df091e1152fd253cd59a3148fd4f789785e3b2ae134925865c4a3d1f258a7c
-MD5 c80e90f970733be32c8f16886e9b4ea3 librsvg-2.12.7.ebuild 2872
-RMD160 14c5814c32359d6f2049e9185943c05262c95b92 librsvg-2.12.7.ebuild 2872
-SHA256 99df091e1152fd253cd59a3148fd4f789785e3b2ae134925865c4a3d1f258a7c librsvg-2.12.7.ebuild 2872
-EBUILD librsvg-2.14.3.ebuild 1904 RMD160 6d8c82b293d0a4b269aecf9cd1606149fd405ec9 SHA1 b1e334a1a28dafb86d9ea9d6d9a6c6e91153129b SHA256 109852f8094e8994bb29fd8b65bbdca3e6cd30c9a733d766fa094943a86f50ca
-MD5 f4a554e2412d347c734616585fdbf025 librsvg-2.14.3.ebuild 1904
-RMD160 6d8c82b293d0a4b269aecf9cd1606149fd405ec9 librsvg-2.14.3.ebuild 1904
-SHA256 109852f8094e8994bb29fd8b65bbdca3e6cd30c9a733d766fa094943a86f50ca librsvg-2.14.3.ebuild 1904
+EBUILD librsvg-2.12.7-r1.ebuild 1909 RMD160 3ca7389d3388a864fe02144f2300eced244dd464 SHA1 de8ae78ca942a8b7035788dec1361aa9d71e197b SHA256 3822587ee64126ea9b99dd16f54bd82cd50769a1d95fd2609bfbfdbae156d049
+MD5 045d6aedb8e54b943051bf86deafcbdd librsvg-2.12.7-r1.ebuild 1909
+RMD160 3ca7389d3388a864fe02144f2300eced244dd464 librsvg-2.12.7-r1.ebuild 1909
+SHA256 3822587ee64126ea9b99dd16f54bd82cd50769a1d95fd2609bfbfdbae156d049 librsvg-2.12.7-r1.ebuild 1909
 EBUILD librsvg-2.14.4.ebuild 1903 RMD160 dc27db9582f3f5bdd784b428ee88d1424cd45135 SHA1 36f808365f517158e7bfcb9fa3d7edddedc0992e SHA256 c810e73e7d856582ad877ab163178fee29059280dcf35c4cbc8254cdfc73b62d
 MD5 04c589f39f1a2e531c5a04ad0480ff1d librsvg-2.14.4.ebuild 1903
 RMD160 dc27db9582f3f5bdd784b428ee88d1424cd45135 librsvg-2.14.4.ebuild 1903
@@ -27,10 +22,10 @@ EBUILD librsvg-2.9.5.ebuild 1546 RMD160 e369ef0527e2122350a21051a3bb48ba81b4f138
 MD5 349f9dbe7f6b83ece07dd3baae7cabcf librsvg-2.9.5.ebuild 1546
 RMD160 e369ef0527e2122350a21051a3bb48ba81b4f138 librsvg-2.9.5.ebuild 1546
 SHA256 15dc4209bd63d453c86e751ca924c6a76fcaec5f56d31e430b065045eed9f738 librsvg-2.9.5.ebuild 1546
-MISC ChangeLog 12826 RMD160 707bc5a7dfd5f4bd457739a9dfeee26e41cdb471 SHA1 f73948e2cd1d92788910f251357fc4dc1244d957 SHA256 e84677ec8bf974ad7d550d46757c70c2ee2160370cd471489bfffb5fb1684a02
-MD5 9ff6fa42ef0895f7bad28fd3361b7734 ChangeLog 12826
-RMD160 707bc5a7dfd5f4bd457739a9dfeee26e41cdb471 ChangeLog 12826
-SHA256 e84677ec8bf974ad7d550d46757c70c2ee2160370cd471489bfffb5fb1684a02 ChangeLog 12826
+MISC ChangeLog 13099 RMD160 5e00e70591af370b10aaa22bf95d7c3e30344d1f SHA1 6ecbcd34a80928a0265012dc0a71de6233a678fd SHA256 95222d8cfda56a31b53e76b98354e7034a8ff1432e03e20c5789bb0226faa51b
+MD5 98f1b2c12ac7ebd013ebfbfb9bc6202f ChangeLog 13099
+RMD160 5e00e70591af370b10aaa22bf95d7c3e30344d1f ChangeLog 13099
+SHA256 95222d8cfda56a31b53e76b98354e7034a8ff1432e03e20c5789bb0226faa51b ChangeLog 13099
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -38,12 +33,9 @@ SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata
 MD5 231ceaf6d065ab638f8c2c3680c3ecc3 files/digest-librsvg-1.0.3 241
 RMD160 49150ab2f93f34dbc4ca702db540985fce85a99b files/digest-librsvg-1.0.3 241
 SHA256 724acf226f85d4dd56ca5e3c9d4cdaa14b649d18cb32c4cb8f857b1f0f001720 files/digest-librsvg-1.0.3 241
-MD5 4f8e95ff01e06d834fe3a889a689f5fe files/digest-librsvg-2.12.7 247
-RMD160 83f11032d4ae615b7ba273b0a2c05a3755773fcf files/digest-librsvg-2.12.7 247
-SHA256 bbc1cc7d1f532d5084d700e0f0b89cd45403c15f4679445cab77a77b2fd647d7 files/digest-librsvg-2.12.7 247
-MD5 8c65731bb3937a331291e512fb4d4a56 files/digest-librsvg-2.14.3 247
-RMD160 264f14a98aacb4dd9002146a40878dc043f9ef96 files/digest-librsvg-2.14.3 247
-SHA256 e62eb5eca6b1dff27306c595b04cd7b2c25d26e1127ed2698b8ac0e6cd4c3996 files/digest-librsvg-2.14.3 247
+MD5 4f8e95ff01e06d834fe3a889a689f5fe files/digest-librsvg-2.12.7-r1 247
+RMD160 83f11032d4ae615b7ba273b0a2c05a3755773fcf files/digest-librsvg-2.12.7-r1 247
+SHA256 bbc1cc7d1f532d5084d700e0f0b89cd45403c15f4679445cab77a77b2fd647d7 files/digest-librsvg-2.12.7-r1 247
 MD5 22970a3883774a333e1c0db3000aa916 files/digest-librsvg-2.14.4 247
 RMD160 023f5d164d987a0e2f295fc51c60b6dc03efc8a8 files/digest-librsvg-2.14.4 247
 SHA256 660fce7479af7482c2081aecdd96cf535ec6aba766e03494ac1f09ff4e8afbd0 files/digest-librsvg-2.14.4 247
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.12.7 b/gnome-base/librsvg/files/digest-librsvg-2.12.7
deleted file mode 100644
index 959ec07405bb..000000000000
--- a/gnome-base/librsvg/files/digest-librsvg-2.12.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2113f01fbf228f3f8fc17c49966143fe librsvg-2.12.7.tar.bz2 396901
-RMD160 b7a1e61a61d1ebf595478e0bb904774d38fe92f6 librsvg-2.12.7.tar.bz2 396901
-SHA256 b2b351675547c9d4a33b8dd6d51063ce024bcdc834ff057bcb5d1c62ab0ed781 librsvg-2.12.7.tar.bz2 396901
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.14.3 b/gnome-base/librsvg/files/digest-librsvg-2.14.3
deleted file mode 100644
index 481424817f95..000000000000
--- a/gnome-base/librsvg/files/digest-librsvg-2.14.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f926aa102ccc3ce99ddf257fcce8ebf4 librsvg-2.14.3.tar.bz2 415420
-RMD160 cbb8f663c9a74c059af7bda7776d94005b3cc64c librsvg-2.14.3.tar.bz2 415420
-SHA256 1fe9d73067f6be070ca5fc0bc3b06e6439947b8037acbb9a2116bf94b3acd2e7 librsvg-2.14.3.tar.bz2 415420
diff --git a/gnome-base/librsvg/librsvg-2.12.7.ebuild b/gnome-base/librsvg/librsvg-2.12.7.ebuild
deleted file mode 100644
index 0da011ef4b40..000000000000
--- a/gnome-base/librsvg/librsvg-2.12.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.12 2006/06/29 13:58:21 dsd 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_with zlib svgz)"
-
-	if use nsplugin && ( \
-		( has_version net-libs/gecko-sdk && \
-		  built_with_use net-libs/gecko-sdk mozsvg ) || \
-		( has_version '<www-client/mozilla-firefox-1.5-r4' && \
-		  built_with_use www-client/mozilla-firefox mozsvg ) || \
-		( has_version '>=www-client/mozilla-firefox-1.5-r4' ) || \
-		( 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"
-		ewarn "will be built with the plugin disabled."
-		ewarn
-		ewarn "In order to use the plugin from librsvg, please make sure to"
-		ewarn "emerge gecko-sdk/mozilla-firefox/mozilla without the 'mozsvg'"
-		ewarn "USE flag."
-
-		G2CONF="${G2CONF} \
-			--disable-mozilla-plugin \
-			--without-mozilla"
-	else
-		G2CONF="${G2CONF} \
-			$(use_enable nsplugin mozilla-plugin) \
-			$(use_with nsplugin mozilla gecko-sdk)"
-	fi
-}
-
-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=/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.14.3.ebuild b/gnome-base/librsvg/librsvg-2.14.3.ebuild
deleted file mode 100644
index f3ffa3a3fb30..000000000000
--- a/gnome-base/librsvg/librsvg-2.14.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.14.3.ebuild,v 1.2 2006/06/29 22:38:48 foser Exp $
-
-inherit eutils multilib gnome2 autotools
-
-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 zlib"
-
-RDEPEND=">=media-libs/fontconfig-1.0.1
-	>=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/pango-1.2
-	>=x11-libs/cairo-1.0.2
-	>=dev-libs/popt-1.5
-	>=dev-libs/libcroco-0.6.1
-	>=media-libs/freetype-2
-	zlib? ( >=gnome-extra/libgsf-1.6 )
-	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() {
-
-	if ! built_with_use x11-libs/cairo png; then
-		einfo "Please re-emerge x11-libs/cairo with the png USE flag set"
-		die "cairo needs the png flag set"
-	fi
-
-	G2CONF="--with-croco \
-		--enable-pixbuf-loader \
-		--enable-gtk-theme \
-		--disable-mozilla-plugin \
-		$(use_enable gnome gnome-vfs) \
-		$(use_with zlib svgz)"
-
-}
-
-src_install() {
-	gnome2_src_install plugindir=/usr/$(get_libdir)/nsbrowser/plugins/
-
-	# remove gdk-pixbuf loaders (#47766)
-	rm -fr ${D}/etc
-
-	# remove plugins dir since we disable the plugin
-	rm -fr ${D}/usr/lib/nsbrowser
-}
-
-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
-}