diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-10-07 14:40:20 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-10-07 14:40:20 +0000 |
| commit | cfd2aec2a8ec96b6927958d0cab5946db109177b (patch) | |
| tree | 70270fb993d295f6b32536f7642196d8c8943a01 /dev-util | |
| parent | Drop ebeep, bug #403911 by Petr Gregor (diff) | |
| download | gentoo-2-cfd2aec2a8ec96b6927958d0cab5946db109177b.tar.gz gentoo-2-cfd2aec2a8ec96b6927958d0cab5946db109177b.tar.bz2 gentoo-2-cfd2aec2a8ec96b6927958d0cab5946db109177b.zip | |
Setup a valid path, EPREFIX does NOT end in /
(Portage version: 2.2.01.21165-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/scons/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/scons/scons-2.2.0.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog index 7baf84fe203a..ed876dffec19 100644 --- a/dev-util/scons/ChangeLog +++ b/dev-util/scons/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/scons # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.125 2012/09/29 18:40:45 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.126 2012/10/07 14:40:20 grobian Exp $ + + 07 Oct 2012; Fabian Groffen <grobian@gentoo.org> scons-2.2.0.ebuild: + Setup a valid path, EPREFIX does NOT end in / 29 Sep 2012; Raúl Porcel <armin76@gentoo.org> scons-2.2.0.ebuild: alpha/ia64/sparc stable wrt #434294 diff --git a/dev-util/scons/scons-2.2.0.ebuild b/dev-util/scons/scons-2.2.0.ebuild index 78ba76abcebd..38c6c8957e43 100644 --- a/dev-util/scons/scons-2.2.0.ebuild +++ b/dev-util/scons/scons-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.ebuild,v 1.8 2012/09/29 18:40:45 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.2.0.ebuild,v 1.9 2012/10/07 14:40:20 grobian Exp $ EAPI="4" PYTHON_DEPEND="2:2.5" @@ -30,7 +30,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.1.0-jython.patch" # https://bugs.gentoo.org/show_bug.cgi?id=361061 - sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}usr/local/bin:${EPREFIX}opt/bin:${EPREFIX}bin:${EPREFIX}usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die + sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die # and make sure the build system doesn't "force" /usr/local/ :( sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die } |