| 1 |
commit: adc30d5d61bbcac8b8bcbbbc88a3164df5b9930e |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 29 18:31:57 2016 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 29 18:31:57 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=adc30d5d |
| 7 |
|
| 8 |
sys-apps/portage: fix version signature |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27-prefix |
| 11 |
RepoMan-Options: --force |
| 12 |
|
| 13 |
sys-apps/portage/portage-2.2.27.ebuild | 10 ++++++++-- |
| 14 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/portage/portage-2.2.27.ebuild b/sys-apps/portage/portage-2.2.27.ebuild |
| 17 |
index 50bb724..2edcee5 100644 |
| 18 |
--- a/sys-apps/portage/portage-2.2.27.ebuild |
| 19 |
+++ b/sys-apps/portage/portage-2.2.27.ebuild |
| 20 |
@@ -91,11 +91,15 @@ pkg_setup() { |
| 21 |
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) |
| 22 |
} |
| 23 |
|
| 24 |
-python_prepare() { |
| 25 |
+python_prepare_all() { |
| 26 |
distutils-r1_python_prepare_all |
| 27 |
|
| 28 |
epatch "${FILESDIR}"/${PN}-2.2.8-ebuildshell.patch # 155161 |
| 29 |
|
| 30 |
+ # solved in git already, remove at next version |
| 31 |
+ sed -i -e "s/version = '2.2.27'/version = '2.2.27-prefix'/" \ |
| 32 |
+ setup.py || die |
| 33 |
+ |
| 34 |
if ! use ipc ; then |
| 35 |
einfo "Disabling ipc..." |
| 36 |
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
| 37 |
@@ -129,7 +133,6 @@ python_prepare() { |
| 38 |
einfo "Adjusting sources for ${EPREFIX}" |
| 39 |
find . -type f -exec \ |
| 40 |
sed -e "s|@PORTAGE_EPREFIX@|${EPREFIX}|" \ |
| 41 |
- -e "s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \ |
| 42 |
-e "s|@PORTAGE_MV@|$(type -P mv)|" \ |
| 43 |
-e "s|@PORTAGE_BASH@|${BASH}|" \ |
| 44 |
-e "s|@PREFIX_PORTAGE_PYTHON@|$(type -P python)|" \ |
| 45 |
@@ -143,6 +146,9 @@ python_prepare() { |
| 46 |
-e "s|@sysconfdir@|${EPREFIX}/etc|" \ |
| 47 |
-i '{}' + || \ |
| 48 |
die "Failed to patch sources" |
| 49 |
+ # We don't need the below, since setup.py deal with this (and |
| 50 |
+ # more) so we don't have to make this correct |
| 51 |
+ # -e "s|@PORTAGE_BASE@|${EPREFIX}/usr/lib/portage/${EPYTHON}|" \ |
| 52 |
|
| 53 |
# remove Makefiles, or else they will get installed |
| 54 |
find . -name "Makefile.*" -delete |
Archives