gentoo auto-resync : 16:09:2024 - 12:11:35

7 files changed, 119 insertions, 73 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 6038fa0fbcd9..d2adb63b573c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index a02c31401e1b..39405c2a9867 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,6 +1,5 @@
-DIST iwdevtools-0.12.11.tar.gz 91626 BLAKE2B ffdc58c9a76105031b3be771d49d3b1afa7550333bc8cc2eae6a8ba798974e363aecf6c3f7f3f76e6d0cf6e3aac1ccd6f73bfafe3f0ae99987099fb3896ecb0f SHA512 6083a7ddef331b8f7ef96491c438096b7c920dedbe2ba3f0d74e6542592cfabbe442939609f10cddce736c21d02794900e8428c10b2b2b46ed988f6efe80351b
+AUX iwdevtools-0.12.12-category-tests.patch 3624 BLAKE2B dc30980bd0f04b7ab2f48b137fb591462f68dbf9c18358574473599854515c9d3d71b4ec7a322929b410434bec2a790ac6e6520280d4af7aeb79c7dab6e0f351 SHA512 442bc5bb805ddd406574fd9ed6ab6ec356af8f0fd9fdd074cee7eb030ceaaf6a394c7b74a002d99be94f9a237a777a7861adbc8c5155f43521a3602242f0b998
 DIST iwdevtools-0.12.12.tar.gz 91784 BLAKE2B 7df4f1996ad55090b65ea87c67a5ae15c5f661a5fd1e21cddbb157e651c4b52aa8e8223f4071dabc726605958942847e17678fc4e102037c6937963ef69fd7bc SHA512 13142c9df7892a55a9fc2172fb0a9480b1d91cfa23dca71a22b1c7f5882bfd84af9c17228a0e8251f1fac0840196c1e18b34f3568b30d04a20b1a8188fa31150
