From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 10 Nov 2019 13:21:36 +0000
Subject: gentoo resync : 10.11.2019

---
 sys-cluster/c3/Manifest        |  2 +-
 sys-cluster/c3/c3-4.0.1.ebuild | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'sys-cluster/c3')

diff --git a/sys-cluster/c3/Manifest b/sys-cluster/c3/Manifest
index 1e5a2e21d45c..5c2b4bde98ac 100644
--- a/sys-cluster/c3/Manifest
+++ b/sys-cluster/c3/Manifest
@@ -1,3 +1,3 @@
 DIST c3-4.0.1.tar.gz 55142 BLAKE2B 33cd81cebb28e3b50ca1863d58343192eb161a92357a56365c207d2ee2a019348d2292c0900433a409980274666ed20f49a19f6b60ba42fa8796a673becefa9d SHA512 a8ace5605709dd713f1686f3e13cd635d0d38224c835b43d0a02f255ddbd77fb9bbd4bbc0a1fac2d08a84bea2e98215264681381d9e9113ae737cc3a23a8dc89
-EBUILD c3-4.0.1.ebuild 1403 BLAKE2B 678ee7ffe2b3b9fe56f732353c51db38f68ac9ffc2950f7ca61953b1f9d0a2e432e37e27b82c28a3e1700270adf4ea60f938011f1ab40ee2da3612fd1ed6de69 SHA512 61605685c88bd90b3db08e272c1fc365bd16e1bae594a2dbf2cbb4c8ae28e1272b8982c8e5859e2ab371e7ff3231cd223ac3b677b1bdf1cd550e024e2e1da6da
+EBUILD c3-4.0.1.ebuild 1352 BLAKE2B 0a6968ef94e26c8c4e7af5815e5082e4f4d5c00ae098f974833e71b81dd4c5176aee1655ab6c5e22c9ae0270a358251ac5f0ae916ff68a0fc0e0bcdef22fa8cc SHA512 10345aefac3377e13f1b435d19fe3a72d77b4298922906968a027dbf87c836217ae452e30992691235a84ef941be035d8f2a660a890c39351e77f9d8d2a9badb
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-cluster/c3/c3-4.0.1.ebuild b/sys-cluster/c3/c3-4.0.1.ebuild
index 0e7edf290744..3231f0b251b3 100644
--- a/sys-cluster/c3/c3-4.0.1.ebuild
+++ b/sys-cluster/c3/c3-4.0.1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="The Cluster Command and Control (C3) tool suite"
 HOMEPAGE="http://www.csm.ornl.gov/torc/C3/"
 SRC_URI="http://www.csm.ornl.gov/torc/C3/Software/${PV}/${P}.tar.gz"
+
 LICENSE="C3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
 # Everything it needs is in "system" (profiles/base/packages)
 DEPEND=""
 
@@ -31,13 +33,13 @@ src_install() {
 	exeinto ${C3DIR}
 	# Everything's in the same dir, so we need to weed out non-tool things
 	local TOOL
-	for TOOL in $(find ${S} -maxdepth 1 -type f -name 'c*' -not -name '*.*'); do
+	for TOOL in $(find . -maxdepth 1 -type f -name 'c*' -not -name '*.*'); do
 		doexe ${TOOL}
 	done
 	# Get systemimager-using tool out of bin, since systemimager isn't in
 	# portage
 	dodoc ${D}/${C3DIR}/cpushimage
-	rm ${D}/${C3DIR}/cpushimage
+	rm ${D}/${C3DIR}/cpushimage || die
 
 	dodoc README README.scale CHANGELOG KNOWN_BUGS
 	docinto contrib
@@ -45,10 +47,10 @@ src_install() {
 
 	doman man/man*/*
 
-	# Create env.d file
-	echo "PATH=${C3DIR}" > ${T}/40${PN}
-	echo "ROOTPATH=${C3DIR}" >> ${T}/40${PN}
-	doenvd ${T}/40${PN}
+	newenvd - 40${PN} <<-EOF
+		PATH=${C3DIR}
+		ROOTPATH=${C3DIR}
+	EOF
 }
 
 pkg_postinst() {
-- 
cgit v1.2.3