gentoo resync : 28.04.2021

3 files changed, 38 insertions, 22 deletions

diff --git a/sys-libs/libhugetlbfs/Manifest b/sys-libs/libhugetlbfs/Manifest
index 22e1a835a85c..af6186689092 100644
--- a/sys-libs/libhugetlbfs/Manifest
+++ b/sys-libs/libhugetlbfs/Manifest
@@ -2,6 +2,6 @@ AUX libhugetlbfs-2.23-uncompressed-man-pages.patch 1515 BLAKE2B b43415a3059f1071
 AUX libhugetlbfs-2.6-fixup-testsuite.patch 1231 BLAKE2B e49ac448b4ac17a6ce9c32543e3ad7391bc8525e147d7a5100ef7ae15e4b0cf48b58ff1fe62d9a0fa61f142b7b8366228974c6628999edaa61d96114371bc09d SHA512 af9ee541ac4a30260e17baab1616cee13fdcc679ae3fdceed29ca6282c12a6b60d24b04bb61e3aa5f42092e017eb3bae59a56fd2b03954e40803f9f6f2cc4f80
 DIST libhugetlbfs-2.22.tar.gz 175099 BLAKE2B e67a6a678065b10492d510b733b7c6e2926f4f01dd741d49f6e76cedde002fa81d7dad6a6fd8922443c6aacd527c9b3df35f84b8da7332c04e3fcf8c52e23084 SHA512 7f38f9fa576841f36c7cd5192a9ee3f79b275b7b64d7e2a838a43636489cf88627bdba3a045d6b3302a4a509cf64627972b569b4c2c3c4fe05d5aa4ae1d66fd8
 DIST libhugetlbfs-2.23.tar.gz 175459 BLAKE2B f469ff9a65364e9f0e04c11c8010c958855ebd4d50e1dd719576cda7c280586623404304be64a794907a5fb1d97bd9c0620a91d7a2492577e04fa40ff432b4c7 SHA512 fc9a7d59bcda9d3ca9c9e43a3a348f989c9cbdbbb77f21a43a06e71eacd05bbe5a7b2b51e20ae9ea00da9f1c4d1130da529bbfb702e8c9d11cab6efadd3dc168
-EBUILD libhugetlbfs-2.22.ebuild 4149 BLAKE2B 883d4ad357edce5f8855380ebc51c90d615a560667992bb736b4807e8de3028f6239adf1daec4a01ef27a273dff98d76b9938373b2ba0b37a57f92c9aa90ff3d SHA512 b855a410ff22962b4657f0bf27ea1ec2f7773ab6ab32d48a42c9b9a94b72c2622f17816f0b5c5514c02677191bfd055e855c961b5f9a3a37931cb5837cdfb69b
-EBUILD libhugetlbfs-2.23.ebuild 4204 BLAKE2B 3124956cdb9ad980fb1f602e6e08908f8ddff29f4745c365c46a29ba7a7bae0aebc5ec9ec24e382141de2adc54a999649011a62b06189aa6bb342bef333ea40e SHA512 3b840f03206070d0469ededbf0e3eed9c7ef331b7ca035fca1456870c2a57123d2560e9c7ef8b82b279a5a1384dbc387f3601607ac49e4de45231dd265276588
+EBUILD libhugetlbfs-2.22.ebuild 4159 BLAKE2B 269220039f048cdc23ec2907c504e30e5034e47431e065c90f527d25aec9f487a82cf983de1f3d915ea43ab6e9d19e4038d4a6f4c0653e6a298d754ab5597c93 SHA512 ee8a77c529de300c43c27355ae6efbf3cc5cfdee88e7d9a344cbb7f9b7185cdb3b698c3cea674563663b1258350487d4a0039998333cf43bdf0b7913d4ea694a
+EBUILD libhugetlbfs-2.23.ebuild 4218 BLAKE2B bd527e5c16ef3f0f9a4a4a7743755d1dc1aac2a6caad747182347600d04ff26ff72b2ea7f4a874ac1e34bfddd38845e69186ae864c7408d759320ca1ff777fe3 SHA512 60facbec943112d3eedfbc66133ee26a9300271ba4e9bca14e7e2f0c01145eedba2d6dbfb9e79183f827e9707be9ae5e3ddd087bdb415fd34aaaed3939e57f63
 MISC metadata.xml 396 BLAKE2B 261776d0894dc66459b99826ce4721148b0916cacca7fa4cadf70eef720c19a0d8fbd9e3a5e63323ba98778843e715e3e493645de701f2276259ebfaa6ae9e87 SHA512 95adcf5f0a47473f679d37ba1a6559b45681f288f7c4c70a8b9dd18c67eab3b4c222df996c3eb83d1317aa9a8a2710dc788ebc23e1255713ed81db33f57df3b8
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
index a6cbf04d56aa..8b11ae28651f 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit multilib toolchain-funcs python-any-r1
+inherit toolchain-funcs python-any-r1
 
-DESCRIPTION="easy hugepage access"
+DESCRIPTION="Easy hugepage access"
 HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
 SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