-EBUILD iwdevtools-0.12.11.ebuild 1941 BLAKE2B 05a7cffe9f1432cb06e39bf402eded0b38fed268cc4c9a5a48e805157a674913dc701156a48068033c9ace0d70075b9cf74b6072b874cec3ba6bb93452ffd937 SHA512 e58e839455245fa4c2825cf2bb37ea08845d71abc31123d428ab8ee7b8c842a8242f6da52762f869116857e418b9a98a4fe6d3c8ec05c2a8391143f87105578e
-EBUILD iwdevtools-0.12.12.ebuild 1941 BLAKE2B 05a7cffe9f1432cb06e39bf402eded0b38fed268cc4c9a5a48e805157a674913dc701156a48068033c9ace0d70075b9cf74b6072b874cec3ba6bb93452ffd937 SHA512 e58e839455245fa4c2825cf2bb37ea08845d71abc31123d428ab8ee7b8c842a8242f6da52762f869116857e418b9a98a4fe6d3c8ec05c2a8391143f87105578e
+EBUILD iwdevtools-0.12.12.ebuild 1995 BLAKE2B f4e790f03880f6c769a21b89359403392851f18652fa6a5dfee836da695dd3dfb51c9e9bdda90e97ad857d30988941d4f86e635a5ea4186b9245f0ad7f4c6449 SHA512 0b9b2f2f6f1fd40c04fdd8ad2f74d5a76ddf79bf93a47532b718f33c73542a3e559e36490f2d56f0267430a5dbfa567ddee227531e7b4422a1269346a912c15e
 EBUILD iwdevtools-9999.ebuild 1828 BLAKE2B 80d91ac38296f1a8cc4696f32c523ef2d5f8bd7bcbdff5bac0790058f36e1c4500a5d807a370f8f8f407735e071fb91d8279bb5d7d542b8c318a0dd74e07d212 SHA512 fd042cc343dd62e315cf7e552543a937c114877bee77c4856046e1d1d93a2d5d35ad0747ec970246eb4af5498fe3727d88ffb1615c081fd7557c43dddef2f6df
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.12.12-category-tests.patch b/app-portage/iwdevtools/files/iwdevtools-0.12.12-category-tests.patch
new file mode 100644
index 000000000000..9f8645f614d4
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.12.12-category-tests.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/939721
+https://github.com/ionenwks/iwdevtools/commit/4f3c463af0af4f62317f2117580e57beed3435b0
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Mon, 16 Sep 2024 02:48:31 -0400
+Subject: [PATCH] tests: work around portage confusion by passing dev-test/
+
+In theory portage should be ignoring ::gentoo (different repos.conf
+which does not specify /var/db/repos/gentoo and changes main-repo),
+but seems it gets confused by a package named "test" existing still
+resulting in:
+
+    You specified an unqualified atom that matched multiple packages:
+    * dev-test/test
+    * dev-python/test
+
+Whether category is passed or not is not important in env-atom and
+*-perms (so can just do it), but in "qa-cmp/pick" it was omitted on
+a few tests to test the missing category logic.
+
+So we lose that extra bit until can figure out a way for portage to
+actually ignore ::gentoo. Not passing the category is however rarely
+done given the portage bashrc hook passes it, this is for when using
+qa-cmp directly and being brief with arguments.
+--- a/tests/eoldnew/env-atom
++++ b/tests/eoldnew/env-atom
+@@ -8,3 +8,3 @@ export EOLDNEW_EMERGE_ARGS_NEW="--new {}"
+ export EOLDNEW_EMERGE_CMD=:
+-expect -s "*'running: : =dev-test/test-1.5 --all test --more test --old test
+-running: : test --all test --more test --new test'*" test
++expect -s "*'running: : =dev-test/test-1.5 --all dev-test/test --more dev-test/test --old dev-test/test
++running: : dev-test/test --all dev-test/test --more dev-test/test --new dev-test/test'*" dev-test/test
+--- a/tests/qa-cmp/diff-filelist-perms
++++ b/tests/qa-cmp/diff-filelist-perms
+@@ -9,6 +9,6 @@ expect -s "*'
+  FILES:+usr/bin/file2 (-rw-r--r-- '*:*')
+-'*'FILES(+1,-2)'*" -c test
++'*'FILES(+1,-2)'*" -c dev-test/test
+ expect -s "*'
+  FILES:-usr/bin/file3
+-'*'FILES(-1)'*" -c --ignore-perms test
++'*'FILES(-1)'*" -c --ignore-perms dev-test/test
+ expect -s "*'
+@@ -17,3 +17,3 @@ expect -s "*'
+  FILES:+usr/bin/file2 (-rw-r--r-- '*:*')
+-'*'FILES(+1,-2)'*" -c --show-perms test
++'*'FILES(+1,-2)'*" -c --show-perms dev-test/test
+ 
+@@ -23,2 +23,2 @@ expect -s "*'
+  FILES:-usr/bin/file3
+-'*'FILES(-1)'*" -c test
++'*'FILES(-1)'*" -c dev-test/test
+--- a/tests/qa-cmp/pick
++++ b/tests/qa-cmp/pick
+@@ -12,7 +12,10 @@ expect "*test-3.5*test-4.5*" -cW dev-test/test
+ expect "*test-1.5*test-3.5*" -cW dev-test/test:2
+-expect "*test-4.5*test-3.5*" -cW test =test-3.5
++expect "*test-4.5*test-3.5*" -cW dev-test/test =dev-test/test-3.5 # *1
+ expect "*test-1.5*test-3.5*" -cW dev-test/test:2 =dev-test/test-3.5
+-expect "*test-2.5*test-4.5*" -cW test:0 =test-4.5
+-expect "*alt-1.5/image*test-4.5*" -cW alt test # nonsense but allowed
+-expect "*=dev-test/alt-1.5*alt-1.5/image*" -cW alt
++expect "*test-2.5*test-4.5*" -cW dev-test/test:0 =dev-test/test-4.5 # *1
++expect "*alt-1.5/image*test-4.5*" -cW dev-test/alt dev-test/test # nonsense but allowed, *1
++expect "*=dev-test/alt-1.5*alt-1.5/image*" -cW dev-test/alt # *1
++# *1: meant to have these tests with unspecified category to test the category
++#     logic, but portage gets confused by ::gentoo (https://bugs.gentoo.org/939721)
++
+ # FIXME:
+--- a/tests/qa-cmp/single-perms
++++ b/tests/qa-cmp/single-perms
+@@ -6,3 +6,3 @@ expect -s "*'
+  FILES: usr/bin/file1 (-rwxr-xr-x '*:*')
+- FILES: usr/bin/file2 (-rw-r--r-- '*:*')'*" -c --single-all --show-perms test
++ FILES: usr/bin/file2 (-rw-r--r-- '*:*')'*" -c --single-all --show-perms dev-test/test
+ 
+@@ -11,2 +11,2 @@ expect -s "*'
+  FILES: usr/bin/file1 (-rwxr-xr-x '*:*')
+- FILES: usr/bin/file2 (?)'*" -c --single-all --show-perms test
++ FILES: usr/bin/file2 (?)'*" -c --single-all --show-perms dev-test/test
diff --git a/app-portage/iwdevtools/iwdevtools-0.12.11.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.11.ebuild
deleted file mode 100644
index 50a983e156b9..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.12.11.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2021-2024 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 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-misc/pax-utils
-	app-portage/portage-utils
-	>=app-shells/bash-5.1:0[readline]
-	dev-libs/libxml2:2
-	sys-apps/coreutils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	|| ( sys-apps/util-linux app-misc/getopt )
-"
-BDEPEND="
-	sys-apps/help2man
-	|| ( sys-apps/util-linux app-misc/getopt )
-	test? ( ${RDEPEND} )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Ddocdir=${PF}
-		-Deprefix="${EPREFIX}"
-		-Dshellcheck=false
-		$(meson_use test)
-	)
-
-	has_version sys-apps/util-linux || emesonargs+=( -Dgetopt=getopt-long )
-
-	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
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.12.12.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.12.ebuild
index 50a983e156b9..e590c0eec548 100644
--- a/app-portage/iwdevtools/iwdevtools-0.12.12.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.12.12.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	test? ( ${RDEPEND} )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-category-tests.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 4d95de21cc87..c0e274a26604 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,5 @@
 DIST mgorny-dev-scripts-54.tar.gz 19583 BLAKE2B 88f8b06f24b419d7c648f68b0f6e277106932353e526fa492a10180b2a36abf50e63c0a208357035c1229e7ebd3e6f655aabad85fad097047abf0f928a23aab9 SHA512 311aeab011e177aeb92c3076d9670dd012246cfc9f1efd8e89234079dbbfa22de4de309e862364ff33d5cbcacc06815f365d6b3cbc26de9e6fe5230abcc32d3c
