Rev bump to 0.2.6.13-r1. Apply patches to fix bug 302784 and bug 304249, thanks to Martin von Gagern <Martin.vGagern@gmx.net> and Torsten Veller <tove@gentoo.org>.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 214 insertions, 4 deletions

diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog
index cdca0aaf5273..a4adf1be8308 100644
--- a/app-portage/gentoolkit-dev/ChangeLog
+++ b/app-portage/gentoolkit-dev/ChangeLog
@@ -1,6 +1,17 @@
 # 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.79 2009/11/12 20:12:46 idl0r Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.80 2010/03/13 11:15:47 idl0r Exp $
+
+*gentoolkit-dev-0.2.6.13-r1 (13 Mar 2010)
+
+  13 Mar 2010; Christian Ruppert <idl0r@gentoo.org>
+  -gentoolkit-dev-0.2.6.13.ebuild, +gentoolkit-dev-0.2.6.13-r1.ebuild,
+  +files/echangelog_add-vcs-switch.patch,
+  +files/echangelog_fix-textwrap-regex.patch,
+  +files/echangelog_improve-vcs-detection.patch:
+  Rev bump to 0.2.6.13-r1. Apply patches to fix bug 302784 and bug 304249,
+  thanks to Martin von Gagern <Martin.vGagern@gmx.net> and Torsten Veller
+  <tove@gentoo.org>.
 
   12 Nov 2009; Christian Ruppert <idl0r@gentoo.org>
   gentoolkit-dev-0.2.6.13.ebuild:
