Follow Gentoo convention in patch name (and add another missing include). Respect CC. Respect LDFLAGS (bug #334617).

(Portage version: 2.2_rc69/cvs/Linux i686)

5 files changed, 77 insertions, 15 deletions

diff --git a/net-misc/netkit-talk/ChangeLog b/net-misc/netkit-talk/ChangeLog
index d9f6855eb67b..e688a4c20d65 100644
--- a/net-misc/netkit-talk/ChangeLog
+++ b/net-misc/netkit-talk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/netkit-talk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/ChangeLog,v 1.32 2009/08/20 02:38:08 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/ChangeLog,v 1.33 2010/08/26 21:26:49 jer Exp $
+
+*netkit-talk-0.17-r5 (26 Aug 2010)
+
+  26 Aug 2010; Jeroen Roovers <jer@gentoo.org> netkit-talk-0.17-r4.ebuild,
+  +netkit-talk-0.17-r5.ebuild, -files/netkit-talk-0.17-r4-gentoo.diff,
+  +files/netkit-talk-0.17-time.patch:
+  Follow Gentoo convention in patch name (and add another missing include).
+  Respect CC. Respect LDFLAGS (bug #334617).
 
   20 Aug 2009; Víctor Ostorga <vostorga@gentoo.org>
   -files/netkit-talk-0.17-r3-gentoo.diff:
diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-r4-gentoo.diff b/net-misc/netkit-talk/files/netkit-talk-0.17-r4-gentoo.diff
deleted file mode 100644
index ec55d5974174..000000000000
--- a/net-misc/netkit-talk/files/netkit-talk-0.17-r4-gentoo.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- netkit-ntalk-0.17/talkd/announce.c~	Sat Jul 22 17:27:39 2000
-+++ netkit-ntalk-0.17/talkd/announce.c	Sun Apr 29 22:09:37 2001
-@@ -49,6 +49,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <paths.h>
-+#include <time.h>
- #include "prot_talkd.h"
- #include "proto.h"
- 
diff --git a/net-misc/netkit-talk/files/netkit-talk-0.17-time.patch b/net-misc/netkit-talk/files/netkit-talk-0.17-time.patch
new file mode 100644
index 000000000000..3a0ccadcb744
--- /dev/null
+++ b/net-misc/netkit-talk/files/netkit-talk-0.17-time.patch
@@ -0,0 +1,20 @@
+--- a/talkd/table.c
++++ b/talkd/table.c
+@@ -57,6 +57,7 @@
+ 
+ #include "prot_talkd.h"
+ #include "proto.h"
++#include <time.h>
+ 
+ #define MAX_ID 16000	/* << 2^15 so I don't have sign troubles */
+ 
+--- a/talkd/announce.c
++++ b/talkd/announce.c
+@@ -49,6 +49,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <paths.h>
++#include <time.h>
+ #include "prot_talkd.h"
+ #include "proto.h"
+ 
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild
index 49c08f87945b..bca11ffbe629 100644
--- a/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild,v 1.22 2008/05/22 02:11:28 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/netkit-talk-0.17-r4.ebuild,v 1.23 2010/08/26 21:26:49 jer Exp $
 
 inherit eutils
 
@@ -21,8 +21,8 @@ RDEPEND="virtual/inetd"
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/${PF}-gentoo.diff
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-time.patch
 	use ipv6 && epatch "${FILESDIR}"/${P}-ipv6.diff
 }
 
diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
new file mode 100644
index 000000000000..32e7eb8e0f4d
--- /dev/null
+++ b/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-talk/netkit-talk-0.17-r5.ebuild,v 1.1 2010/08/26 21:26:49 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P=netkit-ntalk-${PV}
+S=${WORKDIR}/netkit-ntalk-${PV}
+
+DESCRIPTION="Netkit - talkd"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6"
+
+DEPEND=">=sys-libs/ncurses-5.2"
+RDEPEND="virtual/inetd"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-time.patch
+	use ipv6 && epatch "${FILESDIR}"/${P}-ipv6.diff
+	sed -i configure -e '/^LDFLAGS=/d' || die "sed configure"
+}
+
+src_configure() {
+	./configure --with-c-compiler=$(tc-getCC) || die
+}
+
+src_install() {
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/talk.xinetd talk
+	dobin talk/talk || die
+	doman talk/talk.1
+	dosbin talkd/talkd || die
+	dosym talkd /usr/sbin/in.talkd
+	doman talkd/talkd.8
+	dosym talkd.8 /usr/share/man/man8/in.talkd.8
+	dodoc README ChangeLog BUGS
+}