commit:     2cee2aa42e8f945a974c17e9ff80541822866036
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 21:20:28 2016 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 21:24:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cee2aa4

dev-libs/glib: python shebang build failure when USE=utils (bug #578226)

Restore behavior from previous ebuild versions; it's needed
to avoid python shebang mis-mangling while avoiding a build
dependency on python when USE="utils" FEATURES="-test"

Package-Manager: portage-2.2.28

 dev-libs/glib/glib-2.48.0.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-libs/glib/glib-2.48.0.ebuild b/dev-libs/glib/glib-2.48.0.ebuild
index c1d5a50..37bee6d 100644
--- a/dev-libs/glib/glib-2.48.0.ebuild
+++ b/dev-libs/glib/glib-2.48.0.ebuild
@@ -128,9 +128,11 @@ src_prepare() {
        # missing from 2.48.0 tarball, should be fixed in 2.48.1; bug #578238
        cp "${FILESDIR}"/${P}-gobject.stp.in gobject/gobject.stp.in || die
 
-       # leave python shebang alone
-       # sed -e '/${PYTHON}/d' \
-       #       -i glib/Makefile.{am,in} || die
+       # Leave python shebang alone - handled by python_replicate_script
+       # We could call python_setup and give configure a valid --with-python
+       # arg, but that would mean a build dep on python when USE=utils.
+       sed -e '/${PYTHON}/d' \
+               -i glib/Makefile.{am,in} || die
 
        epatch_user
 

Reply via email to