Respect LDFLAGS, bug #233759, thank Mart Raudsepp for report. Remove unused.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 21 insertions, 19 deletions

diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
index 00f21270e396..5f73f282434a 100644
--- a/net-misc/netkit-telnetd/ChangeLog
+++ b/net-misc/netkit-telnetd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/netkit-telnetd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.45 2008/08/02 16:58:11 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.46 2008/08/13 14:02:07 pva Exp $
+
+*netkit-telnetd-0.17-r10 (13 Aug 2008)
+
+  13 Aug 2008; Peter Volkov <pva@gentoo.org> -netkit-telnetd-0.17-r7.ebuild,
+  +netkit-telnetd-0.17-r10.ebuild:
+  Respect LDFLAGS, bug #233759, thank Mart Raudsepp for report. Remove unused.
 
 *netkit-telnetd-0.17-r9 (02 Aug 2008)
 
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 653ff99d8821..3cfa4d2dac6e 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -4,12 +4,11 @@ AUX netkit-telnetd-0.17-gentoo.patch 3155 RMD160 bec68b4e0ebf8a3fc9df1da2a5b5c0e
 AUX telnetd.xinetd 205 RMD160 5d2260272db800af536e6226aad74a43a6f8d65c SHA1 fb1c5a0dabb658889d1417783f1f5dc3357a97c1 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c
 DIST netkit-telnet-0.17.tar.gz 133749 RMD160 faa273e6e4fbb31299d242d8329c597f402c7b83 SHA1 41213dedaf242126b54a3ac51b905a351eb22b15 SHA256 9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00
 DIST netkit-telnet_0.17-28.diff.gz 25764 RMD160 04b70732d4024d2c2415d2ce1285cb80012ee167 SHA1 99fb3dbdbf6131bd4ba9430a63be60d5f15855ab SHA256 510394fc24a9962812c15689effc7813d815e5bf532574bce9d36eb16d138b77
-DIST netkit-telnet_0.17-32.diff.gz 26464 RMD160 c9768d25d76fc6a868a5654105cbf635ea55f38e SHA1 5ca60856cdab252c6f6d6f6e80c3fd464f35577f SHA256 ef384b89a99c88fbbb5c0a57395d6e7f7c6c41dbab97576f2753b0038eff997c
 DIST netkit-telnet_0.17-35.diff.gz 26609 RMD160 630f1d9f61746e4cd6828bba69bda09d234aab73 SHA1 eb745c0b2b918cafe3f81b91b0eff51e97c36b10 SHA256 fa44ace8f3ab244ed13ce5c2057ae78d799539b03322aba8fc61936edd3c32c4
 DIST netkit-telnet_0.17-36.diff.gz 27226 RMD160 c34b32e56ac04fb6c885a47b41690b1898ac2db3 SHA1 a12b757186439b1599b171f86b4f56cd5cce7fbf SHA256 cd192e3acbef83a3e8fbacfa26e1f6ededfe50587e9b372b5a38ce5928d746f7
+EBUILD netkit-telnetd-0.17-r10.ebuild 2375 RMD160 e54daf36f68554e4593addd5f01bf3ee18731e63 SHA1 e7200024381592c5d79bd614724a02aabb718d12 SHA256 09061f2956cb025eaf8d4eacec6bee2f63812588a9fa11663771f7efde37afef
 EBUILD netkit-telnetd-0.17-r6.ebuild 2197 RMD160 ee9c4958eabdad5083a90f26bf7488dd36aaa77d SHA1 4f50af3f7cc80992aa8e7ed253cbe2ed6022c0df SHA256 4d107a1a2eb1b8b84c6e141cb9394e96a815982796cdb329c166a3d45c1ee72f
-EBUILD netkit-telnetd-0.17-r7.ebuild 2407 RMD160 e2a5d87e0ff6173f6488534f5ed17a7bbae2f33a SHA1 005c1524362c55714040bad7157049acd0c7893e SHA256 17064d4691bc76319c5ac39dcf382b2ab1d9ba5c9136f72fce6e30cbbbeec6ef
 EBUILD netkit-telnetd-0.17-r8.ebuild 2330 RMD160 e12ae3557c9f05ad509ce8fbfa0e22c096d9206e SHA1 aedbb3a56d43b99dd06905022b653da878eabf2c SHA256 d6eee0ff420c4a563f2f5b1c8ff2163ea0605990b6bf14def9101a0707e4de78
 EBUILD netkit-telnetd-0.17-r9.ebuild 2333 RMD160 874bd6045e8d119feea3d5404ad4e8a36d908d15 SHA1 952ca4ba779c9b0c000ea60a6c0a2f570c520181 SHA256 f0a7bc9b5b34651010587ba4def0cb9f33d5328e89d52904bf83fd541b78da0b
