gentoo resync : 22.05.2021

3 files changed, 103 insertions, 60 deletions

diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 173035a88ebc..66e8f1a7b22b 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -4,6 +4,6 @@ AUX coreutils-8.32-sandbox-env-test.patch 1958 BLAKE2B 570f62115f0853abb35290174
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
-EBUILD coreutils-8.31-r1.ebuild 5682 BLAKE2B 206d6137b4724c31c7da1014ebad85aa6b8586feead92fda063332e48f7b4623d37591a58c3134e270fc079e1042aa0c0884c3f3f708947734e126e380855294 SHA512 0f9134804420d3b9e87f8f9e18bc755ddab5cc938308bfc3c3b528ad2bc8fd68e0510057b9d92f8ee399886f0c0a37a878396593b4107e35420119231615c581
-EBUILD coreutils-8.32-r1.ebuild 5799 BLAKE2B 0394e78d7a156530d60dbd0ca4bacf47195b671d0d88c928d1d0e2ae87e30f9f67d7111330620c01cc5cf290be7c8e13c06acdb2973dbb94d1de375dc34e77fc SHA512 e37b6c2caeaa7799c3b850047e02254af3c5b2e3cba87302f83753fc0df51ba1f496cd557fadb0de0919d67ae746d691f365eccacd86934e46b7e04f366f7440
+EBUILD coreutils-8.31-r1.ebuild 5834 BLAKE2B 5dd1a356f99e4db05ffcefaff61c0b74d8310b04c050a8ed73713514bc47ad4153ab1a9b89db901fe0ac011a6cf3036d8a11dd12a782564939537d115bbf2b41 SHA512 caaaa8e2d22b79c95facc15a3b917c8d194d76f024fb358c9de2e68356c65c18fff871c092e121507c5b2287fca16da4e642e13612c2b8296d92864210e20933
+EBUILD coreutils-8.32-r1.ebuild 5950 BLAKE2B 1bc00f9caed909d0054aaa2ae6a044758a6bdba05b2b39082ee6c7014436a1c6e4300300d87337d8c7dec9812486173da905f29aeee9f3eece1503e3705a9d8f SHA512 d8c15eb91c5b770340801f3c46bfb9d37529db128d2bce399b6d441e1d5d51cbc72894dccff73e4b0160c9adf6b9ca2f391e3432c9c2b7990fbfd36d2c39777a
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index ff8eae00d6cf..6c16ecc18fb4 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 PYTHON_COMPAT=( python3_7 )
 
-inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+inherit flag-o-matic python-any-r1 toolchain-funcs
 
 PATCH="${PN}-8.30-patches-01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
