Touchup ROOT / libdir usage to get rid of all the // gremlins.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 32 insertions, 27 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 466e7b89e295..9d93c8920f5a 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/tcl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.54 2005/05/27 07:27:46 josejx Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.55 2005/06/03 23:52:01 vapier Exp $
+
+  03 Jun 2005; Mike Frysinger <vapier@gentoo.org> tcl-8.4.9.ebuild:
+  Touchup ROOT / libdir usage to get rid of all the // gremlins.
 
   27 May 2005; Joseph Jezak <josejx@gentoo.org> tcl-8.4.9.ebuild:
   Marked ppc stable.
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 9c8baca9e875..fee5921798ab 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -1,11 +1,11 @@
-MD5 d790ce9491d9fd4d75d3b36459998211 ChangeLog 6822
-MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
-MD5 e1f99689bbe2416ed9dbc3be6e7e5be6 tcl-8.4.9.ebuild 3190
-MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
+MD5 cab7bbe4ed9dc45f81d117384d873f0c ChangeLog 6956
 MD5 72be7b18671e9312d64a3fb833dceecd metadata.xml 264
 MD5 298311384d5fa55d9baeb0da21211103 tcl-8.3.4.ebuild 2537
+MD5 90748478dfa508929dea3baefdcce7ef tcl-8.4.6.ebuild 2923
+MD5 a94e31aed8689fc3a31e268720b50938 tcl-8.4.6-r1.ebuild 3329
+MD5 23262f9d8ccc317ff5aba971ba78dd8a tcl-8.4.9.ebuild 3263
+MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
 MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6 65
 MD5 cb07b4bc1984a971b376e1da5e478fdc files/digest-tcl-8.4.6-r1 65
-MD5 d8691f60be4023222834ccdf6ee6d498 files/digest-tcl-8.3.4 61
 MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
 MD5 9c5852717da8c531e22dda3dd4ade696 files/digest-tcl-8.4.9 65
diff --git a/dev-lang/tcl/tcl-8.4.9.ebuild b/dev-lang/tcl/tcl-8.4.9.ebuild
index b66bb1ef1cfd..d583722d0505 100644
--- a/dev-lang/tcl/tcl-8.4.9.ebuild
+++ b/dev-lang/tcl/tcl-8.4.9.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 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.8 2005/05/27 07:27:46 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.9.ebuild,v 1.9 2005/06/03 23:52:01 vapier Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
@@ -32,8 +32,8 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-8.4.6-multilib.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-8.4.6-multilib.patch
 }
 
 src_compile() {
@@ -57,28 +57,30 @@ 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/$(get_libdir)," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/$(get_libdir)/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/$(get_libdir)," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/$(get_libdir)," \
+		-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_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/$(get_libdir)'," \
-		-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/$(get_libdir)'," \
-		${D}/usr/$(get_libdir)/tclConfig.sh
+		-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}'," \
+		${D}/usr/${mylibdir}/tclConfig.sh
 
 	# install private headers
-	dodir /usr/$(get_libdir)/tcl${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/unix
-	dodir /usr/$(get_libdir)/tcl${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tcl${v1}/include/generic
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tcl.h
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/$(get_libdir)/tcl${v1}/include/generic/tclPlatDecls.h
+	dodir /usr/${mylibdir}/tcl${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/unix
+	dodir /usr/${mylibdir}/tcl${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/generic
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
+	rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
 
 	# install symlink for libraries
-	dosym /usr/$(get_libdir)/libtcl${v1}.so /usr/$(get_libdir)/libtcl.so
-	dosym /usr/$(get_libdir)/libtclstub${v1}.a /usr/$(get_libdir)/libtclstub.a
+	dosym /usr/${mylibdir}/libtcl${v1}.so /usr/${mylibdir}/libtcl.so
+	dosym /usr/${mylibdir}/libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
 
 	ln -sf tclsh${v1} ${D}/usr/bin/tclsh