Fixup manpage install and cleanup ebuild.

Package-Manager: portage-2.2_pre5
RepoMan-Options: --force

3 files changed, 76 insertions, 6 deletions

diff --git a/net-ftp/netkit-tftp/ChangeLog b/net-ftp/netkit-tftp/ChangeLog
index a9da78907555..99e9d844ded4 100644
--- a/net-ftp/netkit-tftp/ChangeLog
+++ b/net-ftp/netkit-tftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/netkit-tftp
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.13 2008/03/23 22:51:54 ranger Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.14 2008/03/29 02:33:27 vapier Exp $
+
+*netkit-tftp-0.17-r6 (29 Mar 2008)
+
+  29 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+  +netkit-tftp-0.17-r6.ebuild:
+  Fixup manpage install and cleanup ebuild.
 
   23 Mar 2008; Brent Baude <ranger@gentoo.org> netkit-tftp-0.17-r5.ebuild:
   stable ppc, bug 214049
diff --git a/net-ftp/netkit-tftp/Manifest b/net-ftp/netkit-tftp/Manifest
index f0a077983e27..24ed635a3394 100644
--- a/net-ftp/netkit-tftp/Manifest
+++ b/net-ftp/netkit-tftp/Manifest
@@ -1,4 +1,6 @@
-AUX man.patch 279 RMD160 19d22663bd0451e35f55662652c8901ea870da5d SHA1 6136616b6e785bddbeea7989866d5a37ac1f65ee SHA256 3ab46253253a278d416f8d2fac9b884e802fc8240aa88d04cc0536c98728d938
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX memset.patch 280 RMD160 e7de5f8e41574e7dc649ee38bb5f7365fc0be4b6 SHA1 fe8c0cbd49f8ddb27b37ec24bd4be3be0abab064 SHA256 9b04964776efc6b321fe9b388dda6206101d681911b80ea20135593d47b948b8
 AUX netkit-tftp-0.17-tftp-connect-segfault.patch 785 RMD160 e1e6daf991f55b8454c58f207d479dbbaeb76f57 SHA1 4b54bbf87cbcfb3a8ad47762086150aa77a0a3a3 SHA256 8ec005824a299cc106b420d012d9f5492093eaf9237c7dba692baffcb081458e
 AUX netkit-tftp-0.17-tftp-fix-put-zero-size.diff 314 RMD160 4ed269cdf6cde97152da6d37eec1b91b3df363aa SHA1 6bfcd34858e78f0a1370c66323f9d26cb2907b7d SHA256 1e216083f0cdb592f927a5a33cec5b3ae1ae6fdc803d20c738b904a1aac7a32e
@@ -6,8 +8,14 @@ AUX netkit-tftp-0.17-tftp-manpage-typo.patch 473 RMD160 43f7599b55c4a4e1493268ea
 AUX tftp-dgram 246 RMD160 adfcba66b4db0afbb6372ff701ec8da310963f77 SHA1 e0afb619d6e4b2665be04ed2016836668a619ffd SHA256 b79af85531e4e300da30731ed0b761d0325ad091c6ae7e9c75bf67806b9e1009
 AUX tftp-stream 246 RMD160 b1075084b89ac25cbcebdaa69152f42a032c57a5 SHA1 2378f5976cfae1c63e3ac96d6df417165dab8d17 SHA256 861a2d955c1d84d7268c3348ef53c33f44ce73453eda96c36b3750bba6f1f836
 DIST netkit-tftp-0.17.tar.gz 23620 RMD160 18fa9eaa4e31ec9579a8ba8a486a2f0da0b22747 SHA1 d3d661d6462f1989a69b37acba4006be5ae112bc SHA256 3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d
-EBUILD netkit-tftp-0.17-r3.ebuild 889 RMD160 7100117cfea0f4e6277647ffb512f362330cb2b0 SHA1 06cfa5074482beca7314272e3727a3c3f751422c SHA256 deb40ab577cb43e148996e2d560cbf1a076790a38ce074971ac351bcc6c96cb1
-EBUILD netkit-tftp-0.17-r4.ebuild 1420 RMD160 6f24607a5d093f8004c60559c35ea48a2be3baab SHA1 fd3d2abbbf1e557d6292370c9877c5b7ea24e1bc SHA256 bc39afa4fb76b896c9f322a3f80888aed90e55554bc00405baa39c4558af055d
 EBUILD netkit-tftp-0.17-r5.ebuild 1503 RMD160 d4678adc779576f6ea767d9e0f52e14647c351a1 SHA1 7c9fc8de6debf59966aac7a1a899c896ecbbe576 SHA256 3a775cd91624e26e68dc522fec919384ab08baeb52c3694e176a0887424946ad
-MISC ChangeLog 3384 RMD160 2db5fb59f5a8df20548cd08445c9d0a6feab6cd8 SHA1 1742a0c089ada3d1a0f382478c18caaa31dea7b7 SHA256 59a97580b63748dd162b129b0abd949cf6fb8d7aa36688a6e992c24a7de2d86f
+EBUILD netkit-tftp-0.17-r6.ebuild 1484 RMD160 121276fcc6dcca2ba625cf76a24009bb7dcbcb60 SHA1 0d1432e1fc4ddade9acd1415c5bee95dfe9399b5 SHA256 c40658e331c43419632025142062570559b9122cb0582fce9f04330a1752148a
+MISC ChangeLog 3546 RMD160 dfc78db16e30fb50bb5ca20ab83e08caeb7bea55 SHA1 37095b33608d6dcf372730ddcf9da982cc38d4af SHA256 283032456e8625ee3cb2a135b3fb5c30bbc31eada885f9a7a613ae8b3f71a167
 MISC metadata.xml 799 RMD160 8f94b4bf878b4bc1c81977707abe311e34b21780 SHA1 14a84369d0cbb5deca5b938f13c6c6fa7c1b5623 SHA256 6fc447069710464408b1e3c22512a9ec36f59f9226bae0918e36267780e6ef4a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH7atCj9hvisErhMIRAhW6AJ9HdiwhCfrLD3hHpcRBRTppTbEt9gCeK6tQ
+GOGj7v4SrgHp5Ox6qQsgOgU=
+=j5r4
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild
new file mode 100644
index 000000000000..c99504a1374f
--- /dev/null
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r6.ebuild,v 1.1 2008/03/29 02:33:27 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="the tftp server included in netkit"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="!virtual/tftp
+	virtual/inetd"
+PROVIDE="virtual/tftp"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Change default man directory
+	sed -i \
+		-e 's:MANDIR="$PREFIX/man":MANDIR="$PREFIX/share/man":' \
+		-e 's:^LDFLAGS=::' \
+		configure
+
+	# don't prestrip binaries
+	find . -name Makefile -print0 | xargs -0 sed -i -e 's:install -s:install:'
+
+	# Solve QA warning by including string.h
+	epatch "${FILESDIR}"/memset.patch
+	epatch "${FILESDIR}"/${P}-tftp-connect-segfault.patch
+	epatch "${FILESDIR}"/${P}-tftp-manpage-typo.patch
+	epatch "${FILESDIR}"/${P}-tftp-fix-put-zero-size.diff
+}
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--installroot="${D}" \
+		--with-c-compiler="$(tc-getCC)" \
+		|| die
+	emake || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/sbin /usr/share/man/man{1,8}
+	emake install || die
+	rm -f "${D}"/usr/share/man/man8/tftpd.8
+	insinto /etc/xinetd.d
+	doins "${FILESDIR}"/{tftp-dgram,tftp-stream}
+	dodoc BUGS ChangeLog README
+}