jer 14/07/14 22:40:46 Modified: ChangeLog netperf-2.6.0-r1.ebuild Removed: netperf-2.6.0.ebuild Log: EAPI bump. Whitespace. cp must die(). Change sed script into patch. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.60 net-analyzer/netperf/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/ChangeLog?rev=1.60&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/ChangeLog?rev=1.60&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/ChangeLog?r1=1.59&r2=1.60 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- ChangeLog 27 Sep 2012 15:52:23 -0000 1.59 +++ ChangeLog 14 Jul 2014 22:40:46 -0000 1.60 @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/netperf -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.59 2012/09/27 15:52:23 jer Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.60 2014/07/14 22:40:46 jer Exp $ + + 14 Jul 2014; Jeroen Roovers <[email protected]> -netperf-2.6.0.ebuild, + netperf-2.6.0-r1.ebuild, +files/netperf-2.6.0-log-dir.patch, + files/netperf-fix-scripts.patch: + EAPI bump. Whitespace. cp must die(). Change sed script into patch. 27 Sep 2012; Jeroen Roovers <[email protected]> netperf-2.6.0-r1.ebuild, metadata.xml: 1.3 net-analyzer/netperf/netperf-2.6.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild?r1=1.2&r2=1.3 Index: netperf-2.6.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- netperf-2.6.0-r1.ebuild 27 Sep 2012 15:52:23 -0000 1.2 +++ netperf-2.6.0-r1.ebuild 14 Jul 2014 22:40:46 -0000 1.3 @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v 1.2 2012/09/27 15:52:23 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v 1.3 2014/07/14 22:40:46 jer Exp $ -EAPI=4 +EAPI=5 inherit eutils flag-o-matic DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more." @@ -15,24 +15,22 @@ IUSE="demo sctp" DEPEND=">=sys-apps/sed-4" -RDEPEND="" src_prepare() { - sed -i src/netserver.c \ - -e '/^#define DEBUG_LOG_FILE_DIR/s:"/tmp/":"/var/log/":' \ - -e 's:sizeof(netperf_response) - 7:MAXSPECDATA:g' \ - || die - - epatch "${FILESDIR}"/${PN}-fix-scripts.patch + epatch \ + "${FILESDIR}"/${PN}-fix-scripts.patch \ + "${FILESDIR}"/${P}-log-dir.patch # Fixing paths in scripts - sed -i -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ - doc/examples/sctp_stream_script \ - doc/examples/tcp_range_script \ - doc/examples/tcp_rr_script \ - doc/examples/tcp_stream_script \ - doc/examples/udp_rr_script \ - doc/examples/udp_stream_script + sed -i \ + -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ + doc/examples/sctp_stream_script \ + doc/examples/tcp_range_script \ + doc/examples/tcp_rr_script \ + doc/examples/tcp_stream_script \ + doc/examples/udp_rr_script \ + doc/examples/udp_stream_script \ + || die # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ @@ -61,5 +59,5 @@ dodoc AUTHORS ChangeLog NEWS README Release_Notes dodir /usr/share/doc/${PF}/examples #Scripts no longer get installed by einstall - cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples + cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die }
