diff options
| author |   Piotr Jaroszyński <peper@gentoo.org> | 2007-06-24 23:36:14 +0000 |
|---|---|---|
| committer | Piotr Jaroszyński <peper@gentoo.org> | 2007-06-24 23:36:14 +0000 |
| commit | 508b0bcce9ae239a5c84bc77cd307ab108db2551 (patch) | |
| tree | eb18b0ced946ffbd70f7a704544ef1c6bb240973 /dev-lang | |
| parent | Stable on amd64 wrt bug 180228 (diff) | |
| download | gentoo-2-508b0bcce9ae239a5c84bc77cd307ab108db2551.tar.gz gentoo-2-508b0bcce9ae239a5c84bc77cd307ab108db2551.tar.bz2 gentoo-2-508b0bcce9ae239a5c84bc77cd307ab108db2551.zip | |
(QA) Fix ${ROOT} abuse. bug #167271.
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/tcl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/tcl/tcl-8.4.14.ebuild | 11 | ||||
| -rw-r--r-- | dev-lang/tcl/tcl-8.4.9.ebuild | 13 |
3 files changed, 16 insertions, 14 deletions
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog index 5ba76e91843e..3eb856c3a730 100644 --- a/dev-lang/tcl/ChangeLog +++ b/dev-lang/tcl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/tcl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.79 2007/05/25 15:15:26 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.80 2007/06/24 23:36:14 peper Exp $ + + 24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> tcl-8.4.9.ebuild, + tcl-8.4.14.ebuild: + (QA) Fix ${ROOT} abuse. bug #167271. 25 May 2007; Brent Baude <ranger@gentoo.org> tcl-8.4.14.ebuild: Marking tcl-8.4.14 ppc64 stable for bug 178320 diff --git a/dev-lang/tcl/tcl-8.4.14.ebuild b/dev-lang/tcl/tcl-8.4.14.ebuild index 2769fc62e481..f2635c1dfcf9 100644 --- a/dev-lang/tcl/tcl-8.4.14.ebuild +++ b/dev-lang/tcl/tcl-8.4.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.14.ebuild,v 1.9 2007/06/24 21:23:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.14.ebuild,v 1.10 2007/06/24 23:36:14 peper Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest @@ -76,13 +76,12 @@ src_install() { S= make DESTDIR="${D}" install || die # fix the tclConfig.sh to eliminate refs to the build directory - [[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/ local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \ + -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L$/usr/${mylibdir}," \ + -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \ + -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \ + -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \ -e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \ -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ diff --git a/dev-lang/tcl/tcl-8.4.9.ebuild b/dev-lang/tcl/tcl-8.4.9.ebuild index aa4e07765b3c..9c9e8291fd68 100644 --- a/dev-lang/tcl/tcl-8.4.9.ebuild +++ b/dev-lang/tcl/tcl-8.4.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.15 2006/09/04 08:51:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.16 2007/06/24 23:36:14 peper Exp $ inherit eutils multilib @@ -67,13 +67,12 @@ src_install() { S= make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die # fix the tclConfig.sh to eliminate refs to the build directory - [[ ${ROOT:0-1} != "/" ]] && ROOT=${ROOT}/ local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} sed -i \ - -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}usr/${mylibdir}/tcl${v1}/include'," \ - -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}usr/${mylibdir}," \ - -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}usr/${mylibdir}," \ + -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/${mylibdir}," \ + -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/${mylibdir}/tcl${v1}/include'," \ + -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/${mylibdir}," \ + -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/${mylibdir}," \ -e "s,^TCL_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \ -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \ |