Stable latest on x86 and amd64 (work on my chroots) drop oldest overshadowed version. Use ED not D in src_install.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 31 insertions, 66 deletions

diff --git a/x11-drivers/xf86-input-wacom/ChangeLog b/x11-drivers/xf86-input-wacom/ChangeLog
index 5cb7224cd37d..7095d0e7ae79 100644
--- a/x11-drivers/xf86-input-wacom/ChangeLog
+++ b/x11-drivers/xf86-input-wacom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-input-wacom
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.47 2011/09/01 18:01:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/ChangeLog,v 1.48 2011/09/29 11:45:21 scarabeus Exp $
+
+  29 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xf86-input-wacom-0.10.11.ebuild, xf86-input-wacom-0.11.1.ebuild:
+  Stable latest on x86 and amd64 (work on my chroots) drop oldest overshadowed
+  version. Use ED not D in src_install.
 
 *xf86-input-wacom-0.11.1 (01 Sep 2011)
 
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 14658c58544b..3521264c9e0d 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1,8 +1,26 @@
-DIST xf86-input-wacom-0.10.11.tar.bz2 439013 RMD160 0f0042719759b3271a8772d2640d00eba956bda6 SHA1 c5c971fa455198a4106d81725b589cc662a230bb SHA256 380a0cd533952074c1fcc72d5c4baaa4dc2c8f4164a34181ad0b064180fc9c6d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xf86-input-wacom-0.11.0.tar.bz2 490183 RMD160 7c6768eb058b5bc11bae540985c088c95d2a9247 SHA1 c76be36900c9f634fa63f6a2b340fc6b79d0a2be SHA256 112235476c4ace61da5fddd63ca9d33e083fd75b84a81b4490102aa023f39e61
 DIST xf86-input-wacom-0.11.1.tar.bz2 505180 RMD160 ec282ff0d203ef70008ba43d8485bbca25e24282 SHA1 e8b0ec91a95a13a897d34c6ebe2af564e1ce3cb2 SHA256 9d32f94610f8faae3214227a8e8f050cd3b469b3fe9d60ef9272a884dcccb6ca
-EBUILD xf86-input-wacom-0.10.11.ebuild 1479 RMD160 76d4a82df95928206e53fc0ab87549b3c151182e SHA1 47e3e30914d75e8985a083216a76f41a852088da SHA256 9576d41e4a5f9170129c7c0e1756324b752f0ea23d4e3f082ab1f3c4ba1c2c83
 EBUILD xf86-input-wacom-0.11.0.ebuild 1401 RMD160 40815e954b5ec0b26d616df9906e243173d274b5 SHA1 cead3229cae3b9a501a093087008b32da407bbf0 SHA256 a70a617f7071e91c19edbc8d7420abdbf0dabeebc4b2a9c00ef9220083c708e7
