summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2022-12-02 04:09:29 +0100
committerMichał Górny <mgorny@gentoo.org>2022-12-02 04:10:37 +0100
commite9409706a2eb928834ed7e169cee7433b8a12b54 (patch)
tree5d11842fd43629ab34ab8f6fbb037e4661359282
parentdev-libs/glib: Depend on dev-libs/libpcre2[unicode(+)] (diff)
downloadgentoo-e9409706a2eb928834ed7e169cee7433b8a12b54.tar.gz
gentoo-e9409706a2eb928834ed7e169cee7433b8a12b54.tar.bz2
gentoo-e9409706a2eb928834ed7e169cee7433b8a12b54.zip
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 <mgorny@gentoo.org>
-rw-r--r--app-alternatives/awk/awk-0.ebuild59
-rw-r--r--app-alternatives/awk/metadata.xml27
-rw-r--r--profiles/arch/amd64/package.use.mask4
-rw-r--r--profiles/arch/base/package.use.mask4
-rw-r--r--profiles/arch/x86/package.use.mask4
5 files changed, 0 insertions, 98 deletions
diff --git a/app-alternatives/awk/awk-0.ebuild b/app-alternatives/awk/awk-0.ebuild
deleted file mode 100644
index 01e69d65fbd1..000000000000
--- 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..000000000000
--- a/app-alternatives/awk/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <maintainer type="person">
- <email>mgorny@gentoo.org</email>
- <name>Michał Górny</name>
- </maintainer>
- <use>
- <flag name="busybox">
- Symlink to <pkg>sys-apps/busybox</pkg>
- </flag>
- <flag name="gawk">
- Symlink to <pkg>sys-apps/gawk</pkg>
- </flag>
- <flag name="mawk">
- Symlink to <pkg>sys-apps/mawk</pkg> (warning: mawk is
- not fully POSIX-compliant)
- </flag>
- <flag name="nawk">
- Symlink to <pkg>sys-apps/nawk</pkg>
- </flag>
- </use>
-</pkgmetadata>
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 <mgorny@gentoo.org> (2022-12-01)
-# Keyworded here.
-app-alternatives/awk -nawk
-
# Guillermo Joandet <gjoandet@gmail.com> (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 <mgorny@gentoo.org> (2022-12-01)
-# Not widely keyworded.
-app-alternatives/awk nawk
-
# Mike Gilbert <floppym@gentoo.org> (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 +1,6 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Michał Górny <mgorny@gentoo.org> (2022-12-01)
-# Keyworded here.
-app-alternatives/awk -nawk
-
# Michał Górny <mgorny@gentoo.org> (2022-11-16)
# spirv-llvm-translator is not keyworded x86.
dev-libs/libclc spirv