summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-03-23 14:56:35 +0000
committerBrian Dolbec <dolsen@gentoo.org>2014-03-23 14:56:35 +0000
commit966e954067003361e884d532e84d5a2469314e98 (patch)
tree5c67eddd04e8296f8def931a78a53c190e876c83
parentStable for ppc, wrt bug #471894 (diff)
downloadgentoo-2-966e954067003361e884d532e84d5a2469314e98.tar.gz
gentoo-2-966e954067003361e884d532e84d5a2469314e98.tar.bz2
gentoo-2-966e954067003361e884d532e84d5a2469314e98.zip
Fix 2.2.9 version setting sed.
(Portage version: 2.2.9/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)
-rw-r--r--sys-apps/portage/ChangeLog9
-rw-r--r--sys-apps/portage/portage-2.2.9-r1.ebuild (renamed from sys-apps/portage/portage-2.2.9.ebuild)4
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 736ef984d2b4..a03aa55d4ef9 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/portage
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1391 2014/03/23 10:14:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1392 2014/03/23 14:56:35 dolsen Exp $
+
+*portage-2.2.9-r1 (23 Mar 2014)
+
+ 23 Mar 2014; Brian Dolbec <dolsen@gentoo.org> -portage-2.2.9.ebuild,
+ +portage-2.2.9-r1.ebuild:
+ Fix the version setting sed, also tarball has the incorrect version. This
+ fixes it.
23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> portage-2.2.8-r1.ebuild:
Stable for sparc, wrt bug #502282
diff --git a/sys-apps/portage/portage-2.2.9.ebuild b/sys-apps/portage/portage-2.2.9-r1.ebuild
index e4791137f72b..7e6e77aa5af9 100644
--- a/sys-apps/portage/portage-2.2.9.ebuild
+++ b/sys-apps/portage/portage-2.2.9-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.9.ebuild,v 1.1 2014/03/23 04:13:02 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.9-r1.ebuild,v 1.1 2014/03/23 14:56:35 dolsen Exp $
# Require EAPI 2 since we now require at least python-2.6 (for python 3
# syntax support) which also requires EAPI 2.
@@ -229,7 +229,7 @@ src_prepare() {
epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
fi
einfo "Setting portage.VERSION to ${PVR} ..."
- sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
+ sed -e "s/^VERSION = .*/VERSION = \"${PVR}\"/" -i pym/portage/__init__.py || \
die "Failed to patch portage.VERSION"
sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
die "Failed to patch VERSION in doc/fragment/version"