summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Hood <squinky86@gentoo.org>2006-06-14 17:57:13 +0000
committerJon Hood <squinky86@gentoo.org>2006-06-14 17:57:13 +0000
commitf600b4f167bf9b8e0bdbb95370ffb6277855a588 (patch)
tree26affb6a41b6d0ef5a5b3ddb89397d4490cc43e9 /x11-misc
parentAdded ~ppc wrt bug 136709 (diff)
downloadgentoo-2-f600b4f167bf9b8e0bdbb95370ffb6277855a588.tar.gz
gentoo-2-f600b4f167bf9b8e0bdbb95370ffb6277855a588.tar.bz2
gentoo-2-f600b4f167bf9b8e0bdbb95370ffb6277855a588.zip
multilib fixes, #132191 (thanks malc!)
(Portage version: 2.1_rc4-r5)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/linuxwacom/ChangeLog5
-rw-r--r--x11-misc/linuxwacom/files/digest-linuxwacom-0.7.22
-rw-r--r--x11-misc/linuxwacom/linuxwacom-0.7.2.ebuild13
3 files changed, 16 insertions, 4 deletions
diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index e8557d4a2dc3..a865737d3ec2 100644
--- 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/files/digest-linuxwacom-0.7.2 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.7.2
index 2c595ac612d8..cc889f774754 100644
--- 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 02a1b55cb5c5..73cbe08f2dd4 100644
--- 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() {