diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2010-03-25 02:38:15 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2010-03-25 02:38:15 +0000 |
| commit | 675847f20718f877dc7ef437c0a4d0d1308269e8 (patch) | |
| tree | 2d5f997e930a91b17aa1555037e118b501b1ae77 /sys-apps | |
| parent | sys-apps/portage: Add live ebuild (permission by zmedico) (diff) | |
| download | historical-675847f20718f877dc7ef437c0a4d0d1308269e8.tar.gz historical-675847f20718f877dc7ef437c0a4d0d1308269e8.tar.bz2 historical-675847f20718f877dc7ef437c0a4d0d1308269e8.zip | |
sys-apps/portage: Fix live ebuild versioning
Package-Manager: portage-2.2_rc67_p26/cvs/Linux i686
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/portage/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 4 |
3 files changed, 10 insertions, 5 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/Manifest b/sys-apps/portage/Manifest index b5f43377a6ab..59cb30996eff 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -17,6 +17,6 @@ EBUILD portage-2.1.7.17.ebuild 10121 RMD160 450a29c406bd178de4396835f0582e043114 EBUILD portage-2.1.8.3.ebuild 9210 RMD160 e6698ebd63f5b593a475386992ac982d7c97d3dd SHA1 3ad899721ef1c039e9bee74d44ab418bd2cc5928 SHA256 0cb2e1df83587ff32de573d532271b8757b250826fd5221db683b6474d0a0869 EBUILD portage-2.2_rc62.ebuild 11046 RMD160 9f093b14959b0c8f45ba8f0e0478d296a7ffc5a5 SHA1 b68099591f14cf208f3dd14934e7e5514048b898 SHA256 15d2d9980755987ef68ce5d51b2351cdf4a451e58e6720084cd1e10b84ba8265 EBUILD portage-2.2_rc67.ebuild 10585 RMD160 5b048e89f617091897af67f01376063b3370184b SHA1 e007b51065300dcad3cd389114899ae422a0c01e SHA256 c089377b80103250aeeff43310b264a0310198de79b3fd032f57cbc535332bc2 -EBUILD portage-9999.ebuild 9884 RMD160 bbf37ddcb73b4e40c886b3d2e4d3557f557dff3b SHA1 dc11cf37248bfc706424a438358abd470ce2bc34 SHA256 e62ddab6a973d95b1431d7bf9834cc015968b1e2487c1b46fea53761117caad0 -MISC ChangeLog 10942 RMD160 4144e31adb492a90044620575111653adf43f431 SHA1 41b2bea3440dd4d914961a4ad1e31df29ee00066 SHA256 0aa868f46b3a375b0d77acfda8876cf7b43fcf960e8e796b51ff4c866c8d5eeb +EBUILD portage-9999.ebuild 9921 RMD160 ab83e07ff5c6fccb9a9ec5b31d3135d89acdb6d2 SHA1 873bf5798c824725073d7f7f73e407567c75ca18 SHA256 b831c9d1fc3251efac3f1f314937434841634fabc840ccdf182b0d3dea004c44 +MISC ChangeLog 11098 RMD160 3b356821079d690d7f8712f48a2669984f6a32e8 SHA1 bf12f9a36d39f1ebaec255be6c562ed9c00afe6e SHA256 89b6044a8b3ca2949e5c64b57415ff5deabf0437bcff14a3985516543d257db2 MISC metadata.xml 618 RMD160 9510c974d4aa9a1383674d331a973140beb44e48 SHA1 0822478deaeb3b22358fff5c695111bfdf3ff2f6 SHA256 00ca0aa3a29ec8f82ddaf2e0f89e0b2e959131a6350f64b3c49b1125cbb32a13 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" |