diff options
Diffstat (limited to 'app-alternatives')
-rw-r--r-- | app-alternatives/Manifest.gz | bin | 1840 -> 1843 bytes | |||
-rw-r--r-- | app-alternatives/awk/Manifest | 2 | ||||
-rw-r--r-- | app-alternatives/awk/awk-4.ebuild | 21 |
3 files changed, 8 insertions, 15 deletions
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz Binary files differindex 42af43caae2c..5b6f92bcc0bb 100644 --- a/app-alternatives/Manifest.gz +++ b/app-alternatives/Manifest.gz diff --git a/app-alternatives/awk/Manifest b/app-alternatives/awk/Manifest index fc82af75e887..c0973667fc63 100644 --- a/app-alternatives/awk/Manifest +++ b/app-alternatives/awk/Manifest @@ -1,2 +1,2 @@ -EBUILD awk-4.ebuild 2512 BLAKE2B 5ace70f092f0c69fa8f2188e5bdafb0357ef45a65d69b9e01889162cb7c9b61232fba67cb15bca88474ff5014e5b8bfebc07e6964d537d08f54158fbcc105310 SHA512 bac9b75ece458a006fb022f44899e83cae0c2ff5285becf77ad0f995a1dfa0c6cdda98ccc718632f02c79c3f9a84a78a77d7a667e583d3c02a4c16e37e1ca4f4 +EBUILD awk-4.ebuild 2435 BLAKE2B 54ba86be89ffb2c11ab1187411255930eef2f164975858f3ba981b72e1d050481414a776d471e5daaaa1dc2904ec4673499d3dfe5ed6508933b43a87ad3bd33c SHA512 79c00bd001fc07c31fd47e096b90c14b3643050b31ccc3ac1650942f03285993200bbca26c1c359b004d0296b3d90fb797bc10f12150e685d393b7eb40df5153 MISC metadata.xml 715 BLAKE2B bd5d943bc9fd00f7a4cc999d80cdf565a2138f5dbb95b51e8589384109b2abfbee478b4fb56b30fc16659a1a51a08b0353b30126004bfee28b9ce5217c68c6d6 SHA512 56434c9ce869659cf9d319fc4c2b6e394fde089657db78430c8b7a87d013f0716758d46349795fdb3be4183dca4d10f6631ae13853b658aae4be0a88e5570888 diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index bc74e2572cb5..2c26d9a417fe 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ ALTERNATIVES=( nawk:sys-apps/nawk ) -inherit app-alternatives +inherit app-alternatives eapi9-ver DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" @@ -49,18 +49,11 @@ pkg_preinst() { has_version "app-alternatives/awk[mawk]" && HAD_MAWK=1 - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${v}" -lt 4; then - SHOW_MAWK_WARNING=1 - fi - - # if we are upgrading from a new enough version, leftover manpage - # symlink cleanup was done already - if ver_test "${v}" -ge 3; then - return - fi - done + ver_replacing -lt 4 && SHOW_MAWK_WARNING=1 + + # if we are upgrading from a new enough version, leftover manpage + # symlink cleanup was done already + ver_replacing -ge 3 && return # otherwise, remove leftover files/symlinks created by eselect-awk (sic!) shopt -s nullglob |