summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-09-09 10:29:41 +0000
committerMichał Górny <mgorny@gentoo.org>2013-09-09 10:29:41 +0000
commit84dc08abb2046e8919cb8245fda589859251b0e6 (patch)
tree2713644852c8964fc4174905178b6b275fc288b5
parentVersion bump, drop old (diff)
downloadgentoo-2-84dc08abb2046e8919cb8245fda589859251b0e6.tar.gz
gentoo-2-84dc08abb2046e8919cb8245fda589859251b0e6.tar.bz2
gentoo-2-84dc08abb2046e8919cb8245fda589859251b0e6.zip
Call python_replicate_script in outer src_install() to avoid implementation-specific environment.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
-rw-r--r--dev-util/scons/ChangeLog7
-rw-r--r--dev-util/scons/scons-2.2.0-r1.ebuild6
-rw-r--r--dev-util/scons/scons-2.3.0.ebuild6
3 files changed, 16 insertions, 3 deletions
diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index ea3a37069a85..e67cf4d83ae4 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/scons
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.133 2013/09/07 19:34:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.134 2013/09/09 10:29:41 mgorny Exp $
+
+ 09 Sep 2013; Michał Górny <mgorny@gentoo.org> scons-2.2.0-r1.ebuild,
+ scons-2.3.0.ebuild:
+ Call python_replicate_script in outer src_install() to avoid implementation-
+ specific environment.
07 Sep 2013; Mike Gilbert <floppym@gentoo.org> scons-2.3.0.ebuild:
Revert previous change; wrong shebangs get installed.
diff --git a/dev-util/scons/scons-2.2.0-r1.ebuild b/dev-util/scons/scons-2.2.0-r1.ebuild
index b12fc042ba74..187be39ba0ad 100644
--- a/dev-util/scons/scons-2.2.0-r1.ebuild
+++ b/dev-util/scons/scons-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.2.0-r1.ebuild,v 1.4 2013/09/05 18:40:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.2.0-r1.ebuild,v 1.5 2013/09/09 10:29:41 mgorny Exp $
EAPI=5
@@ -46,6 +46,10 @@ python_install_all() {
distutils-r1_python_install_all
use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+ distutils-r1_src_install
# Build system does not use build_scripts properly.
# http://scons.tigris.org/issues/show_bug.cgi?id=2891
diff --git a/dev-util/scons/scons-2.3.0.ebuild b/dev-util/scons/scons-2.3.0.ebuild
index a96fcbf116d0..058896b19abd 100644
--- a/dev-util/scons/scons-2.3.0.ebuild
+++ b/dev-util/scons/scons-2.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.0.ebuild,v 1.3 2013/09/07 19:34:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.3.0.ebuild,v 1.4 2013/09/09 10:29:41 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -45,6 +45,10 @@ python_install_all() {
distutils-r1_python_install_all
use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
+
+src_install() {
+ distutils-r1_src_install
# Build system does not use build_scripts properly.
# http://scons.tigris.org/issues/show_bug.cgi?id=2891