gentoo resync : 28.04.2021

4 files changed, 4 insertions, 160 deletions

diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index ddeb1e08c9a6..7525d11e2b91 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1,8 +1,5 @@
 AUX ckermit-8.0.211-build-wart.patch 728 BLAKE2B 5863f23b5eceeef8143e7060e28638b025e186d85b8ca4ebe5f421d89076b7a23914dea5f7ed3ec89169ab08c7996a804cda9e95e1e6473c8f6ca5ac8863bea7 SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730
-AUX ckermit-8.0.211-cleanup.patch 2038 BLAKE2B caf0ed4e8da191cf5dc6f6d8bbfb03b9b898296f6df692dbd32cadf77723719d331b26c144a3c1578877686ce2d2861af30128ebce02645529042b6e2e8a2b08 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7
 AUX ckermit-9.0.302-cleanup.patch 2870 BLAKE2B 6fc0d26cfb1715d92a5e718e6e4d1771a38ebbfd52c601c1e0c18497e677e53a5c4c608c97054da8c14c8af3e1caf7d32bb59dd3d89999b5af22d31bc67dda90 SHA512 c99a47ecdadc27d4a8dca2d917e20e84683e1729ceb8ab07f1818eeffd0ee7d9ca87531862000866a74e7d3b3b3cf977255b8f584f3828ab3443b684a6195b7f
-DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
 DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
-EBUILD ckermit-8.0.211-r4.ebuild 2020 BLAKE2B f365f2fdadb3b0ee32d500e307ace95b5ef59e3cf8fe7f06f41df40c6c622b4b866521e85e6bf4e6f06cf843f927856c2845f9915f8866ecaf35c74559ff5089 SHA512 af5937486bd4e17a6b86aa6af79c15cb8cfcb726caea2406e850a73fd34f29b9e1bf8d807e3433a4a6a477d659fc7d35fc625b8a2c3b0d38b805e42476517e54
-EBUILD ckermit-9.0.302.ebuild 1976 BLAKE2B f67332691f13b68cbcb4bef52519c7058addb97a7212647e64f2d6fc0c71a6065bfbd4d2b28918e4e46481352ad31b7673ca05cb5e8192fe4dd5106a476e57d4 SHA512 4d4b0ce68adb41e1d36c768c04534f21886a29fb17f584e46edd70b7ad388814b34baea737f960b9a0b7015917c1bcdcd73c34cfbe6005da478f77123f28d07b
+EBUILD ckermit-9.0.302.ebuild 2012 BLAKE2B 77def688e33314c10ec70ed4844e912f50299db105b9cff6d5163858ae29084ae3c34a827fd1da6bf245b89f68064bfc782c73f55d5f86f05a38093ee4268215 SHA512 c6c932e25ce45435a7bea0cb89190372b70ec4250c40475b7d43c52f50a64258f4af52f97ae39bfd0669c8f3fdc1a697c3fe75a53fd7c4873f29d5b499e9e0cd
 MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
