From 32d1ba097787321954ec45380b9ede93539d286c Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Mon, 14 Sep 2009 15:09:02 +0000 Subject: Cleanup. (Portage version: 2.2_rc40/cvs/Linux x86_64) --- app-portage/gentoolkit-dev/ChangeLog | 9 +- app-portage/gentoolkit-dev/files/echangelog.patch | 211 --------------------- .../files/gentoolkit-dev-0.2.6.2-Makefile.patch | 21 -- .../gentoolkit-dev/gentoolkit-dev-0.2.6.10.ebuild | 32 ---- .../gentoolkit-dev-0.2.6.11-r2.ebuild | 28 --- .../gentoolkit-dev/gentoolkit-dev-0.2.6.2.ebuild | 40 ---- 6 files changed, 8 insertions(+), 333 deletions(-) delete mode 100644 app-portage/gentoolkit-dev/files/echangelog.patch delete mode 100644 app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.6.2-Makefile.patch delete mode 100644 app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.10.ebuild delete mode 100644 app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.11-r2.ebuild delete mode 100644 app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.2.ebuild (limited to 'app-portage') diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog index 29fc35ca2621..890ec12092dc 100644 --- a/app-portage/gentoolkit-dev/ChangeLog +++ b/app-portage/gentoolkit-dev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/gentoolkit-dev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.76 2009/09/12 13:38:13 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.77 2009/09/14 15:09:01 idl0r Exp $ + + 14 Sep 2009; Christian Ruppert + -gentoolkit-dev-0.2.6.2.ebuild, + -files/gentoolkit-dev-0.2.6.2-Makefile.patch, + -gentoolkit-dev-0.2.6.10.ebuild, -gentoolkit-dev-0.2.6.11-r2.ebuild, + -files/echangelog.patch: + Cleanup. *gentoolkit-dev-0.2.6.13_rc2 (12 Sep 2009) diff --git a/app-portage/gentoolkit-dev/files/echangelog.patch b/app-portage/gentoolkit-dev/files/echangelog.patch deleted file mode 100644 index b94d34a58d56..000000000000 --- a/app-portage/gentoolkit-dev/files/echangelog.patch +++ /dev/null @@ -1,211 +0,0 @@ ---- src/echangelog/echangelog 2009-05-12 20:39:44.721829271 +0200 -+++ src/echangelog/echangelog 2009-05-12 20:34:19.132577156 +0200 -@@ -11,6 +11,7 @@ - use strict; - use POSIX qw(strftime getcwd setlocale); - use File::Find; -+use File::Basename; - use Getopt::Long; - - # Fix bug 21022 by restricting to C locale -@@ -144,6 +145,27 @@ sub changelog_info(%) { - close(INFO); - } - -+sub update_cat_pn { -+ my $t = shift; -+ my $cwd = getcwd(); -+ -+ my $category = basename(dirname($cwd)); -+ my $package_name = basename($cwd); -+ -+ $t =~ s/^(# ChangeLog for).*/$1 $category\/$package_name/; -+ -+ return $t; -+} -+ -+# Just to ensure we don't get duplicate entries. -+sub mypush(\@@) { -+ my $aref = shift; -+ -+ foreach my $value (@_) { -+ push(@{$aref}, $value) if !grep(/^\Q$value\E$/, @{$aref}); -+ } -+} -+ - GetOptions( - 'help' => \$opt_help, - 'strict' => \$opt_strict, -@@ -166,7 +188,7 @@ if ( -d "CVS" ) { - open(GIT, '-|', "git rev-parse --git-dir 2>/dev/null"); - $vcs = "git" if defined(); - close(GIT); -- last; -+ last if $vcs; - } - } - } -@@ -178,22 +200,27 @@ if ( -d "CVS" ) { - - # Read the current ChangeLog - if (-f 'ChangeLog') { -- open I, '; } -- close I; -+ close(I); - } else { - # No ChangeLog here, maybe we should make one... - if (<*.ebuild>) { -- open C, "portageq envvar PORTDIR |" or die "Can't find PORTDIR"; -- my ($new) = ; -- close C; -- -- $new =~ s/\s+$//; -- open I, "< $new/skel.ChangeLog" -- or die "Can't open $new/skel.ChangeLog for input: $!\n"; -+ open(C, '-|', "portageq portdir") or die "portageq returned with an error: $!\n"; -+ my $portdir = ; -+ $portdir =~ s/\s+$//; -+ close(C); -+ -+ die "Can't find PORTDIR\n" if (length $portdir == 0); -+ -+ open(I, '<', "$portdir/skel.ChangeLog") -+ or die "Can't open $portdir/skel.ChangeLog for input: $!\n"; - { local $/ = undef; $text = ; } -- close I; -- $text =~ s/^\*.*//ms; # don't need the fake entry -+ close(I); -+ -+ $text =~ s/^\*.*//ms; # don't need the fake entry -+ -+ $text = update_cat_pn($text); - } else { - die "This should be run in a directory with ebuilds...\n"; - } -@@ -238,49 +265,44 @@ while () { - my ($status, $filename) = ($1,$2); - - if($vcs eq "git") { -- open P, "git rev-parse --sq --show-prefix |"; -+ open(P, '-|', "git rev-parse --sq --show-prefix"); - my $prefix =

