Made tcl multilib friendly.

3 files changed, 52 insertions, 24 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index dd2144fef372..f8f115a96518 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tcl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.44 2004/11/01 18:14:43 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.45 2004/12/21 10:22:13 eradicator Exp $
+
+  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/tcl-8.4.6-multilib.patch, tcl-8.4.6-r1.ebuild:
+  Made tcl multilib friendly.
 
   01 Nov 2004; Lars Weiler <pylon@gentoo.org> tcl-8.4.6-r1.ebuild:
   Stable on ppc for PHP5, Bug #60442.
diff --git a/dev-lang/tcl/files/tcl-8.4.6-multilib.patch b/dev-lang/tcl/files/tcl-8.4.6-multilib.patch
new file mode 100644
index 000000000000..d193064ab607
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.4.6-multilib.patch
@@ -0,0 +1,24 @@
+diff -Naur tcl8.4.6.orig/unix/configure tcl8.4.6/unix/configure
+--- tcl8.4.6.orig/unix/configure	2004-03-01 15:58:59.000000000 -0800
++++ tcl8.4.6/unix/configure	2004-12-21 01:58:16.250206343 -0800
+@@ -7248,7 +7248,7 @@
+ 
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+     TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
+-elif test "$prefix" != "$exec_prefix"; then
++elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
+     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+     TCL_PACKAGE_PATH="${prefix}/lib"
+diff -Naur tcl8.4.6.orig/unix/configure.in tcl8.4.6/unix/configure.in
+--- tcl8.4.6.orig/unix/configure.in	2004-03-01 15:58:59.000000000 -0800
++++ tcl8.4.6/unix/configure.in	2004-12-21 01:57:58.059204301 -0800
+@@ -510,7 +510,7 @@
+ 
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+     TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
+-elif test "$prefix" != "$exec_prefix"; then
++elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
+     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+ else
+     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/dev-lang/tcl/tcl-8.4.6-r1.ebuild b/dev-lang/tcl/tcl-8.4.6-r1.ebuild
index 73269f2422bd..0efc59616963 100644
--- a/dev-lang/tcl/tcl-8.4.6-r1.ebuild
+++ b/dev-lang/tcl/tcl-8.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6-r1.ebuild,v 1.3 2004/11/01 18:14:43 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.6-r1.ebuild,v 1.4 2004/12/21 10:22:13 eradicator Exp $
 
 inherit eutils
 
@@ -31,6 +31,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-multilib.patch
+}
+
 src_compile() {
 	local local_config_use=""
 
@@ -40,13 +46,7 @@ src_compile() {
 	fi
 
 	cd ${S}/unix
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${local_config_use} \
-		|| die
-
+	econf ${local_config_use} || die
 	emake CFLAGS="${CFLAGS}" || die
 }
 
@@ -59,26 +59,26 @@ 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
-	sed -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${ROOT}/usr/lib," \
-		-e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${ROOT}/usr/lib/tcl${v1}/include'," \
-		-e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${ROOT}/usr/lib," \
-		-e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${ROOT}/usr/lib," \
+	sed -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_LIB_FILE='libtcl8.4..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.4\$\{TCL_DBGX\}.so\"," \
-		${D}/usr/lib/tclConfig.sh > ${D}/usr/lib/tclConfig.sh.new
-	mv ${D}/usr/lib/tclConfig.sh.new ${D}/usr/lib/tclConfig.sh
+		${D}/usr/$(get_libdir)/tclConfig.sh > ${D}/usr/$(get_libdir)/tclConfig.sh.new
+	mv ${D}/usr/$(get_libdir)/tclConfig.sh.new ${D}/usr/$(get_libdir)/tclConfig.sh
 
 	# install private headers
-	dodir /usr/lib/tcl${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tcl${v1}/include/unix
-	dodir /usr/lib/tcl${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tcl${v1}/include/generic
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tcl.h
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/lib/tcl${v1}/include/generic/tclPlatDecls.h
+	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
 
 	# install symlink for libraries
-	dosym /usr/lib/libtcl${v1}.so /usr/lib/libtcl.so
-	dosym /usr/lib/libtclstub${v1}.a /usr/lib/libtclstub.a
+	dosym /usr/$(get_libdir)/libtcl${v1}.so /usr/$(get_libdir)/libtcl.so
+	dosym /usr/$(get_libdir)/libtclstub${v1}.a /usr/$(get_libdir)/libtclstub.a
 
 	ln -sf tclsh${v1} ${D}/usr/bin/tclsh