Fixed compile bug when >=dev-libs/eb-4

4 files changed, 57 insertions, 8 deletions

diff --git a/net-misc/ndtpd/ChangeLog b/net-misc/ndtpd/ChangeLog
index e7b9bc477404..1c304a1630f9 100644
--- a/net-misc/ndtpd/ChangeLog
+++ b/net-misc/ndtpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/ndtpd
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.4 2003/11/26 04:29:26 usata Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.5 2004/01/03 16:19:43 usata Exp $
+
+  04 Jan 2004; <usata@gentoo.org> ndtpd-3.1.5.ebuild:
+  Fixed compile bug when >=dev-libs/eb-4.0
 
 *ndtpd-3.1.5 (01 Sep 2003)
 
diff --git a/net-misc/ndtpd/Manifest b/net-misc/ndtpd/Manifest
index 3e57b24209a4..56d8b2acd32f 100644
--- a/net-misc/ndtpd/Manifest
+++ b/net-misc/ndtpd/Manifest
@@ -1,5 +1,6 @@
-MD5 f331fd5874bb353f3a38c72dc39bc080 ndtpd-3.1.5.ebuild 1519
+MD5 4f4a9edae3698c2ab462d5d4bc538b41 ndtpd-3.1.5.ebuild 1663
+MD5 39b369053a88ef56934c20bd57bf43d9 ChangeLog 854
 MD5 043e2d431237aeec1769801a5b0214df metadata.xml 251
-MD5 2fbd39b596c2ae0f48447e6e78c0dd9c ChangeLog 756
 MD5 47643e3514ba4d9dbff244d43e790933 files/ndtpd.initd 679
 MD5 c50d3bad7e4228c971eeb2507f0de06f files/digest-ndtpd-3.1.5 63
+MD5 6b62661262cdfe606b598f57f9249a52 files/ndtpd-3.1.5-eb4-gentoo.diff 658
diff --git a/net-misc/ndtpd/files/ndtpd-3.1.5-eb4-gentoo.diff b/net-misc/ndtpd/files/ndtpd-3.1.5-eb4-gentoo.diff
new file mode 100644
index 000000000000..e37ac9d703a5
--- /dev/null
+++ b/net-misc/ndtpd/files/ndtpd-3.1.5-eb4-gentoo.diff
@@ -0,0 +1,35 @@
+diff -urN ndtpd-3.1.5.ORIG/configure.ac ndtpd-3.1.5/configure.ac
+--- ndtpd-3.1.5.ORIG/configure.ac	2003-05-24 12:44:12.000000000 +0900
++++ ndtpd-3.1.5/configure.ac	2004-01-04 01:09:44.131743536 +0900
+@@ -46,11 +46,6 @@
+ [logdir="${withval}"], [logdir='$(localstatedir)/ndtpd/log'])
+ AC_SUBST(logdir)
+ 
+-dnl *
+-dnl * EB Library 3.x.
+-dnl *
+-eb_LIB_EB3
+-
+ dnl * 
+ dnl * Alternative Programs.
+ dnl * 
+@@ -78,6 +73,7 @@
+ dnl * Compiler Characteristics.
+ dnl * 
+ AC_C_CONST
++AC_C_PROTOTYPES
+ 
+ dnl * 
+ dnl * Libraries.
+@@ -178,6 +174,11 @@
+ fi
+ AC_MSG_RESULT($ENABLE_IPV6)
+ 
++dnl *
++dnl * EB Library 3.x.
++dnl *
++eb_LIB_EB3
++
+ dnl * 
+ dnl * Output Files.
+ dnl * 
diff --git a/net-misc/ndtpd/ndtpd-3.1.5.ebuild b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
index 3a34e859fed8..9e81ef1fbaef 100644
--- a/net-misc/ndtpd/ndtpd-3.1.5.ebuild
+++ b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.4 2003/09/18 12:32:10 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.5 2004/01/03 16:19:43 usata Exp $
 
 inherit eutils
 
@@ -14,13 +14,22 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 
-DEPEND=">=dev-libs/eb-3
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57"
+RDEPEND=">=dev-libs/eb-3
 	>=sys-libs/zlib-1.1.3-r2"
 
-S="${WORKDIR}/${P}"
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-eb4-gentoo.diff
+}
 
 src_compile() {
 
+	autoreconf || die
+
 	econf --with-eb-conf=/etc/eb.conf || die
 	emake || die
 }
@@ -47,6 +56,7 @@ src_install() {
 		cat >>${T}/services<<-EOF
 		ndtp		2010/tcp			# Network Dictionary Transfer Protocol
 		EOF
+		insinto /etc
 		doins ${T}/services
 	fi