Use autotools.eclass instead of calling autoconf directly. Fix conflicting

types build error for canonicalize_file_name. Clean up ebuild.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

4 files changed, 42 insertions, 18 deletions

diff --git a/net-misc/ndtpd/ChangeLog b/net-misc/ndtpd/ChangeLog
index 299b12142976..6ae7f1cba32b 100644
--- a/net-misc/ndtpd/ChangeLog
+++ b/net-misc/ndtpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/ndtpd
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.15 2007/12/25 17:13:26 phreak Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ChangeLog,v 1.16 2008/06/21 15:04:05 dirtyepic Exp $
+
+  21 Jun 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/ndtpd-3.1.5-canonicalize.patch, ndtpd-3.1.5.ebuild:
+  Use autotools.eclass instead of calling autoconf directly. Fix conflicting
+  types build error for canonicalize_file_name. Clean up ebuild.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing usata from metadata.xml as per #22931. Assigning to maintainer-needed.
diff --git a/net-misc/ndtpd/Manifest b/net-misc/ndtpd/Manifest
index 51a715df232e..c2bcb992b5b6 100644
--- a/net-misc/ndtpd/Manifest
+++ b/net-misc/ndtpd/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ndtpd-3.1.5-canonicalize.patch 406 RMD160 f98d700f9e50e205c7c5a78d6839e941a18be33a SHA1 92298a794ac4d29af074f8fdb5add2b9d42ba423 SHA256 7a5cf8d3470ea1608672b1334879a47d2b3b5cc13ea803a31905c37f618ab0b6
 AUX ndtpd-3.1.5-eb4-gentoo.diff 658 RMD160 b2b4ee4f6c5d4a217dee8154470a86df0d167a73 SHA1 3388aeeaf0a45f185e6fe5e31de9a395bae0ca05 SHA256 4337c1d9f1d9a787a8419080e2269907cad5e6d27775e1dc02ee53bb2efa478e
 AUX ndtpd.initd 663 RMD160 fdf69d949cec39372a3a8fec04d3cb49c943eebf SHA1 63389af43aa648cdabfb24d43745689192caf89e SHA256 a2053f2e385a51c9cc6a6716ee73fefc0ec25f69711453b4382b8dd90c237639
 DIST ndtpd-3.1.5.tar.gz 558367 RMD160 6b54e2e3d4ca30f4c78363696d9127edf72deece SHA1 0445cf4c9be4373f0ed06a545a0665f5e6fad7aa SHA256 5ef2f6323d319979a091a255589d1a66556f0d0ae2f357653adf5fda7c2a0c31
-EBUILD ndtpd-3.1.5.ebuild 1204 RMD160 f3a6ce833137463be6de7c53812d0f74c33cb2c4 SHA1 72a8c9ea78f3f021f040be15930d1d4047133bec SHA256 35fb10bc5f86d1028c24c201c117e533c17c379a2595534864b96b507aba3f87
-MISC ChangeLog 1958 RMD160 9dcbde8e1120c46fb5a0fc3ab93bf843e33216af SHA1 20a9cddad4320cf2fddc0d27aac352767624a136 SHA256 4061b86f2470b42fb4d2847584a81cef91e39e6d5bb2c83554bacd6a39043212
+EBUILD ndtpd-3.1.5.ebuild 1300 RMD160 e15b3dbdb5f83f928359260c1603815ebda2273c SHA1 77fe0a8f9705948c79208347affe87fa0b97192f SHA256 afdf33b0adf50116262b1346cd50a157cd9bc2104a32dc9520d1bceac4637bc1
+MISC ChangeLog 2213 RMD160 75da3f068c61d0ac792b0fa03c5e21adb134fc5f SHA1 3d78338227ae57fea35132feb411d590c1ca4bcd SHA256 59aef98702e2c9888b731f54860c1342eb72cfcdbf635903c09f668fd39476bd
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhdGGoACgkQiqiDRvmkBmI1LACg3x9CAp+BaTZ81iVheCgap5bw
+iqwAn0Xv9Nk2lWVwLFF+s2OrLhRO7Cc7
+=txTL
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ndtpd/files/ndtpd-3.1.5-canonicalize.patch b/net-misc/ndtpd/files/ndtpd-3.1.5-canonicalize.patch
new file mode 100644
index 000000000000..92889a41401f
--- /dev/null
+++ b/net-misc/ndtpd/files/ndtpd-3.1.5-canonicalize.patch
@@ -0,0 +1,12 @@
+diff -Naurp ndtpd-3.1.5-orig/lib/filename.h ndtpd-3.1.5/lib/filename.h
+--- ndtpd-3.1.5-orig/lib/filename.h	2001-02-03 03:36:06.000000000 -0600
++++ ndtpd-3.1.5/lib/filename.h	2008-06-21 08:34:18.000000000 -0600
+@@ -25,7 +25,7 @@
+  * Function declarations.
+  */
+ #ifdef __STDC__
+-int canonicalize_file_name(char *);
++char * canonicalize_file_name(const char *);
+ #else
+ int canonicalize_file_name();
+ #endif
diff --git a/net-misc/ndtpd/ndtpd-3.1.5.ebuild b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
index 5ee24cb7b2c9..346b00038029 100644
--- a/net-misc/ndtpd/ndtpd-3.1.5.ebuild
+++ b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # 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.13 2007/12/04 10:02:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.14 2008/06/21 15:04:05 dirtyepic Exp $
 
-inherit eutils
+inherit autotools eutils
 
 IUSE=""
 
@@ -14,10 +14,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
 
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.57"
-RDEPEND=">=dev-libs/eb-3
-	>=sys-libs/zlib-1.1.3-r2"
+DEPEND="${RDEPEND}"
+RDEPEND=">=dev-libs/eb-3"
 
 pkg_setup() {
 	# this is required; src_install() needs ndtpuser:ndtpgrp
@@ -26,23 +24,21 @@ pkg_setup() {
 }
 
 src_unpack() {
-
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-eb4-gentoo.diff"
+	epatch "${FILESDIR}"/${P}-canonicalize.patch
+	eautoreconf
 }
 
 src_compile() {
-
-	autoconf || die
-
-	econf --with-eb-conf=/etc/eb.conf || die
-	emake || die
+	econf --with-eb-conf=/etc/eb.conf || die "Failed during configure."
+	emake || die "Failed during make."
 }
 
 src_install() {
 
-	einstall || die
+	emake DESTDIR="${D}" install || die "Failed during install."
 
 	newinitd "${FILESDIR}/ndtpd.initd" ndtpd