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 <[email protected]> -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 -}
