gentoo resync : 20.03.2022

7 files changed, 53 insertions, 139 deletions

diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 370b16de6248..1dcacfe7298d 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,7 +1,6 @@
-AUX iwdevtools-0.8.1-tests.patch 2580 BLAKE2B f0fd374d2c2cca3f6da7f062ce2f82af2b9345e4c0e0625eb12f849a495fc74fdaba63e5c55355c3d64edf3c844c3382ae264357055af3c3fa41abb075804753 SHA512 4e73b5555da715b1227acafb9372a97888861fd68aa96696bca5d2f340c85851029145c400b70efd01458aea37f11da73c729470f860b71147f99b7cc5404e48
-DIST iwdevtools-0.10.0.tar.gz 60808 BLAKE2B 31f5288c54513a95199c3e41e7147778276ffaa2a63bb88e49a91680fa53602c4d1883ccf9b78bf63eba2fefec3fcd50e45ce7a599a0b252eadfaca62f2d9a09 SHA512 e03eda68eced8a23476d6681bd8090f80b642c40e5ed7e3ecb758fe04e51f496be02042bb87f6b42e150d28086e7ce14b278a6fdd05f06725b184b328405d412
-DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b
-EBUILD iwdevtools-0.10.0.ebuild 2084 BLAKE2B 3c9a88d685e351a66cc08445b91c262be8dd7c48592313702dbb696a1ebc12d0eb6cbb1bd90a9e6b6549439d74d07760cdb0497eea0dfdaabf2ae6c7b97754a2 SHA512 720233a84c9488b79d2312f8fd290526e7e195d13523db84a03d9b4b6dac670d96faa55bbba6787803b216cec8d44fce4494fc15e5dc873130684dd5277e6f2c
-EBUILD iwdevtools-0.8.1.ebuild 2002 BLAKE2B 5882188d2c07ed11dc74bd73b67e716f07e37be8f31fa8ba5bd75e6560dcfc5249634f5f6b4d429f65410e50db9b65a0860e0bdca6472b1c31cc1abbeb26f428 SHA512 e025942e52c89bbc0d57d2bae53836ac930c5d0f275aa31a2043b1b3f095ff5cd34b077ca9cc6da388dcb668b46f9cffc181b1547001eff5b9d8420ad944fff2
-EBUILD iwdevtools-9999.ebuild 2005 BLAKE2B aba034397f28346a4028e484f4a7dc612da870e2b53d21c7d6fdd4306beda1d921d2983d572186e7a623e14b1afea152b45a1e1798d52594ea6e33d5ca44aad3 SHA512 3dedd1d47cb33736d396d3e42c777c3430e4ca3bfdea0dee5e7f1ffbae904c1f2a31d6571b114b38b33d7f34885945e930e4efeeb26d3e6a260e813e5f18c80f
+AUX iwdevtools-0.10.1-diff-off-by-one.patch 674 BLAKE2B dd43504fb924a4a4300d93af80c704a043ed5c5819bad64394bae1c52ba9c5f3b09bcc520798369bfac591a1233a1689d6845e5951285af19c40dafb7ea46264 SHA512 80029ec4559b2dd067e99eb0aeab6c366563fcefb6215d9e8df24e4b435e888d735b0675e34e63a2c9bb7e80958b4c4b11e31d8f855aaec436e47dd8b373a8e2
+AUX iwdevtools-0.10.1-ldpath-regression.patch 840 BLAKE2B 9276d0c413bd377bc97856653eb1e8037a6a41efda68d287d91ffa19c30d986106af2ca862cb9372e6a0a80caf073b371e73058d57653405f7147e8e34ef7322 SHA512 26f58b46f70d9646bcb7f6f5e4279cb1be73b5b12cb0a47bc0411ec076ba822df2e212a7756505845e005e138b1b9989073d4c842f710d53d200715a72b20e03
+DIST iwdevtools-0.10.1.tar.gz 61117 BLAKE2B fd5508a40a854987db7f2ecc0e68e100cd6a8b6cc5b90a9901bbf6c16336ebc497861e05a6c1683ac9082aa9f12a03cb47f7116da793fbd8e105ed78aae2bbb3 SHA512 0f04850f15edc8af368a87bbc665c62d5588f4220c2d15ca5c0dd00d2c8135f7e1294217c8aec313650b7b7aae6433b87bdc32306c2c4c6e6747e55a13adbbe0
+EBUILD iwdevtools-0.10.1-r2.ebuild 1934 BLAKE2B 6951b7759792620ba78862fd5778443908eb878f74101c815ebef0bb6ca43a1689dc7e956e68c1a10e2f826c97816bd5c78967b5ee3ff063a155c57fe623bbaa SHA512 836a82348993825368380e924e0c8b9cb32898dcedd293904eda8e5fe6e10a16f7dd563ea96a261393ce59147efc8478b17f2bf9ea93cd8247210cd7d9a574a3
+EBUILD iwdevtools-9999.ebuild 1763 BLAKE2B 3309b1c749853a52d612cce50c3053596c22327854d6541e51ce72b636c63b7cfce21feeaedc115885eb06803a0988fd5624ceffb5cd7f64577247f2811344ad SHA512 5106ea7d1d23621ad510eb26a44e5b5b97daa3260c1b610a40348d37045b9719554b98aba72f573ccf34c1f6f271a046395e00f471bb02420494985adf66575c
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch b/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch
new file mode 100644
index 000000000000..87564b0b1445
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch
@@ -0,0 +1,20 @@
+https://github.com/ionenwks/iwdevtools/commit/74d7b913a9bea5cfbf59e451d8db4a4c6140cba8
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Wed, 16 Mar 2022 09:51:00 -0400
+Subject: [PATCH] qa-vdb: fix off-by-one in diff output
+
+This wrongly assumed f1 array was always at least as big as f2
+
+--- a/scripts/qa-vdb
++++ b/scripts/qa-vdb
+@@ -203,8 +203,8 @@ vdb-get_libdiff() {
+ 	# create combined output
+ 	local -i len=0
+ 	local o mark changes=false
+-	for ((i=0; i < ${#f1[@]}; i++)); do
+-		: "${f2[i]:=}"
++	for ((i=0; i < (${#f1[@]}>${#f2[@]}?${#f1[@]}:${#f2[@]}); i++)); do
++		: "${f1[i]:=}${f2[i]:=}"
+ 		if [[ ${f1[i]} == "${f2[i]}" ]]; then
+ 			${O[full]} || continue
+ 			mark=' '
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch
new file mode 100644
index 000000000000..5a5312639979
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch
@@ -0,0 +1,22 @@
+https://github.com/ionenwks/iwdevtools/commit/4e89c42455330b6660583ff1a4b54384346a123d
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Fri, 25 Feb 2022 04:20:17 -0500
+Subject: [PATCH] qa-vdb: fix ldpath include regression
+
+commit dd0bb44a3b190c756ce55c190b70f33bf350b7c5 was meant for
+directories, however this is /not/ a directory. As a result
+gcc's ld.so.conf wasn't included which could result in:
+
+ * VDB: detected possibly incorrect RDEPEND (app-text/qpdf-10.6.2)
+ *                > cross-aarch64-unknown-linux-gnu/gcc:11
+--- a/scripts/qa-vdb
++++ b/scripts/qa-vdb
+@@ -674,7 +674,7 @@ _vdb-set_ldpath() {
+ 				path=${1%/*}/${path}
+ 			fi
+ 			for path in ${path}; do
+-				[[ -d ${path} && -x ${path} ]] || continue # ignore bad includes
++				[[ -r ${path} ]] || continue # ignore bad includes
+ 				_vdb-set_ldpath "${path}"
+ 			done
+ 		fi
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
deleted file mode 100644
index 4cbe6712140a..000000000000
--- a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/ionenwks/iwdevtools/commit/a679594f115e8c9fd54aa70fc0742b7d560a2204
-From: Ionen Wolkens <ionen@gentoo.org>
-Date: Tue, 21 Dec 2021 00:36:40 -0500
-Subject: [PATCH] tests: relax globs for some stderr output checks
-
-portage may add noise to these depending on the system, e.g.
-
-!!! Repository 'gentoo' is missing masters attribute in '/var/db/<snip>
-!!! Set 'masters = iwdevtools' in this file for future compatibility
-
-But these tests are only checking if our own expected error is there,
-the rest is not important.
-
-Reported from: https://bugs.gentoo.org/829740
---- a/tests/eoldnew/test-pick
-+++ b/tests/eoldnew/test-pick
-@@ -7,4 +7,4 @@ export EOLDNEW_EMERGE_CMD=echo
- expect "old: dev-test/test-1.5.0*new: dev-test/test-2.0.0*" dev-test/test
- expect "old: dev-test/test-1.0.0*new: dev-test/test-2.0.0*" 2 dev-test/test
- expect "old: dev-test/test-1.0.0*new: dev-test/test-1.5.0*" =dev-test/test-1.5.0
--xfail 1 expect -2 "Error:*older version*" =dev-test/test-1.0.0
-+xfail 1 expect -2 "*Error: failed to find an older version*" =dev-test/test-1.0.0
---- a/tests/eoldnew/test-skip-new
-+++ b/tests/eoldnew/test-skip-new
-@@ -6,4 +6,4 @@ ebuild "$(get_ebuild test 2.0.0)" merge
- export EOLDNEW_EMERGE_CMD=echo
- expect "*=dev-test/test-1.5.0" - dev-test/test
- expect "*=dev-test/test-1.0.0" 2- dev-test/test
--xfail 1 expect -2 "Error:*older version*" - =dev-test/test-1.0.0
-+xfail 1 expect -2 "*Error: failed to find an older version*" - =dev-test/test-1.0.0
---- a/tests/qa-cmp/test-missing
-+++ b/tests/qa-cmp/test-missing
-@@ -1,4 +1,4 @@
- set_portroot
- ebuild "$(get_ebuild test 1.5 :)" install
--xfail 1 expect -2 "Error:*nothing*" -cI dev-test/test
--expect -2 "''" -cI --allow-missing dev-test/test
-+xfail 1 expect -2 "*Error: found nothing to compare*" -cI dev-test/test
-+expect -! -2 "*Error: found nothing to compare*" -cI --allow-missing dev-test/test
---- a/tests/qa-cmp/test-system
-+++ b/tests/qa-cmp/test-system
-@@ -5,7 +5,7 @@ ebuild "$(get_ebuild test 1.5 :)" merge
- ebuild "$(get_ebuild test 2.5 :)" install
- expect -! "CMP:*" -c dev-test/test
- ebuild "$(get_ebuild test 2.5 bin:file{1..2} lib.so:"${LIBD100}")" clean merge
--xfail 1 expect -2 "Error:*" -c dev-test/test
-+xfail 1 expect -2 "*Error: found nothing to compare*" -c dev-test/test
- expect "*CMP: listing*" -c --single-all dev-test/test
- ebuild "$(get_ebuild test 3.5 bin:file{3..4} lib.so:{"${LIBD200}","${LIBA300}"})" install
- expect "*FILES: usr/bin/file3*SONAME: libalt.so.3*FILES:-usr/bin/file1*FILES:+usr/bin/file4*SONAME:-libdummy.so.1*SONAME:+libdummy.so.2*" -c --single-all dev-test/test
diff --git a/app-portage/iwdevtools/iwdevtools-0.10.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
index a667742fb6d0..c4d90017aac1 100644
--- a/app-portage/iwdevtools/iwdevtools-0.10.0.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -27,6 +27,11 @@ BDEPEND="
 	|| ( sys-apps/util-linux app-misc/getopt )
 	test? ( ${RDEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ldpath-regression.patch
+	"${FILESDIR}"/${P}-diff-off-by-one.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}
@@ -59,10 +64,4 @@ pkg_postinst() {
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
 	fi
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-		ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
-		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
-		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
-	fi
 }
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
deleted file mode 100644
index 020799722038..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/pax-utils
-	app-portage/portage-utils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	sys-apps/util-linux"
-BDEPEND="
-	sys-apps/help2man
-	sys-apps/util-linux
-	test? ( ${RDEPEND} )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir=${PF}
-		-Deprefix="${EPREFIX}"
-		-Dshellcheck=false
-		$(meson_use test)
-	)
-
-	meson_src_configure
-}
-
-pkg_postinst() {
-	optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Optional portage integration relies on using /etc/portage/bashrc."
-		elog "The example bashrc can be used as-is if not already using one:"
-		elog
-		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
-		elog
-		elog "Otherwise, inspect the tools' --help output and the example to integrate"
-		elog "(if not defining the same phase functions, the example can be sourced)."
-		elog
-		elog "Note that \`eqawarn\` is used for portage output by default. QA messages"
-		elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:"
-		elog
-		elog '    PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
-	fi
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-		ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
-		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
-		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
-	fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index 377e0ed0f31c..3f6545af3e21 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -59,10 +59,4 @@ pkg_postinst() {
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
 	fi
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-		ver_test ${REPLACING_VERSIONS} -le 0.7.0; then
-		elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer"
-		elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES."
-	fi
 }