-EBUILD xf86-input-wacom-0.11.1.ebuild 1436 RMD160 246f3904c16b5ea1bf35d871be5d830fc80965a9 SHA1 61a0dfb1b90402148967992f174456c9bf5bbc63 SHA256 6ddc339d2821d477a1c124b2374794c0ea44b2caaedb218f46f104efe534be69
-MISC ChangeLog 7228 RMD160 f9f82afbd527274a74446e502e33f84803fa399d SHA1 74d94b4e19fd4803a88325cd86c47c881daaa257 SHA256 3f24a7ec27214d92a4d49757dcc87c9ea9e2bc4c0f039f9cc98dd0f82cf1ae89
+EBUILD xf86-input-wacom-0.11.1.ebuild 1436 RMD160 300b99d436540f9741a2bca877e128376d3fc8c7 SHA1 a598eeb8f173649cd1bdd025c4e922e33adf6682 SHA256 5229d4dcb043f8b8a8d265bbf9be415d5125487373eb02adbed13c3b3fbb06dd
+MISC ChangeLog 7472 RMD160 420ddbf101477b35fd9baea8979165a86a540589 SHA1 8af1d8bfe8d47b43798604b86ae73a4ed4952b36 SHA256 47648aadc58c637d175ee36b24e2851daa907d4718873519ff172218ae6b9e31
 MISC metadata.xml 365 RMD160 808ca8e60d1314d487519f7cf105148f52f96a36 SHA1 fe0154d304388ec2ff8cb6d58a3d30c10e6a44b8 SHA256 c2c9afd84e3b5dea0662cd9cb186a1efcc9ae1d96fc569bb7504701dd2925714
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOhFooAAoJEOSiRoyO7jvo3X0QAJ4sQgO3XEowEcYuypYJHthY
+qX67loI6ri8/ZLfI/RhjIhr67aqVK2yJ5yF31g3pKaQ49bxuJY7otv4A76wDAQa+
+JTCJQVPAWkv+2l5THBQPqYTddNcj82JURn1Pl4RaW7Vh/ND2669T4MXTsbSEwWPR
+8TvqLte8JvrTFXtU+D9kcNlXhkGdQ/jE+B5V3mA4TKVdjpxLnIaPirqICamPCqkk
+GoT25KG0g/keKuHioCzU/G6B+k95wrhNEvlKl48XUErGwsFClDu5B1Fdjq0L3r8S
+3FgPBS38loGO8rlS6gjH3t2GRUjk5X/XdoCRCiA2Pol6Y67xgbUv6LhWgNi1erEO
+9W98n7SB5de/NXOWRCPOXL6N5YCTow2Ny2+7xDyDoR4llKunO7OpEs2Ra3u82Umy
+DpN2RjY4JhNCoPZ/Kjop2Frmhp+XU4nRK9E87J+UtyT0JckyCe0TBckM0B27FZ0J
+fvYbO96Q4aNVAJBCaiVkwrIcNSW6dGqRetkhwjRdPCuXelTR1beDQAIRdkE1X3H2
+BjMpK58JNpW9jBqRlskqDPBq38IaVLGMMRcelVbDepGZbcCrrqvqBH27WA0E86lC
+ATwJSSGF5kC+JDMjAVFqsL0w0c5exSeQbGIhSB4NWB/oXRzcFUOqEPuwWQlEdIN3
+pQTKfKPwKwceelUDjpYf
+=h09d
+-----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.11.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.11.ebuild
deleted file mode 100644
index 398b38f987b7..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.10.11.ebuild,v 1.4 2011/03/26 10:38:44 fauli Exp $
-
-EAPI=4
-
-inherit linux-info xorg-2
-
-DESCRIPTION="Driver for Wacom tablets and drawing devices"
-HOMEPAGE="http://linuxwacom.sourceforge.net/"
-LICENSE="GPL-2"
-EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug"
-
-RDEPEND="!x11-drivers/linuxwacom
-	>=x11-base/xorg-server-1.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/randrproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	CONFIGURE_OPTIONS="$(use_enable debug)"
-}
-
-src_install() {
-	xorg-2_src_install
-
-	rm -rf "${D}"/usr/share/hal
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-
-	if ! linux_config_exists \
-			|| ! linux_chkconfig_present TABLET_USB_WACOM \
-			|| ! linux_chkconfig_present INPUT_EVDEV; then
-		echo
-		ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
-		ewarn "  Device Drivers --->"
-		ewarn "    Input device support --->"
-		ewarn "      <*>   Event interface"
-		ewarn "      [*]   Tablets  --->"
-		ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
-		echo
-	fi
-}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild
index 75b6fa5bd329..a4c25c91f348 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild,v 1.1 2011/09/01 18:01:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.11.1.ebuild,v 1.2 2011/09/29 11:45:21 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://linuxwacom.git.sourceforge.net/gitroot/linuxwacom/${PN}"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug"
 
 RDEPEND="!x11-drivers/linuxwacom
@@ -36,7 +36,7 @@ pkg_setup() {
 src_install() {
 	xorg-2_src_install
 
-	rm -rf "${D}"/usr/share/hal
+	rm -rf "${ED}"/usr/share/hal
 }
 
 pkg_pretend() {