diff options
Diffstat (limited to 'x11-misc/linuxwacom')
| -rw-r--r-- | x11-misc/linuxwacom/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-misc/linuxwacom/files/digest-linuxwacom-0.6.0 | 1 | ||||
| -rw-r--r-- | x11-misc/linuxwacom/linuxwacom-0.6.0.ebuild | 51 | ||||
| -rw-r--r-- | x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild | 67 | ||||
| -rw-r--r-- | x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild | 67 |
5 files changed, 89 insertions, 107 deletions
diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog index d5975e9762e6..8f8c90d1ae82 100644 --- a/x11-misc/linuxwacom/ChangeLog +++ b/x11-misc/linuxwacom/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-misc/linuxwacom # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.8 2004/06/06 20:17:30 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.9 2004/06/10 03:47:34 battousai Exp $ + + 09 Jun 2004; Bryan Stine <battousai@gentoo.org>; linuxwacom-0.6.0.ebuild, + linuxwacom-0.6.2.ebuild, linuxwacom-0.6.3.ebuild: + Added support for USE=sdk flag. When enabled, it will build the X drivers as + it normally did before. When disabled, it will build only the userland tools. + This makes the package more flexible for those who wish to keep the stock X + driver. Thanks to Scott W. Taylor <swtaylor@gentoo.org> for this concept and + related code. Furthermore, linuxwacom-0.6.0 has been clean out. *linuxwacom-0.6.3 (06 Jun 2004) diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.0 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.0 deleted file mode 100644 index 2144251c80e7..000000000000 --- a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 aa34b8968bdab8305511d74244246e9c linuxwacom-0.6.0.tar.bz2 431010 diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.0.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.0.ebuild deleted file mode 100644 index d8cafd4cbafc..000000000000 --- a/x11-misc/linuxwacom/linuxwacom-0.6.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.0.ebuild,v 1.3 2004/04/07 21:02:01 spyderous Exp $ - -DESCRIPTION="Input driver for Wacom tablets and drawing devices" -HOMEPAGE="http://linuxwacom.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND="|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 )" - -pkg_setup() { - 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 -} - -src_unpack() { - unpack ${A} - - # Simple fixes to configure to check the actual location of the XFree86 SDK - cd ${S} - sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure - sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure -} - -src_compile() { - myconf="--enable-wacomdrv --enable-wacomdrvv3 --with-xf86=/usr/X11R6/lib/Server \ - --with-xf86v3=/usr/X11R6/lib/Server" - econf ${myconf} || die "configure failed." - - # Makefile fix for build against SDK - cd ${S}/src - cp Makefile Makefile.orig - sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile - sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile - sed -i -e "s:/include/extensions:/include:g" Makefile - cd ${S} - - emake || die "build failed." -} - -src_install() { - emake DESTDIR=${D} install || die "Install failed." -} diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild index e1f47028fd50..1711267c867f 100644 --- a/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild +++ b/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild,v 1.4 2004/05/10 22:04:37 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.2.ebuild,v 1.5 2004/06/10 03:47:34 battousai Exp $ DESCRIPTION="Input driver for Wacom tablets and drawing devices" HOMEPAGE="http://linuxwacom.sourceforge.net/" @@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" -IUSE="gtk gtk2 tcltk" +IUSE="gtk gtk2 tcltk sdk" RDEPEND="|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 ) gtk? ( @@ -23,31 +23,40 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { - if has_version ">=x11-base/xfree-4.3.0-r6" - then - if [ ! "`grep sdk /var/db/pkg/x11-base/xfree-[0-9]*/USE`" ] + if use sdk; then + 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 + einfo "Building against the X11 SDK. This will install updated X drivers and userland tools." 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 + ewarn "The 'sdk' use flag is not set. Only building userland tools. If you wish to install" + ewarn "the updated external driver for your X server, please remerge your X11 package with" + ewarn "the USE=sdk flag enabled." fi } src_unpack() { unpack ${A} - # Simple fixes to configure to check the actual location of the XFree86 SDK - cd ${S} - sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure - sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure + if use sdk; then + # Simple fixes to configure to check the actual location of the XFree86 SDK + # No need to check if just building userland tools + cd ${S} + sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure + sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure + fi } src_compile() { @@ -69,17 +78,21 @@ src_compile() { withtcltk="--without-tcl --without-tk" fi - myconf="--enable-wacomdrv --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk" - econf ${myconf} || die "configure failed." + if use sdk; then + myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk" + econf ${myconf} || die "configure failed." - # Makefile fix for build against SDK - cd ${S}/src - cp Makefile Makefile.orig - sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile - sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile - sed -i -e "s:/include/extensions:/include:g" Makefile + # Makefile fix for build against SDK + cd ${S}/src + cp Makefile Makefile.orig + sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile + sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile + sed -i -e "s:/include/extensions:/include:g" Makefile + else + myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk" + econf ${myconf} || die "configure failed." + fi cd ${S} - emake || die "build failed." } diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild index f345676e18e4..c27f60281132 100644 --- a/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild +++ b/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild,v 1.1 2004/06/06 20:17:30 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.3.ebuild,v 1.2 2004/06/10 03:47:34 battousai Exp $ DESCRIPTION="Input driver for Wacom tablets and drawing devices" HOMEPAGE="http://linuxwacom.sourceforge.net/" @@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86" -IUSE="gtk gtk2 tcltk" +IUSE="gtk gtk2 tcltk sdk" RDEPEND="|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 ) gtk? ( @@ -23,31 +23,40 @@ DEPEND="${RDEPEND} dev-util/pkgconfig" pkg_setup() { - if has_version ">=x11-base/xfree-4.3.0-r6" - then - if [ ! "`grep sdk /var/db/pkg/x11-base/xfree-[0-9]*/USE`" ] + if use sdk; then + 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 + einfo "Building against the X11 SDK. This will install updated X drivers and userland tools." 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 + ewarn "The 'sdk' use flag is not set. Only building userland tools. If you wish to install" + ewarn "the updated external driver for your X server, please remerge your X11 package with" + ewarn "the USE=sdk flag enabled." fi } src_unpack() { unpack ${A} - # Simple fixes to configure to check the actual location of the XFree86 SDK - cd ${S} - sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure - sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure + if use sdk; then + # Simple fixes to configure to check the actual location of the XFree86 SDK + # No need to check if just building userland tools + cd ${S} + sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure + sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure + fi } src_compile() { @@ -69,17 +78,21 @@ src_compile() { withtcltk="--without-tcl --without-tk" fi - myconf="--enable-wacomdrv --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk" - econf ${myconf} || die "configure failed." + if use sdk; then + myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/lib/Server $withgtk $withtcltk" + econf ${myconf} || die "configure failed." - # Makefile fix for build against SDK - cd ${S}/src - cp Makefile Makefile.orig - sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile - sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile - sed -i -e "s:/include/extensions:/include:g" Makefile + # Makefile fix for build against SDK + cd ${S}/src + cp Makefile Makefile.orig + sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/lib/Server:" Makefile + sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/lib/Server:" Makefile + sed -i -e "s:/include/extensions:/include:g" Makefile + else + myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk" + econf ${myconf} || die "configure failed." + fi cd ${S} - emake || die "build failed." } |