gentoo resync : 29.12.2022

2 files changed, 19 insertions, 16 deletions

diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 052717b17349..90cde651d822 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -11,5 +11,5 @@ EBUILD binutils-hppa64-2.35.2.ebuild 12162 BLAKE2B 0c0b6f56cda46ce66d72b6afe5a07
 EBUILD binutils-hppa64-2.36.1-r2.ebuild 12162 BLAKE2B 0be8fbdc32821f9e71da05ab285a0ebc6d680c7fd700487bf54e8ddc4d3db76a39e2f64456fb7d2f98e21d120cd2e19e4f7d7dd48088dd490815ce0f71f758bb SHA512 7259ac98a908f2ae5c5230e2963bb1b53659e404fcbad0b8f985fb3fc6a2d3fec59609d0a227e9c2e8c836ad50744cb16a30c2f6e304a46724d96d1e434d1387
 EBUILD binutils-hppa64-2.37_p1-r2.ebuild 13250 BLAKE2B f212de7136a4ca923843729776d978b8cb3c1b4b8b860724e90082096562675b90f1a28cc7ca0795107b01e1d3b4a71fab0904d8d24b449bd2de0773acc99e45 SHA512 0f13f09a88dadc7de1e1063bb28dc487fae6fafcdf21bb4be0fd002d8fed1557981334bf5885a21d612b5908044811692e1b3106d0ff4d5d7ff937585704f6d2
 EBUILD binutils-hppa64-2.38-r1.ebuild 13251 BLAKE2B 37f26207f3a9f27716fd877d48595e2d2c1cbd6b757db14e209a4b371b225b140966abeee6b8b69554b5354bcb207724fcbd51bc497c8cf56ea4dd55861c819a SHA512 ad70ede4ee3a0e9fe9f056f5ba56326726f49659a7e2ce885dffa8b58da19f2d1d9ea628ed016568e1657c1d8e99771910a21a71a5abbd1e0115b0610b00e3ec
-EBUILD binutils-hppa64-2.38-r2.ebuild 13067 BLAKE2B 818518302889feb4b8384890009b9c8e12e4b2edd8e02857ce498615f9aa9016423daf1721882ac5b91b6cc22e52a30f4bf92e9af067e1730146bcc79d77c8f8 SHA512 bf910f0f57be5d7c1c050e794b6d265541aedd598a6ce39970626b644588a4bee07e54399711196c115f6ce8a0b43d7c55834f0f9fd8469175a21ac126a6f8c1
+EBUILD binutils-hppa64-2.38-r2.ebuild 13278 BLAKE2B 2cc1fb2b74e46669acf21b9d926b49857e8ff43fe98f66377e7df8d95bd3d960d224cdfc8c87cbdc258cea46198d405943f00d12bf9bc2d0a7408816b08d94e7 SHA512 ff6511563043703d74fcfd3084b5fa6d5956473d890b5793d8f3e415915be6c88181305fe963ec393f2bf3e4f255a574fa3c63b0290cdb178c2465e385ae798f
 MISC metadata.xml 856 BLAKE2B 0c54f8023d390c9716ebfe7271c510f63cb34971b5ebc0862325b109673d7d9fa5a8804aec64245f2e1ce00ff407a9743e680291d2d3ed952c8b4d74ad1d9a0e SHA512 21477678fefb698e4e67e6244d9222ac65b668857a5cc99b27a893238f34f44a3ea087d387571e50561c7014851d66e52e978694a7afc3a16c60d6f798e9cfcc
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
index abe6f85f3a2b..b6e72448d384 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
@@ -70,19 +70,19 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
-MY_BUILDDIR=${WORKDIR}/build
-S=${WORKDIR}/${P/-hppa64/}
+MY_BUILDDIR="${WORKDIR}"/build
+S="${WORKDIR}"/${P/-hppa64/}
 
 src_unpack() {
 	if [[ ${PV} == 9999* ]] ; then
 		EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/toolchain/binutils-patches.git"
-		EGIT_CHECKOUT_DIR=${WORKDIR}/patches-git
+		EGIT_CHECKOUT_DIR="${WORKDIR}"/patches-git
 		git-r3_src_unpack
 		mv patches-git/9999 patch || die
 
+		S="${WORKDIR}"/binutils
 		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
-		S=${WORKDIR}/binutils
-		EGIT_CHECKOUT_DIR=${S}
+		EGIT_CHECKOUT_DIR="${S}"
 		git-r3_src_unpack
 	else
 		unpack ${P/-hppa64/}.tar.xz
@@ -94,7 +94,7 @@ src_unpack() {
 		local dir=${P%_p?}
 		dir=${dir/-hppa64/}
 
-		S=${WORKDIR}/${dir}
+		S="${WORKDIR}"/${dir}
 	fi
 
 	cd "${WORKDIR}" || die
@@ -151,6 +151,11 @@ toolchain-binutils_pkgversion() {
 }
 
 src_configure() {
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
 	# Setup some paths
 	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
 	INCPATH=${LIBPATH}/include
@@ -178,7 +183,7 @@ src_configure() {
 	done
 	echo
 
-	cd "${MY_BUILDDIR}"
+	cd "${MY_BUILDDIR}" || die
 	local myconf=()
 
 	if use plugins ; then
@@ -251,7 +256,6 @@ src_configure() {
 		--with-bugurl="$(toolchain-binutils_bugurl)"
 		--with-pkgversion="$(toolchain-binutils_pkgversion)"
 		$(use_enable static-libs static)
-		${EXTRA_ECONF}
 		# Disable modules that are in a combined binutils/gdb tree. bug #490566
 		--disable-{gdb,libdecnumber,readline,sim}
 		# Strip out broken static link flags.
@@ -281,8 +285,7 @@ src_configure() {
 		fi
 	fi
 
-	echo ./configure "${myconf[@]}"
-	"${S}"/configure "${myconf[@]}" || die
+	ECONF_SOURCE="${S}" econf "${myconf[@]}" || die
 
 	# Prevent makeinfo from running if doc is unset.
 	if ! use doc ; then
@@ -296,11 +299,11 @@ src_compile() {
 	cd "${MY_BUILDDIR}" || die
 
 	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
+	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
 
 	# only build info pages if the user wants them
 	if use doc ; then
-		emake info
+		emake V=1 info
 	fi
 
 	# we nuke the manpages when we're left with junk
@@ -309,12 +312,12 @@ src_compile() {
 }
 
 src_test() {
-	cd "${MY_BUILDDIR}"
+	cd "${MY_BUILDDIR}" || die
 
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
-	emake -k check
+	emake -k V=1 check
 }
 
 src_install() {
@@ -323,7 +326,7 @@ src_install() {
 	cd "${MY_BUILDDIR}" || die
 
 	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
 	rm -rf "${ED}"/${LIBPATH}/bin || die
 	use static-libs || find "${ED}" -name '*.la' -delete