[gentoo-commits] repo/gentoo:master commit in: x11-drivers/xf86-input-vmmouse/

[David Seifert]

commit:     d3e980dfc07df8feaa8a2b40e9570f1eee07e2fe
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 19 22:39:16 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Mar 19 22:39:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e980df

x11-drivers/xf86-input-vmmouse: Port to EAPI 7

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../xf86-input-vmmouse-13.1.0-r1.ebuild               | 19 +++++++++----------
 .../xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild | 19 ++++++++-----------
 2 files changed, 17 insertions(+), 21 deletions(-)

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 5729c0d5e63..2e0a1302968 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
@@ -1,30 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit udev xorg-2
+inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
-IUSE=""
+
 KEYWORDS="amd64 x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
        x11-base/xorg-proto"
 
-pkg_setup() {
-       XORG_CONFIGURE_OPTIONS=(
+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-2_pkg_setup
+       xorg-3_src_configure
 }
 
 src_install() {
-       xorg-2_src_install
-       rm -rf "${ED}"/punt
+       xorg-3_src_install
+       rm -r "${ED}"/punt || die
 }

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 1a242a87847..6e59ab01e3c 100644
--- a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
+++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
@@ -1,30 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit udev xorg-2
+inherit udev xorg-3
 
 DESCRIPTION="VMWare mouse input driver"
-IUSE=""
-KEYWORDS=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
        x11-base/xorg-proto"
 
-pkg_setup() {
-       XORG_CONFIGURE_OPTIONS=(
+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-2_pkg_setup
+       xorg-3_src_configure
 }
 
 src_install() {
-       xorg-2_src_install
-       rm -rf "${ED}"/punt
+       xorg-3_src_install
+       rm -r "${ED}"/punt || die
 }