multilib fixes, #132191 (thanks malc!)

Package-Manager: portage-2.1_rc4-r5

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index e8557d4a2dc35276490ad4bdc4b560e0f3b32746..a865737d3ec2ee40039d0cc2bc77fac4047daab6 100644 (file)
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/linuxwacom
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.35 2006/02/15 22:31:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.36 2006/06/14 17:57:13 squinky86 Exp $
+
+  14 Jun 2006; Jon Hood <squinky86@gentoo.org> linuxwacom-0.7.2.ebuild:
+  Add multilib fixings from Malcomb Lashley <malc@gentoo.org>, #132191.
 
   15 Feb 2006; Markus Rothe <corsair@gentoo.org> linuxwacom-0.7.2.ebuild:
   Added ~ppc64

diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 84c6438833b9b84ad423ea33e03498fb4d2370e8..2002ec456469b5bcc7c72ea365c5c58fac2c8c2c 100644 (file)
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,11 +1,44 @@
-MD5 bb35b31e9e59bb6791c147e8347f5d79 ChangeLog 6203
-MD5 c63cfe07a0a7457ddc796feee5501b6a files/digest-linuxwacom-0.6.7 69
-MD5 5cad69052ceddf84cea16c74fef9b805 files/digest-linuxwacom-0.6.8 69
-MD5 da5ae4274a9f0bb9b38d9ea2f7dc43c1 files/digest-linuxwacom-0.6.9 69
-MD5 8aa2f80d6e277f49d61d346bf33fc043 files/digest-linuxwacom-0.7.2 69
+AUX linuxwacom-0.7.2-modular-x.patch 3139 RMD160 8743a2ec5f9bb0a77c96b370b598325778c0ebb6 SHA1 17eed677f5e68ee97035732860cd0e800faa4daa SHA256 a5614ab425f9a3104f656e12c0e99abc8854ee55b7115369902add654d6dd862
 MD5 f2a560693573941df8d2d80f52121e36 files/linuxwacom-0.7.2-modular-x.patch 3139
+RMD160 8743a2ec5f9bb0a77c96b370b598325778c0ebb6 files/linuxwacom-0.7.2-modular-x.patch 3139
+SHA256 a5614ab425f9a3104f656e12c0e99abc8854ee55b7115369902add654d6dd862 files/linuxwacom-0.7.2-modular-x.patch 3139
+DIST linuxwacom-0.6.7.tar.bz2 496333
+DIST linuxwacom-0.6.8.tar.bz2 496784
+DIST linuxwacom-0.6.9.tar.bz2 475547
+DIST linuxwacom-0.7.2.tar.bz2 781756 RMD160 fa50375d3595f5e968e0bf2482dea4e8d568887c SHA1 e7b9f9a1345972753d851aac5fa8eb86a76a2800 SHA256 639a615d08470168b7da33e2c9f57e35dbee9cfacb739763f5255f62b99dbf1a
+EBUILD linuxwacom-0.6.7.ebuild 3332 RMD160 c1b9b65c1301b9283fbff891a49d4c9f1a329495 SHA1 76dde4e188d92525743fc51ee6e8a997938d4313 SHA256 b82555ce271c0eb3d196d244d6c9f3886f1ec3d49df6a4897f5e91d512253da8
 MD5 9111492a11b718f68ec4bcdd0d8a655d linuxwacom-0.6.7.ebuild 3332
+RMD160 c1b9b65c1301b9283fbff891a49d4c9f1a329495 linuxwacom-0.6.7.ebuild 3332
+SHA256 b82555ce271c0eb3d196d244d6c9f3886f1ec3d49df6a4897f5e91d512253da8 linuxwacom-0.6.7.ebuild 3332
+EBUILD linuxwacom-0.6.8.ebuild 3338 RMD160 de5b70c052591a591ee2b90c65209c60a7b92fdf SHA1 9e4871304e9ff6eac5f47a7abedd870c681922d4 SHA256 6abb2a3281b5ddcff47d398ce75829f2d91785157aba85a9120fdfaaac9ca867
 MD5 7a2955a73037a2929efca7094d01584e linuxwacom-0.6.8.ebuild 3338
+RMD160 de5b70c052591a591ee2b90c65209c60a7b92fdf linuxwacom-0.6.8.ebuild 3338
+SHA256 6abb2a3281b5ddcff47d398ce75829f2d91785157aba85a9120fdfaaac9ca867 linuxwacom-0.6.8.ebuild 3338
+EBUILD linuxwacom-0.6.9.ebuild 2969 RMD160 fe872647166383607db6af8bc8ca1037faf1f9e1 SHA1 fb7b16ce394a32908c937a0c5eebc2552771baba SHA256 cd57f7bf9d824dd938d09f049cfc748a3da08d9dc35f666b78bb60b45f38e6b8
 MD5 d861a7c56b1ede616749e52cfa45f9a4 linuxwacom-0.6.9.ebuild 2969
