diff options
author | Ionen Wolkens <ionen@gentoo.org> | 2024-11-04 10:20:34 -0500 |
---|---|---|
committer | Ionen Wolkens <ionen@gentoo.org> | 2024-11-04 11:13:48 -0500 |
commit | 108661beabdcd76f94e380de7e3e17c8ed5689d3 (patch) | |
tree | 4161ab8ac0ec8b72f2c62458427cfafee1e786ca /app-portage | |
parent | games-engines/devilutionx: drop 1.5.2 (diff) | |
download | gentoo-108661beabdcd76f94e380de7e3e17c8ed5689d3.tar.gz gentoo-108661beabdcd76f94e380de7e3e17c8ed5689d3.tar.bz2 gentoo-108661beabdcd76f94e380de7e3e17c8ed5689d3.zip |
app-portage/iwdevtools: drop 0.12.12
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'app-portage')
-rw-r--r-- | app-portage/iwdevtools/Manifest | 1 | ||||
-rw-r--r-- | app-portage/iwdevtools/files/iwdevtools-0.12.12-category-tests.patch | 79 | ||||
-rw-r--r-- | app-portage/iwdevtools/iwdevtools-0.12.12.ebuild | 74 |
3 files changed, 0 insertions, 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 -} |