@@ -56,10 +56,10 @@ src_install() {
 }
 
 src_test_alloc_one() {
-	hugeadm="$1"
-	sign="$2"
-	pagesize="$3"
-	pagecount="$4"
+	hugeadm="${1}"
+	sign="${2}"
+	pagesize="${3}"
+	pagecount="${4}"
 	${hugeadm} \
 		--pool-pages-max ${pagesize}:${sign}${pagecount} \
 	&& \
@@ -71,7 +71,7 @@ src_test_alloc_one() {
 # die is NOT allowed in this src_test block after the marked point, so that we
 # can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise.
 src_test() {
-	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
+	[[ ${UID} -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
 	emake -j1 tests
 
@@ -91,6 +91,7 @@ src_test() {
 		mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
 		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
 	done
+
 	addwrite /proc/sys/vm/
 	addwrite /proc/sys/kernel/shmall
 	addwrite /proc/sys/kernel/shmmax
@@ -106,7 +107,9 @@ src_test() {
 	einfo "Starting allocation"
 	for pagesize in ${PAGESIZES} ; do
 		pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
+
 		einfo "  ${pagecount} @ ${pagesize}"
+
 		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
 		src_test_alloc_one "${hugeadm}" "+" "${pagesize}" "${pagecount}"
 		rc=$?
@@ -123,6 +126,7 @@ src_test() {
 	if [[ -n "${allocated}" ]]; then
 		# All our allocations worked, so time to run.
 		einfo "Starting tests"
+
 		cd "${S}"/tests || die
 		local TESTOPTS="-t func"
 		case ${ARCH} in
@@ -133,6 +137,7 @@ src_test() {
 				TESTOPTS="${TESTOPTS} -b 32"
 				;;
 		esac
+
 		# This needs a bit of work to give a nice exit code still.
 		./run_tests.py ${TESTOPTS}
 		rc=$?
@@ -147,8 +152,9 @@ src_test() {
 	for alloc in ${allocated} ; do
 		pagesize="${alloc/:*}"
 		pagecount="${alloc/*:}"
+
 		einfo "  ${pagecount} @ ${pagesize}"
-		src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
+		src_test_alloc_one "${hugeadm}" "-" "${pagesize}" "${pagecount}"
 	done
 
 	# ---------------------------------------------------------
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
index 94988481f11a..ce5da82ddfcd 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit multilib toolchain-funcs python-any-r1
+inherit toolchain-funcs python-any-r1
 
-DESCRIPTION="easy hugepage access"
+DESCRIPTION="Easy hugepage access"
 HOMEPAGE="https://github.com/libhugetlbfs/libhugetlbfs"
 SRC_URI="https://github.com/libhugetlbfs/libhugetlbfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
-DEPEND="test? ( ${PYTHON_DEPS} )"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6-fixup-testsuite.patch
@@ -26,6 +26,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e '/^PREFIX/s:/local::' \
 		-e '1iBUILDTYPE = NATIVEONLY' \
@@ -35,6 +36,7 @@ src_prepare() {
 		-e '/^CC\(32\|64\)/s:=.*:= $(CC):' \
 		-e 's@^\(ARCH\) ?=@\1 =@' \
 		Makefile || die "sed failed"
+
 	if [ "$(get_libdir)" == "lib64" ]; then
 		sed -i \
 			-e "/^LIB\(32\)/s:=.*:= lib32:" \
@@ -53,14 +55,16 @@ src_compile() {
 
 src_install() {
 	default
+
 	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }
 
 src_test_alloc_one() {
-	hugeadm="$1"
-	sign="$2"
-	pagesize="$3"
-	pagecount="$4"
+	hugeadm="${1}"
+	sign="${2}"
+	pagesize="${3}"
+	pagecount="${4}"
+
 	${hugeadm} \
 		--pool-pages-max ${pagesize}:${sign}${pagecount} \
 	&& \
@@ -72,7 +76,7 @@ src_test_alloc_one() {
 # die is NOT allowed in this src_test block after the marked point, so that we
 # can clean up memory allocation. You'll leak at LEAST 64MiB per run otherwise.
 src_test() {
-	[[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
+	[[ ${UID} -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite"
 	einfo "Building testsuite"
 	emake -j1 tests
 
@@ -92,6 +96,7 @@ src_test() {
 		mkdir -p /var/lib/hugetlbfs/pagesize-${pagesize}
 		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
 	done
+
 	addwrite /proc/sys/vm/
 	addwrite /proc/sys/kernel/shmall
 	addwrite /proc/sys/kernel/shmmax
@@ -108,8 +113,10 @@ src_test() {
 	for pagesize in ${PAGESIZES} ; do
 		pagecount=$((${MIN_HUGEPAGE_RAM}/${pagesize}))
 		einfo "  ${pagecount} @ ${pagesize}"
+
 		addwrite /var/lib/hugetlbfs/pagesize-${pagesize}
 		src_test_alloc_one "${hugeadm}" "+" "${pagesize}" "${pagecount}"
+
 		rc=$?
 		if [[ ${rc} -eq 0 ]]; then
 			allocated="${allocated} ${pagesize}:${pagecount}"
@@ -124,6 +131,7 @@ src_test() {
 	if [[ -n "${allocated}" ]]; then
 		# All our allocations worked, so time to run.
 		einfo "Starting tests"
+
 		cd "${S}"/tests || die
 		local TESTOPTS="-t func"
 		case ${ARCH} in
@@ -134,6 +142,7 @@ src_test() {
 				TESTOPTS="${TESTOPTS} -b 32"
 				;;
 		esac
+
 		# This needs a bit of work to give a nice exit code still.
 		./run_tests.py ${TESTOPTS}
 		rc=$?
@@ -148,8 +157,9 @@ src_test() {
 	for alloc in ${allocated} ; do
 		pagesize="${alloc/:*}"
 		pagecount="${alloc/*:}"
+
 		einfo "  ${pagecount} @ ${pagesize}"
-		src_test_alloc_one "$hugeadm" "-" "${pagesize}" "${pagecount}"
+		src_test_alloc_one "${hugeadm}" "-" "${pagesize}" "${pagecount}"
 	done
 
 	# ---------------------------------------------------------