diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2010-11-22 20:22:33 +0000 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2010-11-22 20:22:33 +0000 |
| commit | 465c3dd5d4a81b76a9f59cb1cba1d9a11c0cdb07 (patch) | |
| tree | afcf24696d34647e6778954650997c510aefab7a /app-portage | |
| parent | Version bump (bug #341759) (diff) | |
| download | gentoo-2-465c3dd5d4a81b76a9f59cb1cba1d9a11c0cdb07.tar.gz gentoo-2-465c3dd5d4a81b76a9f59cb1cba1d9a11c0cdb07.tar.bz2 gentoo-2-465c3dd5d4a81b76a9f59cb1cba1d9a11c0cdb07.zip | |
Revision bump: Fix cpv.py to handle prefix ebuild inter-revisions. Bug 313295
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/gentoolkit/ChangeLog | 9 | ||||
| -rw-r--r-- | app-portage/gentoolkit/files/0.3.0_rc11-cpv.py.patch | 21 | ||||
| -rw-r--r-- | app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r2.ebuild (renamed from app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild) | 3 |
3 files changed, 31 insertions, 2 deletions
diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index 5a32485aabdd..d3c06db03f2f 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.199 2010/11/19 20:24:24 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.200 2010/11/22 20:22:33 fuzzyray Exp $ + +*gentoolkit-0.3.0_rc11-r2 (22 Nov 2010) + + 22 Nov 2010; Paul Varner <fuzzyray@gentoo.org> + +files/0.3.0_rc11-cpv.py.patch, -gentoolkit-0.3.0_rc11-r1.ebuild, + +gentoolkit-0.3.0_rc11-r2.ebuild: + Revision bump: Fix cpv.py to handle prefix ebuild inter-revisions. Bug 313295 19 Nov 2010; Paul Varner <fuzzyray@gentoo.org> +files/0.3.0_rc11-setup.py.patch, gentoolkit-0.3.0_rc11-r1.ebuild: diff --git a/app-portage/gentoolkit/files/0.3.0_rc11-cpv.py.patch b/app-portage/gentoolkit/files/0.3.0_rc11-cpv.py.patch new file mode 100644 index 000000000000..bdd7415465d0 --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0_rc11-cpv.py.patch @@ -0,0 +1,21 @@ +Index: pym/gentoolkit/cpv.py +=================================================================== +--- pym/gentoolkit/cpv.py (revision 864) ++++ pym/gentoolkit/cpv.py (working copy) +@@ -34,6 +34,8 @@ + "(?:_(p(?:re)?|beta|alpha|rc)\\d*)*$") + isvalid_cat_re = re.compile("^(?:[a-zA-Z0-9][-a-zA-Z0-9+._]*(?:/(?!$))?)+$") + _pkg_re = re.compile("^[a-zA-Z0-9+_]+$") ++# Prefix specific revision is of the form -r0<digit>+.<digit>+ ++isvalid_rev_re = re.compile(r'(\d+|0\d+\.\d+)') + + # ======= + # Classes +@@ -249,6 +251,6 @@ + + + def isvalid_rev(s): +- return s and s[0] == 'r' and s[1:] != '0' and s[1:].isdigit() ++ return s and s[0] == 'r' and isvalid_rev_re.match(s[1:]) + + # vim: set ts=4 sw=4 tw=79: diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r2.ebuild index d07d5cb317ad..f4b0b8e6d17e 100644 --- a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.3 2010/11/19 20:24:24 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r2.ebuild,v 1.1 2010/11/22 20:22:33 fuzzyray Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -40,6 +40,7 @@ distutils_src_compile_pre_hook() { src_prepare() { epatch "${FILESDIR}/${PV}-eshowkw_indir.patch" epatch "${FILESDIR}/${PV}-setup.py.patch" + epatch "${FILESDIR}/${PV}-cpv.py.patch" } src_install() { |