From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 29 Feb 2020 18:01:47 +0000
Subject: gentoo (leap year) resync : 29.02.2020

---
 dev-util/cutils/Manifest             |  2 +-
 dev-util/cutils/cutils-1.6-r4.ebuild | 44 ++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'dev-util/cutils')

diff --git a/dev-util/cutils/Manifest b/dev-util/cutils/Manifest
index 37c0d6abe890..a769bb790110 100644
--- a/dev-util/cutils/Manifest
+++ b/dev-util/cutils/Manifest
@@ -1,5 +1,5 @@
 AUX cutils-1.6-case-insensitive.patch 312 BLAKE2B 58b98dc60606dd5ad0992a233c768fc26fb7aa0edd5f8ed6af392a8c1c47a30a60303736de1dfa4fdcfdd8a989132cd7c59eb48011c84cd7fba88398a8c32c3a SHA512 d2eb81f3fece124cf0bad215f19bcaf805ee006dd673f39c3f7eae92904fbeafc77bc1fae6bc0e5f70613180ca29e015145654cfc5dab2ea75cdeb08d636335e
 AUX cutils-infopage.patch 458 BLAKE2B 444ed84a751a5fbb0179d6ffdba3445af20ba45120c2964fb47531060fc01fcde4a40b0635b5b76e8f54a52b696414d996614eac8814e18919e9507b865cbdb1 SHA512 53fbcaec4fdaf1b7804752f952f6fa2f8715601be2ce5185557c2a1378504b7158c398f59e674eed9fc30e95e51157ce8c4c8f71e9a08c63daf97efd7210eba6
 DIST cutils-1.6.tar.gz 128722 BLAKE2B a3589660c188ae4459911e73686e4322d190964fc40f802a5d1a8932c2cf1ea0b989f1f9a3f76845757e90e850b376cc8b019ddaf995b6e1648b2912cf9d531b SHA512 49a0f6ed210be01eec335903dee7ac6000bfa9d9c05a31b9a9fd6ae8534c8058d774f884d55b2b9fa029abc30beeca1866d8a74389b76158ebb216fb3dfad6eb
-EBUILD cutils-1.6-r4.ebuild 1251 BLAKE2B e5533fe9d2f83dfb96fe3124fe4f631d73630cf139e1ee8ce966486faa569b6c70804957bcbae2e6187f50a206297e9f580dc9edfcb8ef844cd5fb9ffae832a2 SHA512 ccfde76e2884a85680e59d79878f3bf26ddfe01ad7f243b634c84e964f62e223674effbe00ed95b13494deb83af79e8c62d4a793d9c00a0ce07fb102b6465da7
+EBUILD cutils-1.6-r4.ebuild 1171 BLAKE2B bcaba40b8c8772509c9ac39ed71205d3f391de3d832ecc85f6f7d4eee14d555dcedb2af6ac2839cd16610d2604a7eb6b071ca8eea2a2974e37e376ca9a5de058 SHA512 8d43adf257a94faed728367bcd6a5d0367d8c8fa0444dd7de1a197b4cfc05ae081c034e5341c22ff83d0e25e315243e3dd84d39540443bb09c531d7a64eeac0d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cutils/cutils-1.6-r4.ebuild b/dev-util/cutils/cutils-1.6-r4.ebuild
index 8f333cb5c84e..a7b7e983a7b2 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,41 +12,45 @@ 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 () {
+pkg_postinst() {
 	elog "cdecl was installed as cutils-cdecl because of a naming conflict"
 	elog "with dev-util/cdecl."
 }
-- 
cgit v1.2.3