summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-04-14 22:24:36 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-04-14 22:24:36 +0000
commit18cb8d62e8d0c6443952f74474fc4191209a01ca (patch)
tree2b04753b49772598e788ab55a034f72da78676d9 /x11-misc
parentStable on ia64, bug 87517. (diff)
downloadgentoo-2-18cb8d62e8d0c6443952f74474fc4191209a01ca.tar.gz
gentoo-2-18cb8d62e8d0c6443952f74474fc4191209a01ca.tar.bz2
gentoo-2-18cb8d62e8d0c6443952f74474fc4191209a01ca.zip
--enable-xserver64 on amd64.
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/linuxwacom/ChangeLog6
-rw-r--r--x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild30
2 files changed, 21 insertions, 15 deletions
diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index e8e2fac02202..423d5da57cce 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/linuxwacom
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.23 2005/02/21 22:10:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.24 2005/04/14 22:24:36 eradicator Exp $
+
+ 14 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ linuxwacom-0.6.6.ebuild:
+ --enable-xserver64 on amd64.
08 Feb 2005; Bryan Stine <battousai@gentoo.org> -linuxwacom-0.6.2.ebuild,
linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild:
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
index d99583b74017..4bf15c094829 100644
--- a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.5 2005/02/21 22:10:09 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.6 2005/04/14 22:24:36 eradicator Exp $
IUSE="gtk gtk2 tcltk sdk"
@@ -86,26 +86,28 @@ src_unpack() {
}
src_compile() {
- if use gtk;
- then
- if use gtk2;
- then
- withgtk="--with-gtk=2.0"
+ if use gtk; then
+ if use gtk2; then
+ myconf="${myconf} --with-gtk=2.0"
else
- withgtk="--with-gtk=1.2"
+ myconf="${myconf} --with-gtk=1.2"
fi
else
- withgtk="--with-gtk=no"
+ myconf="${myconf} --with-gtk=no"
fi
- if use tcltk;
- then
- withtcltk="--with-tcl --with-tk"
+
+ if use tcltk ; then
+ myconf="${myconf} --with-tcl --with-tk"
else
- withtcltk="--without-tcl --without-tk"
+ myconf="${myconf} --without-tcl --without-tk"
+ fi
+
+ if use amd64 ; then
+ myconf="${myconf} --enable-xserver64"
fi
if use sdk; then
- myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk"
+ myconf="${myconf} --enable-wacomdrv --enable-wacdump --enable-xsetwacom"
if [ -f "/usr/$(get_libdir)/Server/include/xf86Version.h" ]; then
myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server"
else
@@ -118,7 +120,7 @@ src_compile() {
cd ${S}/src
sed -i -e "s:/include/extensions:/include:g" Makefile
else
- myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk"
+ myconf="${myconf} --disable-wacomdrv --enable-wacdump --enable-xsetwacom"
econf ${myconf} || die "configure failed."
fi
cd ${S}