Version bump to 0.2.6.14.

Add python-3 support in 0.2.6.14 and 9999, bug 311777.
Clean up.
(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 29 insertions, 218 deletions

diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog
index a4adf1be8308..4178d0b031ff 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-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 $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.81 2010/03/30 13:54:05 idl0r Exp $
+
+*gentoolkit-dev-0.2.6.14 (30 Mar 2010)
+
+  30 Mar 2010; Christian Ruppert <idl0r@gentoo.org>
+  -gentoolkit-dev-0.2.6.13-r1.ebuild, +gentoolkit-dev-0.2.6.14.ebuild,
+  gentoolkit-dev-9999.ebuild, -files/echangelog_add-vcs-switch.patch,
+  -files/echangelog_fix-textwrap-regex.patch,
+  -files/echangelog_improve-vcs-detection.patch, metadata.xml:
+  Version bump to 0.2.6.14.
+  Add python-3 support in 0.2.6.14 and 9999, bug 311777.
+  Clean up.
 
 *gentoolkit-dev-0.2.6.13-r1 (13 Mar 2010)
 
diff --git a/app-portage/gentoolkit-dev/files/echangelog_add-vcs-switch.patch b/app-portage/gentoolkit-dev/files/echangelog_add-vcs-switch.patch
deleted file mode 100644
index f95156f2118c..000000000000
--- a/app-portage/gentoolkit-dev/files/echangelog_add-vcs-switch.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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
deleted file mode 100644
index dd4c226f183a..000000000000
--- a/app-portage/gentoolkit-dev/files/echangelog_fix-textwrap-regex.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index cb971e1fff47..000000000000
--- a/app-portage/gentoolkit-dev/files/echangelog_improve-vcs-detection.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-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-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.14.ebuild
index 1c186b634b81..7177006ef055 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.13-r1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.14.ebuild
@@ -1,10 +1,12 @@
 # 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-r1.ebuild,v 1.1 2010/03/13 11:15:47 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.14.ebuild,v 1.1 2010/03/30 13:54:05 idl0r Exp $
 
 EAPI="2"
+PYTHON_DEPEND="*:2.6:3.1"
+PYTHON_USE_WITH="xml"
 
-inherit eutils
+inherit python
 
 DESCRIPTION="Collection of developer scripts for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -15,20 +17,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="dev-lang/python[xml]"
-RDEPEND="${DEPEND}
-	sys-apps/portage
+DEPEND=""
+RDEPEND="sys-apps/portage
 	dev-lang/perl"
 
-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() {
 	# echangelog test is not able to run as root
 	# the EUID check may not work for everybody
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
index 895c1b1181a2..04aa84e2d8b8 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
@@ -1,10 +1,12 @@
-# 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-9999.ebuild,v 1.2 2009/09/09 16:50:27 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.3 2010/03/30 13:54:05 idl0r Exp $
 
 EAPI="2"
+PYTHON_DEPEND="*:2.6:3.1"
+PYTHON_USE_WITH="xml"
 
-inherit subversion
+inherit subversion python
 
 DESCRIPTION="Collection of developer scripts for Gentoo"
 HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -15,9 +17,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-DEPEND="dev-lang/python[xml]"
-RDEPEND="${DEPEND}
-	sys-apps/portage
+DEPEND=""
+RDEPEND="sys-apps/portage
 	dev-lang/perl"
 
 ESVN_REPO_URI="svn://anonsvn.gentoo.org/gentoolkit/trunk/${PN}"
diff --git a/app-portage/gentoolkit-dev/metadata.xml b/app-portage/gentoolkit-dev/metadata.xml
index 8ab1d6793eb3..fa4d72590c50 100644
--- a/app-portage/gentoolkit-dev/metadata.xml
+++ b/app-portage/gentoolkit-dev/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tools-portage</herd>
-<longdescription>
-Gentoolkit-dev is a collection of developer tools for the Gentoo
-distribution.
-</longdescription>
+	<herd>tools-portage</herd>
+	<longdescription>
+		Gentoolkit-dev is a collection of developer tools for the Gentoo distribution.
+	</longdescription>
 </pkgmetadata>