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

Package-Manager: portage-2.2_rc46/cvs/Linux i686

7 files changed, 26 insertions, 250 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/Manifest b/x11-drivers/linuxwacom/Manifest
index 32972ad3418a..09747f54448c 100644
--- a/x11-drivers/linuxwacom/Manifest
+++ b/x11-drivers/linuxwacom/Manifest
@@ -1,17 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX check_driver 499 RMD160 298507626fa8bb20df0d5d1404002133ef1e4c41 SHA1 12ae37807a03f36be2c5cc47e444475677b41693 SHA256 45331d948e1d37141a56258510d6ff708092f70181e83348eb66eef005878069
 AUX check_driver.1 750 RMD160 9ebe8e30ce2cb83ca3245ba29d19b06e81181651 SHA1 4d6fba491df26709b821184f9e011568eaaaebde SHA256 67bf1469f122830d9e99cbd8762e61f682c9a831577fde29af8ef1ab0440d024
 AUX linuxwacom-0.8.2-kernel-2.6.29.patch 450 RMD160 bee26069381eef22d4b5c01febe6c90f552ac826 SHA1 43fca4143f002a724bc64a09d45fd9bb589b29a1 SHA256 b695e990b72897a4f56e5f29c3e1a76022b69a99fddd00287d30bf488567f6e9
 AUX linuxwacom-0.8.2-xserver-xorg-input-wacom.udev 7329 RMD160 70f9752e2e0bc162316923b105bf93e0e6c18bb7 SHA1 23712146a2906e69c07ec1fe64ba86124da6b064 SHA256 cf2a86d752a657f8213ba22f0064d2843b10ab1dac7cc94091d65b1165e9950a
 AUX linuxwacom-0.8.3_p6-xf86config.patch 1830 RMD160 b5269aeb9b897c9b9c56f039a80552beb248553e SHA1 07b0c463f0db0fe2d29aa4560bf81b30c3ef1ae1 SHA256 a23380631a38edd1633379a248f5630191aced9a0f19990f4dae8ff97e4d02a4
-DIST linuxwacom-0.8.2-2.tar.bz2 1098067 RMD160 850ef22abf12e21d69e299b55a2114502fb20d49 SHA1 b1fd2bb816bc766cc52c36cf9e93607cd85e511c SHA256 1d3b8dc397510309b14239291781135af0c4fab99907d8e0b8aad95465390733
 DIST linuxwacom-0.8.2.tar.bz2 1092825 RMD160 2485eea1a3f0d5f50de6a3b7286d39b81ad553c4 SHA1 96ba8783b9756bc8ac418c62faafacf28841e212 SHA256 5f3096d7194940ca583be8b63b59bb75001d01f1a4a75c1807c8f01cf697dfb5
-DIST linuxwacom-0.8.3-2.tar.bz2 1147631 RMD160 99b02579a75a129cd5003d95fe229f7c102ec498 SHA1 5b528f7d1d18ea73d8a4983c7778f3d6a5968e7e SHA256 c38300cb5bca30ecdaac829c7a27be94eedb5ab97cc8f56b34d1bb0e64537c04
 DIST linuxwacom-0.8.3-6.tar.bz2 1152871 RMD160 3c08fcee7c4bd2c5bffa0c03218a377bbc2200e5 SHA1 4fce8180f2846d578b7a08f29533485b616802e4 SHA256 d09bafc25757ba12d6e4a1fc90d742f2a841d7e16c440c62fea444ebb1c4c10b
 DIST linuxwacom-0.8.4-1.tar.bz2 1178689 RMD160 83ede914c768cd345198979bcae8ee06366422fd SHA1 771073162da25e1573309a87755df9869516e04c SHA256 e9c3cbc001b9453e6bc92d529c98ae55f79b5d1f386df400070db1105395dabd
