diff options
| -rw-r--r-- | sys-apps/portage/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index bf15e04ff10d..4bbaa72fcd31 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.694 2010/03/25 02:17:04 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.695 2010/03/25 02:38:15 sping Exp $ + + 25 Mar 2010; Sebastian Pipping <sping@gentoo.org> portage-9999.ebuild: + Fix live ebuild versioning: + - OLD: 2.2_rc67-26-g1f09ba1 + - NEW: 2.2_rc67_p26 *portage-9999 (25 Mar 2010) diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 6fbd5ff2249c..98714429fee0 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.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/sys-apps/portage/portage-9999.ebuild,v 1.1 2010/03/25 02:17:04 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.2 2010/03/25 02:38:15 sping Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -86,7 +86,7 @@ pkg_setup() { } src_prepare() { - local _version="'$(cd "${S}/.git" && git describe --tags)'[1:]" + local _version="'$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|')'[1:]" einfo "Setting portage.VERSION to ${_version} ..." sed -i "s/^VERSION=.*/VERSION=${_version}/" pym/portage/__init__.py || \ die "Failed to patch portage.VERSION" |