-MD5 7c5f7d1b5d556074f2a9411a33a0d60d linuxwacom-0.7.2.ebuild 3388
+RMD160 fe872647166383607db6af8bc8ca1037faf1f9e1 linuxwacom-0.6.9.ebuild 2969
+SHA256 cd57f7bf9d824dd938d09f049cfc748a3da08d9dc35f666b78bb60b45f38e6b8 linuxwacom-0.6.9.ebuild 2969
+EBUILD linuxwacom-0.7.2.ebuild 3661 RMD160 6d98b5b3c47166b525616c005d69b83800db502f SHA1 f27bd576dd78249d8176c117a165be270ce6ca6f SHA256 3e8d4e74ca6da7ff916978be4c39e5100028f7b6b693ad091f052fae2c719bf6
+MD5 b093dc76e5920442e3264b32b84772cb linuxwacom-0.7.2.ebuild 3661
+RMD160 6d98b5b3c47166b525616c005d69b83800db502f linuxwacom-0.7.2.ebuild 3661
+SHA256 3e8d4e74ca6da7ff916978be4c39e5100028f7b6b693ad091f052fae2c719bf6 linuxwacom-0.7.2.ebuild 3661
+MISC ChangeLog 6350 RMD160 ac53b0cd69ee40d75935459355b2ad680c166619 SHA1 62951993756c4043a5e870f7a35ab346e28dcd7a SHA256 647543300b970f22762ae29b4143446a0c7554befacb3115f46f541846383dc5
+MD5 b1b9974ceb4b32eeafab794b56672df8 ChangeLog 6350
+RMD160 ac53b0cd69ee40d75935459355b2ad680c166619 ChangeLog 6350
+SHA256 647543300b970f22762ae29b4143446a0c7554befacb3115f46f541846383dc5 ChangeLog 6350
+MISC metadata.xml 268 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b SHA1 accbac976c7847c397f73b97e89582008d47b5f9 SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d
 MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
+RMD160 3152329e942d732ece1c03d9e633a92a1012a97b metadata.xml 268
+SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d metadata.xml 268
+MD5 c63cfe07a0a7457ddc796feee5501b6a files/digest-linuxwacom-0.6.7 69
+RMD160 2c3178d8b805f493716142c2126cd98a5f2ef6f1 files/digest-linuxwacom-0.6.7 69
+SHA256 124448ce4d93159845262369effaa61b3bbc097dddbe04cc67fd3ab9285b3b2c files/digest-linuxwacom-0.6.7 69
+MD5 5cad69052ceddf84cea16c74fef9b805 files/digest-linuxwacom-0.6.8 69
+RMD160 f1c2d205f3dd4b8b8efd70135ee028a995136a1c files/digest-linuxwacom-0.6.8 69
+SHA256 dc70a3a60c36fcae1066a619eee84faaead1f38706e6104a216c272b41377bbd files/digest-linuxwacom-0.6.8 69
+MD5 da5ae4274a9f0bb9b38d9ea2f7dc43c1 files/digest-linuxwacom-0.6.9 69
+RMD160 17646ae93e40caec0f51398995de65598855e4d7 files/digest-linuxwacom-0.6.9 69
+SHA256 e95108be1cf56d35acaaa61f801712253aa96cbd9a8eb810b559c09730e116ef files/digest-linuxwacom-0.6.9 69
+MD5 dd86b4a2f3227fed8818eada1545b7b0 files/digest-linuxwacom-0.7.2 253
+RMD160 a5f9b66e4acfbc6e32477027d08bbd7d527bb8a8 files/digest-linuxwacom-0.7.2 253
+SHA256 a79017c36673a3f7d5db1200f5a4a4235ebee16fc29a0855f3f015c3a4eb2a86 files/digest-linuxwacom-0.7.2 253

diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.7.2 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.7.2
index 2c595ac612d888fd9bdab174b93c2a1df9aeb1ff..cc889f77475436b2c9a70842cb177f6a40f5c10c 100644 (file)
--- a/x11-misc/linuxwacom/files/digest-linuxwacom-0.7.2
+++ b/x11-misc/linuxwacom/files/digest-linuxwacom-0.7.2
@@ -1 +1,3 @@
 MD5 3f6290101d5712a24097243ca9f092ed linuxwacom-0.7.2.tar.bz2 781756
+RMD160 fa50375d3595f5e968e0bf2482dea4e8d568887c linuxwacom-0.7.2.tar.bz2 781756
+SHA256 639a615d08470168b7da33e2c9f57e35dbee9cfacb739763f5255f62b99dbf1a linuxwacom-0.7.2.tar.bz2 781756

diff --git a/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild b/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild
index 02a1b55cb5c5d5d07f5d6506c26b6b0998e89033..73cbe08f2dd4f6a1ffe9ca47de0165dcd6c6cd2a 100644 (file)
--- a/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild,v 1.3 2006/02/15 22:31:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild,v 1.4 2006/06/14 17:57:13 squinky86 Exp $
 
 IUSE="dlloader gtk gtk2 tcltk sdk usb"
 
@@ -47,6 +47,10 @@ pkg_setup() {
 
 src_unpack() {
        unpack ${A}
+       cd ${S}
+
+       # Fix multilib-strict error for Tcl/Tk library install
+       sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
 
        if use sdk && ! has_version ">=x11-base/xorg-server-0.1" ; then
                cd ${S}
@@ -60,9 +64,12 @@ src_unpack() {
        if has_version ">=x11-base/xorg-server-0.1"; then
                cd ${S}
                epatch ${FILESDIR}/${P}-modular-x.patch
-               autoreconf -v --install
-               libtoolize --force --copy
+       # moved to end of src_unpack to fix multilib issue -Jon <squinky86@gentoo.org>
+       #       autoreconf -v --install
+       #       libtoolize --force --copy
        fi
+       autoreconf -v --install
+       libtoolize --force --copy
 }
 
 src_compile() {