Respect LDFLAGS (bug #331871). Add missing include.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 84 insertions, 12 deletions

diff --git a/net-analyzer/netio/ChangeLog b/net-analyzer/netio/ChangeLog
index 5cd134a27a1c..828e2ea7f130 100644
--- a/net-analyzer/netio/ChangeLog
+++ b/net-analyzer/netio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netio
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netio/ChangeLog,v 1.22 2010/01/01 17:41:56 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netio/ChangeLog,v 1.23 2010/08/09 17:44:49 jer Exp $
+
+*netio-1.26-r1 (09 Aug 2010)
+
+  09 Aug 2010; Jeroen Roovers <jer@gentoo.org> +netio-1.26-r1.ebuild,
+  +files/netio-1.26-linux-include.patch:
+  Respect LDFLAGS (bug #331871). Add missing include.
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> netio-1.26.ebuild:
   Transfer Prefix keywords
diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest
index c2faad7065ca..cbe4e8e0d4d8 100644
--- a/net-analyzer/netio/Manifest
+++ b/net-analyzer/netio/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX netio-1.26-linux-include.patch 309 RMD160 e18e1c6397a471e4f16051be5862828c9560bf87 SHA1 1be313a0f2ac8494192328e05903b99fa66e7185 SHA256 77a7b6aabf43fd0f2cf46d116ea9967ef77053907eb46437a3286b94b3dc86aa
 DIST netio126.zip 140402 RMD160 bff92f25df1df87c7075432b1da3e0f7defe1e30 SHA1 ef63e9b0564445a1831b53be98a5472dbceaa922 SHA256 86c0bdee3224477b43c0cb6161ce1a20b2a2b6d59ef37f67864227096d9e8d5c
+EBUILD netio-1.26-r1.ebuild 1652 RMD160 efd498b8e24e932846f81fa2eec8725aa8f8602d SHA1 fd18ab8d0366b4ea4f49aec93c418be4376e0588 SHA256 d4beaaf91335d29a09ccc200c508634caa119a8f553c7fd01b953b04130c64b3
 EBUILD netio-1.26.ebuild 1538 RMD160 25eec36768945732f619811cd622b233d295e6ed SHA1 ec7c21f24187d2320e742d1f4563cfed8fc1f789 SHA256 5848fbe44510c5d6b8abd1821475fe2f98cdd66d80aea0f9908c90aa37cef13f
-MISC ChangeLog 5473 RMD160 daf1502778c2d7ad8a27908fe89b344729441664 SHA1 da027dac40b8ba4198abe463ac753e4ac1a1b6fc SHA256 e89443dc7a2b0797a4de9136c781e95c26463519219402662689e741a0b24f8f
+MISC ChangeLog 5667 RMD160 af4a9b967d03f02f457985067eafaf351b624b7a SHA1 b28dfd61dd7f0f7f2c1db29f424ca748c8ccdb5a SHA256 d819f8d045b971e63d8c59859683987e0766ae369a79303697bc2fa2ba4b9f0e
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+M+kACgkQNQqtfCuFneP5DwCeLDUBBxI0NLRCS7UeVrLhHje/
-yjUAoI4iMlMGfl0cx/e+nKkby2Afoht0
-=7uvD
------END PGP SIGNATURE-----
diff --git a/net-analyzer/netio/files/netio-1.26-linux-include.patch b/net-analyzer/netio/files/netio-1.26-linux-include.patch
new file mode 100644
index 000000000000..dc0cd9813e52
--- /dev/null
+++ b/net-analyzer/netio/files/netio-1.26-linux-include.patch
@@ -0,0 +1,13 @@
+Add missing include (see inet(3)) - JeR
+
+
+--- a/netio.c	2005-08-30 16:47:18.000000000 +0200
++++ b/netio.c	2010-08-09 19:31:51.000000000 +0200
+@@ -199,6 +199,7 @@
+ #include <sys/time.h>
+ #include <time.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netdb.h>
+ 
+ #define psock_errno(x) perror(x)
diff --git a/net-analyzer/netio/netio-1.26-r1.ebuild b/net-analyzer/netio/netio-1.26-r1.ebuild
new file mode 100644
index 000000000000..21ba7c3eacd8
--- /dev/null
+++ b/net-analyzer/netio/netio-1.26-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netio/netio-1.26-r1.ebuild,v 1.1 2010/08/09 17:44:49 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs versionator
+
+MY_P="${PN}$(get_version_component_range 1)$(get_version_component_range 2)"
+DESCRIPTION="a network benchmark for DOS, OS/2, Windows NT and Unix that measures net througput with NetBIOS and TCP/IP protocols."
+HOMEPAGE="http://www.ars.de/ars/ars.nsf/docs/netio"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	>=sys-apps/sed-4"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	edos2unix *.c *.h
+
+	sed -i Makefile \
+		-e 's|\(CFLAGS\)=|\1+=|g' \
+		-e 's|\(CC\)=|\1?=|g' \
+		-e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \
+		|| die "sed Makefile failed"
+	epatch "${FILESDIR}"/${P}-linux-include.patch
+}
+
+src_compile() {
+	emake linux	\
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin netio || die "dobin failed"
+
+	# to be sure to comply with the license statement in netio.doc,
+	# just install everything included in the package to doc
+	dodoc netio.doc FILE_ID.DIZ getopt.h netb_1_c.h netbios.h netio.c \
+		netb_2_c.h netio.doc getopt.c Makefile netbios.c
+
+	# also install binaries
+	dodoc bin/os2-i386.exe bin/win32-i386.exe
+}
+
+pkg_postinst() {
+	echo
+	elog "NOTE: all files included in the upstream zip file have"
+	elog "been installed to /usr/share/doc/${PF}, as required by"
+	elog "the license."
+	echo
+}