Disable auth/telnet/ftp cruft as other packages do these things better. Switch to the linuxa target to avoid parsing /usr/include/ directly. Make ncurses support optional. Respect all env build flags. Clean up missing prototypes and other bad warnings.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

4 files changed, 175 insertions, 2 deletions

diff --git a/app-misc/ckermit/ChangeLog b/app-misc/ckermit/ChangeLog
index 9ee314f693f9..423662fffa5b 100644
--- a/app-misc/ckermit/ChangeLog
+++ b/app-misc/ckermit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/ckermit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ChangeLog,v 1.30 2009/12/07 07:54:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ChangeLog,v 1.31 2009/12/07 12:51:20 vapier Exp $
+
+*ckermit-8.0.211-r4 (07 Dec 2009)
+
+  07 Dec 2009; Mike Frysinger <vapier@gentoo.org>
+  +ckermit-8.0.211-r4.ebuild, +files/ckermit-8.0.211-cleanup.patch:
+  Disable auth/telnet/ftp cruft as other packages do these things better.
+  Switch to the linuxa target to avoid parsing /usr/include/ directly. Make
+  ncurses support optional. Respect all env build flags. Clean up missing
+  prototypes and other bad warnings.
 
   07 Dec 2009; Mike Frysinger <vapier@gentoo.org> ckermit-8.0.211-r3.ebuild:
   Mark all stable.
diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index 713bac1275ab..ca828d9a694b 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ckermit-8.0.211-cleanup.patch 2038 RMD160 a1512fa7aec9ea80cac7b0ff0d2a699ab2668992 SHA1 33333ccd26236d05eabcd7b863fd22e459a0c894 SHA256 b3cbcce96dcb0a1b6a25ea05ba19dab7aa75448e57cd98921de73ef39936eee8
 DIST cku211.tar.gz 2878523 RMD160 c80de6eeec3b4d87a09946a4d440da3b4faaa3b2 SHA1 cd5e0524d27fea0275a0938da2a5fc115e0978b8 SHA256 39e7cd4892502344a635952843487d9b4bfa98e59d1e1acad5ef8aa969abba93
 EBUILD ckermit-8.0.211-r2.ebuild 1307 RMD160 09ff22cf19431b696671f6db5fd78be86101e363 SHA1 c711520f4d1bcf0414f9f7a70eeeb0c2c9da9cb1 SHA256 15f2ec6d0273f57f6f32bac4358b398245b44447646a19db2a4d776e11ce20e2
 EBUILD ckermit-8.0.211-r3.ebuild 1676 RMD160 eb014cc82bc8fbb3e3c13a279f3a42194c7b6d89 SHA1 f890bf5cfcc128113a9ff099b3047b9970b17060 SHA256 9aec9b4a117624803bf3ef17633aed2cadf23b12b71bf3342b5ad9406e31843d
-MISC ChangeLog 4322 RMD160 f4e375677163c5de3534d923a0781436fcd0164a SHA1 121ded944accafe4cf32ce9e7f1f2eef39d76136 SHA256 232e6b251bcf5f8162600ebbc5c8d4a53321f2c377dc56ec8d6eec5cc1da1cf2
+EBUILD ckermit-8.0.211-r4.ebuild 2010 RMD160 18a527243558d862508d0ecaf476558096e93f80 SHA1 da86403df5070dd0d69b7b36126a688b2ad598ce SHA256 321f274320f25941507bc1f2cb2a98b7d1130852bde999dda3d64beffce81d24
+MISC ChangeLog 4737 RMD160 37341ff6f12f3d561dfac9be148c5219b7f9fc20 SHA1 f2e1d97bca0cea874689feb8777aa589fd2b0d2e SHA256 05b74218dc3e2ad7dd269985caf19f41f4f95d83d1cebd9481f2a4f4e066f445
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAksc+lAACgkQlPl3HsVfCDoAtgCeOGZZ//B8Z6CYPhpMfLoFeyt+
+gjAAn2oDFWfhE6vV7g/NKwZdZahbwghp
+=Z1fW
+-----END PGP SIGNATURE-----
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
new file mode 100644
index 000000000000..c99d1334e658
--- /dev/null
+++ b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ckermit/ckermit-8.0.211-r4.ebuild,v 1.1 2009/12/07 12:51:20 vapier Exp $
+
+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.kermit-project.org/"
+
+LICENSE="Kermit"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
+RDEPEND="${DEPEND}
+	net-dialup/lrzsz"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cleanup.patch
+	sed -i -r \
+		-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
+		-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
+		makefile || die
+}
+
+ck_use() {
+	use $1 && append-cppflags $2 && libs="${libs} $3"
+}
+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
+
+	local libs
+	ck_use ncurses -DCK_NCURSES -lncurses
+	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE #202840
+	append-cppflags -DHAVE_CRYPT_H
+	emake \
+		CC="$(tc-getCC)" \
+		KFLAGS="${CPPFLAGS}" \
+		LIBS="-lcrypt -lresolv ${libs}" \
+		LNKFLAGS="${LDFLAGS}" \
+		linuxa || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	emake \
+		DESTDIR="${D}" \
+		BINDIR=/usr/bin \
+		MANDIR="${D}"/usr/share/man/man1 \
+		MANEXT=1 \
+		install || die
+
+	# make the correct symlink
+	rm -f "${D}"/usr/bin/kermit-sshsub
+	dosym /usr/bin/kermit /usr/bin/kermit-sshsub
+
+	# the ckermit.ini script is calling the wrong kermit binary --
+	# the one from ${D}
+	dosed /usr/bin/ckermit.ini
+	dodoc COPYING.TXT UNINSTALL *.txt
+}
diff --git a/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch b/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
new file mode 100644
index 000000000000..5b7c1ed6b951
--- /dev/null
+++ b/app-misc/ckermit/files/ckermit-8.0.211-cleanup.patch
@@ -0,0 +1,78 @@
+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 */