Bump noscript. Remove eix-0.22.1 to avoid collision with the main tree

6 files changed, 13 insertions, 48 deletions

diff --git a/app-portage/eix/ChangeLog b/app-portage/eix/ChangeLog
index 62495fcf..059a306a 100644
--- a/app-portage/eix/ChangeLog
+++ b/app-portage/eix/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  12 Sep 2010; Martin Väth <martin@mvath.de>
+  Remove eix-0.22.1 again to avoid unnecessary collision with the main tree.
+  Still keeping the intermediate versions for a while in case of regressions.
+
 *eix-0.22.1 (11 Sep 2010)
   11 Sep 2010; Martin Väth <martin@mvath.de>
   Versiom bump
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index fa9e6ddc..dfa1ac62 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -2,10 +2,8 @@ AUX eix-0.22.0-typename.patch 1491 RMD160 39ca530bd855a3331e950c1d716642833e7e44
 DIST eix-0.20.7.tar.xz 419104 RMD160 d2608f76fd3c644ed6d3a5ffba7b49c058fc87a0 SHA1 54ab933895ef617fe362040f4eae103ff153d646 SHA256 44327699a1802c31a7458da83925c2576544cb23c4789c7889d09a91fa524b57
 DIST eix-0.21.0.tar.xz 421588 RMD160 3ac2c8c38dbf5b74e2462da306ef72f787da019f SHA1 ef23d0a29364ca09510b0d853f0acee24c404649 SHA256 34f20454f665f21da0a409820a70cccdba4a5e2916f61501eceb14a5d4b1c097
 DIST eix-0.22.0.tar.xz 423840 RMD160 2cad716022708ffae7382318b8bfb1d3742f3bd3 SHA1 4fbfa890f9a001affc823ae16d82c7b483c488d8 SHA256 21aa9225afc508588887f408715c86c3726f812e6cbff2bed4cd4f367799af6b
-DIST eix-0.22.1.tar.xz 423064 RMD160 b94c54a21fd9d8e0176c0090fa974e08af293a4a SHA1 d6e9755e611fe052389841c448558264342f80a4 SHA256 4372fc9d98f5357bb63587896c1f4a88d38b5455ed1546e200b1dc6f49e321c5
 EBUILD eix-0.20.7.ebuild 1540 RMD160 93583561ce949f78dc820b26048a67f781776f0f SHA1 dfd0501faadd5bbd7355e06807fa6ca8fa40c084 SHA256 0b8635b4015d3b82430bd66abb12bd56dc10d058d89a24a89e8c80bfa59e4ffc
 EBUILD eix-0.21.0.ebuild 1540 RMD160 93583561ce949f78dc820b26048a67f781776f0f SHA1 dfd0501faadd5bbd7355e06807fa6ca8fa40c084 SHA256 0b8635b4015d3b82430bd66abb12bd56dc10d058d89a24a89e8c80bfa59e4ffc
 EBUILD eix-0.22.0-r2.ebuild 1608 RMD160 21dc72ade1739bbe7fc261465241353191f2ce94 SHA1 69fe098c0006efadcf82839ddd27246ef3200d58 SHA256 1528b3d10095d8260e472c90fa767ae9310c90ab8839efdaedcc64ada7c38b45
-EBUILD eix-0.22.1.ebuild 1540 RMD160 93583561ce949f78dc820b26048a67f781776f0f SHA1 dfd0501faadd5bbd7355e06807fa6ca8fa40c084 SHA256 0b8635b4015d3b82430bd66abb12bd56dc10d058d89a24a89e8c80bfa59e4ffc
-MISC ChangeLog 760 RMD160 04019fe53123d9172b50d7456a8b43b3db21a40c SHA1 8b9016c31d91e595ccc10b68363bf6b19e0b68f2 SHA256 9774ffc78f14fc9e54e30ee15b2f0461b0df531f60b38f78155f87976903dcc3
+MISC ChangeLog 980 RMD160 d29ef11f903d74a7d6caf8aa004c0b75eac8d260 SHA1 6aff3757bccbb93b7d11c28d9d7e61c4dfed02a7 SHA256 fe74e22224eb515a8ec97f92dd210a0867ca0a9d65a0dd5306999c6748257ac3
 MISC metadata.xml 2193 RMD160 498f0619acad6adaac47497ba0d0c65eb0785241 SHA1 eaf011ee64ed16383f0326d7d9bdf673ba96fee1 SHA256 6c4f99cdfd38eeb7cff4eae3637f051b56eb47ea200f73c66a8afd8ab109437d
