* [gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/
@ 2022-02-06 19:47 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2022-02-06 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 7c1afbcf77456e36c84cd5d55df5b9144d9b2e76
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 6 19:46:02 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Feb 6 19:46:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1afbcf
app-portage/iwdevtools: drop 0.8.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-portage/iwdevtools/Manifest | 1 -
.../iwdevtools/files/iwdevtools-0.8.1-tests.patch | 50 ----------------
app-portage/iwdevtools/iwdevtools-0.8.1.ebuild | 70 ----------------------
3 files changed, 121 deletions(-)
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 28fa8edb3cd6..ef36a601aa85 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,2 +1 @@
DIST iwdevtools-0.10.0.tar.gz 60808 BLAKE2B 31f5288c54513a95199c3e41e7147778276ffaa2a63bb88e49a91680fa53602c4d1883ccf9b78bf63eba2fefec3fcd50e45ce7a599a0b252eadfaca62f2d9a09 SHA512 e03eda68eced8a23476d6681bd8090f80b642c40e5ed7e3ecb758fe04e51f496be02042bb87f6b42e150d28086e7ce14b278a6fdd05f06725b184b328405d412
-DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b
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.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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/
@ 2022-02-25 9:38 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2022-02-25 9:38 UTC (permalink / raw
To: gentoo-commits
commit: bf3ee3557073e6b2680c59f319b6f46dc58202d3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 09:32:47 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 09:36:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3ee355
app-portage/iwdevtools: backport ldpath include fix
Trivial 1-line change reverting to the old (proper)
behavior, safe and not worth a new release for now.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../iwdevtools-0.10.1-ldpath-regression.patch | 22 ++++++++++++++++++++++
...s-0.10.1.ebuild => iwdevtools-0.10.1-r1.ebuild} | 4 ++++
2 files changed, 26 insertions(+)
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/iwdevtools-0.10.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
similarity index 96%
rename from app-portage/iwdevtools/iwdevtools-0.10.1.ebuild
rename to app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
index 09262d7fea22..bc84297f29a9 100644
--- a/app-portage/iwdevtools/iwdevtools-0.10.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
|| ( sys-apps/util-linux app-misc/getopt )
test? ( ${RDEPEND} )"
+PATCHES=(
+ "${FILESDIR}"/${P}-ldpath-regression.patch
+)
+
src_configure() {
local emesonargs=(
-Ddocdir=${PF}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/
@ 2022-03-16 14:21 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2022-03-16 14:21 UTC (permalink / raw
To: gentoo-commits
commit: fcdde1d0bc3279dacc5bf25aed059b8b40b1efef
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 14:02:00 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 14:21:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcdde1d0
app-portage/iwdevtools: backport diff output fix
Another short fix, leaving releases for later and going
straight to stable.
Kind of important fix, in some rare'ish cases a line may not
have been displayed leading to missed information. So new
output may be available.
Thanks-to: Joonas Niilola <juippis <AT> gentoo.org>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/iwdevtools-0.10.1-diff-off-by-one.patch | 20 ++++++++++++++++++++
...-0.10.1-r1.ebuild => iwdevtools-0.10.1-r2.ebuild} | 1 +
2 files changed, 21 insertions(+)
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/iwdevtools-0.10.1-r1.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
similarity index 97%
rename from app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
rename to app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
index bc84297f29a9..c4d90017aac1 100644
--- a/app-portage/iwdevtools/iwdevtools-0.10.1-r1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
@@ -29,6 +29,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-ldpath-regression.patch
+ "${FILESDIR}"/${P}-diff-off-by-one.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/
@ 2022-07-11 22:57 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2022-07-11 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 140557eab5ff892c51195fb977484154eda06933
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 22:43:37 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 22:56:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=140557ea
app-portage/iwdevtools: drop 0.10.1-r2, 0.11.2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-portage/iwdevtools/Manifest | 2 -
.../files/iwdevtools-0.10.1-diff-off-by-one.patch | 20 -------
.../iwdevtools-0.10.1-ldpath-regression.patch | 22 -------
app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild | 67 ----------------------
app-portage/iwdevtools/iwdevtools-0.11.2.ebuild | 64 ---------------------
5 files changed, 175 deletions(-)
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 7f2de16f332a..51b4aa7ff5f4 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,3 +1 @@
-DIST iwdevtools-0.10.1.tar.gz 61117 BLAKE2B fd5508a40a854987db7f2ecc0e68e100cd6a8b6cc5b90a9901bbf6c16336ebc497861e05a6c1683ac9082aa9f12a03cb47f7116da793fbd8e105ed78aae2bbb3 SHA512 0f04850f15edc8af368a87bbc665c62d5588f4220c2d15ca5c0dd00d2c8135f7e1294217c8aec313650b7b7aae6433b87bdc32306c2c4c6e6747e55a13adbbe0
-DIST iwdevtools-0.11.2.tar.gz 84518 BLAKE2B 1d3920b8a1503a916f913d0c075a1f3c703ca238c55761c0cd6423f68e0395e2eb0c8ab07bf069c3cdf44ab9d07b4652184d790d9b74e1f00cb74e8b86290de6 SHA512 7e4584f8f2141b54bf32828801415e039ceec319095268fccb40f4960d66af2504da97fd6f18b1763f6beaef477ac3b6b0bf7ae9bac08a474de73b420ebd5a43
DIST iwdevtools-0.11.3.tar.gz 84838 BLAKE2B a4f501c24cc70b13ded5ca88599a3c11b076ae3a3464d065fe3999c8cb9268cfd17fc116197c09ddc6b968d7527409b348c0c1bdb939f6ed1b7a2abdfc868774 SHA512 38a62654042b714689fcf813a533ad463b7bdc0a4b501dc37c498e528792104a3db601f82781d889407217c824a9f48233544fb56a012de19fd34fa92d1de06d
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
deleted file mode 100644
index 87564b0b1445..000000000000
--- a/app-portage/iwdevtools/files/iwdevtools-0.10.1-diff-off-by-one.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
deleted file mode 100644
index 5a5312639979..000000000000
--- a/app-portage/iwdevtools/files/iwdevtools-0.10.1-ldpath-regression.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/iwdevtools-0.10.1-r2.ebuild b/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
deleted file mode 100644
index 754e9dbb9fc4..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.10.1-r2.ebuild
+++ /dev/null
@@ -1,67 +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 ~loong 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 app-misc/getopt )"
-BDEPEND="
- sys-apps/help2man
- || ( 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}
- -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.11.2.ebuild b/app-portage/iwdevtools/iwdevtools-0.11.2.ebuild
deleted file mode 100644
index 67662de04000..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.11.2.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"
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/
@ 2024-11-04 16:15 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2024-11-04 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 108661beabdcd76f94e380de7e3e17c8ed5689d3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 4 15:20:34 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 16:13:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108661be
app-portage/iwdevtools: drop 0.12.12
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-portage/iwdevtools/Manifest | 1 -
.../files/iwdevtools-0.12.12-category-tests.patch | 79 ----------------------
app-portage/iwdevtools/iwdevtools-0.12.12.ebuild | 74 --------------------
3 files changed, 154 deletions(-)
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index 932dd31f6111..6aa430b436a2 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,2 +1 @@
-DIST iwdevtools-0.12.12.tar.gz 91784 BLAKE2B 7df4f1996ad55090b65ea87c67a5ae15c5f661a5fd1e21cddbb157e651c4b52aa8e8223f4071dabc726605958942847e17678fc4e102037c6937963ef69fd7bc SHA512 13142c9df7892a55a9fc2172fb0a9480b1d91cfa23dca71a22b1c7f5882bfd84af9c17228a0e8251f1fac0840196c1e18b34f3568b30d04a20b1a8188fa31150
DIST iwdevtools-0.12.13.tar.gz 92069 BLAKE2B aab815edc3a8ba5e57cac7954af3bbb75e66ca605ea0299c5d024fcaf321fe0d00b1b2fb1a22178ab485de1c669220c845ec9b69c94f22ffd925d347b737c47b SHA512 20a3b238fd27d7c57faf2f79705d86359f3dde0b8e59bd4fa63844aea294d539a74a875916a5129f4a774edc9e26b485a5852393f450edb74894f43d5c1cc3a1
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
deleted file mode 100644
index 9f8645f614d4..000000000000
--- a/app-portage/iwdevtools/files/iwdevtools-0.12.12-category-tests.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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.12.ebuild b/app-portage/iwdevtools/iwdevtools-0.12.12.ebuild
deleted file mode 100644
index e590c0eec548..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.12.12.ebuild
+++ /dev/null
@@ -1,74 +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} )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-category-tests.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 ' PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"'
- elog
- elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools."
- fi
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-11-04 16:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-11 22:57 [gentoo-commits] repo/gentoo:master commit in: app-portage/iwdevtools/files/, app-portage/iwdevtools/ Ionen Wolkens
-- strict thread matches above, loose matches on Subject: below --
2024-11-04 16:15 Ionen Wolkens
2022-03-16 14:21 Ionen Wolkens
2022-02-25 9:38 Ionen Wolkens
2022-02-06 19:47 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox