7 files changed, 58 insertions, 78 deletions
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 518eba4c29fc..8231eb3737d7 100644
--- a/x11-drivers/Manifest.gz
+++ b/x11-drivers/Manifest.gz
diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest
index 223d191819c3..c262eecf45ed 100644
--- a/x11-drivers/xf86-input-vmmouse/Manifest
+++ b/x11-drivers/xf86-input-vmmouse/Manifest
@@ -1,4 +1,6 @@
 DIST xf86-input-vmmouse-13.1.0.tar.bz2 319188 BLAKE2B dddcee47a0d667555ba8a85a4a86c9f922a68ff716f836ac38bb0dbc643011debfbbd2d2054bb8df2f04cc94f2da95cfff7b0ccfb30879e07ca571a9b3aa840a SHA512 38e09c5d7da971eb25ed79fc2daac3b8e1f5e6ec1096424696652c975ea653ed4a49d7779e7735d81a512c12c0a30829d5443ca78a275f3181ebd1740dd2dfd4
-EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 503 BLAKE2B 343e6d9870d8a0eed5a001c144f8fc17d79d23049e94ba625244040a2b86ec2883c7565f80bd0b706acbd175c544845093dbf421cf3e9018fe10bdebf6ff66f8 SHA512 072a5aa6582c19888b884d0f9ae505a1c1ab1f322fd78c86fe8e74127be772fb627a3b5fb4e6037954bbaa59d48beaceb46096be9792cf3df099fc99b4f9ea5d
-EBUILD xf86-input-vmmouse-9999.ebuild 481 BLAKE2B 5582fc0af9618bea03d5acc3c4b6a211e64f2c865798ee834743f9f26b6213be0b34513afb7c647e0593c68d0b4727a73f9ecd301d65158e600578dd45347c9e SHA512 1ca12df2be0239c6540f1863933b397795242e33a31cf4db838ecd5434a7f4721141350c6c58c616828dc0f109abfd9af02f83fa2d0e1e84667a1e75a1555af6
+DIST xf86-input-vmmouse-13.2.0.tar.xz 284684 BLAKE2B a63caa3959b47ee4b43dd4e90e7b68706fc39da2d4018965112218c372b4107cbbcebb19fae8fea05a7c95c86a4a793b414ff6cd49e1391fbce04341b7a9eb9c SHA512 26a01347a679db058abdc7cbd9a363bb4fccd1a727dc18e279d15b8a0dce71f67af5ff54df28b908391da8d2fc311d8c1813f26dcded4e9a2668db7b55ca5687
+EBUILD xf86-input-vmmouse-13.1.0-r1.ebuild 567 BLAKE2B 452739edaf39b5794a4d4eb301d09b033f1dea53b0d2ff6068d6be063983df7dd94d570ff1ea9308024c3694ea356824c94d7c03c7d6a6156e2ae46e56b72a6f SHA512 dc8f159983ef6ae0ba06152a52fedb5ee53608d80b42d48f26edfecc1e1aa6f20edd68702538080c4d309f7a6bdaa399944b86c40aa099ee98315639b628ae61
+EBUILD xf86-input-vmmouse-13.2.0.ebuild 593 BLAKE2B 64a02d4e9db97de1e8f7d819f36ca27bf14aa0a0bfbff291c533d8063dbcd62fe85a86617dab20ab1e1964fc01dc4fa039543261695d144327515cd4654352c2 SHA512 0a028ecb0fa7f3863a46d98fea5dd19fd9728c66dadeb7803e3bb0b2ef50a39d08563fad23fd7ac189c85ac8bdac58ef6b556688ee002a7d98de991528422f5c
+EBUILD xf86-input-vmmouse-9999.ebuild 569 BLAKE2B d10e2679e2991969744610ddce72d11b667496c4c6416e42ffe238d33f3b8f5f8a44f3005f309a78dfd20cab89bddaefd82c8fd8d24d5a69585463905f050fc9 SHA512 d636fae99cfa1e4c2015215bee24188d0f4043a865fe037b7cd416290650fc150a765bc551691bdec98e900d4ea221e4acd57c326123e8ab50ab1695fad0a856
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
index 80e99c12fe76..c531152cd25f 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.1.0-r1.ebuild
@@ -25,3 +25,11 @@ src_install() {
 	xorg-3_src_install
 	rm -r "${ED}"/punt || die
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
new file mode 100644
index 000000000000..401559b5c2d6
--- /dev/null
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
+inherit udev xorg-3
+
+DESCRIPTION="VMWare mouse input driver"
+
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="x11-base/xorg-proto"
+
+src_configure() {
+	local XORG_CONFIGURE_OPTIONS=(
+		--with-hal-bin-dir=/punt
+		--with-hal-callouts-dir=/punt
+		--with-hal-fdi-dir=/punt
+		--with-udev-rules-dir=$(get_udevdir)/rules.d
+	)
+	xorg-3_src_configure
+}
+
+src_install() {
+	xorg-3_src_install
+	rm -r "${ED}"/punt || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
index 061219f805e8..c07006dff553 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
+EAPI=8
+XORG_TARBALL_SUFFIX="xz"
 inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
@@ -23,3 +23,11 @@ src_install() {
 	xorg-3_src_install
 	rm -r "${ED}"/punt || die
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 6ba1e9ddd0a4..da039c149a74 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-input-wacom-0.40.0.tar.bz2 629310 BLAKE2B 63b930d3cd786d825250048fdf368fff4e607a39bfabee44e42a2c3ce9693c44ec8966871759d06b823f0568c4e3c2aee003633b863f5437eedc3125f19dd351 SHA512 ce0a24e2e9b4768e7eb65a5c663b3adce856356da7b83a1367dd7e031525805fc26d0b7c8b176a21fcd949c757940e18fec51d7253da157c0ac43ca446c4e536
 DIST xf86-input-wacom-1.1.0.tar.bz2 645948 BLAKE2B fccc81f49777b10527072bf4b30cb1a510e35d61f30fca96a68d05df55acc91f6c8dc44b2fad5d2b2f3f000646d85b2052841cbc8f933db51b668b1eb3e49dbe SHA512 d4ca8d5ea5e328c6e6b4bdb3d0ca23dee0bdb960e79f4422483d456330f9c88ea7579da4fba192fd250b23d7db1b7f40ad8ef0127f334c580030858edcbb9f4d
-EBUILD xf86-input-wacom-0.40.0.ebuild 1882 BLAKE2B bddb296eb4ea85cbb251e88f3bac83fd14eed98b94d6c57a7ce489e985b418308edc38f53dbf5fc3348efc22696fd0597439d1655b93985afb0abbf80fbf5007 SHA512 91d9d201e7446a55a5302cc3aec95aa19307f5e3edca8350a960416b24fa31d87267e91634e8ac52063369051dea39410513aa9da0863b628b3344682b798fed
 EBUILD xf86-input-wacom-1.1.0.ebuild 1918 BLAKE2B 9e0f2b9438782ff2894d576db4ed7e63b566961436ab49c471ee5658bbc852453b6f3faaa790766e645633438be13776887eac325686fdc3c5e6fea0d3489b3e SHA512 2a991e5afb0860baa6fafaa875cf192fdb936563ba6501cd131c8b20a59dd241ff18355634b8e752668c2c6866cecc433e5e1ebb0a1ca96b49af00ea57d16314
 MISC metadata.xml 337 BLAKE2B 4af5fa6cfa58ef6ecec60cbe9f316cc4adfa0b1eb304d2c1fe4525b916e1c347bd3b9a74c2e79a5bb88649aae92f00b624c619169fc8cb6ac81e359e58c53d2b SHA512 fba2d6d8bbfe90c65794dd1b831c6bad7dcd2b6e67036f46d629f4e85f926409b7fba0e99892ce7a2ce527fd080d5e75467d0ec38fee0ea2f7ecd311c2c49893
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
deleted file mode 100644
index ee39fbabc711..000000000000
--- a/x11-drivers/xf86-input-wacom/xf86-input-wacom-0.40.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
-}