diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2006-08-28 17:58:05 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2006-08-28 17:58:05 +0000 |
| commit | 28b6a0234ba82791520e861330ff4ee26a369b47 (patch) | |
| tree | 215779a7b83a0ccfaeebdcc87e1e34460af74dcb /x11-drivers | |
| parent | Stable for HPPA (bug #141077). (diff) | |
| download | gentoo-2-28b6a0234ba82791520e861330ff4ee26a369b47.tar.gz gentoo-2-28b6a0234ba82791520e861330ff4ee26a369b47.tar.bz2 gentoo-2-28b6a0234ba82791520e861330ff4ee26a369b47.zip | |
linuxwacom removed gtk1 and re-added multilib-strict-fix
(Portage version: 2.1.1_rc1-r1)
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/linuxwacom/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-drivers/linuxwacom/linuxwacom-0.7.4_p3.ebuild | 27 |
2 files changed, 16 insertions, 16 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/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} \ |