[gentoo-commits] repo/gentoo:master commit in: dev-util/cutils/

[gentoo-commits] repo/gentoo:master commit in: dev-util/cutils/

[David Seifert]

commit:     19d9eeadebfed5c85d23ef8f9d47c6592d6ce8e8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 19:11:25 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 19:11:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19d9eead

dev-util/cutils: Port to EAPI 7

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

 dev-util/cutils/cutils-1.6-r4.ebuild | 42 ++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/dev-util/cutils/cutils-1.6-r4.ebuild b/dev-util/cutils/cutils-1.6-r4.ebuild
index 8f333cb5c84..0f4268c780b 100644
--- a/dev-util/cutils/cutils-1.6-r4.ebuild
+++ b/dev-util/cutils/cutils-1.6-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="C language utilities"
 HOMEPAGE="http://www.sigala.it/sandro/software.php#cutils"
@@ -12,38 +12,42 @@ SRC_URI="http://www.sigala.it/sandro/files/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-RDEPEND=""
-DEPEND="sys-devel/flex"
+BDEPEND="sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-infopage.patch
+	"${FILESDIR}"/${P}-case-insensitive.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-infopage.patch
+	default
+
+	mv src/cdecl/{,cutils-}cdecl.1 || die
 
-	epatch "${FILESDIR}"/${P}-case-insensitive.patch
+	# delete pointless README
+	rm README.compile || die
 
-	mv "${S}"/src/cdecl/cdecl.1 			\
-		"${S}"/src/cdecl/cutils-cdecl.1 || die
 	# Force rebuild of cutils.info
-	rm -f "${S}"/doc/cutils.info || die
+	rm doc/cutils.info || die
 
 	sed -e "s/cdecl/cutils-cdecl/g"	\
-		-i "${S}"/doc/cutils.texi || die
+		-i doc/cutils.texi || die
 	sed -e "/PROG/s/cdecl/cutils-cdecl/" \
-		-i "${S}"/src/cdecl/Makefile.in || die
+		-i src/cdecl/Makefile.in || die
 	sed -e "/Xr/s/cdecl/cutils-cdecl/" \
-		-i "${S}"/src/cundecl/cundecl.1 || die
-	sed -i "/Nm/s/cdecl/cutils-cdecl/" \
-		"${S}"/src/cdecl/cutils-cdecl.1 || die
+		-i src/cundecl/cundecl.1 || die
+	sed -e "/Nm/s/cdecl/cutils-cdecl/" \
+		-i src/cdecl/cutils-cdecl.1 || die
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" -j1
 }
 
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc CREDITS HISTORY NEWS README
+src_install() {
+	default
+	dodoc HISTORY
 }
 
 pkg_postinst () {