summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-03-19 08:10:12 +0000
committerJustin Lecher <jlec@gentoo.org>2012-03-19 08:10:12 +0000
commite8e650217ffcc53ae2b43bec4c5fd166ba7df287 (patch)
tree5ef98d1687adf5a83f95be9b4f095e8032c3fdb3
parentCleaned old (diff)
downloadhistorical-e8e650217ffcc53ae2b43bec4c5fd166ba7df287.tar.gz
historical-e8e650217ffcc53ae2b43bec4c5fd166ba7df287.tar.bz2
historical-e8e650217ffcc53ae2b43bec4c5fd166ba7df287.zip
Drop unnessecary stripping of slashes, #408261, thanks Kevin Pyle for the patch
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
-rw-r--r--dev-lang/tcl/ChangeLog6
-rw-r--r--dev-lang/tcl/tcl-8.5.11.ebuild4
-rw-r--r--dev-lang/tk/ChangeLog6
-rw-r--r--dev-lang/tk/tk-8.5.11.ebuild6
4 files changed, 15 insertions, 7 deletions
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 607073b98266..b06e9b7377de 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/tcl
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.153 2012/03/11 07:36:32 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.154 2012/03/19 08:08:52 jlec Exp $
+
+ 19 Mar 2012; Justin Lecher <jlec@gentoo.org> tcl-8.5.11.ebuild:
+ Drop unnessecary stripping of slashes, #408261, thanks Kevin Pyle for the
+ patch
11 Mar 2012; Jeff Horelick <jdhore@gentoo.org> tcl-8.5.10-r1.ebuild:
marked x86 per bug 406607
diff --git a/dev-lang/tcl/tcl-8.5.11.ebuild b/dev-lang/tcl/tcl-8.5.11.ebuild
index 725ffd7ffb72..9db269a03ff4 100644
--- a/dev-lang/tcl/tcl-8.5.11.ebuild
+++ b/dev-lang/tcl/tcl-8.5.11.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-lang/tcl/tcl-8.5.11.ebuild,v 1.4 2012/03/10 15:34:30 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.11.ebuild,v 1.5 2012/03/19 08:08:52 jlec Exp $
EAPI=4
@@ -71,7 +71,7 @@ src_install() {
S= emake DESTDIR="${D}" install
# fix the tclConfig.sh to eliminate refs to the build directory
- local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+ local mylibdir=$(get_libdir)
sed -i \
-e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir}," \
-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tcl${v1}/include'," \
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index c343bb99015a..5bb60f2a5ce8 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/tk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.165 2012/03/11 07:35:36 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.166 2012/03/19 08:10:12 jlec Exp $
+
+ 19 Mar 2012; Justin Lecher <jlec@gentoo.org> tk-8.5.11.ebuild:
+ Drop unnessecary stripping of slashes, #408261, thanks Kevin Pyle for the
+ patch
11 Mar 2012; Jeff Horelick <jdhore@gentoo.org> tk-8.5.10-r1.ebuild:
marked x86 per bug 406607
diff --git a/dev-lang/tk/tk-8.5.11.ebuild b/dev-lang/tk/tk-8.5.11.ebuild
index 7bd6fad9794c..b41086913984 100644
--- a/dev-lang/tk/tk-8.5.11.ebuild
+++ b/dev-lang/tk/tk-8.5.11.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-lang/tk/tk-8.5.11.ebuild,v 1.2 2012/03/04 20:13:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11.ebuild,v 1.3 2012/03/19 08:10:12 jlec Exp $
EAPI=4
@@ -49,7 +49,7 @@ src_configure() {
tc-export CC
cd "${S}"/unix
- local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+ local mylibdir=$(get_libdir)
econf \
--with-tcl="${EPREFIX}/usr/${mylibdir}" \
@@ -76,7 +76,7 @@ src_install() {
local nS="$(cd "${S}"; pwd)"
# fix the tkConfig.sh to eliminate refs to the build directory
- local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
+ local mylibdir=$(get_libdir)
sed -i \
-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
-e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \