1 |
commit: e9409706a2eb928834ed7e169cee7433b8a12b54 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 2 03:09:29 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 2 03:10:37 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9409706 |
7 |
|
8 |
app-alternatives/awk: Revert "New package to control awk symlinks" |
9 |
|
10 |
We'll do a pkgmove from virtual/awk. |
11 |
|
12 |
Reverts: fe323f5591a2556d80dd16a8fde2f2cfc349f3b2 |
13 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
14 |
|
15 |
app-alternatives/awk/awk-0.ebuild | 59 ------------------------------------ |
16 |
app-alternatives/awk/metadata.xml | 27 ----------------- |
17 |
profiles/arch/amd64/package.use.mask | 4 --- |
18 |
profiles/arch/base/package.use.mask | 4 --- |
19 |
profiles/arch/x86/package.use.mask | 4 --- |
20 |
5 files changed, 98 deletions(-) |
21 |
|
22 |
diff --git a/app-alternatives/awk/awk-0.ebuild b/app-alternatives/awk/awk-0.ebuild |
23 |
deleted file mode 100644 |
24 |
index 01e69d65fbd1..000000000000 |
25 |
--- a/app-alternatives/awk/awk-0.ebuild |
26 |
+++ /dev/null |
27 |
@@ -1,59 +0,0 @@ |
28 |
-# Copyright 2022 Gentoo Authors |
29 |
-# Distributed under the terms of the GNU General Public License v2 |
30 |
- |
31 |
-EAPI=8 |
32 |
- |
33 |
-DESCRIPTION="/bin/awk and /usr/bin/awk symlinks" |
34 |
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Base/Alternatives" |
35 |
-SRC_URI="" |
36 |
-S=${WORKDIR} |
37 |
- |
38 |
-LICENSE="CC0-1.0" |
39 |
-SLOT="0" |
40 |
-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" |
41 |
-IUSE="busybox +gawk mawk nawk split-usr" |
42 |
-REQUIRED_USE="^^ ( busybox gawk mawk nawk )" |
43 |
- |
44 |
-RDEPEND=" |
45 |
- busybox? ( sys-apps/busybox ) |
46 |
- gawk? ( sys-apps/gawk ) |
47 |
- mawk? ( sys-apps/mawk ) |
48 |
- nawk? ( sys-apps/nawk ) |
49 |
- !app-eselect/eselect-awk |
50 |
-" |
51 |
- |
52 |
-src_install() { |
53 |
- local root_prefix= |
54 |
- use split-usr && root_prefix=../../bin/ |
55 |
- |
56 |
- if use busybox; then |
57 |
- dosym "${root_prefix}busybox" /usr/bin/awk |
58 |
- newman - awk.1 <<<".so busybox.1" |
59 |
- elif use gawk; then |
60 |
- dosym gawk /usr/bin/awk |
61 |
- newman - awk.1 <<<".so gawk.1" |
62 |
- elif use mawk; then |
63 |
- dosym mawk /usr/bin/awk |
64 |
- newman - awk.1 <<<".so mawk.1" |
65 |
- elif use nawk; then |
66 |
- dosym nawk /usr/bin/awk |
67 |
- newman - awk.1 <<<".so nawk.1" |
68 |
- else |
69 |
- die "Invalid USE flag combination (broken REQUIRED_USE?)" |
70 |
- fi |
71 |
- |
72 |
- if use split-usr; then |
73 |
- dosym ../usr/bin/awk /bin/awk |
74 |
- fi |
75 |
-} |
76 |
- |
77 |
-pkg_postrm() { |
78 |
- # make sure we don't leave the user without the symlinks, since |
79 |
- # they've not been owned by any other package |
80 |
- if [[ ! -h ${EROOT}/usr/bin/awk ]]; then |
81 |
- ln -s gawk "${EROOT}/usr/bin/awk" || die |
82 |
- fi |
83 |
- if [[ ! -h ${EROOT}/bin/awk ]]; then |
84 |
- ln -s ../usr/bin/awk "${EROOT}/bin/awk" || die |
85 |
- fi |
86 |
-} |
87 |
|
88 |
diff --git a/app-alternatives/awk/metadata.xml b/app-alternatives/awk/metadata.xml |
89 |
deleted file mode 100644 |
90 |
index 7c4c46c75e10..000000000000 |
91 |
--- a/app-alternatives/awk/metadata.xml |
92 |
+++ /dev/null |
93 |
@@ -1,27 +0,0 @@ |
94 |
-<?xml version="1.0" encoding="UTF-8"?> |
95 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
96 |
-<pkgmetadata> |
97 |
- <maintainer type="project"> |
98 |
- <email>base-system@g.o</email> |
99 |
- <name>Gentoo Base System</name> |
100 |
- </maintainer> |
101 |
- <maintainer type="person"> |
102 |
- <email>mgorny@g.o</email> |
103 |
- <name>Michał Górny</name> |
104 |
- </maintainer> |
105 |
- <use> |
106 |
- <flag name="busybox"> |
107 |
- Symlink to <pkg>sys-apps/busybox</pkg> |
108 |
- </flag> |
109 |
- <flag name="gawk"> |
110 |
- Symlink to <pkg>sys-apps/gawk</pkg> |
111 |
- </flag> |
112 |
- <flag name="mawk"> |
113 |
- Symlink to <pkg>sys-apps/mawk</pkg> (warning: mawk is |
114 |
- not fully POSIX-compliant) |
115 |
- </flag> |
116 |
- <flag name="nawk"> |
117 |
- Symlink to <pkg>sys-apps/nawk</pkg> |
118 |
- </flag> |
119 |
- </use> |
120 |
-</pkgmetadata> |
121 |
|
122 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
123 |
index 317dfc821763..27207c6da3f9 100644 |
124 |
--- a/profiles/arch/amd64/package.use.mask |
125 |
+++ b/profiles/arch/amd64/package.use.mask |
126 |
@@ -17,10 +17,6 @@ |
127 |
|
128 |
#--- END OF EXAMPLES --- |
129 |
|
130 |
-# Michał Górny <mgorny@g.o> (2022-12-01) |
131 |
-# Keyworded here. |
132 |
-app-alternatives/awk -nawk |
133 |
- |
134 |
# Guillermo Joandet <gjoandet@×××××.com> (2022-11-22) |
135 |
# app-text/pandoc is keyworded on this architecture |
136 |
net-libs/gssdp -man |
137 |
|
138 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
139 |
index 8ca1e3eda94e..5a1455d90b27 100644 |
140 |
--- a/profiles/arch/base/package.use.mask |
141 |
+++ b/profiles/arch/base/package.use.mask |
142 |
@@ -1,10 +1,6 @@ |
143 |
# Copyright 1999-2022 Gentoo Authors |
144 |
# Distributed under the terms of the GNU General Public License v2 |
145 |
|
146 |
-# Michał Górny <mgorny@g.o> (2022-12-01) |
147 |
-# Not widely keyworded. |
148 |
-app-alternatives/awk nawk |
149 |
- |
150 |
# Mike Gilbert <floppym@g.o> (2022-10-16) |
151 |
# Only supported on MIPS. |
152 |
dev-lang/gnat-gpl fixed-point |
153 |
|
154 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
155 |
index b733021ebde4..a68e233ecfd9 100644 |
156 |
--- a/profiles/arch/x86/package.use.mask |
157 |
+++ b/profiles/arch/x86/package.use.mask |
158 |
@@ -1,10 +1,6 @@ |
159 |
# Copyright 1999-2022 Gentoo Authors |
160 |
# Distributed under the terms of the GNU General Public License v2 |
161 |
|
162 |
-# Michał Górny <mgorny@g.o> (2022-12-01) |
163 |
-# Keyworded here. |
164 |
-app-alternatives/awk -nawk |
165 |
- |
166 |
# Michał Górny <mgorny@g.o> (2022-11-16) |
167 |
# spirv-llvm-translator is not keyworded x86. |
168 |
dev-libs/libclc spirv |