[gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/, app-portage/iwdevtools/files/
commit: 59554079eec0badcbc0d8a2b0090485275a0e1fa
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Aug 13 01:00:40 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Aug 13 01:00:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59554079
app-portage/iwdevtools: drop 0.11.5-r1
Signed-off-by: Ionen Wolkens gentoo.org>
app-portage/iwdevtools/Manifest| 1 -
.../files/iwdevtools-0.11.5-rcd-plain-name.patch | 18 --
app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild | 68 --
3 files changed, 87 deletions(-)
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 6219e8157377..9dd8555ce4d7 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,2 +1 @@
-DIST iwdevtools-0.11.5.tar.gz 85698 BLAKE2B
0f5b0c81735017b82144c74b2396826b2e6ea97db70704977c7885bdb00442c83023f593aeb25ab2e51f3a35cd659be98440f51e4496418a92f1559212db5b5d
SHA512
05e0169a465cd4956d663f54bdc66d3c17379229b23c26a94d9deff879ef9e53b1b28f59e7cf314d36127954cb75728f008d0b0728659436ad1e63de5fb11bbb
DIST iwdevtools-0.11.6.tar.gz 85945 BLAKE2B
61c18ae0ed1c0f7e90d41af485f18f891cdd9ffbaff5437cb9f9ca88622efa0f5acd89ac8596e7d41c25a083a970143f3b226284f4566b0b8ee3718071cd6cbb
SHA512
21ffda72945947658bf6867bf83d9b9ad4f6b930d4c2cee3dea551581030668ab286a4c4a07edeae937fd91f4aba08fe8e7c6506459808c4ada38502226b5b26
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
deleted file mode 100644
index dbb2ca17f887..
--- a/app-portage/iwdevtools/files/iwdevtools-0.11.5-rcd-plain-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/ionenwks/iwdevtools/commit/408fba9
-From: Ionen Wolkens
-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.5-r1.ebuild
b/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
deleted file mode 100644
index 4cb0eb5fc207..
--- a/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
+++ /dev/null
@@ -1,68 +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} )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-rcd-plain-name.patch
-)
-
-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 '
[gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/, app-portage/iwdevtools/files/
commit: dec725db9a6e01516765f88e3bce77582d8c69a4
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Aug 1 08:34:15 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Aug 1 08:39:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec725db
app-portage/iwdevtools: backport rcd name display fix
Not bothering with a release over this, but still wanted
before stabling.
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/iwdevtools-0.11.5-rcd-plain-name.patch | 18 ++
...tools-0.11.5.ebuild => iwdevtools-0.11.5-r1.ebuild} | 4
2 files changed, 22 insertions(+)
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 ..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
+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.5.ebuild
b/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
similarity index 97%
rename from app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
rename to app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
index 68858249d8a0..46e22b80aa3d 100644
--- a/app-portage/iwdevtools/iwdevtools-0.11.5.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.11.5-r1.ebuild
@@ -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}
[gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/, app-portage/iwdevtools/files/
commit: 1ca30b6cec74f3dc94cb5cf3e2042fe9db311380
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 21 05:57:19 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 21 05:59:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca30b6c
app-portage/iwdevtools: backport tests fix for repos missing masters
May also have caused issues in other situations in the future,
so it's good to fix here rather than just fix the repo's metadata.
Closes: https://bugs.gentoo.org/829740
Signed-off-by: Ionen Wolkens gentoo.org>
.../iwdevtools/files/iwdevtools-0.8.1-tests.patch | 50 ++
app-portage/iwdevtools/iwdevtools-0.8.1.ebuild | 4 ++
2 files changed, 54 insertions(+)
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 ..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
+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/
+!!! 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.1.ebuild
b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
index 63ef0e674569..6b7b59ddc4ac 100644
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="
sys-apps/help2man
test? ( ${RDEPEND} )"
+PATCHES=(
+ "${FILESDIR}"/${P}-tests.patch
+)
+
src_configure() {
local emesonargs=(
-Ddocdir=${PF}