diff --git a/app-portage/eix/eix-0.22.1.ebuild b/app-portage/eix/eix-0.22.1.ebuild
deleted file mode 100644
index 0a0a3574..00000000
--- a/app-portage/eix/eix-0.22.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header $
-
-EAPI=3
-
-inherit multilib
-RESTRICT="mirror"
-
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
-HOMEPAGE="http://eix.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+bzip2 debug doc hardened nls optimization strong-optimization sqlite tools"
-
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-	nls? ( virtual/libintl )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	doc? ( dev-python/docutils )
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_with bzip2) $(use_with sqlite) $(use_with doc rst) \
-		$(use_enable nls) $(use_enable tools separate-tools) \
-		$(use_enable hardened security) $(use_enable optimization) \
-		$(use_enable strong-optimization) $(use_enable debug debugging) \
-		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
-		--with-portage-rootpath="${ROOTPATH}" \
-		--with-eprefix-default="${EPREFIX}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	prepalldocs
-}
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index f2fe47e2..daa83115 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+*noscript-2.0.3 (12 Sep 2010)
+
+  12 Sep 2010; Martin Väth <martin@mvath.de>
+  Version bump, remove old ebuild.
+
 *noscript-2.0.2.5 (03 Sep 2010)
 
   03 Sep 2010; Martin Väth <martin@mvath.de>
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index 0d9cd6ba..a8962620 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1,4 +1,4 @@
-DIST noscript-2.0.2.5.xpi 496671 RMD160 ae6756143741aa3fd4549c4c7370cbd1334a0667 SHA1 06e251468d7d5b309133fe15def1595510d3befc SHA256 fb4d837708cfe447f74bbba216e5213a01757c097aa22a2159d5912b8b9daf59
-EBUILD noscript-2.0.2.5.ebuild 495 RMD160 4d989c6a74642d2d964c91b8810d9d3501708e05 SHA1 04acd4e4e7a0625358fbbcf82610fbb04a2a2231 SHA256 a7d4cc1f195484bd328ca572e24695fdc47df107ced37bbe4d6bab68aef3636d
-MISC ChangeLog 1842 RMD160 7709d35dc281a78edda1bd5b10cbfa31ac921ed3 SHA1 7376ff7614d981e0ecb1c0c706edee2cd18c2b29 SHA256 47af75da70b1308b2e5f1b12de51508f9f70ee4e5a2334a33631633f010ae139
+DIST noscript-2.0.3.xpi 497644 RMD160 053ada5be7302306dfd5f281cd6ce7bd0da04a18 SHA1 3139ad411ec674928a25ecadc308b95d50fd2d74 SHA256 4e5e4378de6de2014de421aa44278ce40df461673f819ec3d25ac1a9789b3863
+EBUILD noscript-2.0.3.ebuild 495 RMD160 4d989c6a74642d2d964c91b8810d9d3501708e05 SHA1 04acd4e4e7a0625358fbbcf82610fbb04a2a2231 SHA256 a7d4cc1f195484bd328ca572e24695fdc47df107ced37bbe4d6bab68aef3636d
+MISC ChangeLog 1973 RMD160 6a1ae5fdd41ec0a8425410fe881110cbafe2eace SHA1 1a88ab58d1aeffa27f021bf547b9f31c80b736ba SHA256 8f569554368ecdb6fe0b3a5d12ccfe7a4a85c7367a5d063b5f291f008cf07689
 MISC metadata.xml 447 RMD160 4ec5ea6b99ff64f433b133a9347f0a57039b73b7 SHA1 a6af7ca7a606d2ddc4afbb9ba31ac694f22e9abd SHA256 927431d432628bf04ca3f6e6cd0fc9b5e40ac0f2d2ea70e4a795e0df527cba67
diff --git a/www-plugins/noscript/noscript-2.0.2.5.ebuild b/www-plugins/noscript/noscript-2.0.3.ebuild
index 1ee6d1e6..1ee6d1e6 100644
--- a/www-plugins/noscript/noscript-2.0.2.5.ebuild
+++ b/www-plugins/noscript/noscript-2.0.3.ebuild