Bump to 1.9.6.6, cleanup old versions

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 13 insertions, 46 deletions

diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 50e4727f6bd7..872903a88b7d 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/noscript
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/noscript/ChangeLog,v 1.1 2009/07/21 15:05:38 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/noscript/ChangeLog,v 1.2 2009/07/21 15:39:00 nirbheek Exp $
+
+*noscript-1.9.6.6 (21 Jul 2009)
+
+  21 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -noscript-1.6.9.ebuild, -noscript-1.8.1.3.ebuild,
+  +noscript-1.9.6.6.ebuild:
+  Bump to 1.9.6.6, cleanup old versions
 
   21 Jul 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   +noscript-1.6.9.ebuild, +noscript-1.8.1.3.ebuild, +noscript-1.8.8.ebuild,
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index 265a42084954..686705891373 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1,10 +1,8 @@
-DIST noscript-1.6.9.xpi 280258 RMD160 55c6c86c1e151c4bd369b577acc386c4ba0384d7 SHA1 61acaa2023d719511fd64a0ae076372d40269e49 SHA256 71d6200beb9b1e3a455cb334075ab9047388f2151e3b94b6519f9c231526baef
-DIST noscript-1.8.1.3.xpi 293863 RMD160 bf86ad2c736f6fbee5349cb24b0c6e139fefaa72 SHA1 b12631b9616a7f52502d6da4c8a8e8de93cb4329 SHA256 8a996d0e7713d356543f7218b94a39943a78a7f8d424e724b9f16593f925f03b
 DIST noscript-1.8.8.xpi 345965 RMD160 e651b2ef4909af32bc992aef8cbdc1b727b26d4e SHA1 c9eb72cce2df0ba2be42240681ecae9d6cecf4de SHA256 23f4fcd7f74c9b67b73b01d18ab33f6a1109e9ea295d0b3891f012b21f3fbd95
 DIST noscript-1.9.0.4.xpi 356976 RMD160 dfe768c6beffb2821c30331a73fbb66c953bd3a3 SHA1 59b002b6740bdd9ea3a407500db67d3e1c96ac28 SHA256 bca495aaaa5cf40010cae328d04b10e1a30351037b00a50c67e314aac6655921
-EBUILD noscript-1.6.9.ebuild 1005 RMD160 707c34c2adecf20310ebcdc17d91e820a9f36de6 SHA1 43a89fbdcdbdcc3a53307245ffc3b45cecff81f5 SHA256 603a31874bb03ae5b7d4b8df1d44f4a294ce1af6349e7a6c7d7e974b0a388846
-EBUILD noscript-1.8.1.3.ebuild 1010 RMD160 57ad013a48befb2f5bc7708fb6463dccec3faad0 SHA1 87fccdca3c504f2db04e825751612ce439a7c4f0 SHA256 ec087c92c9a1df51fc2860c7d3b197d02a0a4644a30748695d491f980b67b0ac
+DIST noscript-1.9.6.6.xpi 425336 RMD160 b588b9d4a60613c700ee0f7686b57f2527d1ca46 SHA1 3d6825542617e2835b929cfc11c0a637917b48d9 SHA256 59906f6204455d17ead743ad0e0a57e1d819a0a3cc14632eb27543731d95881d
 EBUILD noscript-1.8.8.ebuild 1005 RMD160 80517fae9af7b9a4a10dd1f6276b2e132d729aa5 SHA1 5a4d65a7d95679853728cead8afc89469316333f SHA256 e02e8f5bb34023b6de7e9b675cd99518ff096a9fab655753799853cddd16dca3
 EBUILD noscript-1.9.0.4.ebuild 1016 RMD160 bc5ec70efbc5fc94d0793d17acf2e0fe4ecfdf82 SHA1 4259d767dbaa1a288e356ee5f144d146d2b1e238 SHA256 15425f35f3d8bc95480da492590de8db128b11bb363eb96df94ce07fab88ebd3
-MISC ChangeLog 16374 RMD160 3f2674d09f01da9cae7b3917fe2dfc84543f7b2d SHA1 30de82070baaa78e673bb0e3287d9c598963383b SHA256 dca9a0bca0ba0f2f26eac292f5fdedacf66ea83e4f9b8d277c22544c115ebea6
+EBUILD noscript-1.9.6.6.ebuild 1016 RMD160 5afd81e465bbb8ec734fe6ec4744db89958ae27f SHA1 fe4a0cb2d8460dd4f366529a0c2877ee7190ec17 SHA256 a6481b9095e654fe7d3d83c23c35c230108d11ebc759fdfbd0ab49116d478c1d
+MISC ChangeLog 16582 RMD160 78a9f76e669afe547977e30a328ad17353c77886 SHA1 523aea7fca6e043f3dc190816bb65b7de2dcb4ee SHA256 5511061bb7c1dea251fef20f37080164067257b370714ab2b30bc8b432bd2c8c
 MISC metadata.xml 328 RMD160 7d2512727c4295ca86b028edea2c2150191ee27b SHA1 f4db49bbc73bc75d69cc7e8dd1f436e91dea3c9f SHA256 3a75ad0084a701a164df71d693b92548e9e48b710a86528f1f3fa1f8f5686f4c
diff --git a/www-plugins/noscript/noscript-1.8.1.3.ebuild b/www-plugins/noscript/noscript-1.8.1.3.ebuild
deleted file mode 100644
index c6b73d41ebab..000000000000
--- a/www-plugins/noscript/noscript-1.8.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/noscript/noscript-1.8.1.3.ebuild,v 1.1 2009/07/21 15:05:38 nirbheek Exp $
-
-inherit mozextension multilib
-
-DESCRIPTION="Firefox plugin to disable javascript"
-HOMEPAGE="http://noscript.net/"
-SRC_URI="http://software.informaction.com/data/releases/${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="|| (
-	>=www-client/mozilla-firefox-bin-1.5.0.7
-	>=www-client/mozilla-firefox-1.5.0.7
-)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	xpi_unpack "${P}".xpi
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME
-	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
-		xpi_install "${S}"/"${P}"
-	fi
-	if has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
-		MOZILLA_FIVE_HOME="/opt/firefox"
-		xpi_install "${S}"/"${P}"
-	fi
-}
diff --git a/www-plugins/noscript/noscript-1.6.9.ebuild b/www-plugins/noscript/noscript-1.9.6.6.ebuild
index 53c25a9ef4ac..4cff4af381b4 100644
--- a/www-plugins/noscript/noscript-1.6.9.ebuild
+++ b/www-plugins/noscript/noscript-1.9.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/noscript/noscript-1.6.9.ebuild,v 1.1 2009/07/21 15:05:38 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/noscript/noscript-1.9.6.6.ebuild,v 1.1 2009/07/21 15:39:00 nirbheek Exp $
 
 inherit mozextension multilib
 
@@ -10,7 +10,7 @@ SRC_URI="http://software.informaction.com/data/releases/${P}.xpi"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="|| (