summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2015-06-25 00:24:51 +0000
committerMike Gilbert <floppym@gentoo.org>2015-06-25 00:24:51 +0000
commit045f4801833400f8086891520689f5805db45d39 (patch)
treef62000278b589e4686282ddb602450a2d2aff5f7
parentAdd uboot platform. (diff)
downloadgentoo-2-045f4801833400f8086891520689f5805db45d39.tar.gz
gentoo-2-045f4801833400f8086891520689f5805db45d39.tar.bz2
gentoo-2-045f4801833400f8086891520689f5805db45d39.zip
Call python_setup before esetup.py in python_prepare_all, bug 552906.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
-rw-r--r--app-portage/layman/ChangeLog6
-rw-r--r--app-portage/layman/layman-2.3.0.ebuild3
-rw-r--r--app-portage/layman/layman-9999.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index b49579f5ed5b..87baab36f665 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-portage/layman
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.234 2015/05/07 16:02:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.235 2015/06/25 00:24:51 floppym Exp $
+
+ 25 Jun 2015; Mike Gilbert <floppym@gentoo.org> layman-2.3.0.ebuild,
+ layman-9999.ebuild:
+ Call python_setup before esetup.py in python_prepare_all, bug 552906.
07 May 2015; Anthony G. Basile <blueness@gentoo.org> layman-2.3.0.ebuild:
Keyworded ~ppc. Bug #539366.
diff --git a/app-portage/layman/layman-2.3.0.ebuild b/app-portage/layman/layman-2.3.0.ebuild
index bd7837de193f..bef24ea75b34 100644
--- a/app-portage/layman/layman-2.3.0.ebuild
+++ b/app-portage/layman/layman-2.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.3.0.ebuild,v 1.7 2015/05/07 16:02:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.3.0.ebuild,v 1.8 2015/06/25 00:24:51 floppym Exp $
EAPI="5"
@@ -57,6 +57,7 @@ pkg_setup() {
}
python_prepare_all() {
+ python_setup
esetup.py setup_plugins
distutils-r1_python_prepare_all
#rm "${S}"/"${PN}"/tests/dtest.py
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index dbf540ba7592..eff7c18f4aa3 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.42 2015/04/25 13:57:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-9999.ebuild,v 1.43 2015/06/25 00:24:51 floppym Exp $
EAPI="5"
@@ -57,6 +57,7 @@ pkg_setup() {
}
python_prepare_all() {
+ python_setup
esetup.py setup_plugins
distutils-r1_python_prepare_all
eprefixify etc/layman.cfg layman/config.py