Require <xorg-server-1.7 (see bug 290730). Also clean up some old ebuilds.

(Portage version: 2.2_rc46/cvs/Linux i686)

6 files changed, 12 insertions, 242 deletions

diff --git a/x11-drivers/linuxwacom/ChangeLog b/x11-drivers/linuxwacom/ChangeLog
index f409fa868ce1..049b2b2393d3 100644
--- a/x11-drivers/linuxwacom/ChangeLog
+++ b/x11-drivers/linuxwacom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/linuxwacom
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.43 2009/10/26 20:50:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/ChangeLog,v 1.44 2009/11/01 14:41:59 ikelos Exp $
+
+  01 Nov 2009; Mike Auty <ikelos@gentoo.org> linuxwacom-0.8.2.ebuild,
+  -linuxwacom-0.8.2_p2.ebuild, -linuxwacom-0.8.3_p2.ebuild,
+  linuxwacom-0.8.3_p6.ebuild, linuxwacom-0.8.4_p1.ebuild:
+  Require <xorg-server-1.7 (see bug 290730). Also clean up some old ebuilds.
 
   26 Oct 2009; Jeroen Roovers <jer@gentoo.org> linuxwacom-0.8.4_p1.ebuild:
   Stable for HPPA (bug #282290).
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild
index 97eeca6b4c4c..a6cce585cc6a 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild,v 1.8 2009/07/21 18:53:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.2.ebuild,v 1.9 2009/11/01 14:41:59 ikelos Exp $
 
 inherit eutils autotools toolchain-funcs linux-mod
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="x11-proto/inputproto
-	x11-base/xorg-server
+	<x11-base/xorg-server-1.7
 	gtk? ( >=x11-libs/gtk+-2 )
 	tcl? ( dev-lang/tcl )
 	tk?  ( dev-lang/tk )
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild
deleted file mode 100644
index 8839e1c80682..000000000000
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.2_p2.ebuild,v 1.4 2009/07/21 18:53:05 ssuominen Exp $
-
-inherit eutils autotools toolchain-funcs linux-mod
-
-DESCRIPTION="Input driver for Wacom tablets and drawing devices"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tar.bz2"
-
-IUSE="gtk tcl tk usb modules"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-RDEPEND="x11-proto/inputproto
-	x11-base/xorg-server
-	gtk? ( >=x11-libs/gtk+-2 )
-	tcl? ( dev-lang/tcl )
-	tk?  ( dev-lang/tk )
-	sys-fs/udev
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )"
-S=${WORKDIR}/${P/_p/-}
-
-MODULE_NAMES="wacom(input:${S}/src:${S}/src)"
-
-wacom_check() {
-	ebegin "Checking for wacom module"
-	linux_chkconfig_module TABLET_USB_WACOM
-	eend $?
-
-	if [[ $? -ne 0 ]] || ! [ -f "/lib/modules/${KV}/kernel/drivers/input/tablet/wacom.ko" ]; then
-		eerror "You need to have your kernel compiled with wacom as a module"
-		eerror "to let linuxwacom overwrite it."
-		eerror "Enable it in the kernel, found at:"
-		eerror
-		eerror " Device Drivers"
-		eerror "    Input device support"
-		eerror "        Tablets"
-		eerror "            <M> Wacom Intuos/Graphire tablet support (USB)"
-		eerror
-		eerror "(in the "USB support" page it is suggested to include also:"
-		eerror "EHCI , OHCI , USB Human Interface Device+HID input layer)"
-		eerror
-		eerror "Then recompile kernel. Otherwise, remove the module USE flag."
-		die "Wacom not compiled in kernel as a module!"
-	fi
-}
-
-pkg_setup() {
-	if use modules; then
-		linux-mod_pkg_setup
-		wacom_check
-		# echo "kernel version is ${KV} , name is ${KV%%-*}"
-	fi
-	ewarn "Versions of linuxwacom >= 0.7.9 require gcc >= 4.2 to compile."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix multilib-strict error for Tcl/Tk library install
-	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
-
-	# Remove warning parameters for gcc < 4, bug 205139
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am
-	fi
-
-	epatch "${FILESDIR}/${PN}-0.8.2-kernel-2.6.29.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	if use modules; then
-		myconf="${myconf} --enable-wacom"
-		myconf="${myconf} --with-kernel=${KV_OUT_DIR}"
-	fi
-
-	econf ${myconf} \
-		$(use_with tcl tcl) \
-		$(use_with tk tk) \
-		--enable-wacomdrv --enable-wacdump \
-		--enable-xsetwacom --enable-dlloader || die "econf failed"
-
-		#$(use_enable quirks quirk-tablet-rescale) \
-
-	unset ARCH
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
-
-	# Inelegant attempt to work around a nasty build system
-	if use modules; then
-		cp "${S}"/src/*/wacom.{o,ko} "${S}"/src/
-		linux-mod_src_install
-	fi
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/${P%_p*}-xserver-xorg-input-wacom.udev 60-wacom.rules
-
-	exeinto /lib/udev/
-	doexe "${FILESDIR}"/check_driver
-	doman "${FILESDIR}"/check_driver.1
-
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p2.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p2.ebuild
deleted file mode 100644
index 503ec646f4c5..000000000000
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.3_p2.ebuild,v 1.4 2009/07/21 18:53:05 ssuominen Exp $
-
-inherit eutils autotools toolchain-funcs linux-mod
-
-DESCRIPTION="Input driver for Wacom tablets and drawing devices"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}.tar.bz2"
-
-IUSE="gtk tcl tk usb modules"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-RDEPEND="x11-proto/inputproto
-	x11-base/xorg-server
-	gtk? ( >=x11-libs/gtk+-2 )
-	tcl? ( dev-lang/tcl )
-	tk?  ( dev-lang/tk )
-	sys-fs/udev
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	usb? ( >=sys-kernel/linux-headers-2.6 )"
-S=${WORKDIR}/${P/_p/-}
-
-MODULE_NAMES="wacom(input:${S}/src:${S}/src)"
-
-wacom_check() {
-	ebegin "Checking for wacom module"
-	linux_chkconfig_module TABLET_USB_WACOM
-	eend $?
-
-	if [[ $? -ne 0 ]] || ! [ -f "/lib/modules/${KV}/kernel/drivers/input/tablet/wacom.ko" ]; then
-		eerror "You need to have your kernel compiled with wacom as a module"
-		eerror "to let linuxwacom overwrite it."
-		eerror "Enable it in the kernel, found at:"
-		eerror
-		eerror " Device Drivers"
-		eerror "    Input device support"
-		eerror "        Tablets"
-		eerror "            <M> Wacom Intuos/Graphire tablet support (USB)"
-		eerror
-		eerror "(in the "USB support" page it is suggested to include also:"
-		eerror "EHCI , OHCI , USB Human Interface Device+HID input layer)"
-		eerror
-		eerror "Then recompile kernel. Otherwise, remove the module USE flag."
-		die "Wacom not compiled in kernel as a module!"
-	fi
-}
-
-pkg_setup() {
-	if use modules; then
-		linux-mod_pkg_setup
-		wacom_check
-		# echo "kernel version is ${KV} , name is ${KV%%-*}"
-	fi
-	ewarn "Versions of linuxwacom >= 0.7.9 require gcc >= 4.2 to compile."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix multilib-strict error for Tcl/Tk library install
-	sed -i -e "s:WCM_EXECDIR/lib:WCM_EXECDIR/$(get_libdir):" configure.in
-
-	# Remove warning parameters for gcc < 4, bug 205139
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		sed -i -e "s:-Wno-variadic-macros::" src/xdrv/Makefile.am
-	fi
-
-	epatch "${FILESDIR}/${PN}-0.8.2-kernel-2.6.29.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	if use modules; then
-		myconf="${myconf} --enable-wacom"
-		myconf="${myconf} --with-kernel=${KV_OUT_DIR}"
-	fi
-
-	econf ${myconf} \
-		$(use_with tcl tcl) \
-		$(use_with tk tk) \
-		--enable-wacomdrv --enable-wacdump \
-		--enable-xsetwacom --enable-dlloader || die "econf failed"
-
-	unset ARCH
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed."
-
-	# Inelegant attempt to work around a nasty build system
-	if use modules; then
-		cp "${S}"/src/*/wacom.{o,ko} "${S}"/src/
-		linux-mod_src_install
-	fi
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/${PN}-0.8.2-xserver-xorg-input-wacom.udev 60-wacom.rules
-
-	exeinto /lib/udev/
-	doexe "${FILESDIR}"/check_driver
-	doman "${FILESDIR}"/check_driver.1
-
-	dohtml -r docs/*
-	dodoc AUTHORS ChangeLog NEWS README
-
-	ewarn "Please remove any HAL .FDI files you may"
-	ewarn "previously have installed fr linuxwacom."
-}
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
index 54220b9b96b9..b64c26f12874 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild,v 1.2 2009/10/22 12:30:47 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.3_p6.ebuild,v 1.3 2009/11/01 14:41:59 ikelos Exp $
 
 inherit eutils autotools toolchain-funcs linux-mod
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 RDEPEND="x11-proto/inputproto
-	x11-base/xorg-server
+	<x11-base/xorg-server-1.7
 	gtk? ( >=x11-libs/gtk+-2 )
 	tcl? ( dev-lang/tcl )
 	tk?  ( dev-lang/tk )
diff --git a/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild b/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild
index 36d8dbef16e0..1ba5471f32d9 100644
--- a/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild
+++ b/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild,v 1.5 2009/10/26 20:50:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/linuxwacom/linuxwacom-0.8.4_p1.ebuild,v 1.6 2009/11/01 14:41:59 ikelos Exp $
 
 inherit eutils autotools toolchain-funcs linux-mod
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
 
 RDEPEND="x11-proto/inputproto
-	x11-base/xorg-server
+	<x11-base/xorg-server-1.7
 	gtk? ( >=x11-libs/gtk+-2 )
 	tcl? ( dev-lang/tcl )
 	tk?  ( dev-lang/tk )