Fixed filtering out of LDFLAGS, bug 209740, thank you Diego Pettenò! Compiler is now set correctly.

Package-Manager: portage-2.1.4.4

5 files changed, 74 insertions, 14 deletions

diff --git a/net-ftp/netkit-tftp/ChangeLog b/net-ftp/netkit-tftp/ChangeLog
index bd0fa327ef23..a76f457dc87b 100644
--- a/net-ftp/netkit-tftp/ChangeLog
+++ b/net-ftp/netkit-tftp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2008/02/05 11:05:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/ChangeLog,v 1.9 2008/02/20 09:19:05 pva Exp $
+
+*netkit-tftp-0.17-r5 (20 Feb 2008)
+
+  20 Feb 2008; <pva@gentoo.org> netkit-tftp-0.17-r3.ebuild,
+  netkit-tftp-0.17-r4.ebuild, +netkit-tftp-0.17-r5.ebuild:
+  Fixed filtering out of LDFLAGS, bug 209740, thank you Diego Pettenò!
+  Compiler is now set correctly.
 
   05 Feb 2008; Markus Rothe <corsair@gentoo.org> netkit-tftp-0.17-r4.ebuild:
   Stable on ppc64
diff --git a/net-ftp/netkit-tftp/Manifest b/net-ftp/netkit-tftp/Manifest
index 7e29fd75dcdb..8f78dbbf12c0 100644
--- a/net-ftp/netkit-tftp/Manifest
+++ b/net-ftp/netkit-tftp/Manifest
@@ -6,7 +6,8 @@ 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 967c55df0f81cfa7bc69917acd4aafffaa2545ab SHA1 23dc1c253e7835a37ffbd4a1463479ed166ab5e9 SHA256 2e47c31a9ccdb75b50806fdec2d86a2487dc7b889534c782158b50e640c30e61
-EBUILD netkit-tftp-0.17-r4.ebuild 1416 RMD160 fc82c9cd990c6e6f6af0776f8e82308fbeb1d61c SHA1 3d000f0192f86930954700474645efc13740cf61 SHA256 bd7bec3d2d4f20c35e9fd158888b134109fe7e5567bb43cc2600929e5f90e503
-MISC ChangeLog 2705 RMD160 fd406d506f5764d1c78b88b12952fabc898441ba SHA1 87684a34852f486e202372a06ddd3a45401e0f6d SHA256 a3866fe1cd94660e3a609407b9e45e9f78173e95818ddc4ddffebfadd35bdf9d
+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 1505 RMD160 4d72efc43fb40f4b0ec5c651caf6656d2c7a3666 SHA1 d7cf5a91a025004597cee577fdc1e3584b6880bb SHA256 d5dc248f76470fc41166e4c05e506810194a81050d246aa4cbf725e97bc1a7ec
+MISC ChangeLog 2962 RMD160 b97f56a7f1868d078feaf82c2e0f78430d04e80c SHA1 35cc53c080ab3a4b0d8dca6adab052da89c7dec3 SHA256 44db65d81861ae809463948dd4a871ae2ba6eaae401b2a8693d48226c59329d7
 MISC metadata.xml 799 RMD160 8f94b4bf878b4bc1c81977707abe311e34b21780 SHA1 14a84369d0cbb5deca5b938f13c6c6fa7c1b5623 SHA256 6fc447069710464408b1e3c22512a9ec36f59f9226bae0918e36267780e6ef4a
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild
index ec783e268a17..f13782cf0dc1 100644
--- a/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild
@@ -1,6 +1,6 @@
-# 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-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild,v 1.2 2007/06/26 02:25:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r3.ebuild,v 1.3 2008/02/20 09:19:05 pva Exp $
 
 inherit eutils
 
@@ -18,11 +18,11 @@ PROVIDE="virtual/tftp"
 
 src_compile() {
 	# Change default man directory
-	epatch ${FILESDIR}/man.patch
+	epatch "${FILESDIR}"/man.patch
 	# Solve QA warning by including string.h
-	epatch ${FILESDIR}/memset.patch
+	epatch "${FILESDIR}"/memset.patch
 
-	./configure --prefix=/usr --installroot=${D} || die
+	./configure --prefix=/usr --installroot="${D}" || die
 	emake || die
 }
 
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild
index 736b42a665e5..d725460c9865 100644
--- a/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.3 2008/02/05 11:05:07 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-tftp/netkit-tftp-0.17-r4.ebuild,v 1.4 2008/02/20 09:19:05 pva Exp $
 
 inherit eutils
 
@@ -28,10 +28,10 @@ src_unpack() {
 	find -name Makefile -exec sed -ie '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
+	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() {
diff --git a/net-ftp/netkit-tftp/netkit-tftp-0.17-r5.ebuild b/net-ftp/netkit-tftp/netkit-tftp-0.17-r5.ebuild
new file mode 100644
index 000000000000..47c001014bc5
--- /dev/null
+++ b/net-ftp/netkit-tftp/netkit-tftp-0.17-r5.ebuild
@@ -0,0 +1,52 @@
+# 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-r5.ebuild,v 1.1 2008/02/20 09:19:05 pva Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="the tftp server included in netkit"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-0.17.tar.gz"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+
+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 -exec 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
+	doman tftp/tftp.1 tftpd/tftpd.8
+	make install || die
+
+	dodoc "${FILESDIR}"/{tftp-dgram,tftp-stream} BUGS ChangeLog README
+	einfo "Take a look at /usr/share/doc/${PF}/tftp-* files"
+	einfo "for sample xinetd configuration files."
+}