diff --git a/app-portage/gentoolkit-dev/files/echangelog_add-vcs-switch.patch b/app-portage/gentoolkit-dev/files/echangelog_add-vcs-switch.patch
new file mode 100644
index 000000000000..f95156f2118c
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/echangelog_add-vcs-switch.patch
@@ -0,0 +1,65 @@
+Index: src/echangelog/echangelog
+===================================================================
+--- src/echangelog/echangelog	(revision 737)
++++ src/echangelog/echangelog	(revision 738)
+@@ -23,7 +23,7 @@
+ # Global variables
+ my (@files, @ebuilds, @conflicts, @trivial, @unknown, @new_versions, %actions);
+ my ($input, $editor, $entry, $user, $date, $text, $vcs);
+-my ($opt_help, $opt_nostrict, $opt_version);
++my ($opt_help, $opt_nostrict, $opt_force_vcs, $opt_version);
+ 
+ $opt_help = 0;
+ $opt_nostrict = 0;
+@@ -86,7 +86,11 @@
+ 	Options:
+ 	    --help      err, this screen ...
+ 	    --no-strict do not abort on trivial/no changes
++	    --vcs <vcs> skip vcs autodetection and use the specified vcs instead      
++	                for a list of supported version control systems see below
+ 	    --version   show version info
++
++	Supported VCS: bzr, cvs, git, hg, svn
+ 	EOF
+ 	print $usage;
+ 	exit 0;
+@@ -207,7 +211,8 @@
+ GetOptions(
+ 	'help' => \$opt_help,
+ 	'no-strict' => \$opt_nostrict,
+-	'version' => \$opt_version,
++	'vcs=s' => \$opt_force_vcs,
++	'version|v' => \$opt_version,
+ 	'strict' => \$opt_strict,
+ );
+ 
+@@ -221,17 +226,22 @@
+ 
+ # Figure out what kind of repo we are in.
+ # Respect $PATH while looking for the VCS
+-if (getenv("PATH")) {
+-	foreach my $path ( split(":", getenv("PATH")) ) {
+-		foreach my $_vcs (keys(%vcs)) {
+-			if ( -X "${path}/${_vcs}" ) {
+-				$vcs = $_vcs if check_vcs_dir($vcs{$_vcs}{directory});
+-				last if $vcs;
++if(! defined($opt_force_vcs)) {
++	if (getenv("PATH")) {
++		foreach my $path ( split(":", getenv("PATH")) ) {
++			foreach my $_vcs (sort(keys(%vcs))) {
++				if ( -X "${path}/${_vcs}" ) {
++					$vcs = $_vcs if check_vcs_dir($vcs{$_vcs}{directory});
++					last if $vcs;
++				}
+ 			}
++			last if $vcs;
+ 		}
+-		last if $vcs;
+ 	}
+ }
++else {
++	$vcs = $opt_force_vcs if defined $vcs{$opt_force_vcs};
++}
+ 
+ if ( ! $vcs ) {
+ 	print STDERR "Either no CVS, .git, .svn, ... directories found, the specific VCS has not been\n";
diff --git a/app-portage/gentoolkit-dev/files/echangelog_fix-textwrap-regex.patch b/app-portage/gentoolkit-dev/files/echangelog_fix-textwrap-regex.patch
new file mode 100644
index 000000000000..dd4c226f183a
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/echangelog_fix-textwrap-regex.patch
@@ -0,0 +1,13 @@
+Index: src/echangelog/echangelog
+===================================================================
+--- src/echangelog/echangelog	(revision 738)
++++ src/echangelog/echangelog	(revision 741)
+@@ -136,7 +136,7 @@
+ 	my $pp;
+ 
+ 	for $pp ( split(/\n\s+/, join("\n", @raw)) ) {
+-		$pp =~ s/[\x09|\x0B|\x0C|\x20]+/ /g;
++		$pp =~ s/[\x09\x0B\x0C\x20]+/ /g;
+ 		my $x = Text::Wrap::wrap($ip, $xp, $pp);
+ 		push(@para, $x);
+ 	}
diff --git a/app-portage/gentoolkit-dev/files/echangelog_improve-vcs-detection.patch b/app-portage/gentoolkit-dev/files/echangelog_improve-vcs-detection.patch
new file mode 100644
index 000000000000..cb971e1fff47
--- /dev/null
+++ b/app-portage/gentoolkit-dev/files/echangelog_improve-vcs-detection.patch
@@ -0,0 +1,114 @@
+Index: src/echangelog/echangelog
+===================================================================
+--- src/echangelog/echangelog	(revision 735)
++++ src/echangelog/echangelog	(revision 736)
+@@ -33,6 +33,7 @@
+ 
+ my %vcs = (
+ 	bzr => {
++		directory => ".bzr",
+ 		diff => "bzr diff",
+ 		status => "bzr status -S .",
+ 		add => "bzr add",
+@@ -41,6 +42,7 @@
+ 		regex => qr/^=== \S+ file '\S+\/\S+\/((\S+)\.ebuild)/
+ 	},
+ 	cvs => {
++		directory => "CVS",
+ 		diff => "cvs -f diff -U0",
+ 		status => "cvs -fn up",
+ 		add => "cvs -f add",
+@@ -48,6 +50,7 @@
+ 		regex => qr/^Index: (([^\/]*?)\.ebuild)\s*$/
+ 	},
+ 	git => {
++		directory => ".git",
+ 		diff => "git diff",
+ 		status => "git diff-index HEAD --name-status",
+ 		add => "git add",
+@@ -57,6 +60,7 @@
+ 		regex => qr/^diff \-\-git \S*\/((\S*)\.ebuild)/
+ 	},
+ 	hg => {
++		directory => ".hg",
+ 		diff => "hg diff",
+ 		status => "hg status .",
+ 		add => "hg add",
+@@ -66,6 +70,7 @@
+ 		regex => qr/diff \-r \S+ \S+\/\S+\/((\S+)\.ebuild)/
+ 	},
+ 	svn => {
++		directory => ".svn",
+ 		diff => "svn diff -N",
+ 		status => "svn status",
+ 		add => "svn add",
+@@ -175,6 +180,21 @@
+ 	return $t;
+ }
+ 
++# Check partent dirs recursivevly/backward
++sub check_vcs_dir {
++	my $type = shift;
++
++	my $dir = getcwd();
++	while($dir !~ /^\/$/) {
++		return 1 if -d "${dir}/${type}";
++		$dir = dirname($dir);
++	}
++	# Check / as well
++	return 1 if -d "/${type}";
++
++	return 0;
++}
++
+ # Just to ensure we don't get duplicate entries.
+ sub mypush(\@@) {
+ 	my $aref = shift;
+@@ -203,32 +223,13 @@
+ # Respect $PATH while looking for the VCS
+ if (getenv("PATH")) {
+ 	foreach my $path ( split(":", getenv("PATH")) ) {
+-		if ( -X "${path}/bzr" ) {
+-			open(BZR, '-|', "${path}/bzr root 2>/dev/null");
+-			$vcs = "bzr" if defined(<BZR>);
+-			close(BZR);
+-			last if $vcs;
++		foreach my $_vcs (keys(%vcs)) {
++			if ( -X "${path}/${_vcs}" ) {
++				$vcs = $_vcs if check_vcs_dir($vcs{$_vcs}{directory});
++				last if $vcs;
++			}
+ 		}
+-		if ( -X "${path}/cvs" ) {
+-			$vcs = "cvs" if -d "CVS";
+-			last if $vcs;
+-		}
+-		if ( -X "${path}/git" ) {
+-			open(GIT, '-|', "${path}/git rev-parse --git-dir 2>/dev/null");
+-			$vcs = "git" if defined(<GIT>);
+-			close(GIT);
+-			last if $vcs;
+-		}
+-		if ( -X "${path}/hg" ) {
+-			open(HG, '-|', "${path}/hg root 2>/dev/null");
+-			$vcs = "hg" if defined(<HG>);
+-			close(HG);
+-			last if $vcs;
+-		}
+-		if ( -X "${path}/svn" ) {
+-			$vcs = "svn" if -d ".svn";
+-			last if $vcs;
+-		}
++		last if $vcs;
+ 	}
+ }
+ 
+@@ -305,7 +306,7 @@
+ 		}
+ 	}
+ 	if (/^C\s+(\S+)/) {
+-		# TODO: The git part here might be unused
++		# NOTE: The git part here might be unused
+ 		if($vcs eq "git") {
+ 			my $filename = $1;
+ 			$filename =~ /\S*\/(\S*)/;
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.13.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.13-r1.ebuild
index 376ad920b7a3..1c186b634b81 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.13.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.13-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.13.ebuild,v 1.2 2009/11/12 20:12:46 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.13-r1.ebuild,v 1.1 2010/03/13 11:15:47 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"
@@ -20,6 +22,11 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	sed -i -e 's:sh test:bash test:' src/echangelog/Makefile || die
+
+	# bug 302784 and bug 304249
+	epatch "${FILESDIR}/echangelog_improve-vcs-detection.patch" \
+		"${FILESDIR}/echangelog_add-vcs-switch.patch" \
+		"${FILESDIR}/echangelog_fix-textwrap-regex.patch"
 }
 
 src_test() {