Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ckermit/, app-misc/ckermit/files/
Date: Sun, 25 Apr 2021 06:19:33
Message-Id: 1619331522.a70f59729b078fa208aee0e7f12923e39b343e25.sam@gentoo
1 commit: a70f59729b078fa208aee0e7f12923e39b343e25
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 25 06:18:16 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 25 06:18:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70f5972
7
8 app-misc/ckermit: drop 8.0.211-r4 (EAPI 5)
9
10 Closes: https://bugs.gentoo.org/783642
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-misc/ckermit/Manifest | 1 -
14 app-misc/ckermit/ckermit-8.0.211-r4.ebuild | 78 ----------------------
15 .../ckermit/files/ckermit-8.0.211-cleanup.patch | 78 ----------------------
16 3 files changed, 157 deletions(-)
17
18 diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
19 index af4966e9a0c..06e5efc2a1f 100644
20 --- a/app-misc/ckermit/Manifest
21 +++ b/app-misc/ckermit/Manifest
22 @@ -1,2 +1 @@
23 -DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
24 DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
25
26 diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
27 deleted file mode 100644
28 index 666d31687f2..00000000000
29 --- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
30 +++ /dev/null
31 @@ -1,78 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="5"
36 -
37 -inherit versionator epatch flag-o-matic toolchain-funcs
38 -
39 -# Columbia University only uses the third component, e.g. cku211.tar.gz for
40 -# what we would call 8.0.211.
41 -MY_P="cku$( get_version_component_range 3 ${PV} )"
42 -
43 -DESCRIPTION="combined serial and network communication software package"
44 -SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
45 -HOMEPAGE="http://www.kermitproject.org/"
46 -
47 -LICENSE="Kermit"
48 -SLOT="0"
49 -KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
50 -IUSE="ncurses"
51 -
52 -DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
53 -RDEPEND="${DEPEND}
54 - net-dialup/lrzsz"
55 -
56 -DEPEND+=" ncurses? ( virtual/pkgconfig )"
57 -
58 -S=${WORKDIR}
59 -
60 -src_prepare() {
61 - epatch "${FILESDIR}"/${P}-cleanup.patch
62 - epatch "${FILESDIR}"/${P}-build-wart.patch
63 - tc-export_build_env BUILD_CC
64 - sed -i -r \
65 - -e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
66 - -e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
67 - makefile || die
68 -}
69 -
70 -src_compile() {
71 - # we don't enable any of the telnet/ftp authentication stuff
72 - # since there are other packages which do these things better
73 - # USE="kerberos pam shadow ssl zlib"
74 - append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
75 -
76 - if use ncurses; then
77 - append-cppflags "-DCK_NCURSES"
78 - append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
79 - append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
80 - fi
81 -
82 - append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
83 - append-cppflags -DHAVE_CRYPT_H
84 - emake \
85 - CC="$(tc-getCC)" \
86 - KFLAGS="${CPPFLAGS}" \
87 - LIBS="-lcrypt -lresolv ${LIBS}" \
88 - LNKFLAGS="${LDFLAGS}" \
89 - linuxa
90 -}
91 -
92 -src_install() {
93 - dodir /usr/bin /usr/share/man/man1
94 - emake \
95 - DESTDIR="${ED}" \
96 - BINDIR=/usr/bin \
97 - MANDIR="${ED}"/usr/share/man/man1 \
98 - MANEXT=1 \
99 - install
100 - dodoc *.txt
101 -
102 - # make the correct symlink
103 - rm "${ED}"/usr/bin/kermit-sshsub || die
104 - dosym kermit /usr/bin/kermit-sshsub
105 -
106 - # the ckermit.ini script is calling the wrong kermit binary --
107 - # the one from ${D}
108 - sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
109 -}
110
111 diff --git a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch b/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
112 deleted file mode 100644
113 index 5b7c1ed6b95..00000000000
114 --- a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
115 +++ /dev/null
116 @@ -1,78 +0,0 @@
117 -clean up missing prototypes and broken printfs
118 -
119 ---- a/ckcmai.c
120 -+++ b/ckcmai.c
121 -@@ -623,6 +623,8 @@ ACKNOWLEDGMENTS:
122 - #include "ckntap.h"
123 - #endif /* NT */
124 -
125 -+#include <time.h>
126 -+
127 - #ifndef NOSERVER
128 - /* Text message definitions.. each should be 256 chars long, or less. */
129 - #ifdef MINIX
130 ---- a/ckufio.c
131 -+++ b/ckufio.c
132 -@@ -40,6 +40,7 @@ char *ckzv = "UNIX File support, 8.0.200, 4 Mar 2004";
133 - #include "ckcsym.h"
134 - #include "ckcdeb.h"
135 - #include "ckcasc.h"
136 -+#include "ckuusr.h"
137 -
138 - #ifndef NOCSETS
139 - #include "ckcxla.h"
140 -@@ -1803,6 +1804,8 @@ zxin(n,s,x) int n, x; char *s; {
141 - return(fread(s, sizeof (char), x, fp[n]));
142 - }
143 -
144 -+extern int ttwait(int fd, int secs);
145 -+
146 - /*
147 - Z I N F I L L -- Buffered file input.
148 -
149 ---- a/ckutio.c
150 -+++ b/ckutio.c
151 -@@ -1808,6 +1808,11 @@ ttgwsiz() {
152 - #endif /* NONAWS */
153 - }
154 -
155 -+#ifdef CK_NAWS /* Negotiate About Window Size */
156 -+#ifdef RLOGCODE
157 -+_PROTOTYP( int rlog_naws, (void) );
158 -+#endif /* RLOGCODE */
159 -+#endif /* CK_NAWS */
160 -
161 - #ifndef NOSIGWINCH
162 - #ifdef SIGWINCH
163 ---- a/ckuus5.c
164 -+++ b/ckuus5.c
165 -@@ -7747,7 +7747,7 @@ doshow(x) int x; {
166 - printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
167 - printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
168 - printf(" --cdmessage:%d\n",srvcdmsg);
169 -- printf(" --helpfile:%d\n",helpfile);
170 -+ printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
171 - if (inserver) {
172 - printf("\n");
173 - break;
174 ---- a/ckuus7.c
175 -+++ b/ckuus7.c
176 -@@ -2981,7 +2981,7 @@ dopurge() { /* Do the PURGE command */
177 - if (n < tokeep) { /* Not deleting any */
178 - count = 0;
179 - if (listing)
180 -- printf(" Matches = %d: Not enough to purge.\n");
181 -+ printf(" Matches = %d: Not enough to purge.\n", n);
182 - goto xpurge;
183 - }
184 -
185 ---- a/ckuusx.c
186 -+++ b/ckuusx.c
187 -@@ -56,7 +56,6 @@
188 - #include <termcap.h>
189 - #endif /* NOHTERMCAP */
190 - #endif /* BSD44 */
191 --#else /* !BSD44 */
192 - #ifdef linux
193 - #include <term.h>
194 - #endif /* linux */