summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2016-03-26 17:20:28 -0400
committerAlexandre Rostovtsev <tetromino@gentoo.org>2016-03-26 17:24:57 -0400
commit2cee2aa42e8f945a974c17e9ff80541822866036 (patch)
tree043ae752289560ea116c9c98d488cc02a848125f
parentdev-libs/glib: gobject.stp.in missing from tarball, bug #578238 (diff)
downloadgentoo-2cee2aa42e8f945a974c17e9ff80541822866036.tar.gz
gentoo-2cee2aa42e8f945a974c17e9ff80541822866036.tar.bz2
gentoo-2cee2aa42e8f945a974c17e9ff80541822866036.zip
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
-rw-r--r--dev-libs/glib/glib-2.48.0.ebuild8
1 files 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 c1d5a506be6..37bee6d2406 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