Gentoo Archives: gentoo-commits

From: Joshua Kinard <kumba@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/xc/files/, net-dialup/xc/
Date: Wed, 08 Sep 2021 05:35:07
Message-Id: 1631078912.39c34d0d33945ca3c6f3937ce0d1746acf082495.kumba@gentoo
1 commit: 39c34d0d33945ca3c6f3937ce0d1746acf082495
2 Author: Joshua Kinard <kumba <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 8 05:28:32 2021 +0000
4 Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 8 05:28:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c34d0d
7
8 net-dialup/xc: remove last rited package
9
10 Closes: https://bugs.gentoo.org/551786
11 Closes: https://bugs.gentoo.org/715846
12 Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
13
14 net-dialup/xc/Manifest | 1 -
15 net-dialup/xc/files/xc-4.3.2-add-115200.patch | 12 --
16 .../xc/files/xc-4.3.2-fix-set_bps-overflow.patch | 14 ---
17 net-dialup/xc/files/xc-4.3.2-gentoo.patch | 122 ---------------------
18 net-dialup/xc/files/xc-4.3.2-implicit-decl.patch | 22 ----
19 net-dialup/xc/metadata.xml | 12 --
20 net-dialup/xc/xc-4.3.2-r5.ebuild | 44 --------
21 7 files changed, 227 deletions(-)
22
23 diff --git a/net-dialup/xc/Manifest b/net-dialup/xc/Manifest
24 deleted file mode 100644
25 index 9b83d97b761..00000000000
26 --- a/net-dialup/xc/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST xc-4.3.2.tar.gz 162098 BLAKE2B d3ce005bea46cff7673d8c9c4c288356cf340a04658917934a3553705f0554ffcc433379a8fdbbe2cb8a456cf15a73c5bcdd1719c0f9f3b7d41623b535b45ee6 SHA512 89de05a82f54ffd89a6950f9cb4aea732573ac1b15a27aaba4e25293a5d0b763052287700e4499f7f2adf9acc952ecea572239c8403c86c5871efd363d68710a
30
31 diff --git a/net-dialup/xc/files/xc-4.3.2-add-115200.patch b/net-dialup/xc/files/xc-4.3.2-add-115200.patch
32 deleted file mode 100644
33 index c8238565ac0..00000000000
34 --- a/net-dialup/xc/files/xc-4.3.2-add-115200.patch
35 +++ /dev/null
36 @@ -1,12 +0,0 @@
37 -add support for 115200 baud
38 -
39 ---- xc-4.3.2/xcport.c
40 -+++ xc-4.3.2/xcport.c
41 -@@ -107,6 +107,7 @@
42 - {"38400",38400,B38400},
43 - {"57600",57600,B50},
44 - #endif
45 -+ {"115200",115200,B115200},
46 - {"0", 0, B0}
47 - };
48 -
49
50 diff --git a/net-dialup/xc/files/xc-4.3.2-fix-set_bps-overflow.patch b/net-dialup/xc/files/xc-4.3.2-fix-set_bps-overflow.patch
51 deleted file mode 100644
52 index 5934aa2f6d7..00000000000
53 --- a/net-dialup/xc/files/xc-4.3.2-fix-set_bps-overflow.patch
54 +++ /dev/null
55 @@ -1,14 +0,0 @@
56 -diff -Naurp xc-4.3.2.orig/xcmain.c xc-4.3.2/xcmain.c
57 ---- xc-4.3.2.orig/xcmain.c 1996-11-24 01:35:41.000000000 -0500
58 -+++ xc-4.3.2/xcmain.c 2014-04-18 19:58:26.267227496 -0400
59 -@@ -696,8 +696,8 @@ static void
60 - SET_bps()
61 - {
62 - if (statflag){
63 -- char br[6];
64 -- sprintf(br, "%d", mrate( NULL ));
65 -+ char br[11];
66 -+ snprintf(br, 11, "%d", mrate( NULL ));
67 - fprintf(tfp, statfmt, "bps", "Bits per Second", br);
68 - return;
69 - }
70
71 diff --git a/net-dialup/xc/files/xc-4.3.2-gentoo.patch b/net-dialup/xc/files/xc-4.3.2-gentoo.patch
72 deleted file mode 100644
73 index 7c0c559958d..00000000000
74 --- a/net-dialup/xc/files/xc-4.3.2-gentoo.patch
75 +++ /dev/null
76 @@ -1,122 +0,0 @@
77 ---- xc-4.3.2/Makefile
78 -+++ xc-4.3.2/Makefile
79 -@@ -5,21 +5,24 @@
80 -
81 - SHELL = /bin/sh
82 -
83 -+DESTDIR =
84 -+
85 - #WARN = -Wall -ansi -pedantic -Wshadow -Wmissing-prototypes
86 -
87 - #machine = -m486
88 --CC = gcc
89 --GCCOPT = -pipe -O2 -fno-strength-reduce -fomit-frame-pointer $(machine)
90 -+#CC = gcc
91 -+GCCOPT = -fno-strength-reduce
92 - #GCCOPT = -O -g
93 --CDEFS = -D_POSIX_SOURCE=1
94 -+CDEFS = -D_XOPEN_SOURCE
95 --CFLAGS = $(WARN) $(CDEFS) $(GCCOPT)
96 -+CFLAGS += $(WARN) $(CDEFS) $(GCCOPT)
97 -
98 --prefix = /usr/local
99 -+prefix = /usr
100 - bindir = $(prefix)/bin
101 - libdir = $(prefix)/lib/xc
102 --mandir = /usr/man/man1
103 -+mandir = /usr/share/man
104 -+man1dir = $(mandir)/man1
105 - catdir = /var/catman/cat1
106 --manown = -o root -g man
107 -+manown = -o root -g root
108 - binown = -o root -g root
109 -
110 - export CC CFLAGS manown binown
111 -@@ -37,7 +39,7 @@
112 - # gs -sDEVICE=ljet4 -dNOPAUSE -sOutputFile=$@ $<
113 -
114 - INSTALL = install
115 --LDFLAGS = -ltermcap editline/libedit.a
116 -+LIBS += -lncurses editline/libedit.a
117 - NROFF = groff -mandoc
118 -
119 - # defines for use with cextract under Linux
120 -@@ -56,7 +58,7 @@
121 - @echo "Now you may execute 'make install'"
122 -
123 - xc: $(OBJS) eline
124 -- $(CC) $(CFLAGS) $(OBJS) -o xc $(LDFLAGS)
125 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o xc $(LIBS)
126 -
127 - uninstall:
128 - rm -f $(bindir)/xc $(mandir)/xc.1 $(catdir)/xc.1.*
129 -@@ -64,10 +66,9 @@
130 -
131 - install: ./bin/xc ./bin/crc xc.1 crc.1
132 - @echo " "
133 -- $(INSTALL) $(binown) -m 755 -s ./bin/xc $(bindir)
134 -- $(INSTALL) $(binown) -m 755 -s ./bin/crc $(bindir)
135 -- $(INSTALL) $(manown) -m 644 xc.1 $(mandir)
136 -- $(INSTALL) $(manown) -m 644 crc.1 $(mandir)
137 -+ $(INSTALL) -d -m755 $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
138 -+ $(INSTALL) $(binown) -m 755 xc crc $(DESTDIR)$(bindir)
139 -+ $(INSTALL) $(manown) -m 644 xc.1 crc.1 $(DESTDIR)$(man1dir)
140 - @echo " "
141 - @echo " "
142 - @echo "You will want to manually install 'phonelist' and"
143 ---- xc-4.3.2/xcsubs.c
144 -+++ xc-4.3.2/xcsubs.c
145 -@@ -23,7 +23,6 @@
146 - *tgetstr(), *tgoto();
147 - int LI, /* One less than screen length in termcap entry */
148 - CO; /* Screen width */
149 --speed_t ospeed; /* Used by termcap lib */
150 - static char tc[LG_BUFF]; /* termcap buffer */
151 - static char tbuf[LG_BUFF], *CD, *CF, *CL, *CM, *CN, *AE, *SE, *SO, *ME;
152 - char *CE, PC; /* used by termcap -- padding character */
153 -
154 -limit the 32bit crc to 32bits
155 -
156 -add simple usage
157 -
158 ---- xc-4.3.2/crc.c
159 -+++ xc-4.3.2/crc.c
160 -@@ -152,7 +152,7 @@ char *name;
161 - }
162 - crc32 = oldcrc32; oldcrc = oldcrc32 = ~oldcrc32;
163 -
164 -- printf("%08lx %7ld ", oldcrc, charcnt);
165 -+ printf("%08lx %7ld ", oldcrc & 0xffffffff, charcnt);
166 - if (Block == 128)
167 - printf("%5ld+%3ld ", charcnt/Block, charcnt%Block);
168 - if (Block == 1024)
169 -@@ -170,6 +170,10 @@ char **argv;
170 - {
171 - register errors = 0;
172 -
173 -+ if (argc == 1) {
174 -+ puts("Usage: crc [-x|-k] <files>\n -x pad to 128 bytes\n -k pad to 1024 bytes");
175 -+ exit(0);
176 -+ }
177 - if (argc > 1) {
178 - if (!strcmp(argv[1], "-x")) {
179 - Block = 128;
180 ---- xc-4.3.2/editline/Makefile.orig 2013-03-02 21:15:29.667344872 +0400
181 -+++ xc-4.3.2/editline/Makefile 2013-03-02 21:15:38.434344313 +0400
182 -@@ -34,7 +34,7 @@
183 - LDFLAGS = -ltermcap
184 -
185 - ## Set ranlib as appropriate:
186 --RANLIB = ranlib
187 -+RANLIB ?= ranlib
188 - #RANLIB = echo
189 -
190 - ## End of configuration.
191 -@@ -70,6 +70,6 @@
192 -
193 - libedit.a: $(OBJECTS)
194 - @rm -f $@
195 -- ar r $@ $(OBJECTS)
196 -+ $(AR) r $@ $(OBJECTS)
197 - $(RANLIB) $@
198 -
199
200 diff --git a/net-dialup/xc/files/xc-4.3.2-implicit-decl.patch b/net-dialup/xc/files/xc-4.3.2-implicit-decl.patch
201 deleted file mode 100644
202 index 556392d8b18..00000000000
203 --- a/net-dialup/xc/files/xc-4.3.2-implicit-decl.patch
204 +++ /dev/null
205 @@ -1,22 +0,0 @@
206 ---- xc-4.3.2/crc.c
207 -+++ xc-4.3.2/crc.c
208 -@@ -5,6 +5,8 @@
209 - * Crc - 32 BIT ANSI X3.66 CRC checksum files
210 - */
211 - #include <stdio.h>
212 -+#include <stdlib.h>
213 -+#include <string.h>
214 - #define OK 0
215 - #define ERROR (-1)
216 - #define LINT_ARGS
217 ---- xc-4.3.2/xcterm.c
218 -+++ xc-4.3.2/xcterm.c
219 -@@ -4,6 +4,8 @@
220 - #define XCTERM_C 1
221 -
222 - #include <stdio.h>
223 -+#include <stdlib.h>
224 -+#include <string.h>
225 - #include <sys/types.h>
226 - #include <sys/stat.h>
227 - #include <unistd.h>
228
229 diff --git a/net-dialup/xc/metadata.xml b/net-dialup/xc/metadata.xml
230 deleted file mode 100644
231 index 1ee4d878300..00000000000
232 --- a/net-dialup/xc/metadata.xml
233 +++ /dev/null
234 @@ -1,12 +0,0 @@
235 -<?xml version="1.0" encoding="UTF-8"?>
236 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
237 -<pkgmetadata>
238 - <maintainer type="person">
239 - <email>kumba@g.o</email>
240 - <name>Joshua Kinard</name>
241 - </maintainer>
242 - <maintainer type="project">
243 - <email>embedded@g.o</email>
244 - <name>Embedded Gentoo</name>
245 - </maintainer>
246 - </pkgmetadata>
247
248 diff --git a/net-dialup/xc/xc-4.3.2-r5.ebuild b/net-dialup/xc/xc-4.3.2-r5.ebuild
249 deleted file mode 100644
250 index ec2eda48fa3..00000000000
251 --- a/net-dialup/xc/xc-4.3.2-r5.ebuild
252 +++ /dev/null
253 @@ -1,44 +0,0 @@
254 -# Copyright 1999-2021 Gentoo Authors
255 -# Distributed under the terms of the GNU General Public License v2
256 -
257 -EAPI=5
258 -
259 -inherit epatch flag-o-matic multilib toolchain-funcs
260 -
261 -DESCRIPTION="Modem dialout & serial terminal program"
262 -HOMEPAGE="http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/"
263 -SRC_URI="http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/${P}.tar.gz"
264 -
265 -LICENSE="xc-radley"
266 -SLOT="0"
267 -KEYWORDS="amd64 ~ia64 ~mips ppc ppc64 sparc x86"
268 -IUSE=""
269 -
270 -RDEPEND="sys-libs/ncurses:="
271 -DEPEND="${RDEPEND}
272 - virtual/pkgconfig"
273 -
274 -src_prepare() {
275 - epatch "${FILESDIR}"/${P}-gentoo.patch
276 - epatch "${FILESDIR}"/${P}-implicit-decl.patch
277 - epatch "${FILESDIR}"/${P}-add-115200.patch
278 - epatch "${FILESDIR}"/${P}-fix-set_bps-overflow.patch
279 -
280 - sed -i \
281 - -e "/^libdir/s:/lib/:/$(get_libdir)/:" \
282 - -e "/strip/d" \
283 - Makefile || die
284 - # bug 459796
285 - append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
286 -}
287 -
288 -src_compile() {
289 - tc-export AR CC RANLIB
290 - emake WARN="" all
291 -}
292 -
293 -src_install() {
294 - default
295 - insinto /usr/$(get_libdir)/xc
296 - doins phonelist xc.init dotfiles/.[a-z]*
297 -}