; -- $prefix = substr($prefix, 0, -1); -- close P; -+ close(P); - -- if ($filename =~ /$prefix(\S*)/) { -- $filename = $1 ; -- } -- else { -- next; -+ if (defined($prefix)) { -+ chomp($prefix); -+ -+ if ($filename =~ /$prefix(\S*)/) { -+ $filename = $1 ; -+ } -+ else { -+ next; -+ } - } - } - -- if( -d $filename ) { -- next; -- } -+ next if -d $filename; - -- push @files, $filename; -+ push(@files, $filename); - ($actions{$filename} = $status) =~ tr/DARM/-+-/d; - } - } - --# git only shows files already added so we need to check for unknown files --# separately here. --if($vcs eq "git") { -- find(\&git_unknown_objects, "./"); --} -- - sub git_unknown_objects { - my $object = $_; -- my ($dev,$ino,$mode,$nlink,$uid,$gid); - -- # Ignore empty directories - git doesn't version them and cvs removes them. -- if ( (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) && ! -d _ ) { -- open C, $vcs." status $_ 2>&1 1>/dev/null |"; -- -- while () { -- $_ = ; -- push @unknown, $object; -- }; -+ return if -d $object; -+ return if $File::Find::dir =~ m/^\.\/\.git\/?/; - -- close C; -- }; -+ open(C, '-|', "${vcs} status ${object} 2>&1 1>/dev/null"); -+ push(@unknown, $object) if defined(); -+ close(C); -+} -+ -+# git only shows files already added so we need to check for unknown files -+# separately here. -+if($vcs eq "git") { -+ find(\&git_unknown_objects, "./"); - } - - # Separate out the trivial files for now -@@ -398,18 +420,8 @@ sub sortfunc($$) { - return 0; - } - --# Just to ensure we don't get duplicate entries. --sub mypush(\@@) { -- my $aref = shift; -- -- foreach my $value (@_) { -- push(@{$aref}, $value) if !grep(/^$value$/, @{$aref}); -- } --} -- - # Forget ebuilds that only have changed copyrights, unless that's all - # the changed files we have -- - @ebuilds = grep /\.ebuild$/, @files; - @files = grep !/\.ebuild$/, @files; - -@@ -626,18 +638,6 @@ if (@new_versions) { - or die "Failed to insert new entry (3)\n"; - } - --sub update_cat_pn { -- my ($t) = @_; -- my ($cwd) = getcwd(); -- -- $cwd =~ m|.*/(\w+-\w+\|virtual)/([^/]+)| -- or die "Can't figure out category/package.. sorry!\n"; -- my ($category, $package_name) = ($1, $2); -- $t =~ s/^(# ChangeLog for).*/$1 $category\/$package_name/; -- -- return $t; --} -- - # New packages and/or ones that have moved around often have stale data here. - # But only do that in places where ebuilds are around (as echangelog can be - # used in profiles/ and such places). -@@ -686,6 +686,12 @@ for my $e (grep /\.ebuild$/, @files) { - # Move things around and show the diff - system "diff -U 0 $e $e.new"; - rename "$e.new", $e or warn("Can't rename $e.new: $!\n"); -+ -+ # git requires to re-add this file else it wouln't be included in the commit. -+ if ($vcs eq "git") -+ { -+ system("$vcs{$vcs}{add} ${e}"); -+ } - } - } - diff --git a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.6.2-Makefile.patch b/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.6.2-Makefile.patch deleted file mode 100644 index fe7deed673e9..000000000000 --- a/app-portage/gentoolkit-dev/files/gentoolkit-dev-0.2.6.2-Makefile.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile (revision 336) -+++ Makefile (working copy) -@@ -20,7 +20,7 @@ - rm -rf release/* - - dist: -- echo "Err0r: Must use either dist-gentoolkit or dist-gentoolkit-dev" -+ echo "Error: Must use either dist-gentoolkit or dist-gentoolkit-dev" - exit 1 - - dist-gentoolkit-dev: -@@ -80,6 +80,6 @@ - - install -m 0644 AUTHORS ChangeLog COPYING NEWS README README.Developer TODO $(docdir)/ - -- for x in ekeyword echangelog ego ebump gensync epkgmove eviewcvs ; do \ -+ for x in ekeyword echangelog ego ebump gensync eviewcvs ; do \ - ( cd src/$$x ; make DESTDIR=$(DESTDIR) install ) \ - done diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.10.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.10.ebuild deleted file mode 100644 index e96542b78a53..000000000000 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.10.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.10.ebuild,v 1.1 2009/04/29 20:44:33 fuzzyray Exp $ - -inherit eutils - -DESCRIPTION="Collection of developer scripts for Gentoo" -HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" -SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND=">=sys-apps/portage-2.0.50 - >=dev-lang/python-2.0 - >=dev-util/dialog-0.7 - >=dev-lang/perl-5.6 - >=sys-apps/grep-2.4" -RDEPEND="$DEPEND" - -src_install() { - emake DESTDIR="${D}" install-gentoolkit-dev || die -} - -pkg_postinst() { - ewarn "The gensync utility has been deprecated in favor of" - ewarn "app-portage/layman. It is still available in" - ewarn "${ROOT}usr/share/doc/${PF}/deprecated/ for use while" - ewarn "you migrate to layman." -} diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.11-r2.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.11-r2.ebuild deleted file mode 100644 index 084992c06c1b..000000000000 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.11-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.11-r2.ebuild,v 1.1 2009/05/12 18:57:11 idl0r Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="Collection of developer scripts for Gentoo" -HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" -SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="sys-apps/portage - dev-lang/perl" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}/echangelog.patch" -} - -src_install() { - emake DESTDIR="${D}" install-gentoolkit-dev || die -} diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.2.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.2.ebuild deleted file mode 100644 index e393c1e7923d..000000000000 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.2.ebuild,v 1.14 2009/05/05 03:49:48 fuzzyray Exp $ - -inherit eutils - -DESCRIPTION="Collection of developer scripts for Gentoo" -HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" -SRC_URI="mirror://gentoo/${P}.tar.gz http://dev.gentoo.org/~fuzzyray/distfiles/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="" - -DEPEND=">=sys-apps/portage-2.0.50 - >=dev-lang/python-2.0 - >=dev-util/dialog-0.7 - >=dev-lang/perl-5.6 - >=sys-apps/grep-2.4" -RDEPEND="${DEPEND}" - -src_unpack() { - # This is to patch a cosmetic error in gentoolkit-dev-0.2.6.2, Remove from - # next version bump - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PF}-Makefile.patch -} - -src_install() { - emake DESTDIR="${D}" install-gentoolkit-dev || die -} - -pkg_postinst() { - ewarn "The gensync utility has been deprecated in favor of" - ewarn "app-portage/layman. It is still available in" - ewarn "${ROOT}usr/share/doc/${PF}/deprecated/ for use while" - ewarn "you migrate to layman." -} -- cgit v1.2.3-65-gdbad