gentoo auto-resync : 01:08:2022 - 15:15:48

4 files changed, 25 insertions, 68 deletions

diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index df681c4d7cb5..e14edc178de1 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,8 +1,7 @@
+AUX iwdevtools-0.11.5-rcd-plain-name.patch 667 BLAKE2B 6f775ac87e50327e7240e204be7cfda9e1acf0455486c18e7d50522746ece2c90d97c27ce9b5d927fa87b4d71935941f3298bd8c22be7bfebc1c94593cceb8ca SHA512 cbb915f4a463e8c3dd68c043f73323ca624a36f178dab53ca3eee61dd74ec485d33b47ab8c6bd4a4db900e1516f84cfdd0a11c9365773f7fc438659246ab426c
 DIST iwdevtools-0.11.3.tar.gz 84838 BLAKE2B a4f501c24cc70b13ded5ca88599a3c11b076ae3a3464d065fe3999c8cb9268cfd17fc116197c09ddc6b968d7527409b348c0c1bdb939f6ed1b7a2abdfc868774 SHA512 38a62654042b714689fcf813a533ad463b7bdc0a4b501dc37c498e528792104a3db601f82781d889407217c824a9f48233544fb56a012de19fd34fa92d1de06d
-DIST iwdevtools-0.11.4.tar.gz 85480 BLAKE2B 44b86ee22e23320aa1c25676c08638332cbf66882e2610d3bc19580e682e7623c53013534977299fdad1f697a1ca10447d5753f221e839039011bbdccf017f35 SHA512 907755307b5cd617b2e85aabe76558b9b0c1b42e08e0a7d71760250f1ae455ac24a6a676c0707c2a371a80d86d0b60c16d8fa45702ba0e779f7817866bfb3a26
 DIST iwdevtools-0.11.5.tar.gz 85698 BLAKE2B 0f5b0c81735017b82144c74b2396826b2e6ea97db70704977c7885bdb00442c83023f593aeb25ab2e51f3a35cd659be98440f51e4496418a92f1559212db5b5d SHA512 05e0169a465cd4956d663f54bdc66d3c17379229b23c26a94d9deff879ef9e53b1b28f59e7cf314d36127954cb75728f008d0b0728659436ad1e63de5fb11bbb
 EBUILD iwdevtools-0.11.3.ebuild 1890 BLAKE2B 4dc6fd1395f96dbd7f0fd6729894cd4666a9a42bf7ef21e06c769f671b30e5f30f0c08386c479a1efbdde7d2bdaf452facce8f11e036f0eb56bf5e725be9e467 SHA512 f70d833f6b63f381befa3097f82640f4b4ba9964404f9ebf0d36c07b25f33d7a0a9fcf9243ebad419f25d0f9f1cc02c437e67326eaa92f80ce6c852537c76bcb
-EBUILD iwdevtools-0.11.4.ebuild 1909 BLAKE2B 7e32358db8ec521ba8712fc31cec84398c3e4deb3743df510b1fbf232e219ff46adb293e1d732783da6ccc8eff16cca170a09cafec5ab521e86718432ae3ff39 SHA512 671c69bbfda922fc8efef5f5ad299f7ffe7ae8f21dbda4d568d6966c3e2066c3bfd661da9856160f1e8101c5b4a302fb236f5d3aca0096033f089e2544a90a25
-EBUILD iwdevtools-0.11.5.ebuild 1909 BLAKE2B 7e32358db8ec521ba8712fc31cec84398c3e4deb3743df510b1fbf232e219ff46adb293e1d732783da6ccc8eff16cca170a09cafec5ab521e86718432ae3ff39 SHA512 671c69bbfda922fc8efef5f5ad299f7ffe7ae8f21dbda4d568d6966c3e2066c3bfd661da9856160f1e8101c5b4a302fb236f5d3aca0096033f089e2544a90a25
+EBUILD iwdevtools-0.11.5-r1.ebuild 1955 BLAKE2B 6d126fd53e92bdf29cb93ef168fddabf88e61d1a8fdd86ad6268ceeb76e47dcd391c7d4f7e8d66b13b6d85959ce32046e1a284636b322763d7278c2ff0526d70 SHA512 bfffcc7aa2ba0da26bf1d30576f02289d9e95cd2e2c3389456c6f1c2bee36eb669e3d15c46433b5fe145fd86fbad78205f13e81b1c8871d73d2a05cbaa4f3842
 EBUILD iwdevtools-9999.ebuild 1806 BLAKE2B 90e7cd55d1f57c126a6c59489b4bfacf39266a48875370659693efcdd90fef644bbc21e67ecb21c665000139b28008c3d0979796b7f2f2312ca2deebb3860250 SHA512 56e8546414c77b124a5da1b334833384bf2e78adfc385918f6a05a336d1a22cae705d3e526846b8e7a483f929fb9327288d9527c9c157a607a69c362743d9d11
 MISC metadata.xml 354 BLAKE2B 752c8fbf18967fb380f0f5d460396222f5fea3f0c7b9ed960ff0dbe62a9a505a2d07c45750aaa55285d11169e01f5e83b82eb278b12fbc5e9c43353c0a5fc9ed SHA512 d8e5866d89b7f05a5a8cd8cc464083d3d096b4c03f8a83e9314dcf45e57c25369bf8a3bc725aed3b8db9f3f86e76bad358bfa58f1eca70f7ec0bf3d31286c2c3
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.11.5-rcd-plain-name.patch b/app-portage/iwdevtools/files/iwdevtools-0.11.5-rcd-plain-name.patch
new file mode 100644
index 000000000000..dbb2ca17f887
--- /dev/null
+++ b/app-portage/iwdevtools/files/iwdevtools-0.11.5-rcd-plain-name.patch
@@ -0,0 +1,18 @@
+https://github.com/ionenwks/iwdevtools/commit/408fba9
+From: Ionen Wolkens <ionen@gentoo.org>
+Date: Mon, 1 Aug 2022 04:28:49 -0400
+Subject: [PATCH] repo-cd: use plain name for error display
+
+Given doesn't look so nice with the [_-] addition:
+ ! no non-excluded match found for '*some[_-]name*'
+--- a/scripts/repo-cd
++++ b/scripts/repo-cd
+@@ -307,7 +307,7 @@ rcd-cd() {
+ 		done | mapfile -td '' choice
+ 
+ 		if (( ! ${#choice[@]} )); then
+-			rcd-msg '!:r' "no non-excluded match found for '${C[m]}${search}${C[n]}'${userepo:+ in ::${userepo}}"
++			rcd-msg '!:r' "no non-excluded match found for '${C[m]}${name}${C[n]}'${userepo:+ in ::${userepo}}"
+ 			exit 104
+ 		fi
+ 
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.4.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
index 68858249d8a0..4cb0eb5fc207 100644
--- a/app-portage/iwdevtools/iwdevtools-0.11.4.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.11.5-r1.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 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -29,6 +29,10 @@ BDEPEND="
 	|| ( sys-apps/util-linux app-misc/getopt )
 	test? ( ${RDEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-rcd-plain-name.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Ddocdir=${PF}
diff --git a/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
deleted file mode 100644
index 68858249d8a0..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
+++ /dev/null
@@ -1,64 +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 ~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
-	dev-libs/libxml2:2
-	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
-}