-EBUILD linuxwacom-0.8.2.ebuild 3079 RMD160 28ba2d2a247c136eefed1811dbe883a9499ca836 SHA1 61041f4346bc010dcfa8c0fbc79171e4547ab9d3 SHA256 ae1f4d687c914b1efd28b35c14b9ad04e5997de7b0f3c92967e2763167c036f1
-EBUILD linuxwacom-0.8.2_p2.ebuild 3147 RMD160 b1ede86176d68f76a7adc257ad9d7ed9cad15365 SHA1 43d8c65df7da39a44f5459fef06c015d3746041e SHA256 146a354eb605a8167b6a38f9d7575ee88f3174cc304cd028d7aa3af622be9bdb
-EBUILD linuxwacom-0.8.3_p2.ebuild 3203 RMD160 8d85f50bedbb21f075a2f0f87841a353508f973a SHA1 42ab8eb67fe29f7fa7edbbbb66220a37c824d3ed SHA256 1dcfe61330f78c9c08ef097d74e1828a602c2d7e11c4ad5a6c74c2da19f0f04b
-EBUILD linuxwacom-0.8.3_p6.ebuild 3208 RMD160 820cf5d2100741e0b716b7068e912d26c3803d2b SHA1 55753ca04d36aa849ae37413b9703979aead4115 SHA256 ae162c029938fcdd6d478f8f3d399d34fba95e2a3ef2676cff4187b11d798ab6
-EBUILD linuxwacom-0.8.4_p1.ebuild 3201 RMD160 5fc440490c91372edc38274b9ea913df19f7879d SHA1 b3f2f86644fd6088073040d0b258e0f6922ca582 SHA256 16104e188e1fb69b2edb3a0ffd0f62b053de22edad81212145f13e53382fa1f3
-MISC ChangeLog 14547 RMD160 51dd4bf98a07955bc498935ac261b60ed94e7aa0 SHA1 199f5f3e4e86eb0056ab4a1b268d5b952a32ea9f SHA256 70de49abb91f005e2c728c6967ea9a132a18a9b90e242fce7f68891758d1399d
+EBUILD linuxwacom-0.8.2.ebuild 3081 RMD160 f1321500fdca68272e45bdc3c0b1d528b2e081e5 SHA1 7b21e3ae47f15d8ff4b7ad8cec7bd995aa723552 SHA256 8d2a85f39c24b29aad6ffd2f1d3a6d3826714a003d9fd1c5330b6c4243ca67a1
+EBUILD linuxwacom-0.8.3_p6.ebuild 3213 RMD160 040578e722daa5dfb594c510331e16c6e4a9feaf SHA1 26372134740a772290e5266f5b01d8a1891eccf0 SHA256 f03627a6c8242fdc974c241376c6e8f5299e6eb62b420af6b42dec739b0ff61a
+EBUILD linuxwacom-0.8.4_p1.ebuild 3209 RMD160 c40eab63570e9be5b08b5b571809e8472378be95 SHA1 cb41c1dc26858859ffa537fe83eedef90ee5ec9f SHA256 7d306f372e4bb1ec151e0ef189096735cf5a5bc873f7b7efb0e182c46facc45b
+MISC ChangeLog 14816 RMD160 24a98f243465e0abace66dfabe721e3f497f24a2 SHA1 28d4b1b9fb9bf7dc406deacf04be2a8c4972f23a SHA256 7dfc7eeb03f6baf8297685363b292f14b0b4244af890ca6221cb024a5b41353a
 MISC metadata.xml 525 RMD160 380f5e9f0bb342944fab6998a48487c4997fc135 SHA1 4e496236e555ae633d0c528ecac33eb43786bd3a SHA256 0916ff7fc43636f8c1d6c66567f03e0692d99f670abc07f4d2168d2afa70bd8c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkrtnkEACgkQu7rWomwgFXosOACgtSApXfyFpyTY0y6Z57IF/1GZ
+zEEAoKhRDHsNlTldlOjW8Sjc9/ksLgeN
+=u4pC
+-----END PGP SIGNATURE-----
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 )