-MISC ChangeLog 6317 RMD160 d1269949d99188325172e65ca781775889b586cd SHA1 44d7afcd55de6d0140f9e75ac3b64e92f6a2a435 SHA256 e15d447e6ccf856bbdc08e05ecdd93cfeebb9b1df038ca97d15cbf37863f17da
+MISC ChangeLog 6547 RMD160 85b07f8265b5e82e265e68320ade34fa5b28b4c0 SHA1 9a276c04ec019faa16c910efcef1ccddd917cede SHA256 7ca008878bf971c115cff80de31465c85bf90530d7caf704c372cf01e231e8ed
 MISC metadata.xml 386 RMD160 889c599e493faf7b639d90fd719266980c918c8d SHA1 b628c5ce40d39e78a3b136bfc77dd337821fde50 SHA256 78f12e3f9d5c80b91fa48846b8037b7d66e6323ad54f1ea8efc1b64b4414f30f
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
index defe4a641439..acfcad78ee71 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild
@@ -1,10 +1,10 @@
-# 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/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild,v 1.5 2007/06/26 02:33:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild,v 1.1 2008/08/13 14:02:07 pva Exp $
 
 inherit eutils toolchain-funcs
 
-PATCHLEVEL=32
+PATCHLEVEL=36
 DESCRIPTION="Standard Linux telnet client and server"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 # http://packages.debian.org/stablesource/netkit-telnet
@@ -14,8 +14,8 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="build"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2
 	!net-misc/telnet-bsd"
@@ -24,7 +24,7 @@ S=${WORKDIR}/netkit-telnet-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# Patch: [0]
 	# Gentoo lacks a maintainer for this package right now. And a
 	# security problem arose. While reviewing our options for how
@@ -32,14 +32,13 @@ src_unpack() {
 	# better to just stay in sync with debian's own netkit-telnet
 	# package. Lots of bug fixes by them over time which were not in
 	# our telnetd.
-	epatch ${WORKDIR}/netkit-telnet_0.17-${PATCHLEVEL}.diff || die
+	epatch "${WORKDIR}"/netkit-telnet_0.17-${PATCHLEVEL}.diff
 
 	# Patch: [1]
 	# after the deb patch we need to add a small patch that defines
 	# gnu source. This is needed for gcc-3.4.x (needs to be pushed
 	# back to the deb folk?)
-	epatch ${FILESDIR}/netkit-telnetd-0.17-cflags-gnu_source.patch \
-		|| die
+	epatch "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
 }
 
 src_compile() {
@@ -47,20 +46,18 @@ src_compile() {
 
 	sed -i \
 		-e "s:-pipe -O2:${CFLAGS}:" \
+		-e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \
 		-e "s:-Wpointer-arith::" \
 		-e "s:^CC=.*:CC=$(tc-getCC):" \
 		-e "s:^CXX=.*:CXX=$(tc-getCXX):" \
 		MCONFIG
 
 	make || die
-	cd telnetlogin
-	make || die
+	cd telnetlogin && make || die
 }
 
 src_install() {
 	dobin telnet/telnet || die
-	#that's it if we're going on a build image
-	use build && return 0
 
 	dosbin telnetd/telnetd || die
 	dosym telnetd /usr/sbin/in.telnetd
@@ -71,9 +68,9 @@ src_install() {
 	dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
 	doman telnetlogin/telnetlogin.8
 	dodoc BUGS ChangeLog README
-	dodoc ${FILESDIR}/net.issue.sample
+	dodoc "${FILESDIR}"/net.issue.sample
 	newdoc telnet/README README.telnet
 	newdoc telnet/TODO TODO.telnet
 	insinto /etc/xinetd.d
-	newins ${FILESDIR}/telnetd.xinetd telnetd
+	newins "${FILESDIR}"/telnetd.xinetd telnetd
 }