[gentoo-commits] gentoo-x86 commit in sys-apps/portage: portage-9999.ebuild ChangeLog

["Sebastian Pipping (sping)" <sping@gentoo.org>]

sping       10/03/25 02:38:15

  Modified:             portage-9999.ebuild ChangeLog
  Log:
  sys-apps/portage: Fix live ebuild versioning
  (Portage version: 2.2_rc67_p26/cvs/Linux i686)

Revision  Changes    Path
1.2                  sys-apps/portage/portage-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/portage-9999.ebuild?r1=1.1&r2=1.2

Index: portage-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portage-9999.ebuild	25 Mar 2010 02:17:04 -0000	1.1
+++ portage-9999.ebuild	25 Mar 2010 02:38:15 -0000	1.2
@@ -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 @@
 }
 
 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"



1.695                sys-apps/portage/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.695&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?rev=1.695&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/portage/ChangeLog?r1=1.694&r2=1.695

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -r1.694 -r1.695
--- ChangeLog	25 Mar 2010 02:17:04 -0000	1.694
+++ ChangeLog	25 Mar 2010 02:38:15 -0000	1.695
@@ -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)