@@ -68,15 +68,16 @@ src_prepare() {
 	# Since we've patched many .c files, the make process will try to
 	# re-build the manpages by running `./bin --help`.  When doing a
 	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
 	# Also, it's not like we changed the usage on any of these things,
 	# so let's just update the timestamps and skip the help2man step.
 	set -- man/*.x
-	touch ${@/%x/1}
+	touch ${@/%x/1} || die
 
-	# Avoid perl dep for compiled in dircolors default #348642
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
 	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
 	fi
 }
 
@@ -85,6 +86,9 @@ src_configure() {
 		--with-packager="Gentoo"
 		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
 		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
 		--enable-install-program="arch,$(usev hostname),$(usev kill)"
 		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
 		--enable-largefile
@@ -95,17 +99,29 @@ src_configure() {
 		$(use_enable xattr)
 		$(use_with gmp)
 	)
+
 	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
 	fi
 
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
 	econf "${myconf[@]}"
 }
 
@@ -121,12 +137,13 @@ src_test() {
 
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
 
-	# coreutils tests like to do `mount` and such with temp dirs
-	# so make sure /etc/mtab is writable #265725
-	# make sure /dev/loop* can be mounted #269758
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
 	mkdir -p "${T}"/mount-wrappers || die
 	mkwrap() {
 		local w ww
@@ -136,7 +153,7 @@ src_test() {
 				#!${EPREFIX}/bin/sh
 				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
 			EOF
-			chmod a+rx "${ww}"
+			chmod a+rx "${ww}" || die
 		done
 	}
 	mkwrap mount umount
@@ -157,25 +174,30 @@ src_install() {
 	if use split-usr ; then
 		cd "${ED%/}"/usr/bin || die
 		dodir /bin
-		# move critical binaries into /bin (required by FHS)
+
+		# Move critical binaries into /bin (required by FHS)
 		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
 		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "could not move fhs bins"
-		if use hostname; then
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
 			mv hostname ../../bin/ || die
 		fi
-		if use kill; then
+
+		if use kill ; then
 			mv kill ../../bin/ || die
 		fi
-		# move critical binaries into /bin (common scripts)
-		# Why are these required for booting?
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
 		local com="basename chroot cut dir dirname du env expr head mkfifo
 		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "could not move common bins"
-		# create a symlink for uname in /usr/bin/ since autotools require it
-		# Other than uname, we need to figure out why we are
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
 		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place.
+		# the files there in the first place...)
 		local x
 		for x in ${com} uname ; do
 			dosym ../../bin/${x} /usr/bin/${x}
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 9b25f987a67a..4ff6e6859fbd 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+inherit flag-o-matic python-any-r1 toolchain-funcs
 
 PATCH="${PN}-8.30-patches-01"
 DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
@@ -79,15 +79,16 @@ src_prepare() {
 	# Since we've patched many .c files, the make process will try to
 	# re-build the manpages by running `./bin --help`.  When doing a
 	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	#
 	# Also, it's not like we changed the usage on any of these things,
 	# so let's just update the timestamps and skip the help2man step.
 	set -- man/*.x
-	touch ${@/%x/1}
+	touch ${@/%x/1} || die
 
-	# Avoid perl dep for compiled in dircolors default #348642
+	# Avoid perl dep for compiled in dircolors default (bug #348642)
 	if ! has_version dev-lang/perl ; then
-		touch src/dircolors.h
-		touch ${@/%x/1}
+		touch src/dircolors.h || die
+		touch ${@/%x/1} || die
 	fi
 }
 
@@ -96,6 +97,9 @@ src_configure() {
 		--with-packager="Gentoo"
 		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
 		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		# kill/uptime - procps
+		# groups/su   - shadow
+		# hostname    - net-tools
 		--enable-install-program="arch,$(usev hostname),$(usev kill)"
 		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
 		--enable-largefile
@@ -106,17 +110,28 @@ src_configure() {
 		$(use_enable xattr)
 		$(use_with gmp)
 	)
+
 	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
-		export fu_cv_sys_stat_statfs2_bsize=yes #311569
-		export gl_cv_func_realpath_works=yes #416629
+		# bug #311569
+		export fu_cv_sys_stat_statfs2_bsize=yes
+		# bug #416629
+		export gl_cv_func_realpath_works=yes
+	fi
+
+	# bug #409919
+	export gl_cv_func_mknod_works=yes
+
+	if use static ; then
+		append-ldflags -static
+		# bug #321821
+		sed -i '/elf_sys=yes/s:yes:no:' configure || die
+	fi
+
+	if ! use selinux ; then
+		# bug #301782
+		export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
 	fi
 
-	export gl_cv_func_mknod_works=yes #409919
-	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
-	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
-	# kill/uptime - procps
-	# groups/su   - shadow
-	# hostname    - net-tools
 	econf "${myconf[@]}"
 }
 
@@ -132,12 +147,13 @@ src_test() {
 
 	# Non-root tests will fail if the full path isn't
 	# accessible to non-root users
-	chmod -R go-w "${WORKDIR}"
-	chmod a+rx "${WORKDIR}"
+	chmod -R go-w "${WORKDIR}" || die
+	chmod a+rx "${WORKDIR}" || die
 
-	# coreutils tests like to do `mount` and such with temp dirs
-	# so make sure /etc/mtab is writable #265725
-	# make sure /dev/loop* can be mounted #269758
+	# coreutils tests like to do `mount` and such with temp dirs,
+	# so make sure:
+	# - /etc/mtab is writable (bug #265725)
+	# - /dev/loop* can be mounted (bug #269758)
 	mkdir -p "${T}"/mount-wrappers || die
 	mkwrap() {
 		local w ww
@@ -147,7 +163,7 @@ src_test() {
 				#!${EPREFIX}/bin/sh
 				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
 			EOF
-			chmod a+rx "${ww}"
+			chmod a+rx "${ww}" || die
 		done
 	}
 	mkwrap mount umount
@@ -168,25 +184,30 @@ src_install() {
 	if use split-usr ; then
 		cd "${ED}"/usr/bin || die
 		dodir /bin
-		# move critical binaries into /bin (required by FHS)
+
+		# Move critical binaries into /bin (required by FHS)
 		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
 		           mkdir mknod mv pwd rm rmdir stty sync true uname"
-		mv ${fhs} ../../bin/ || die "could not move fhs bins"
-		if use hostname; then
+		mv ${fhs} ../../bin/ || die "Could not move FHS bins!"
+
+		if use hostname ; then
 			mv hostname ../../bin/ || die
 		fi
-		if use kill; then
+
+		if use kill ; then
 			mv kill ../../bin/ || die
 		fi
-		# move critical binaries into /bin (common scripts)
-		# Why are these required for booting?
+
+		# Move critical binaries into /bin (common scripts)
+		# (Why are these required for booting?)
 		local com="basename chroot cut dir dirname du env expr head mkfifo
 		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
-		mv ${com} ../../bin/ || die "could not move common bins"
-		# create a symlink for uname in /usr/bin/ since autotools require it
-		# Other than uname, we need to figure out why we are
+		mv ${com} ../../bin/ || die "Could not move common bins!"
+
+		# Create a symlink for uname in /usr/bin/ since autotools require it.
+		# (Other than uname, we need to figure out why we are
 		# creating symlinks for these in /usr/bin instead of leaving
-		# the files there in the first place.
+		# the files there in the first place...)
 		local x
 		for x in ${com} uname ; do
 			dosym ../../bin/${x} /usr/bin/${x}