[patch] Updated diff that actually works

linuxwacom-0.6.2.diff (text/plain), 2.25 KB, created by Torne Wuff on 2004-05-03 10:10:19 UTC

--- /usr/portage/x11-misc/linuxwacom/linuxwacom-0.6.0.ebuild	2004-04-07 22:12:58.000000000 +0100
+++ linuxwacom-0.6.2.ebuild	2004-05-03 17:59:05.377832872 +0100
@@ -8,16 +8,34 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="gtk gtk2 tcltk"
 
-DEPEND="|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 )"
+RDEPEND="|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 )
+		gtk? (
+			gtk2? ( >=x11-libs/gtk+-2 ) : ( =x11-libs/gtk-1.2* )
+		)
+		tcltk? ( dev-lang/tcl dev-lang/tk )
+		sys-libs/ncurses"
+DEPEND="${RDEPEND}
+		sys-devel/libtool
+		dev-util/pkgconfig"
 
 pkg_setup() {
-	if [ ! "`grep sdk /var/db/pkg/x11-base/xfree-[0-9]*/USE`" ]
+	if has_version ">=x11-base/xfree-4.3.0-r6"
 	then
-		eerror "This package builds against the XFree86 SDK, and therefore requires"
-		eerror "that you have emerged xfree with the sdk USE flag enabled."
-		die "Please remerge xfree with the sdk USE flag enabled."
+		if [ ! "`grep sdk /var/db/pkg/x11-base/xfree-[0-9]*/USE`" ]
+		then
+			eerror "This package builds against the XFree86 SDK, and therefore requires"
+			eerror "that you have emerged xfree with the sdk USE flag enabled."
+			die "Please remerge xfree with the sdk USE flag enabled."
+		fi
+	else
+		if [ ! "`grep sdk /var/db/pkg/x11-base/xorg-x11-[0-9]*/USE`" ]
+		then
+			eerror "This package builds against the X.Org SDK, and therefore requires"
+			eerror "that you have emerged xorg-x11 with the sdk USE flag enabled."
+			die "Please remerge xorg-x11 with the sdk USE flag enabled."
+		fi
 	fi
 }
 
@@ -31,8 +49,25 @@
 }
 
 src_compile() {
-	myconf="--enable-wacomdrv --enable-wacomdrvv3 --with-xf86=/usr/X11R6/lib/Server \
-		--with-xf86v3=/usr/X11R6/lib/Server"
+	if [ `use gtk` ];
+	then
+		if [ `use gtk2` ];
+		then
+			withgtk="--with-gtk=2.0"
+		else
+			withgtk="--with-gtk=1.2"
+		fi
+	else
+		withgtk="--with-gtk=no"
+	fi
+	if [ `use tcltk` ];
+	then
+	  withtcltk="--with-tcl --with-tk"
+	else
+	  withtcltk="--without-tcl --without-tk"
+	fi
+
+	myconf="--enable-wacomdrv --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk"
 	econf ${myconf} || die "configure failed."
 
 	# Makefile fix for build against SDK
@@ -48,4 +83,6 @@
 
 src_install() {
 	emake DESTDIR=${D} install || die "Install failed."
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
 }