From: Christian Ruppert Date: Tue, 30 Mar 2010 13:54:06 +0000 (+0000) Subject: Version bump to 0.2.6.14. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bf76e214f4edf988aa968522e503dbf481de1d7e;p=gentoo.git Version bump to 0.2.6.14. Add python-3 support in 0.2.6.14 and 9999, bug 311777. Clean up. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- 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 + -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/Manifest b/app-portage/gentoolkit-dev/Manifest index a5114e399922..a8e043d00b69 100644 --- a/app-portage/gentoolkit-dev/Manifest +++ b/app-portage/gentoolkit-dev/Manifest @@ -1,20 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX echangelog_add-vcs-switch.patch 1967 RMD160 a0b09d27342154d565fea8386b5fd06a9ab2ee5c SHA1 e424da5857ce0997f311f9a847761f41d6b5c9c7 SHA256 c4364f7dcdc3ab4e9068ce52950ce3df9148194660c6d5d0e4a514aaf3649cff -AUX echangelog_fix-textwrap-regex.patch 417 RMD160 e1fdfaeccf71f5f47b8c889ac9e55af63eb51082 SHA1 2eaf193b50e1aa40b3194fa3218973e6d177a952 SHA256 7be8602351dff82d015d884b8b2066521e164d61eb16308dfb64c3a3dc0e184f -AUX echangelog_improve-vcs-detection.patch 2673 RMD160 42f911cedff39d48402d2d17961d7a87697ada4b SHA1 3c0cd9f032e7b19a77dd00663315b6de6f3b20bc SHA256 1377d3bb3c26aa90ab4e4fa9b118b6cc959920ed35e0ff9e54f10edc95ff2a10 DIST gentoolkit-dev-0.2.6.12.tar.gz 49593 RMD160 15661eb1ce031232875c068d208e006c263aa48a SHA1 b0297305a474dae1d235c738503a776e7dbc6120 SHA256 daf6bd493cb82e7d0b62994141ab3345a8862f3fb2afc65e58378c8e34d10ae5 -DIST gentoolkit-dev-0.2.6.13.tar.gz 55921 RMD160 228c2f0738dfb54697fea640fde9d6240d15e263 SHA1 b6711bc851e72aff4c0d9af57ca518c284269d42 SHA256 163308d5281567c1a878bdd3e28712871ead6e8e8bfcf67f4be610d327ab27a7 +DIST gentoolkit-dev-0.2.6.14.tar.gz 56556 RMD160 0973d325cf41fee4fe371cf22f48a51f3ac9a046 SHA1 a4fcfcd7ff54b67ea5ba257e75d18b11ca27d0ec SHA256 df1e6002215e8397c39924c550bfb3d984e6e087f402dd3f52965b4885219d8f EBUILD gentoolkit-dev-0.2.6.12.ebuild 1048 RMD160 d15584cb9f1931ddae938a2ceace5da92eb3679a SHA1 1c4e0214f3e5eca8d9df22285d7c682026063c09 SHA256 494add05f80886518ad7ad129c8da2fc46c3c80007ded09f91855795d7901f04 -EBUILD gentoolkit-dev-0.2.6.13-r1.ebuild 1229 RMD160 e908af160c373059254489dc6bc8cd84a1ee097e SHA1 c63176a9fe899be0d703bbe70a0ebd540a9849ee SHA256 94d160ff3c99b579b6d4c773b82877f4980a9a558b7eedd585ed0ffc7f70579a -EBUILD gentoolkit-dev-9999.ebuild 893 RMD160 0d0423bf0d3804fe21c9acbe524ca516c190ed14 SHA1 7f29556a38b61349166e84a6308f66757a81f570 SHA256 6aa91d5ee154bc80030a01bdaa9b07daf0fc32b3d2c915d1785327b53de091f0 -MISC ChangeLog 13441 RMD160 a8387971d5040ebcfb01a58004aa7d57698f72f3 SHA1 c11f296a251c768fabff824ea15ebcbd6f47b3f8 SHA256 3d40d24570059310ffbc5580c7b363cf80be1863a84a3578fbe6c223c32f1984 -MISC metadata.xml 282 RMD160 0eb345cd4d45d200be98d46ef58d9c7d984d0fea SHA1 e884a6236439bc56617e7fe1c48fc10a356e01a3 SHA256 bbc59170a0b8682ed3a03f67bafc63610875532ab87b33a3ad2695482624f5a8 +EBUILD gentoolkit-dev-0.2.6.14.ebuild 964 RMD160 450a4025b8cb7f7a1723334c508955f18deb44c7 SHA1 ea325280b40eb3a1a199336e005e1cd81bd3a475 SHA256 0dfce1895ed3ec9a146ce033e287ebbe1839fce70404609cb7374675fbab0e43 +EBUILD gentoolkit-dev-9999.ebuild 917 RMD160 2e2221656d985804cdd064ff9b8e82080ae6ad6a SHA1 d275f565b7385bb1e283d2d2ca3b0c562e21f411 SHA256 82b0be2d2951006924c7e677624675753d567a7e5d2ba59aed96205c2cc112e1 +MISC ChangeLog 13881 RMD160 155b809ab748c7e05ae8594d51be707f74d3ce0c SHA1 f615159202b5d15e168dcc43af811d2685ad0d3c SHA256 f667ddc3fc295adcba5eaaa3d08857a92e0a0b056fb17d2ff7f11a1d3fff45bc +MISC metadata.xml 287 RMD160 d518a27e5afb62e205d7f44961843eadcb28a20d SHA1 4048323d5bac2e3eb9d0f4c87695ae0a1a47fca1 SHA256 744d6ef36382f5f864ae0b04d0babbed7962c00018a7ed23899ea965f84b4faf -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkubc+wACgkQixe2jn+ufTjO9wCeOldBC7+IFrI2I+EiP6AWY8bm -954AnRIc8LKYyAAcRpU64yKolONk3iTM -=v9xx +iEYEARECAAYFAkuyAoMACgkQixe2jn+ufThSBgCfRT0nCAAHGSbI8LJmblLIZFj1 +L2wAniLzp+Ugsk+xTcmK7pvOAE3SqPyJ +=xmCg -----END PGP SIGNATURE----- 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 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(); -- 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(); -- close(GIT); -- last if $vcs; -- } -- if ( -X "${path}/hg" ) { -- open(HG, '-|', "${path}/hg root 2>/dev/null"); -- $vcs = "hg" if defined(); -- 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 similarity index 64% rename from app-portage/gentoolkit-dev/gentoolkit-dev-0.2.6.13-r1.ebuild rename to 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 @@ -tools-portage - -Gentoolkit-dev is a collection of developer tools for the Gentoo -distribution. - + tools-portage + + Gentoolkit-dev is a collection of developer tools for the Gentoo distribution. +