linuxwacom removed gtk1 and re-added multilib-strict-fix

Package-Manager: portage-2.1.1_rc1-r1

3 files changed, 27 insertions, 27 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index 5d84223b7a12..a8b20bc1e702 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/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-drivers/linuxwacom/ChangeLog,v 1.1 2006/08/26 02:48:41 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.2 2006/08/28 17:58:05 hanno Exp $
+
+  28 Aug 2006; Hanno Boeck <hanno@gentoo.org> linuxwacom-0.7.4_p3.ebuild:
+  Remove gtk1 and fix multilib.
 
   02 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
   linuxwacom-0.6.7.ebuild, linuxwacom-0.6.8.ebuild, linuxwacom-0.6.9.ebuild,
diff --git a/x11-drivers/linuxwacom/Manifest b/x11-drivers/linuxwacom/Manifest
index b63bbf28455b..1e4bdcaa739d 100644
--- a/x11-drivers/linuxwacom/Manifest
+++ b/x11-drivers/linuxwacom/Manifest
@@ -15,14 +15,14 @@ EBUILD linuxwacom-0.7.2.ebuild 3862 RMD160 37b60b2b4665426ceb7bebe0afb141ccb294f
 MD5 71d69f15c7622626408d748442e48982 linuxwacom-0.7.2.ebuild 3862
 RMD160 37b60b2b4665426ceb7bebe0afb141ccb294f276 linuxwacom-0.7.2.ebuild 3862
 SHA256 54aa0395d10311ce0b888ec8408bb6934d4d5bcf70aed3eaf1f7fcb3dadddeda linuxwacom-0.7.2.ebuild 3862
-EBUILD linuxwacom-0.7.4_p3.ebuild 1436 RMD160 72b742c2d290a34dd826968bd978ee80c0a3e1ff SHA1 167a6642e54ca55bde48ecb042bec2b898f4c01d SHA256 11e75956798505eee7451ddd19ec7e01626e6683bb02ca674e01b01f5220f1e8
-MD5 fd2279d3fae826e6c2dee7a901c1b9be linuxwacom-0.7.4_p3.ebuild 1436
-RMD160 72b742c2d290a34dd826968bd978ee80c0a3e1ff linuxwacom-0.7.4_p3.ebuild 1436
-SHA256 11e75956798505eee7451ddd19ec7e01626e6683bb02ca674e01b01f5220f1e8 linuxwacom-0.7.4_p3.ebuild 1436
-MISC ChangeLog 7689 RMD160 7e9fe90ca44bf0306e0664daeadf06d552ccdcc7 SHA1 1ff9e9242e4b59dea2c7d291980da60f5ddb50ff SHA256 ea96723dd09fa094c1f55c23420ab2914ed31450fab62f00d930869683e5fa8a
-MD5 d9df666495efa3b65d84fc82891b017e ChangeLog 7689
-RMD160 7e9fe90ca44bf0306e0664daeadf06d552ccdcc7 ChangeLog 7689
-SHA256 ea96723dd09fa094c1f55c23420ab2914ed31450fab62f00d930869683e5fa8a ChangeLog 7689
+EBUILD linuxwacom-0.7.4_p3.ebuild 1429 RMD160 a2ff81307d970436e41fb7908066780af5633ec6 SHA1 1ef92e9e4f23f105d2ef3eceebdd36dca1835d8d SHA256 5bf174cf4dd0a5b8f75479a4669b4479c3466a0f6d58dce3e844684172327971
+MD5 5ed40f0ca1a08644e09e56d0d5065457 linuxwacom-0.7.4_p3.ebuild 1429
+RMD160 a2ff81307d970436e41fb7908066780af5633ec6 linuxwacom-0.7.4_p3.ebuild 1429
+SHA256 5bf174cf4dd0a5b8f75479a4669b4479c3466a0f6d58dce3e844684172327971 linuxwacom-0.7.4_p3.ebuild 1429
+MISC ChangeLog 7796 RMD160 cb589502f92398fa45755843e8466b243ce2ca60 SHA1 7585b166c024031692217db7dd2cff79c665f5a0 SHA256 7d021a702c56785c81eaac3a71048408814d2d28709336f1988ed0d8439a8d3e
+MD5 d54345fe6b86507a9a212c8bdb67b56e ChangeLog 7796
+RMD160 cb589502f92398fa45755843e8466b243ce2ca60 ChangeLog 7796
+SHA256 7d021a702c56785c81eaac3a71048408814d2d28709336f1988ed0d8439a8d3e ChangeLog 7796
 MISC metadata.xml 268 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b SHA1 accbac976c7847c397f73b97e89582008d47b5f9 SHA256 437b6b7b25a842130a8a726afd95106b0e7c3a6939015d880ef8038a7a6d4e3d
 MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
 RMD160 3152329e942d732ece1c03d9e633a92a1012a97b metadata.xml 268
@@ -36,7 +36,7 @@ SHA256 f0ba1bee14a249725abc3316adc7bc023b572afb76447d0cdfe239514974fd1e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE77rvr2QksT29OyARAtvdAKCMsvbk+6qeCJQUu5yScLEx2DEBEwCfbXL6
-ohw7u6uWIKiazVZ/Y2OPNlg=
-=6C+Z
+iD8DBQFE8y7Jr2QksT29OyARAgI3AKCT1nvrwV2sMwkjOzXuMcqlnIHlNACfYnlU
+mih8A0WsJileTIYDhFUEERQ=
+=6koZ
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
index 3ec06fa73cfd..cf8e9aee13ad 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.1 2006/08/26 03:03:59 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild,v 1.2 2006/08/28 17:58:05 hanno Exp $
 
-IUSE="gtk gtk2 tcltk usb"
+IUSE="gtk tcltk usb"
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Input driver for Wacom tablets and drawing devices"
 HOMEPAGE="http://linuxwacom.sourceforge.net/"
@@ -17,17 +17,13 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 RDEPEND="|| ( ( x11-proto/inputproto
 		x11-base/xorg-server )
 	      virtual/x11 )
-	gtk? (
-		gtk2? ( >=x11-libs/gtk+-2 )
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-	)
+	gtk? ( >=x11-libs/gtk+-2 )
 	tcltk? ( dev-lang/tcl dev-lang/tk )
 	sys-libs/ncurses"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )
-	>=sys-apps/sed-4"
+	usb? ( >=sys-kernel/linux-headers-2.6 )"
 S=${WORKDIR}/${P/_p/-}
 
 
@@ -35,17 +31,18 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/linuxwacom-xorg71.diff
+
+	# Fix multilib-strict error for Tcl/Tk library install
+	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
+
+	eautoreconf
 }
 
 src_compile() {
 	if use gtk; then
-		if use gtk2; then
-			myconf="${myconf} --with-gtk=2.0"
-		else
-			myconf="${myconf} --with-gtk=1.2"
-		fi
+		myconf="--with-gtk=2.0"
 	else
-		myconf="${myconf} --with-gtk=no"
+		myconf="--with-gtk=no"
 	fi
 
 	econf ${myconf} \