deleted file mode 100644
index 9d8950eb448b..000000000000
--- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator eutils flag-o-matic toolchain-funcs
-
-# Columbia University only uses the third component, e.g. cku211.tar.gz for
-# what we would call 8.0.211.
-MY_P="cku$( get_version_component_range 3 ${PV} )"
-
-DESCRIPTION="combined serial and network communication software package"
-SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
-HOMEPAGE="http://www.kermitproject.org/"
-
-LICENSE="Kermit"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
-RDEPEND="${DEPEND}
-	net-dialup/lrzsz"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cleanup.patch
-	epatch "${FILESDIR}"/${P}-build-wart.patch
-	tc-export_build_env BUILD_CC
-	sed -i -r \
-		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
-		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
-		makefile || die
-}
-
-src_compile() {
-	# we don't enable any of the telnet/ftp authentication stuff
-	# since there are other packages which do these things better
-	# USE="kerberos pam shadow ssl zlib"
-	append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
-
-	if use ncurses; then
-		append-cppflags "-DCK_NCURSES"
-		append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
-		append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-	fi
-
-	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
-	append-cppflags -DHAVE_CRYPT_H
-	emake \
-		CC="$(tc-getCC)" \
-		KFLAGS="${CPPFLAGS}" \
-		LIBS="-lcrypt -lresolv ${LIBS}" \
-		LNKFLAGS="${LDFLAGS}" \
-		linuxa
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	emake \
-		DESTDIR="${ED}" \
-		BINDIR=/usr/bin \
-		MANDIR="${ED}"/usr/share/man/man1 \
-		MANEXT=1 \
-		install
-	dodoc *.txt
-
-	# make the correct symlink
-	rm "${ED}"/usr/bin/kermit-sshsub || die
-	dosym kermit /usr/bin/kermit-sshsub
-
-	# the ckermit.ini script is calling the wrong kermit binary --
-	# the one from ${D}
-	sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
-}
diff --git a/app-misc/ckermit/ckermit-9.0.302.ebuild b/app-misc/ckermit/ckermit-9.0.302.ebuild
index 8c7e12e0f401..e688a28197ba 100644
--- a/app-misc/ckermit/ckermit-9.0.302.ebuild
+++ b/app-misc/ckermit/ckermit-9.0.302.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,12 +15,13 @@ HOMEPAGE="http://www.kermitproject.org/"
 
 LICENSE="Kermit"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="ncurses"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
 RDEPEND="${DEPEND}
 	net-dialup/lrzsz"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
 
 S=${WORKDIR}
 
diff --git a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch b/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
deleted file mode 100644
index 5b7c1ed6b951..000000000000
--- a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-clean up missing prototypes and broken printfs
-
---- a/ckcmai.c
-+++ b/ckcmai.c
-@@ -623,6 +623,8 @@ ACKNOWLEDGMENTS:
- #include "ckntap.h"
- #endif /* NT */
- 
-+#include <time.h>
-+
- #ifndef NOSERVER
- /* Text message definitions.. each should be 256 chars long, or less. */
- #ifdef MINIX
---- a/ckufio.c
-+++ b/ckufio.c
-@@ -40,6 +40,7 @@ char *ckzv = "UNIX File support, 8.0.200, 4 Mar 2004";
- #include "ckcsym.h"
- #include "ckcdeb.h"
- #include "ckcasc.h"
-+#include "ckuusr.h"
- 
- #ifndef NOCSETS
- #include "ckcxla.h"
-@@ -1803,6 +1804,8 @@ zxin(n,s,x) int n, x; char *s; {
-     return(fread(s, sizeof (char), x, fp[n]));
- }
- 
-+extern int ttwait(int fd, int secs);
-+
- /*
-   Z I N F I L L  --  Buffered file input.
- 
---- a/ckutio.c
-+++ b/ckutio.c
-@@ -1808,6 +1808,11 @@ ttgwsiz() {
- #endif /* NONAWS */
- }
- 
-+#ifdef CK_NAWS                          /* Negotiate About Window Size */
-+#ifdef RLOGCODE
-+_PROTOTYP( int rlog_naws, (void) );
-+#endif /* RLOGCODE */
-+#endif /* CK_NAWS */
- 
- #ifndef NOSIGWINCH
- #ifdef SIGWINCH
---- a/ckuus5.c
-+++ b/ckuus5.c
-@@ -7747,7 +7747,7 @@ doshow(x) int x; {
-           printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
-           printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
-           printf(" --cdmessage:%d\n",srvcdmsg);
--          printf(" --helpfile:%d\n",helpfile);
-+          printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
-           if (inserver) {
-               printf("\n");
-               break;
---- a/ckuus7.c
-+++ b/ckuus7.c
-@@ -2981,7 +2981,7 @@ dopurge() {                             /* Do the PURGE command */
-     if (n < tokeep) {                   /* Not deleting any */
-         count = 0;
-         if (listing)
--          printf(" Matches = %d: Not enough to purge.\n");
-+          printf(" Matches = %d: Not enough to purge.\n", n);
-         goto xpurge;
-     }
- 
---- a/ckuusx.c
-+++ b/ckuusx.c
-@@ -56,7 +56,6 @@
- #include <termcap.h>
- #endif /* NOHTERMCAP */
- #endif /* BSD44 */
--#else  /* !BSD44 */
- #ifdef linux
- #include <term.h>
- #endif /* linux */