+DIST mgorny-dev-scripts-55.tar.gz 19610 BLAKE2B 9f08783b9f7f33bcb64b5db9af60502106c5d48e249a5f5355d8a242085ec674e6af1012a036efb731077f137ce94f0bbdc3d7edf659f25821191d9a4e61d8c7 SHA512 3a0504a41359f909a40726337d7d71505bf8f26f68e29662916377bb388622cdcaa90748ddc19b9bde3ed2f0803311fcc477f0cf0b5ca07d0a1448630beb4fd5
 EBUILD mgorny-dev-scripts-54.ebuild 679 BLAKE2B cdf4570230ebdfc7ea04cd879fd6353ae575bdac63dd61370288fff22f0f764452ab027b41675e7683f26c9d5f0f9646835ed41b3c5f26908f8df9137f3cb4ab SHA512 645491104d2f457e2ccdce46b2f9565e58de94fdad79787a61730cb69e8a79ffcc6e4f0952a10f0448f89c3a234fdff67ea1f02fe9f520ea6aec034566c5a59c
+EBUILD mgorny-dev-scripts-55.ebuild 683 BLAKE2B b5733f2cbac61f85aded2521e8d9e4cd089151a21e39078254c2a5af42f5fa31b3302ec09775df7abe4c88e1d0438acd67ffab0717d97c7f20e864526eec8f8e SHA512 9b2458ca55f4bf59d3fc8b304af0334be9b71d85872fa1b67eafe7f1e80630330feedcd829520b801ec795204089c1170c9b4347117b9552c9fe3633b6900f6e
 MISC metadata.xml 362 BLAKE2B 9f7873c2b1dea8abe84daabea4db33438b730c92487220d28af391e411f58b15f7eaa7aedffab8849a8d0cf4c032db04e48cbf9be28f0ee7602b6a05f0e430be SHA512 d7d44e67c952a00cda52b223975c1c48ca8283d55ccc084edbed956633e8f2a04ede1553f16a3b673485ce433b9067d35c1459f0ef392ddf6d4d03ab02d339a2
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-55.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-55.ebuild
new file mode 100644
index 000000000000..0b89f83d564d
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-55.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/projg2/mgorny-dev-scripts/"
+SRC_URI="
+	https://github.com/projg2/mgorny-dev-scripts/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	app-portage/gentoolkit
+	>=app-portage/gpyutils-0.12
+	dev-perl/URI
+	dev-util/pkgcheck
+	dev-vcs/git
+	net-misc/wget
+	sys-apps/portage
+	x11-misc/xdg-utils
+"
+
+src_install() {
+	dodoc README.rst
+	rm -f COPYING README.rst || die
+	dobin *
+}