gentoo resync : 22.12.2021

4 files changed, 57 insertions, 68 deletions

diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 3b8cb52764ff..5aabfefd17e1 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +1,5 @@
-DIST iwdevtools-0.8.0.tar.gz 57529 BLAKE2B b8068c7781b8b164b9b5d191f8a33a4a89854edb7c78c56d4f1312dd0d051d0b033f21611066303acb7efdf8403d6869458db98e7b1b2a293c779cca2bdcdd36 SHA512 df39fa02d7f4f72334286305bfa9c2db6d5db90bddc47194e3383a99492366796c7ae2e751bcf8af01d14cfa0bac88ea8d9c8678b7891f85aaa1b20e4a9e91cb
+AUX iwdevtools-0.8.1-tests.patch 2580 BLAKE2B f0fd374d2c2cca3f6da7f062ce2f82af2b9345e4c0e0625eb12f849a495fc74fdaba63e5c55355c3d64edf3c844c3382ae264357055af3c3fa41abb075804753 SHA512 4e73b5555da715b1227acafb9372a97888861fd68aa96696bca5d2f340c85851029145c400b70efd01458aea37f11da73c729470f860b71147f99b7cc5404e48
 DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b
-EBUILD iwdevtools-0.8.0.ebuild 1886 BLAKE2B 58b7db6dce9bdd9ea1cce3c5ee3889aa1fa3107b57908d2b6d01776ef6037ff45a57568b4174f2cf97c40e010338543c8f1b9d6cbb88f713374b502bbe7ce11b SHA512 4432156adc76ea8a8b2db83548e5ad3c676f63aaecc29c045e8e074dae7bb57dbc1264717ec1c164b8f27a7a40bcf44eb955200915386c7d67ec31ebed24651a
-EBUILD iwdevtools-0.8.1.ebuild 1919 BLAKE2B ae899a1f817add16cfa17e4ab3d8cabf0400caea0b3df5a40fae03908b3bb7dd4f801c6e3ff761d4befb17d11ad096284fc34b3d6efb5be405595d589b83b2b1 SHA512 0fa9c0a926aa54eb66814bb1bcc00209766606710691ed73d345c4fa7574ba4b46984caf99baee7e1e6e9b8c44a73f9748fd14b717b0236093d9f516a523ce86
+EBUILD iwdevtools-0.8.1.ebuild 1976 BLAKE2B 52b80193e13ceecabe40bc8132d254fa0feb982967f14151863660d2215a36677dc6623e8ef76c7e948cc2aee5661adea8d4e15b18e4f78af7f53df6838b52f0 SHA512 fcd4f2882587fd912bf397ee8d9fb35cc19341227e18f4207913cf2b34acd6faceab2d67e43cb370da186af3070a4e8da9d48494e90d92f52d926f871e3db9f5
 EBUILD iwdevtools-9999.ebuild 1859 BLAKE2B 040a0a3481f04bc8c414000b6e6f3afc80fdeb0807f0c92300c86659f58b91bb23de6ec8596f8c5170f2bbeb7a1ca165542c75be91f89688eda87c4e151c05f5 SHA512 2aa5fb6f48366ec6ecc219c6efe0ec8808b91db83d235c22cd3f37729629ea75f35aef138cff73210797d145a65c2d044e695882534835990aa9c0943436d937
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
new file mode 100644
index 000000000000..4cbe6712140a
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch
@@ -0,0 +1,50 @@
+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.8.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
deleted file mode 100644
index 5d03e033a003..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2021 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 ~riscv ~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
-	test? ( ${RDEPEND} )"
-
-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 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
index 5add38623491..1d98d6de0beb 100644
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.8.1.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 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -26,6 +26,10 @@ BDEPEND="
 	sys-apps/help2man
 	test? ( ${RDEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}