Multilib fixes.

4 files changed, 40 insertions, 17 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 748c5cb64c83..5deacd79dbab 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.28 2004/11/10 07:37:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.29 2004/12/21 11:27:46 eradicator Exp $
+
+  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/expect-5.42.1-multilib.patch, expect-5.42.1.ebuild:
+  Multilib fixes.
 
 *expect-5.42.1 (10 Nov 2004)
 
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 65c3125bf451..3b826f3639e2 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ac2b282a81d35a3e3eff1964591622b1 ChangeLog 4301
+MD5 d3c5abf36167f5310fd1414151462ae2 ChangeLog 4442
 MD5 a15812d97737f672a6d9337ddd345e48 expect-5.37.1-r1.ebuild 1823
-MD5 60eac249d8a22c10b2e44579fb0f2a16 expect-5.37.1-r2.ebuild 3048
-MD5 175e88b652d769c0df6ee6204e560af1 expect-5.40.0-r1.ebuild 2511
 MD5 efa22ab043d94cd5020be7f5921fbac8 expect-5.40.0.ebuild 1778
-MD5 f18678bdbc649309134253dec6d51e53 expect-5.42.1.ebuild 2508
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 60eac249d8a22c10b2e44579fb0f2a16 expect-5.37.1-r2.ebuild 3048
+MD5 175e88b652d769c0df6ee6204e560af1 expect-5.40.0-r1.ebuild 2511
+MD5 d829c9035e43b39a506ddb744c88d184 expect-5.42.1.ebuild 2705
 MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r1 65
-MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r2 65
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0 65
+MD5 f4bfc81e857154719e1924f00b505ea3 files/digest-expect-5.37.1-r2 65
 MD5 56f93170a590d0db63d826802dcc9847 files/digest-expect-5.40.0-r1 65
 MD5 980077a691e90dc8affe4829e3169d66 files/digest-expect-5.42.1 65
+MD5 2103ff302f6e8a0dd748772f6512b3a5 files/expect-5.42.1-multilib.patch 507
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBlMHyI1lqEGTUzyQRAv+nAKCdtOheZO4pb569mXoUC/HcUaIu/QCfXkgd
-cy39swMhQOVo9IgcRGK4Fkw=
-=ER1G
+iD8DBQFByAjBArHZZzCEUG0RAtsPAJ9cXCa7q9Jm7WucRiilbxxE+VJU8gCfTUHv
+Et1t5UFi9uPpSBeLQdwqi8w=
+=7kbb
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.42.1.ebuild b/dev-tcltk/expect/expect-5.42.1.ebuild
index 31425cf1a1b9..83502e16cc74 100644
--- a/dev-tcltk/expect/expect-5.42.1.ebuild
+++ b/dev-tcltk/expect/expect-5.42.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1.ebuild,v 1.1 2004/11/10 07:37:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.42.1.ebuild,v 1.2 2004/12/21 11:27:46 eradicator Exp $
 
-inherit gnuconfig
+inherit eutils gnuconfig
 
 DESCRIPTION="tool for automating interactive applications"
 HOMEPAGE="http://expect.nist.gov/"
@@ -13,22 +13,28 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="X doc"
 
-DEPEND=">=dev-lang/tcl-8.2
+RDEPEND=">=dev-lang/tcl-8.2
 	X? ( >=dev-lang/tk-8.2 )"
 
+DEPEND="${RDEPEND}
+	=sys-devel/autoconf-2.1*"
+
 NON_MICRO_V=${P%.[0-9]}
 S=${WORKDIR}/${NON_MICRO_V}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-multilib.patch
 	sed -i 's#/usr/local/bin#/usr/bin#' expect.man
 	sed -i 's#/usr/local/bin#/usr/bin#' expectk.man
 	#stops any example scripts being installed by default
 	sed -i \
 		-e '/^install:/s/install-libraries //' \
-		-e 's/^SCRIPTS_MANPAGES = /_&/' Makefile.in
+		-e 's/^SCRIPTS_MANPAGES = /_&/' \
+		Makefile.in
 	gnuconfig_update
+	WANT_AUTOCONF=2.1 autoconf
 }
 
 src_compile() {
@@ -43,13 +49,13 @@ src_compile() {
 	#tkv=$(grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
 
 	#configure needs to find the files tclConfig.sh and tclInt.h
-	myconf="--with-tcl=/usr/lib --with-tclinclude=/usr/lib/tcl${tclv}/include/generic"
+	myconf="--with-tcl=/usr/$(get_libdir) --with-tclinclude=/usr/$(get_libdir)/tcl${tclv}/include/generic"
 
 	if use X; then
 		#--with-x is enabled by default
 		#configure needs to find the file tkConfig.sh and tk.h
 		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
-		myconf="$myconf --with-tk=/usr/lib"
+		myconf="$myconf --with-tk=/usr/$(get_libdir)"
 	else
 		#configure knows that tk depends on X so just disable X
 		myconf="$myconf --without-x"
@@ -60,12 +66,13 @@ src_compile() {
 }
 
 src_install () {
+	dodir /usr/$(get_libdir)
 	make install INSTALL_ROOT=${D} || die "make install failed"
 
 	dodoc ChangeLog FAQ HISTORY NEWS README
 
 	local static_lib="lib${NON_MICRO_V/-/}.a"
-	rm ${D}/usr/lib/${NON_MICRO_V/-/}/${static_lib}
+	rm ${D}/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib}
 
 	#install examples if 'doc' is set
 	if use doc; then
diff --git a/dev-tcltk/expect/files/expect-5.42.1-multilib.patch b/dev-tcltk/expect/files/expect-5.42.1-multilib.patch
new file mode 100644
index 000000000000..9257537349d5
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.42.1-multilib.patch
@@ -0,0 +1,11 @@
+--- expect-5.42/configure.in.orig	2004-12-21 03:02:36.095170881 -0800
++++ expect-5.42/configure.in	2004-12-21 03:03:08.987170537 -0800
+@@ -1141,7 +1141,7 @@
+ fi
+ 
+ EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}${DBGX}"
+-EXP_LIB_SPEC="-L\${INSTALL_ROOT}\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}${DBGX}"
++EXP_LIB_SPEC="-L\${libdir} -lexpect${EXP_LIB_VERSION}${DBGX}"
+ EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}${DBGX}.a
+ 
+ # The TCL_SHARED_LIB_SUFFIX macro below relies on the DBGX macro,