[gentoo-commits] repo/gentoo:master commit in: x11-misc/xtoolwait/

[David Seifert]

commit:     88fe0b5520d428152ea981237d95421757d05347
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 24 17:40:11 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 24 17:40:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88fe0b55

x11-misc/xtoolwait: Port to EAPI 7

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

 x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index b1878e8d3e4..386962ee976 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
@@ -11,16 +12,17 @@ SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
 	app-text/rman
-	x11-base/xorg-proto
 	x11-misc/imake"
 
-src_prepare() {
+src_configure() {
 	xmkmf || die
 	sed -i \
 		-e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \
@@ -36,11 +38,11 @@ src_compile() {
 
 src_install() {
 	emake \
-		BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		DOCDIR=/usr/share/doc/${PF} \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANPATH="${EPREFIX}"/usr/share/man \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
 		DESTDIR="${D}" \
 		install{,.man}
 
-	dodoc CHANGES README
+	einstalldocs
 }