1 |
commit: 7c1afbcf77456e36c84cd5d55df5b9144d9b2e76 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 6 19:46:02 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 6 19:46:02 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1afbcf |
7 |
|
8 |
app-portage/iwdevtools: drop 0.8.1 |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
app-portage/iwdevtools/Manifest | 1 - |
13 |
.../iwdevtools/files/iwdevtools-0.8.1-tests.patch | 50 ---------------- |
14 |
app-portage/iwdevtools/iwdevtools-0.8.1.ebuild | 70 ---------------------- |
15 |
3 files changed, 121 deletions(-) |
16 |
|
17 |
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest |
18 |
index 28fa8edb3cd6..ef36a601aa85 100644 |
19 |
--- a/app-portage/iwdevtools/Manifest |
20 |
+++ b/app-portage/iwdevtools/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST iwdevtools-0.10.0.tar.gz 60808 BLAKE2B 31f5288c54513a95199c3e41e7147778276ffaa2a63bb88e49a91680fa53602c4d1883ccf9b78bf63eba2fefec3fcd50e45ce7a599a0b252eadfaca62f2d9a09 SHA512 e03eda68eced8a23476d6681bd8090f80b642c40e5ed7e3ecb758fe04e51f496be02042bb87f6b42e150d28086e7ce14b278a6fdd05f06725b184b328405d412 |
23 |
-DIST iwdevtools-0.8.1.tar.gz 58058 BLAKE2B b9f17f68bb073ecf2d8a94fc8b97d95f7188e7526dd6a32cf33aa3b01fe82bf25c696cc2be9cbdc0aaa3a8279532e506ab287d3e25da5d5fb55789064d47aec6 SHA512 cb365e7010d620f2a255db0244ee1a38fd5714a17093b2e2a71627155764165853f99a4477b281b92061f7fe184297a222a8c79c2c62beb8e0656761feee859b |
24 |
|
25 |
diff --git a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch b/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch |
26 |
deleted file mode 100644 |
27 |
index 4cbe6712140a..000000000000 |
28 |
--- a/app-portage/iwdevtools/files/iwdevtools-0.8.1-tests.patch |
29 |
+++ /dev/null |
30 |
@@ -1,50 +0,0 @@ |
31 |
-https://github.com/ionenwks/iwdevtools/commit/a679594f115e8c9fd54aa70fc0742b7d560a2204 |
32 |
-From: Ionen Wolkens <ionen@g.o> |
33 |
-Date: Tue, 21 Dec 2021 00:36:40 -0500 |
34 |
-Subject: [PATCH] tests: relax globs for some stderr output checks |
35 |
- |
36 |
-portage may add noise to these depending on the system, e.g. |
37 |
- |
38 |
-!!! Repository 'gentoo' is missing masters attribute in '/var/db/<snip> |
39 |
-!!! Set 'masters = iwdevtools' in this file for future compatibility |
40 |
- |
41 |
-But these tests are only checking if our own expected error is there, |
42 |
-the rest is not important. |
43 |
- |
44 |
-Reported from: https://bugs.gentoo.org/829740 |
45 |
---- a/tests/eoldnew/test-pick |
46 |
-+++ b/tests/eoldnew/test-pick |
47 |
-@@ -7,4 +7,4 @@ export EOLDNEW_EMERGE_CMD=echo |
48 |
- expect "old: dev-test/test-1.5.0*new: dev-test/test-2.0.0*" dev-test/test |
49 |
- expect "old: dev-test/test-1.0.0*new: dev-test/test-2.0.0*" 2 dev-test/test |
50 |
- expect "old: dev-test/test-1.0.0*new: dev-test/test-1.5.0*" =dev-test/test-1.5.0 |
51 |
--xfail 1 expect -2 "Error:*older version*" =dev-test/test-1.0.0 |
52 |
-+xfail 1 expect -2 "*Error: failed to find an older version*" =dev-test/test-1.0.0 |
53 |
---- a/tests/eoldnew/test-skip-new |
54 |
-+++ b/tests/eoldnew/test-skip-new |
55 |
-@@ -6,4 +6,4 @@ ebuild "$(get_ebuild test 2.0.0)" merge |
56 |
- export EOLDNEW_EMERGE_CMD=echo |
57 |
- expect "*=dev-test/test-1.5.0" - dev-test/test |
58 |
- expect "*=dev-test/test-1.0.0" 2- dev-test/test |
59 |
--xfail 1 expect -2 "Error:*older version*" - =dev-test/test-1.0.0 |
60 |
-+xfail 1 expect -2 "*Error: failed to find an older version*" - =dev-test/test-1.0.0 |
61 |
---- a/tests/qa-cmp/test-missing |
62 |
-+++ b/tests/qa-cmp/test-missing |
63 |
-@@ -1,4 +1,4 @@ |
64 |
- set_portroot |
65 |
- ebuild "$(get_ebuild test 1.5 :)" install |
66 |
--xfail 1 expect -2 "Error:*nothing*" -cI dev-test/test |
67 |
--expect -2 "''" -cI --allow-missing dev-test/test |
68 |
-+xfail 1 expect -2 "*Error: found nothing to compare*" -cI dev-test/test |
69 |
-+expect -! -2 "*Error: found nothing to compare*" -cI --allow-missing dev-test/test |
70 |
---- a/tests/qa-cmp/test-system |
71 |
-+++ b/tests/qa-cmp/test-system |
72 |
-@@ -5,7 +5,7 @@ ebuild "$(get_ebuild test 1.5 :)" merge |
73 |
- ebuild "$(get_ebuild test 2.5 :)" install |
74 |
- expect -! "CMP:*" -c dev-test/test |
75 |
- ebuild "$(get_ebuild test 2.5 bin:file{1..2} lib.so:"${LIBD100}")" clean merge |
76 |
--xfail 1 expect -2 "Error:*" -c dev-test/test |
77 |
-+xfail 1 expect -2 "*Error: found nothing to compare*" -c dev-test/test |
78 |
- expect "*CMP: listing*" -c --single-all dev-test/test |
79 |
- ebuild "$(get_ebuild test 3.5 bin:file{3..4} lib.so:{"${LIBD200}","${LIBA300}"})" install |
80 |
- 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 |
81 |
|
82 |
diff --git a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild |
83 |
deleted file mode 100644 |
84 |
index 020799722038..000000000000 |
85 |
--- a/app-portage/iwdevtools/iwdevtools-0.8.1.ebuild |
86 |
+++ /dev/null |
87 |
@@ -1,70 +0,0 @@ |
88 |
-# Copyright 2021-2022 Gentoo Authors |
89 |
-# Distributed under the terms of the GNU General Public License v2 |
90 |
- |
91 |
-EAPI=8 |
92 |
- |
93 |
-inherit meson optfeature |
94 |
- |
95 |
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA" |
96 |
-HOMEPAGE="https://github.com/ionenwks/iwdevtools" |
97 |
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" |
98 |
- |
99 |
-LICENSE="BSD-2" |
100 |
-SLOT="0" |
101 |
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" |
102 |
-IUSE="test" |
103 |
-RESTRICT="!test? ( test )" |
104 |
- |
105 |
-RDEPEND=" |
106 |
- app-misc/pax-utils |
107 |
- app-portage/portage-utils |
108 |
- sys-apps/diffutils |
109 |
- sys-apps/file |
110 |
- sys-apps/portage |
111 |
- sys-apps/util-linux" |
112 |
-BDEPEND=" |
113 |
- sys-apps/help2man |
114 |
- sys-apps/util-linux |
115 |
- test? ( ${RDEPEND} )" |
116 |
- |
117 |
-PATCHES=( |
118 |
- "${FILESDIR}"/${P}-tests.patch |
119 |
-) |
120 |
- |
121 |
-src_configure() { |
122 |
- local emesonargs=( |
123 |
- -Ddocdir=${PF} |
124 |
- -Deprefix="${EPREFIX}" |
125 |
- -Dshellcheck=false |
126 |
- $(meson_use test) |
127 |
- ) |
128 |
- |
129 |
- meson_src_configure |
130 |
-} |
131 |
- |
132 |
-pkg_postinst() { |
133 |
- optfeature "detecting potential ABI issues using abidiff" dev-util/libabigail |
134 |
- |
135 |
- if [[ ! ${REPLACING_VERSIONS} ]]; then |
136 |
- elog "Optional portage integration relies on using /etc/portage/bashrc." |
137 |
- elog "The example bashrc can be used as-is if not already using one:" |
138 |
- elog |
139 |
- elog " ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc" |
140 |
- elog |
141 |
- elog "Otherwise, inspect the tools' --help output and the example to integrate" |
142 |
- elog "(if not defining the same phase functions, the example can be sourced)." |
143 |
- elog |
144 |
- elog "Note that \`eqawarn\` is used for portage output by default. QA messages" |
145 |
- elog "aren't logged / shown post-emerge unless e.g. in /etc/portage/make.conf:" |
146 |
- elog |
147 |
- elog ' PORTAGE_ELOG_CLASSES="${PORTAGE_ELOG_CLASSES} qa"' |
148 |
- elog |
149 |
- elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for information on tools." |
150 |
- fi |
151 |
- |
152 |
- if [[ ${REPLACING_VERSIONS} ]] && |
153 |
- ver_test ${REPLACING_VERSIONS} -le 0.7.0; then |
154 |
- elog "qa-* bashrcs now use \`eqawarn\` for portage output. If no longer" |
155 |
- elog "seeing messages post-emerge, ensure 'qa' is in PORTAGE_ELOG_CLASSES." |
156 |
- fi |
157 |
-} |