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 <io...@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 <io...@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 -}
