Bump noscript, remove ufed. Update checksums

11 files changed, 6 insertions, 112 deletions

diff --git a/app-portage/ufed/ChangeLog b/app-portage/ufed/ChangeLog
deleted file mode 100644
index b4b28aac..00000000
--- a/app-portage/ufed/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-# ChangeLog for app-portage/ufed
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  15 Oct 2012; Martin Väth <martin@mvath.de>
-  Copy from tree to support make.{conf,profile} optionally also in /etc/portage
-  Clear old ChangeLog
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
deleted file mode 100644
index b070ace5..00000000
--- a/app-portage/ufed/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ufed-0.40.1.tar.bz2 78242 SHA256 bd2b6dcc22d7b14794cf871187cbead00a0530eda5a41cccf99d882bd2a44706 SHA512 995ccab0ea5ed66abf8fc76eed78e59d2526bad570eda0f2da9fd1468837c366c74c14a522cb876ed9f1744deb1d39147a12f121bf273729b862838fec193a73 WHIRLPOOL 6eaa489f7d0b4f807a24e3b9d2f86c38b2b8fdbf0246a2ffbc1c142b28a43ccfd0513683d9fe9a6ed4661fd6c0b89692afc63c774afc1bbc845c74e188a26648
diff --git a/app-portage/ufed/files/ufed-0.40.1-make.conf-read.patch b/app-portage/ufed/files/ufed-0.40.1-make.conf-read.patch
deleted file mode 100644
index c3fb1f47..00000000
--- a/app-portage/ufed/files/ufed-0.40.1-make.conf-read.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Portage.pm
-+++ Portage.pm
-@@ -137,6 +137,7 @@
- }
- 
- sub read_make_conf() {
-	my %env = read_sh "/etc/make.conf";
-+	merge (%env, read_sh('/etc/portage/make.conf'));
- 	merge %make_conf_flags, %{$env{USE}} if exists $env{USE};
- 	@portagedirs = $environment{PORTDIR};
- 	push @portagedirs, split ' ', $environment{PORTDIR_OVERLAY} if defined $environment{PORTDIR_OVERLAY};
diff --git a/app-portage/ufed/files/ufed-0.40.1-make.conf-write.patch b/app-portage/ufed/files/ufed-0.40.1-make.conf-write.patch
deleted file mode 100644
index f1387d95..00000000
--- a/app-portage/ufed/files/ufed-0.40.1-make.conf-write.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- ufed.pl.in
-+++ ufed.pl.in
-@@ -156,9 +156,11 @@
- 	my (@flags) = @_;
- 	my $contents;
- 
-+	my $makeconf_name = '/etc/make.conf';
-+	$makeconf_name = '/etc/portage/make.conf' unless(-r $makeconf_name);
- 	{
--		open my $makeconf, '<', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n";
--		open my $makeconfold, '>', '/etc/make.conf.old' or die "Couldn't open /etc/make.conf.old\n";
-+		open my $makeconf, '<', $makeconf_name or die "Couldn't open $makeconf_name\n";
-+		open my $makeconfold, '>', $makeconf_name . '.old' or die "Couldn't open $makeconf_name.old\n";
- 		local $/;
- 		$_ = <$makeconf>;
- 		print $makeconfold $_;
-@@ -293,11 +295,11 @@
- 	die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@;
- 
- 	print STDERR <<EOF if $sourcing;
--Warning: source command found in /etc/make.conf. Flags may
-+Warning: source command found in $makeconf_name. Flags may
- be saved incorrectly if the sourced file modifies them.
- EOF
- 	{
--		open my $makeconf, '>', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n";
-+		open my $makeconf, '>', $makeconf_name or die "Couldn't open $makeconf_name\n";
- 		print $makeconf $_;
- 		close $makeconf;
- 	}
diff --git a/app-portage/ufed/files/ufed-0.40.1-make.globals-path.patch b/app-portage/ufed/files/ufed-0.40.1-make.globals-path.patch
deleted file mode 100644
index c6ae0399..00000000
--- a/app-portage/ufed/files/ufed-0.40.1-make.globals-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/427862
-http://bugs.gentoo.org/431064
-
---- Portage.pm
-+++ Portage.pm
-@@ -150,7 +150,7 @@
- }
- 
- sub read_make_globals() {
--	for my $dir(@profiles, '/etc') {
-+	for my $dir(@profiles, '/usr/share/portage/config') {
- 		read_sh "$dir/make.globals";
- 	}
- }
diff --git a/app-portage/ufed/files/ufed-0.40.1-make.profile-path.patch b/app-portage/ufed/files/ufed-0.40.1-make.profile-path.patch
deleted file mode 100644
index fa6efbf2..00000000
--- a/app-portage/ufed/files/ufed-0.40.1-make.profile-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Portage.pm
-+++ Portage.pm
-@@ -205,7 +205,8 @@
- 
- sub read_profiles() {
- 	$_ = readlink '/etc/make.profile';
--	die "/etc/make.profile is not a symlink\n" if not defined $_;
-+	$_ = readlink '/etc/portage/make.profile' if not defined $_;
-+	die "/etc\{,/portage\}/make.profile is not a symlink\n" if not defined $_;
- 	@profiles = norm_path '/etc', $_;
- 	for (my $i = -1; $i >= -@profiles; $i--) {
- 		for(noncomments "$profiles[$i]/parent") {
diff --git a/app-portage/ufed/metadata.xml b/app-portage/ufed/metadata.xml
deleted file mode 100644
index d29ef566..00000000
--- a/app-portage/ufed/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>tools-portage</herd>
-</pkgmetadata>
diff --git a/app-portage/ufed/ufed-0.40.1-r2.ebuild b/app-portage/ufed/ufed-0.40.1-r2.ebuild
deleted file mode 100644
index a41c906f..00000000
--- a/app-portage/ufed/ufed-0.40.1-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/ufed/ufed-0.40.1-r1.ebuild,v 1.1 2012/08/12 11:44:53 ssuominen Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="Gentoo Linux USE flags editor"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~truedfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.globals-path.patch
-	epatch "${FILESDIR}"/${P}-make.conf-read.patch
-	epatch "${FILESDIR}"/${P}-make.conf-write.patch
-	epatch "${FILESDIR}"/${P}-make.profile-path.patch
-}
-
-src_configure() {
-	econf --libexecdir=/usr/$(get_libdir)/ufed
-}
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 991e375c..a801e919 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*noscript-2.6 (03 Nov 2012)
+
+  03 Nov 2012; Martin Väth <martin@mvath.de>
+  Version bump, remove old ebuild.
+
 *noscript-2.5.9 (26 Oct 2012)
 
   26 Oct 2012; Martin Väth <martin@mvath.de>
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index 3f0ba373..d6dff685 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-2.5.9.xpi 530068 SHA256 fd948fd9de22779a958f01c3e346a610ac2948d7b1c6904b044f3cd4318587e5 SHA512 c8878629cc0c340ef144439a9b70bdd7d0b6258ffd1cd7c7ea1d23a184e1f04970bd39a00b583847d280c961d415afe9f23b23c6e173497977a6c136fedd5efc WHIRLPOOL c9c36bbd43fa253f7b6138140dfa772a4c595e4b141f5e8b9cffd79f5df08c1f726d93d0e72deab641c3472eb9dddbab78f40b464144455054319dd4cb4b8a7c
+DIST noscript-2.6.xpi 530388 SHA256 d532373d7d0f01025dd28723370873cf07c7b97d6287f1a7bbb86817d82a348a SHA512 c61d63b14bf0ba17384ea71a734f125f566bdd357f79bb938b2d5112df0ea6ff4dddfc9a40df4de30fd4c76a4f5a7694556a60bef44db67793267652c6807ba5 WHIRLPOOL fdb5f04d27949b5d898a95f042d9c808da08c3aa24e5e9a61a52fa18d7433fd1d888189174166706aad6922f9aaf72e5ee6129d2d68e91d788396cc1f2fa2eba
diff --git a/www-plugins/noscript/noscript-2.5.9.ebuild b/www-plugins/noscript/noscript-2.6.ebuild
index 0c2758ff..0c2758ff 100644
--- a/www-plugins/noscript/noscript-2.5.9.ebuild
+++ b/www-plugins/noscript/noscript-2.6.ebuild