[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 0a76df521dd7b668607ba7f366b853cd01adfc20
Author: Sam James gentoo org>
AuthorDate: Tue Dec 27 23:51:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 28 00:32:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a76df52
app-alternatives/awk: drop 1, 3
Signed-off-by: Sam James gentoo.org>
app-alternatives/awk/awk-1.ebuild | 19 --
app-alternatives/awk/awk-3.ebuild | 77 ---
2 files changed, 96 deletions(-)
diff --git a/app-alternatives/awk/awk-1.ebuild
b/app-alternatives/awk/awk-1.ebuild
deleted file mode 100644
index cef6aea276d2..
--- a/app-alternatives/awk/awk-1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for awk implementation"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-LICENSE="metapackage"
-
-RDEPEND="
- || (
- >=sys-apps/gawk-4.0.1-r1
- sys-apps/mawk
- sys-apps/nawk
- sys-apps/busybox
- )"
diff --git a/app-alternatives/awk/awk-3.ebuild
b/app-alternatives/awk/awk-3.ebuild
deleted file mode 100644
index 46ba60100171..
--- a/app-alternatives/awk/awk-3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ALTERNATIVES=(
- gawk:sys-apps/gawk
- busybox:sys-apps/busybox
- mawk:sys-apps/mawk
- nawk:sys-apps/nawk
-)
-
-inherit app-alternatives
-
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="split-usr"
-
-RDEPEND="
- !app-eselect/eselect-awk
-"
-
-src_install() {
- local alt=$(get_alternative)
- local root_prefix=
- use split-usr && root_prefix=../../bin/
-
- # We could consider setting AWK=... like we do for yacc & lex,
- # but it would need some testing with a fair amount of packages first,
- # as autoconf prefers gawk.
- case ${alt} in
- busybox)
- dosym "${root_prefix}busybox" /usr/bin/awk
- ;;
- *)
- dosym "${alt}" /usr/bin/awk
- ;;
- esac
-
- newman - awk.1 <<<".so ${alt}.1"
-
- if use split-usr; then
- dosym ../usr/bin/awk /bin/awk
- fi
-}
-
-pkg_preinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- # 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
-
- # otherwise, remove leftover files/symlinks created by eselect-awk
(sic!)
- shopt -s nullglob
- local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
- shopt -u nullglob
-
- if [[ ${files[@]} ]]; then
- einfo "Cleaning up leftover manpage symlinks from eselect-awk
..."
- rm -v "${files[@]}" || die
- fi
-}
-
-pkg_postrm() {
- # make sure we don't leave the user without the symlinks, since
- # they've not been owned by any other package
- if [[ ! -h ${EROOT}/usr/bin/awk ]]; then
- ln -s gawk "${EROOT}/usr/bin/awk" || die
- fi
- if [[ ! -h ${EROOT}/bin/awk ]]; then
- ln -s ../usr/bin/awk "${EROOT}/bin/awk" || die
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 12d06b19165ec1f4c344e8d9cb8d98edf5bed02e Author: Sam James gentoo org> AuthorDate: Tue Dec 27 23:01:36 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 23:01:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d06b19 app-alternatives/awk: Stabilize 4 hppa, #888657 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index d0b88a20cf1c..1407a6fc464c 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 13fd9f4510e0eed77a59192d6731f4e772151c15 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 20:22:01 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 20:26:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13fd9f45 app-alternatives/awk: Stabilize 4 sparc, #888657 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index 8cf40f362370..d0b88a20cf1c 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 6677391dd94b3df15919c46b8bf13f05d78227c3 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 20:22:00 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 20:26:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6677391d app-alternatives/awk: Stabilize 4 x86, #888657 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index b80d5e2ffa89..8cf40f362370 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: ba75b765f68bba503164acc40a7ee0c3895c2ccc Author: Arthur Zamarin gentoo org> AuthorDate: Tue Dec 27 20:23:53 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Dec 27 20:23:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba75b765 app-alternatives/awk: Stabilize 4 ppc, #888657 Signed-off-by: Arthur Zamarin gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index a3f7d64cc51b..b80d5e2ffa89 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 5cb53ddbc7cc4d66b4fb05a2f8edd4156e0fc472 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Dec 27 20:23:52 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Dec 27 20:23:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb53ddb app-alternatives/awk: Stabilize 4 ppc64, #888657 Signed-off-by: Arthur Zamarin gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index 095370fc774d..a3f7d64cc51b 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 186512bfe7474d6051f7db37a63c99aa438e089f Author: Sam James gentoo org> AuthorDate: Tue Dec 27 20:21:14 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 20:21:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=186512bf app-alternatives/awk: Stabilize 4 arm, #888657 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index ad93ec094c75..ae89c88502e4 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 9915446c53a11a3feb890bee5d9492342ff55b62 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 20:21:13 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 20:21:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9915446c app-alternatives/awk: Stabilize 4 amd64, #888657 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index 127157897532..ad93ec094c75 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: df302bd69d3f33f4ff7b73e7d35a54c41d5a244c Author: Sam James gentoo org> AuthorDate: Tue Dec 27 20:21:16 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 20:21:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df302bd6 app-alternatives/awk: Stabilize 4 arm64, #888657 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-4.ebuild b/app-alternatives/awk/awk-4.ebuild index ae89c88502e4..095370fc774d 100644 --- a/app-alternatives/awk/awk-4.ebuild +++ b/app-alternatives/awk/awk-4.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 5a493969488e8157c64813695ca2a4406217fbd7 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 19:47:08 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 19:53:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a493969 app-alternatives/awk: Stabilize 3 ppc64, #886017 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-3.ebuild b/app-alternatives/awk/awk-3.ebuild index bd5cf6c897ea..46ba60100171 100644 --- a/app-alternatives/awk/awk-3.ebuild +++ b/app-alternatives/awk/awk-3.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 4781132b184679ea47c1b84c334e8b027e686d1d Author: Sam James gentoo org> AuthorDate: Tue Dec 27 19:36:58 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 19:45:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4781132b app-alternatives/awk: Stabilize 3 hppa, #886017 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-3.ebuild b/app-alternatives/awk/awk-3.ebuild index a8df89224381..f688697b2c9c 100644 --- a/app-alternatives/awk/awk-3.ebuild +++ b/app-alternatives/awk/awk-3.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 05d21fb40f872eb11372e91ef92cae615f279895 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 13:39:33 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 13:39:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d21fb4 app-alternatives/awk: Stabilize 3 arm64, #886017 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-3.ebuild b/app-alternatives/awk/awk-3.ebuild index de4c6f66b515..e47aaabd1b09 100644 --- a/app-alternatives/awk/awk-3.ebuild +++ b/app-alternatives/awk/awk-3.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: c41f9152b2afa3fc0f19752e79fa37dd44ea04e8 Author: Sam James gentoo org> AuthorDate: Tue Dec 27 11:31:08 2022 + Commit: Sam James gentoo org> CommitDate: Tue Dec 27 11:31:08 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c41f9152 app-alternatives/awk: Stabilize 3 amd64, #886017 Signed-off-by: Sam James gentoo.org> app-alternatives/awk/awk-3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-alternatives/awk/awk-3.ebuild b/app-alternatives/awk/awk-3.ebuild index d722129ee333..8ad33e38a019 100644 --- a/app-alternatives/awk/awk-3.ebuild +++ b/app-alternatives/awk/awk-3.ebuild @@ -13,7 +13,7 @@ ALTERNATIVES=( inherit app-alternatives DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="split-usr" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 10e8d5a43a30291adc3578304e3c8df9b7591b99
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 06:40:51 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Dec 16 06:41:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10e8d5a4
app-alternatives/awk: add 4 (warning for mawk)
Add one-off warning if using mawk, as suggested by kerframil.
Signed-off-by: Sam James gentoo.org>
app-alternatives/awk/awk-4.ebuild | 95 +++
1 file changed, 95 insertions(+)
diff --git a/app-alternatives/awk/awk-4.ebuild
b/app-alternatives/awk/awk-4.ebuild
new file mode 100644
index ..127157897532
--- /dev/null
+++ b/app-alternatives/awk/awk-4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ALTERNATIVES=(
+ gawk:sys-apps/gawk
+ busybox:sys-apps/busybox
+ mawk:sys-apps/mawk
+ nawk:sys-apps/nawk
+)
+
+inherit app-alternatives
+
+DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="split-usr"
+
+RDEPEND="
+ !app-eselect/eselect-awk
+"
+
+src_install() {
+ local alt=$(get_alternative)
+ local root_prefix=
+ use split-usr && root_prefix=../../bin/
+
+ # We could consider setting AWK=... like we do for yacc & lex,
+ # but it would need some testing with a fair amount of packages first,
+ # as autoconf prefers gawk.
+ case ${alt} in
+ busybox)
+ dosym "${root_prefix}busybox" /usr/bin/awk
+ ;;
+ *)
+ dosym "${alt}" /usr/bin/awk
+ ;;
+ esac
+
+ newman - awk.1 <<<".so ${alt}.1"
+
+ if use split-usr; then
+ dosym ../usr/bin/awk /bin/awk
+ fi
+}
+
+pkg_preinst() {
+ HAD_MAWK=0
+
+ 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
+
+ # otherwise, remove leftover files/symlinks created by eselect-awk
(sic!)
+ shopt -s nullglob
+ local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
+ shopt -u nullglob
+
+ if [[ ${files[@]} ]]; then
+ einfo "Cleaning up leftover manpage symlinks from eselect-awk
..."
+ rm -v "${files[@]}" || die
+ fi
+}
+
+pkg_postinst() {
+ # Show the warning on new installs if using mawk, or older installs
+ # if upgrading from < app-alternatives/awk-4[mawk].
+ if [[ -z ${REPLACING_VERSIONS} || ${SHOW_MAWK_WARNING} -eq 1 ||
${HAD_MAWK} -eq 0 ]] && use mawk; then
+ ewarn "mawk (incompletely) implements awk, as it was defined
by the now-obsolete"
+ ewarn "POSIX 1003.2 (draft 11.3) specification. It does not
fully implement the standard"
+ ewarn "extended regular expression syntax and there are other
known issues pertaining to POSIX conformance."
+ fi
+}
+
+pkg_postrm() {
+ # make sure we don't leave the user without the symlinks, since
+ # they've not been owned by any other package
+ if [[ ! -h ${EROOT}/usr/bin/awk ]]; then
+ ln -s gawk "${EROOT}/usr/bin/awk" || die
+ fi
+ if [[ ! -h ${EROOT}/bin/awk ]]; then
+ ln -s ../usr/bin/awk "${EROOT}/bin/awk" || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: d4c96a45f9e0c5401a6d4df4867dc85348fd7989
Author: Michał Górny gentoo org>
AuthorDate: Mon Dec 5 15:17:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 6 09:15:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c96a45
app-alternatives/awk: Clean up stale manpages from eselect-awk
Closes: https://bugs.gentoo.org/884427
Signed-off-by: Michał Górny gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28551
Signed-off-by: Sam James gentoo.org>
app-alternatives/awk/{awk-2.ebuild => awk-3.ebuild} | 21 +
1 file changed, 21 insertions(+)
diff --git a/app-alternatives/awk/awk-2.ebuild
b/app-alternatives/awk/awk-3.ebuild
similarity index 72%
rename from app-alternatives/awk/awk-2.ebuild
rename to app-alternatives/awk/awk-3.ebuild
index c20aa0953478..d722129ee333 100644
--- a/app-alternatives/awk/awk-2.ebuild
+++ b/app-alternatives/awk/awk-3.ebuild
@@ -44,6 +44,27 @@ src_install() {
fi
}
+pkg_preinst() {
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ # 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
+
+ # otherwise, remove leftover files/symlinks created by eselect-awk
(sic!)
+ shopt -s nullglob
+ local files=( "${EROOT}"/usr/share/man/man1/awk.1* )
+ shopt -u nullglob
+
+ if [[ ${files[@]} ]]; then
+ einfo "Cleaning up leftover manpage symlinks from eselect-awk
..."
+ rm -v "${files[@]}" || die
+ fi
+}
+
pkg_postrm() {
# make sure we don't leave the user without the symlinks, since
# they've not been owned by any other package
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: dfdb9ce0454d59a5d5a2d466c5a1de1346fcdc72
Author: Michał Górny gentoo org>
AuthorDate: Fri Dec 2 19:11:05 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Mon Dec 5 19:13:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfdb9ce0
app-alternatives/awk: Use app-alternatives.eclass
Signed-off-by: Michał Górny gentoo.org>
app-alternatives/awk/awk-2.ebuild | 48 +--
1 file changed, 21 insertions(+), 27 deletions(-)
diff --git a/app-alternatives/awk/awk-2.ebuild
b/app-alternatives/awk/awk-2.ebuild
index c76362361bef..c20aa0953478 100644
--- a/app-alternatives/awk/awk-2.ebuild
+++ b/app-alternatives/awk/awk-2.ebuild
@@ -3,47 +3,41 @@
EAPI=8
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives;
-SRC_URI=""
-S=${WORKDIR}
+ALTERNATIVES=(
+ gawk:sys-apps/gawk
+ busybox:sys-apps/busybox
+ mawk:sys-apps/mawk
+ nawk:sys-apps/nawk
+)
+
+inherit app-alternatives
-LICENSE="CC0-1.0"
-SLOT="0"
+DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="busybox +gawk mawk nawk split-usr"
-REQUIRED_USE="^^ ( busybox gawk mawk nawk )"
+IUSE="split-usr"
RDEPEND="
- busybox? ( sys-apps/busybox )
- gawk? ( sys-apps/gawk )
- mawk? ( sys-apps/mawk )
- nawk? ( sys-apps/nawk )
!app-eselect/eselect-awk
"
src_install() {
+ local alt=$(get_alternative)
local root_prefix=
use split-usr && root_prefix=../../bin/
# We could consider setting AWK=... like we do for yacc & lex,
# but it would need some testing with a fair amount of packages first,
# as autoconf prefers gawk.
- if use busybox; then
- dosym "${root_prefix}busybox" /usr/bin/awk
- newman - awk.1 <<<".so busybox.1"
- elif use gawk; then
- dosym gawk /usr/bin/awk
- newman - awk.1 <<<".so gawk.1"
- elif use mawk; then
- dosym mawk /usr/bin/awk
- newman - awk.1 <<<".so mawk.1"
- elif use nawk; then
- dosym nawk /usr/bin/awk
- newman - awk.1 <<<".so nawk.1"
- else
- die "Invalid USE flag combination (broken REQUIRED_USE?)"
- fi
+ case ${alt} in
+ busybox)
+ dosym "${root_prefix}busybox" /usr/bin/awk
+ ;;
+ *)
+ dosym "${alt}" /usr/bin/awk
+ ;;
+ esac
+
+ newman - awk.1 <<<".so ${alt}.1"
if use split-usr; then
dosym ../usr/bin/awk /bin/awk
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: a88b50da320f6eca75f92a5e59b1657674775d85
Author: Sam James gentoo org>
AuthorDate: Sat Dec 3 01:37:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 3 01:37:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88b50da
app-alternatives/awk: add note re AWK in env
Signed-off-by: Sam James gentoo.org>
app-alternatives/awk/awk-2.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/app-alternatives/awk/awk-2.ebuild
b/app-alternatives/awk/awk-2.ebuild
index 01e69d65fbd1..c76362361bef 100644
--- a/app-alternatives/awk/awk-2.ebuild
+++ b/app-alternatives/awk/awk-2.ebuild
@@ -26,6 +26,9 @@ src_install() {
local root_prefix=
use split-usr && root_prefix=../../bin/
+ # We could consider setting AWK=... like we do for yacc & lex,
+ # but it would need some testing with a fair amount of packages first,
+ # as autoconf prefers gawk.
if use busybox; then
dosym "${root_prefix}busybox" /usr/bin/awk
newman - awk.1 <<<".so busybox.1"
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/
commit: 2e89118d084a68992d7ed042619cdc2c856daf1c Author: Michał Górny gentoo org> AuthorDate: Fri Dec 2 03:46:18 2022 + Commit: Michał Górny gentoo org> CommitDate: Fri Dec 2 03:47:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e89118d app-alternatives/awk: Define LICENSE and HOMEPAGE for the virtual Signed-off-by: Michał Górny gentoo.org> app-alternatives/awk/awk-1.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-alternatives/awk/awk-1.ebuild b/app-alternatives/awk/awk-1.ebuild index a17f47bf0746..cef6aea276d2 100644 --- a/app-alternatives/awk/awk-1.ebuild +++ b/app-alternatives/awk/awk-1.ebuild @@ -4,8 +4,11 @@ EAPI=7 DESCRIPTION="Virtual for awk implementation" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage; + SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +LICENSE="metapackage" RDEPEND=" || (
[gentoo-commits] repo/gentoo:master commit in: app-alternatives/awk/, profiles/arch/amd64/, profiles/arch/base/, ...
commit: e9409706a2eb928834ed7e169cee7433b8a12b54
Author: Michał Górny gentoo org>
AuthorDate: Fri Dec 2 03:09:29 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Dec 2 03:10:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9409706
app-alternatives/awk: Revert "New package to control awk symlinks"
We'll do a pkgmove from virtual/awk.
Reverts: fe323f5591a2556d80dd16a8fde2f2cfc349f3b2
Signed-off-by: Michał Górny gentoo.org>
app-alternatives/awk/awk-0.ebuild| 59
app-alternatives/awk/metadata.xml| 27 -
profiles/arch/amd64/package.use.mask | 4 ---
profiles/arch/base/package.use.mask | 4 ---
profiles/arch/x86/package.use.mask | 4 ---
5 files changed, 98 deletions(-)
diff --git a/app-alternatives/awk/awk-0.ebuild
b/app-alternatives/awk/awk-0.ebuild
deleted file mode 100644
index 01e69d65fbd1..
--- a/app-alternatives/awk/awk-0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives;
-SRC_URI=""
-S=${WORKDIR}
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="busybox +gawk mawk nawk split-usr"
-REQUIRED_USE="^^ ( busybox gawk mawk nawk )"
-
-RDEPEND="
- busybox? ( sys-apps/busybox )
- gawk? ( sys-apps/gawk )
- mawk? ( sys-apps/mawk )
- nawk? ( sys-apps/nawk )
- !app-eselect/eselect-awk
-"
-
-src_install() {
- local root_prefix=
- use split-usr && root_prefix=../../bin/
-
- if use busybox; then
- dosym "${root_prefix}busybox" /usr/bin/awk
- newman - awk.1 <<<".so busybox.1"
- elif use gawk; then
- dosym gawk /usr/bin/awk
- newman - awk.1 <<<".so gawk.1"
- elif use mawk; then
- dosym mawk /usr/bin/awk
- newman - awk.1 <<<".so mawk.1"
- elif use nawk; then
- dosym nawk /usr/bin/awk
- newman - awk.1 <<<".so nawk.1"
- else
- die "Invalid USE flag combination (broken REQUIRED_USE?)"
- fi
-
- if use split-usr; then
- dosym ../usr/bin/awk /bin/awk
- fi
-}
-
-pkg_postrm() {
- # make sure we don't leave the user without the symlinks, since
- # they've not been owned by any other package
- if [[ ! -h ${EROOT}/usr/bin/awk ]]; then
- ln -s gawk "${EROOT}/usr/bin/awk" || die
- fi
- if [[ ! -h ${EROOT}/bin/awk ]]; then
- ln -s ../usr/bin/awk "${EROOT}/bin/awk" || die
- fi
-}
diff --git a/app-alternatives/awk/metadata.xml
b/app-alternatives/awk/metadata.xml
deleted file mode 100644
index 7c4c46c75e10..
--- a/app-alternatives/awk/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-
- base-sys...@gentoo.org
- Gentoo Base System
-
-
- mgo...@gentoo.org
- Michał Górny
-
-
-
- Symlink to sys-apps/busybox
-
-
- Symlink to sys-apps/gawk
-
-
- Symlink to sys-apps/mawk (warning: mawk is
- not fully POSIX-compliant)
-
-
- Symlink to sys-apps/nawk
-
-
-
diff --git a/profiles/arch/amd64/package.use.mask
b/profiles/arch/amd64/package.use.mask
index 317dfc821763..27207c6da3f9 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,10 +17,6 @@
#--- END OF EXAMPLES ---
-# Michał Górny (2022-12-01)
-# Keyworded here.
-app-alternatives/awk -nawk
-
# Guillermo Joandet (2022-11-22)
# app-text/pandoc is keyworded on this architecture
net-libs/gssdp -man
diff --git a/profiles/arch/base/package.use.mask
b/profiles/arch/base/package.use.mask
index 8ca1e3eda94e..5a1455d90b27 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -1,10 +1,6 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Michał Górny (2022-12-01)
-# Not widely keyworded.
-app-alternatives/awk nawk
-
# Mike Gilbert (2022-10-16)
# Only supported on MIPS.
dev-lang/gnat-gpl fixed-point
diff --git a/profiles/arch/x86/package.use.mask
b/profiles/arch/x86/package.use.mask
index b733021ebde4..a68e233ecfd9 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,10
