[gentoo-commits] repo/proj/prefix:master commit in: sys-apps/portage/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     adc30d5d61bbcac8b8bcbbbc88a3164df5b9930e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 29 18:31:57 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 18:31:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=adc30d5d

sys-apps/portage: fix version signature

Package-Manager: portage-2.2.27-prefix
RepoMan-Options: --force

 sys-apps/portage/portage-2.2.27.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-2.2.27.ebuild b/sys-apps/portage/portage-2.2.27.ebuild
index 50bb724..2edcee5 100644
--- a/sys-apps/portage/portage-2.2.27.ebuild
+++ b/sys-apps/portage/portage-2.2.27.ebuild
@@ -91,11 +91,15 @@ pkg_setup() {
 	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
 }
 
-python_prepare() {
+python_prepare_all() {
 	distutils-r1_python_prepare_all
 
 	epatch "${FILESDIR}"/${PN}-2.2.8-ebuildshell.patch # 155161
 
+	# solved in git already, remove at next version
+	sed -i -e "s/version = '2.2.27'/version = '2.2.27-prefix'/" \
+		setup.py || die
+
 	if ! use ipc ; then
 		einfo "Disabling ipc..."
 		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
@@ -129,7 +133,6 @@ python_prepare() {
 		einfo "Adjusting sources for ${EPREFIX}"
 		find . -type f -exec \
 		sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \
-			-e "s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \
 			-e "s|@PORTAGE_MV@|$(type -P mv)|" \
 			-e "s|@PORTAGE_BASH@|${BASH}|" \
 			-e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \
@@ -143,6 +146,9 @@ python_prepare() {
 			-e "s|@sysconfdir@|${EPREFIX}/etc|" \
 			-i '{}' + || \
 			die "Failed to patch sources"
+		# We don't need the below, since setup.py deal with this (and
+		# more) so we don't have to make this correct
+		#	-e "s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \
 
 		# remove Makefiles, or else they will get installed
 		find . -name "Makefile.*" -delete