Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/nawk/, sys-apps/nawk/files/
Date: Fri, 14 May 2021 22:14:12
Message-Id: 1621030384.6acc3193fef6ca39399fdc111546119f12474a7e.soap@gentoo
1 commit: 6acc3193fef6ca39399fdc111546119f12474a7e
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 14 22:13:04 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri May 14 22:13:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6acc3193
7
8 sys-apps/nawk: drop 20121220-r3
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sys-apps/nawk/Manifest | 1 -
13 .../nawk/files/nawk-20121220-parallel-build.patch | 61 ----------------------
14 sys-apps/nawk/nawk-20121220-r3.ebuild | 61 ----------------------
15 3 files changed, 123 deletions(-)
16
17 diff --git a/sys-apps/nawk/Manifest b/sys-apps/nawk/Manifest
18 index 935d6bbecde..7c9c21c58ad 100644
19 --- a/sys-apps/nawk/Manifest
20 +++ b/sys-apps/nawk/Manifest
21 @@ -1,2 +1 @@
22 -DIST nawk-20121220.tar.gz 88970 BLAKE2B e00b9e55bb3b9139c00b8cc0be3f6cea2acc1162ee4326103c054c7270ef4a29b97cdddc9a692cad0773a72a17c399d2da5453939681a5d2456f0b740b6bc2ee SHA512 1dd62e1aa4c8cfad7ce599b10d88e9b450ecae3217cf8327cc0f3ce77d0d0dcb731101b8f211066462d46dc4ef23e20ccd7f70d799d7d48940026abe8fa79d4f
23 DIST nawk-20180827.tar.gz 1824076 BLAKE2B 4cfd000842d75d9a713fe73a85eefab33c17f9ecaca4f7f663d1157da411fd9fcf2badbf5180b4a90910445332095fe457e7acf0643621ac8a68da1a246b5e5f SHA512 cd6561149be71e6311aaa69c86b90ee4b29a057e5c2595470ccc8a41c40c653ec31b4bd46d7f58896d012f5fb5952103a76aa463a69e5128cba43d80eedf0b9b
24
25 diff --git a/sys-apps/nawk/files/nawk-20121220-parallel-build.patch b/sys-apps/nawk/files/nawk-20121220-parallel-build.patch
26 deleted file mode 100644
27 index ee6421c665a..00000000000
28 --- a/sys-apps/nawk/files/nawk-20121220-parallel-build.patch
29 +++ /dev/null
30 @@ -1,61 +0,0 @@
31 ---- a/makefile 2013-02-06 10:26:36.452829647 -0700
32 -+++ b/makefile 2013-02-07 09:12:13.293898947 -0700
33 -@@ -44,7 +44,7 @@
34 - LISTING = awk.h proto.h awkgram.y lex.c b.c main.c maketab.c parse.c \
35 - lib.c run.c tran.c
36 -
37 --SHIP = README FIXES $(SOURCE) ytab[ch].bak makefile \
38 -+SHIP = README FIXES $(SOURCE) makefile \
39 - awk.1
40 -
41 - a.out: ytab.o $(OFILES)
42 -@@ -52,11 +52,15 @@
43 -
44 - $(OFILES): awk.h ytab.h proto.h
45 -
46 --ytab.o: awk.h proto.h awkgram.y
47 -+#Clear dependency for parallel build: (make -j)
48 -+#YACC generated y.tab.c and y.tab.h at the same time
49 -+#this needs to be a static pattern rules otherwise multiple target
50 -+#are mapped onto multiple executions of yacc, which overwrite
51 -+#each others outputs.
52 -+y%.c y%.h: awk.h proto.h awkgram.y
53 - $(YACC) $(YFLAGS) awkgram.y
54 -- mv y.tab.c ytab.c
55 -- mv y.tab.h ytab.h
56 -- $(CC) $(CFLAGS) -c ytab.c
57 -+ mv y.$*.c y$*.c
58 -+ mv y.$*.h y$*.h
59 -
60 - proctab.c: maketab
61 - ./maketab >proctab.c
62 -@@ -64,23 +68,23 @@
63 - maketab: ytab.h maketab.c
64 - $(CC) $(CFLAGS) maketab.c -o maketab
65 -
66 --bundle:
67 -+bundle: $(SHIP)
68 - @cp ytab.h ytabh.bak
69 - @cp ytab.c ytabc.bak
70 -- @bundle $(SHIP)
71 -+ @bundle $(SHIP) ytabh.bak ytabc.bak
72 -
73 --tar:
74 -+tar: $(SHIP)
75 - @cp ytab.h ytabh.bak
76 - @cp ytab.c ytabc.bak
77 - @bundle $(SHIP) >awk.shar
78 -- @tar cf awk.tar $(SHIP)
79 -+ @tar cf awk.tar $(SHIP) ytabh.bak ytabc.bak
80 - gzip awk.tar
81 - ls -l awk.tar.gz
82 -- @zip awk.zip $(SHIP)
83 -+ @zip awk.zip $(SHIP) ytabh.bak ytabc.bak
84 - ls -l awk.zip
85 -
86 - names:
87 - @echo $(LISTING)
88 -
89 - clean:
90 -- rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda # proctab.c
91 -+ rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda ytab.c ytab.h # proctab.c
92
93 diff --git a/sys-apps/nawk/nawk-20121220-r3.ebuild b/sys-apps/nawk/nawk-20121220-r3.ebuild
94 deleted file mode 100644
95 index 975fa861320..00000000000
96 --- a/sys-apps/nawk/nawk-20121220-r3.ebuild
97 +++ /dev/null
98 @@ -1,61 +0,0 @@
99 -# Copyright 1999-2021 Gentoo Authors
100 -# Distributed under the terms of the GNU General Public License v2
101 -
102 -EAPI=6
103 -
104 -inherit toolchain-funcs
105 -
106 -DESCRIPTION="Brian Kernighan's pattern scanning and processing language"
107 -HOMEPAGE="https://www.cs.princeton.edu/~bwk/btl.mirror/"
108 -SRC_URI="mirror://gentoo/${P}.tar.gz"
109 -
110 -LICENSE="MIT"
111 -SLOT="0"
112 -KEYWORDS="~amd64 ~x86 ~amd64-linux"
113 -
114 -RDEPEND="
115 - app-eselect/eselect-awk"
116 -
117 -DEPEND="
118 - ${RDEPEND}
119 - virtual/yacc"
120 -
121 -S="${WORKDIR}"
122 -
123 -PATCHES=( "${FILESDIR}/${P}"-parallel-build.patch )
124 -
125 -DOCS=( README FIXES )
126 -
127 -src_prepare() {
128 - default
129 - rm -v ytab.[hc] || die
130 -}
131 -
132 -src_compile() {
133 - emake \
134 - CC="$(tc-getCC)" \
135 - CFLAGS="${CFLAGS}" \
136 - CPPFLAGS=-DHAS_ISBLANK \
137 - ALLOC="${LDFLAGS}" \
138 - YACC=$(type -p yacc) \
139 - YFLAGS="-d"
140 -}
141 -
142 -src_install() {
143 - newbin a.out "${PN}"
144 - sed \
145 - -e 's/awk/nawk/g' \
146 - -e 's/AWK/NAWK/g' \
147 - -e 's/Awk/Nawk/g' \
148 - awk.1 > "${PN}".1 || die "manpage patch failed"
149 - doman "${PN}.1"
150 - einstalldocs
151 -}
152 -
153 -pkg_postinst() {
154 - eselect awk update ifunset
155 -}
156 -
157 -pkg_postrm() {
158 - eselect awk update ifunset
159 -}