gentoo resync : 31.05.2021

3 files changed, 2 insertions, 75 deletions

diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 8493a85ee05e..44f48d8f76ad 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-wacom-0.39.0.tar.bz2 622440 BLAKE2B c0a76c36e03bc4153ac62fa61dc5a588588f5d4dfff0bc0710ef20cc4be9cb80e4fd972d1edc734a18155926c77c8a205e5a55e0e223dc2af96a193da1bdbcb3 SHA512 9ad92c86c4ba3587d68e2107057c89dfe8628c0a2ec882f5a424ab4983c18ff6048489d7f6d3a8de87403744f74de1982de25327fc955bb5c21346a242e0aaa3
 DIST xf86-input-wacom-0.40.0.tar.bz2 629310 BLAKE2B 63b930d3cd786d825250048fdf368fff4e607a39bfabee44e42a2c3ce9693c44ec8966871759d06b823f0568c4e3c2aee003633b863f5437eedc3125f19dd351 SHA512 ce0a24e2e9b4768e7eb65a5c663b3adce856356da7b83a1367dd7e031525805fc26d0b7c8b176a21fcd949c757940e18fec51d7253da157c0ac43ca446c4e536
-EBUILD xf86-input-wacom-0.39.0.ebuild 1882 BLAKE2B bddb296eb4ea85cbb251e88f3bac83fd14eed98b94d6c57a7ce489e985b418308edc38f53dbf5fc3348efc22696fd0597439d1655b93985afb0abbf80fbf5007 SHA512 91d9d201e7446a55a5302cc3aec95aa19307f5e3edca8350a960416b24fa31d87267e91634e8ac52063369051dea39410513aa9da0863b628b3344682b798fed
-EBUILD xf86-input-wacom-0.40.0.ebuild 1888 BLAKE2B acbbdd0fdb0cf5aa1b43a6e11c8056a2fb15c3ebcdb8b8d437496d842f01a8821f5b61b317b61783c8fd73ec5c77e90edad2cc1db4820e45bbdbd876c3067da8 SHA512 3a8bdb00e0b0620e7c5a132db7248a574a0c61daca703303d70a0c224d2d6bc4de9822142da633f798328f1a805dc1d2ca1418ed618908f1f362ebbd80cc04dc
+EBUILD xf86-input-wacom-0.40.0.ebuild 1882 BLAKE2B bddb296eb4ea85cbb251e88f3bac83fd14eed98b94d6c57a7ce489e985b418308edc38f53dbf5fc3348efc22696fd0597439d1655b93985afb0abbf80fbf5007 SHA512 91d9d201e7446a55a5302cc3aec95aa19307f5e3edca8350a960416b24fa31d87267e91634e8ac52063369051dea39410513aa9da0863b628b3344682b798fed
 MISC metadata.xml 336 BLAKE2B 695ad5dc8eb6e6aa5d1dd2d6c462e077ca1aede7a309de0a9b13744299e4894514f6f83d42e39457751fd42dd7408a496d6ba6533387ebc130cab3ee21ce7405 SHA512 780490741b739aff3ba3d1a4fe1861c3b198196dd3a1ce471d5637d2c2b2a19b2aadda8103defd41a010b70bb5dad1fc00a78552c1b0ea8fab280423259fb360
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.39.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.39.0.ebuild
deleted file mode 100644
index ee39fbabc711..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.39.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd udev xorg-3
-
-DESCRIPTION="Driver for Wacom tablets and drawing devices"
-HOMEPAGE="https://linuxwacom.github.io/"
-LICENSE="GPL-2"
-EGIT_REPO_URI="https://github.com/linuxwacom/xf86-input-wacom"
-[[ ${PV} != 9999* ]] && \
-	SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libwacom
-	virtual/libudev:=
-	>=x11-base/xorg-server-1.7
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXinerama"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-pkg_pretend() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 3 17; then
-		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
-	else
-		if ! linux_config_exists \
-				|| ! linux_chkconfig_present HID_WACOM; then
-			echo
-			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
-			ewarn "  Device Drivers --->"
-			ewarn "    HID support  --->"
-			ewarn "      Special HID drivers  --->"
-			ewarn "        <*> Wacom Intuos/Graphire tablet support (USB)"
-			echo
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="$(get_udevdir)/rules.d"
-		$(use_enable debug)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.40.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.40.0.ebuild
index 979b98494b56..ee39fbabc711 100644
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.40.0.ebuild
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.40.0.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/linuxwacom/xf86-input-wacom"
 [[ ${PV} != 9999* ]] && \
 	SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="debug"
 
 RDEPEND="dev-libs/libwacom