Multilib fixes.

diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index cdca9a1b05fd01458ec7b938932473cd9bf25027..2233b61cefd640f0bbac196c6b88937a0c21f0e0 100644 (file)
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -5,7 +5,7 @@ MD5 02df4ae9a9f3904ad46f63197732f47a ChangeLog 5954
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 2cfd331c4234b3d109bf51d1697bd461 tcl-8.3.4.ebuild 2538
 MD5 d2bf35d1b9d4e346394bc2a823fcdf02 tcl-8.4.6.ebuild 2921
-MD5 7403668da76af3e24af218fac5e6e527 tcl-8.4.6-r1.ebuild 3157
+MD5 b3d04a7fddf65f7c6f8a9c6a6c5f30e9 tcl-8.4.6-r1.ebuild 3329
 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
@@ -13,7 +13,7 @@ MD5 1209abd340cad17f50f87c58f1c0f9f5 files/tcl-8.4.6-multilib.patch 1070
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBx/lfArHZZzCEUG0RAq/nAJ9+gv25UKp1oHCideDEzn7YRYvQ6gCfYge0
-OJbPa9z6irnqq3OmluU5JC4=
-=CHd2
+iD8DBQFByAQ4ArHZZzCEUG0RAiX6AJ9cqN/SMH0h/1z1ucJa3y91LtJMyQCaA6/M
+QM51H+hoTlWqQRLFKt0LX74=
+=C+bN
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index e96d8ca28ca1e0aa96f855dd65957a8b99266503..f177a2455e336a39cf8ef0d44bcc854bcd5a8b30 100644 (file)
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/tk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.48 2004/11/09 23:35:08 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.49 2004/12/21 11:07:23 eradicator Exp $
+
+  21 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> tk-8.4.6-r1.ebuild:
+  Multilib fixes.
 
   10 Nov 2004; Joseph Jezak <josejx@gentoo.org> tk-8.4.6-r1.ebuild:
   Marked ppc stable.

diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index d42b6c33c9a49b88b78f27336c0743890508454d..66ddbaeba88c34babfca1dbb2c150e7f1166daef 100644 (file)
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,11 +1,21 @@
-MD5 5fdff070f636a10d83cee76b9d79283c ChangeLog 6534
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9963230e76ff7a87bd99a49c227928e3 ChangeLog 6634
 MD5 2f5742ad939b6008a985134cd84dac84 tk-8.3.4-r1.ebuild 2414
 MD5 ebde695d56724380017c2976f9bca64a tk-8.4.6.ebuild 2386
 MD5 37d9be6d753633a1cb6704052776ab1f metadata.xml 159
-MD5 41e33b57ca45d1856abb8d961177e321 tk-8.4.6-r1.ebuild 2456
-MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6-r1 64
-MD5 c1c1e9dfac0e70f21ef1a73e6dc76b8f files/tk-wm-maxsize.patch 896
+MD5 de624338645604ae3b8dbbad8419d8b5 tk-8.4.6-r1.ebuild 2768
 MD5 60b4e7758ce769df141b81b19c338f34 files/digest-tk-8.3.4-r1 60
 MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6 64
 MD5 e662e61449ea86b439ceb41463762cdc files/remove-control-v-8.4.diff 449
 MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
+MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6-r1 64
+MD5 c1c1e9dfac0e70f21ef1a73e6dc76b8f files/tk-wm-maxsize.patch 896
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFByAP2ArHZZzCEUG0RAo8mAJ9pzkp1tYqYQgvshfQKu2rLuRvR2gCZAeXe
+CU9fzRimylftXt/dDHDy20Q=
+=Zszj
+-----END PGP SIGNATURE-----

diff --git a/dev-lang/tk/tk-8.4.6-r1.ebuild b/dev-lang/tk/tk-8.4.6-r1.ebuild
index f266182429ca079beaa5809efd2bcfa8199cb675..a82a9aae1884386dcad723da31d86705a356ec9b 100644 (file)
--- a/dev-lang/tk/tk-8.4.6-r1.ebuild
+++ b/dev-lang/tk/tk-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/tk/tk-8.4.6-r1.ebuild,v 1.10 2004/11/09 23:35:08 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6-r1.ebuild,v 1.11 2004/12/21 11:07:23 eradicator Exp $
 
 inherit eutils
 
@@ -54,7 +54,7 @@ src_compile() {
        fi
 
        econf \
-               --with-tcl=/usr/lib \
+               --with-tcl=/usr/$(get_libdir) \
                ${local_config_use} || die
 
        emake CFLAGS="${CFLAGS}" || die
@@ -70,25 +70,27 @@ src_install() {
 
        # fix the tkConfig.sh to eliminate refs to the build directory
        sed -i \
-               -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
-               -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/lib/tk${v1}/include'," \
-               -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
-               -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/lib," \
+               -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
+               -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/$(get_libdir)/tk${v1}/include'," \
+               -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \
+               -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/$(get_libdir)," \
+               -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
+               -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \
                ${D}/usr/lib/tkConfig.sh
 
        # install private headers
-       dodir /usr/lib/tk${v1}/include/unix
-       install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tk${v1}/include/unix
-       dodir /usr/lib/tk${v1}/include/generic
-       install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tk${v1}/include/generic
-       rm -f ${D}/usr/lib/tk${v1}/include/generic/tk.h
-       rm -f ${D}/usr/lib/tk${v1}/include/generic/tkDecls.h
-       rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h
+       dodir /usr/$(get_libdir)/tk${v1}/include/unix
+       install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/unix
+       dodir /usr/$(get_libdir)/tk${v1}/include/generic
+       install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/generic
+       rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tk.h
+       rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkDecls.h
+       rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkPlatDecls.h
 
        # install symlink for libraries
-       #dosym /usr/lib/libtk${v1}.a /usr/lib/libtk.a
-       dosym /usr/lib/libtk${v1}.so /usr/lib/libtk.so
-       dosym /usr/lib/libtkstub${v1}.a /usr/lib/libtkstub.a
+       #dosym /usr/$(get_libdir)/libtk${v1}.a /usr/$(get_libdir)/libtk.a
+       dosym /usr/$(get_libdir)/libtk${v1}.so /usr/$(get_libdir)/libtk.so
+       dosym /usr/$(get_libdir)/libtkstub${v1}.a /usr/$(get_libdir)/libtkstub.a
 
        ln -sf wish${v1} ${D}/usr/bin/wish