diff options
| author |   Vikraman Choudhury <vikraman@gentoo.org> | 2014-02-13 11:37:51 +0000 |
|---|---|---|
| committer | Vikraman Choudhury <vikraman@gentoo.org> | 2014-02-13 11:37:51 +0000 |
| commit | 7237ed25b0a5a771c658680d49c4078635da6d03 (patch) | |
| tree | 8b4f24efbc52ac4117ce0f232498f4b027f36e32 /sys-apps | |
| parent | Version bump. (diff) | |
| download | gentoo-2-7237ed25b0a5a771c658680d49c4078635da6d03.tar.gz gentoo-2-7237ed25b0a5a771c658680d49c4078635da6d03.tar.bz2 gentoo-2-7237ed25b0a5a771c658680d49c4078635da6d03.zip | |
Fix patching of portage.VERSION
Because of upstream commit b1197c
(Portage version: 2.2.8_p46/cvs/Linux i686, signed Manifest commit with key B0A72FD2)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index e5472ce472aa..f243c5831d42 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,9 @@ # 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.1381 2014/01/20 18:50:39 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.1382 2014/02/13 11:37:51 vikraman Exp $ + + 13 Feb 2014; Vikraman Choudhury <vikraman@gentoo.org> portage-9999.ebuild: + Fix patching of VERSION Because of upstream commit b1197c *portage-2.2.8-r1 (20 Jan 2014) diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 8834fb18dfcb..3215782e2bef 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.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-9999.ebuild,v 1.92 2014/01/20 17:41:31 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.93 2014/02/13 11:37:51 vikraman Exp $ EAPI=3 PYTHON_COMPAT=( @@ -217,7 +217,7 @@ src_prepare() { local _version=$(cd "${S}/.git" && git describe --tags | sed -e 's|-\([0-9]\+\)-.\+$|_p\1|') _version=${_version:1} einfo "Setting portage.VERSION to ${_version} ..." - sed -e "s/^VERSION=.*/VERSION='${_version}'/" -i pym/portage/__init__.py || \ + sed -e "s/^VERSION =.*/VERSION = '${_version}'/" -i pym/portage/__init__.py || \ die "Failed to patch portage.VERSION" sed -e "1s/VERSION/${_version}/" -i doc/fragment/version || \ die "Failed to patch VERSION in doc/fragment/version" |