Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

13 files changed, 231 insertions, 290 deletions

diff --git a/net-analyzer/cacti-spine/ChangeLog b/net-analyzer/cacti-spine/ChangeLog
index 0c7f8808779c..5d591844b736 100644
--- a/net-analyzer/cacti-spine/ChangeLog
+++ b/net-analyzer/cacti-spine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti-spine
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.50 2015/07/23 09:34:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/ChangeLog,v 1.51 2015/07/25 08:28:12 jer Exp $
+
+*cacti-spine-0.8.8f (25 Jul 2015)
+
+  25 Jul 2015; Jeroen Roovers <jer@gentoo.org> +cacti-spine-0.8.8f.ebuild:
+  Version bump.
 
   23 Jul 2015; Agostino Sarubbo <ago@gentoo.org> cacti-spine-0.8.8e.ebuild:
   Stable for sparc, wrt bug #554816
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index e18cdec5d238..b0b6310212bf 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,32 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cacti-spine-0.8.8d-fix-ac-macro.patch 217 SHA256 a51b4a4d7573ac4dd3482d5ea0b5fd199cd795b691e92a3a1acf4b17f69c549c SHA512 aef082e19e043e107788447ca07fc02a5b46e14eac818e4cbe8d91ad6618addd4bbb2fcaca75846e459d9cd37b7776c2fa15caf91ba0947971f0dd69612b5d95 WHIRLPOOL f2a9414b6254b16a4c406b5d7037c352d45ffe78010e5cc51a3d27d5717f7250dfdc713cb04397aed58547de7762ea4e2e96931d09099e0bbd9a7c1deebd7911
 AUX cacti-spine-0.8.8d-mysql.patch 283 SHA256 bd99d14dcab780ff4fa01d85107d69c879faf1bdf113e1b38f3c7f9509823f40 SHA512 0291015f09a9f74cb3e9132c3fe751105928217d6f9c8e4312501d161ef30b6277114a3600c160704af7e43a75cea6c06f75dd6a8777fedee4b8d0909ef67642 WHIRLPOOL 34c3d743eb12db7286c7b7905b8433507f34e68b2ecf3cd9fbb0bd7b2b604aa67faddf4fcc818af009c5422c69363e5f6e5a1602bcaf601e9b7fe4519eb11bc0
-AUX cacti-spine-0.8.8d-net-snmp.patch 772 SHA256 ec5c71001f694c0f4cfcb5776e48aee223f71b95eecc8cf753202ca8b4368fee SHA512 6434bb3c588b8e83736eace7bb3d410444653578dfd54d073dfcc176dbc94a3c0533fa6818af43445262350f76df9619456cf12de2865cd5beedd4c100603923 WHIRLPOOL 805413dd35d24844958df978f5e24af2eaa6e045657dee6dad4ad0980aa743f7a0edc428c88ffc033068692dc50184ec9f369b38abecdf1a8a205cde3ed66f64
 AUX cacti-spine-0.8.8d-ping.patch 235 SHA256 be4b619c9a476759cd06f243641d6043a25345b6a2b3ac5dd16622d1463aff3d SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265 WHIRLPOOL 88b32e2229a5c8b1fd6c2a5c187af9a2372996b87ef4ef6837eee6f06b0de18a909d6d98dd521c2a762e76f8742e9d96f48a71efd3ad759db227e6da222be726
-AUX cacti-spine-0.8.8d-polling_time.patch 8890 SHA256 b8f9630f2a495f378372f624befaa370092c26fa77bcb39d60c334ecca7dea85 SHA512 cdcb353762cc3a67be3f5debdceb09f40e2990201825cfa36b7403bacc69303c85785f5094dca0337ef31dfa4790d5729708f0d6c48896ab633a8dacfc1157c2 WHIRLPOOL c17e733b759138b3b27d45e1ffec9ad88ee23e8666b648db1fe6d1e7d51d9512cc0e3a4a1962ddd5e71150a9c3f62e5fa2474b4f882c6dd01d509655193d0a6b
 AUX cacti-spine-0.8.8d-snmp_spine_close.patch 511 SHA256 47edea95aaa7d6018ae0f64aeb894b42607cccdfe062495afad1b358afcc76d1 SHA512 13e885421658e28ffe94530f0feccfa24020d1a2cef4115ab2d4390fcf557cd5224f89395ddeb24797d9556c4cd8a55a90c8ddf65341eeb642569498478c0ea9 WHIRLPOOL 5fc6cd5503b0b27f2a1d6d957740e5a93ae9cba33bddbaae85e236f3d3749bc3159313149064cab928878797455bd118653e395cd62fd1b54dd7cba0c1bc155c
 AUX cacti-spine-0.8.8e-fix-ac-macro.patch 217 SHA256 1465202e4fb7cb68863da4bd93c9df39b1199d97a39481f3b7a7ef31cf2e010a SHA512 caed6d2fa5f02cc769462cc2b7c0d5918e1912cc4962c4958dcee03c58270afb9ad8aa74204a498b305bbbea9870c0c5e337265a9230d47aa3b9a9424935d0a6 WHIRLPOOL b45d4e0864aebccdc4c4457f4b86f6f4dcb76d66742455262c645b07a36881ede204dcdc2dd271221f6f0764180ae8dac274e0fc49bbd58e8fed3650bff0aea2
 AUX cacti-spine-0.8.8e-net-snmp.patch 572 SHA256 7ed0d70a33e5932c2e0e4ca91cd813e7fc345cdd88d01c82a53fe4490881b6d3 SHA512 c2cd85aae8ec925837f6aeb4b1e29b3b0a9c62aee53554c69a2caf6d964b27897c9dff0aaebfcdd68e64fed3a93315318943636a289e016f34c50b5248843f98 WHIRLPOOL ee593c1c73ac191242902a3e893085f1b8ffc24e4acf23c1c0f3316c24eb03e799ba8249a1b6e1f866ecf3ada0c8e04daf445e211aadaab18cfa6bbffe670ad2
 DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
+DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232
 EBUILD cacti-spine-0.8.8e.ebuild 1131 SHA256 7a69624fc90684e97026bfff3eba872d4c9e541e03fdc4ee5809e36b1414d561 SHA512 915f10da5d55faa2ae91c741bd00f02e08f79027d400777f5b73f5ba5889ea4ed4f79f72c90c403864c5753593ab69f24eedc471b37f8221bcb8f5c0b7ba22a7 WHIRLPOOL 661e68605ce0740e29d00db7c6479689b7b75137ac6d59151a63d89ddb7f3047d684174bba463301df30d526221421d925cd0021cac8f5764e0e0ffc9c1334dc
-MISC ChangeLog 7344 SHA256 7e10c08dea14bf5d2ac57b659358f4285c313c6eb6fceaf97153c8c3505ede67 SHA512 a513e327b73fec28818be575d9635771c7cd25852c7d76d6f385a69f8abe7242abb8fe47f3a7d171ce3e4c134eb9ee1ea337df710777e42a7975d5020b3c4e2e WHIRLPOOL a926cc79895c3f4a60839bb86c0c485d0f20e3f74685bc85c6d3614fe8532dfb2b2340ee220682dba864cb5997ed49a1f29a83aa95fb3b9ee41fb4019949db6f
+EBUILD cacti-spine-0.8.8f.ebuild 1135 SHA256 07c04acfc5e9b67232cf695affa72337d57d7d450efe3c0fc91f356c9505d8ba SHA512 52facaef6ee9b3733382ae2d1ee3532e52f5977f7935de235cf556ada180c18c262af1b2c8e0b9ec4f747dd4eed3f159c594e8937a7bbecc27f90235d5ee1564 WHIRLPOOL f1213aec06b85a66e24fd26d465c988f4e0358b38221a05a971606d66a5638e49cddef2eee614638fa71554e6661da3e9597d960ce1ae4d87337b0f105af981c
+MISC ChangeLog 7471 SHA256 09a53039c952b23473382b6efe329be716a4cce6c5aedddbdcfbc7c7021c58a0 SHA512 6c0b1cab5c5fd06d3188baf26ace092575c91e4d8edfbe23e3b208454caa54455fcad8ec331310fe99629f83645ac169bf11675c468e81805373db95c91dfd14 WHIRLPOOL 8cc680e5734f0239d44f70f10c6c88b659abc9ea9554bce32fa8cdedbaf8ca735c9448224a1f9dd9c2cef40566091b68bb46735643243684ac85fea4812de9b4
 MISC metadata.xml 609 SHA256 6ce745a690546641ddd769949d48fb9b30124f542b7efcd2ab6b4faea0064410 SHA512 9e949dde99ebbc17b1ba2e877e5cbffa4fae0f192d84cdce62992ee9065d4c91e20b4c173bc3a51e4c42695728bca0805c7835f10956f544a8b1a2695ee9e329 WHIRLPOOL 4eb83a74fc24080746118a5f319eeeea6bf5e2f9cfdb4ffacf2f3f485cec953c46f166f216cbd6e234559bcd9e5f9c8b0f0a28d5a80aeb9726b4eb678439cc38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVsLUkAAoJELp701BxlEWfJFsQAImKuoE+Cnrgrn22iEKeumhZ
-8/rLrar96C8XKEwbOAJlZ9ff/afsMznpajKydHMfZHTHstG7XtkpbkDauAQnlSUt
-ZzyEnGD/19tZVs4es5utaf3AWOMnXE3ht2XpApwPU4+46JVQfPc7jrHvS4ntrCIA
-PUtAVjwcbRNNGytR8I5hPgAkR/7E9MDSlTEn9nqRH3ycsumRrc1YQW+JnCMoGwXG
-DwvbYcjKeWIAUYhAQN1X83j9cn+uEjln3J0clA09svDEflnXxCNikxO5Y9H5Gt0X
-44WEE46I2hjIXH8oKHGCr04N+J7T1g5qgC3BFaRQGwwn/0ortcptqBziwzaEF7Xa
-fmEli5HEQzw94Q+EoaqhQ86JvABFdaQ4JyMrHRHCDvqfC2cjPSPRMkmLjN8Dso4U
-rsor2VfdQ5Uw6x/U0ppY9fPjURInvBri6fI4OW+SWZLimqKwd458kTc05fqapgGe
-Ntot1LVYFe3qcosr5I/DN/ydIkkC9Ty/4YUTLEtpIRm/ASbQ2/JPm+xKxMF7/mFb
-Xq0AHiTIbRxzkN5R8BrnzO8+astZ+FeEP0lfNflaVfYSRZogmVkdxJvgnAEapEEJ
-V5ppoJjvqiA3pxIa0X8r43G6/t+0IfYebL6CrAcEyMyg9x1Xy5TB7pOl9azhLCRN
-Hem1V0eFWHpwP8timTvU
-=Cnog
+iEYEAREIAAYFAlWzSJ4ACgkQVWmRsqeSphPCLgCfbeguM1Ss+tthZODyAlpGnukL
+QgQAoIBdlJ5JYCI4SL4ic3A8faTlIRhd
+=Zdpi
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
new file mode 100644
index 000000000000..e3ef02a2064c
--- /dev/null
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild,v 1.1 2015/07/25 08:28:12 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${PN}-${PV/_p/-}
+
+DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
+HOMEPAGE="http://cacti.net/spine_info.php"
+SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	dev-libs/openssl:*
+	net-analyzer/net-snmp
+	virtual/mysql
+"
+RDEPEND="
+	${DEPEND}
+	>net-analyzer/cacti-0.8.8
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.8e-fix-ac-macro.patch \
+		"${FILESDIR}"/${PN}-0.8.8e-net-snmp.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
+		"${FILESDIR}"/${PN}-0.8.8d-snmp_spine_close.patch
+
+	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
+	AT_M4DIR="config" eautoreconf
+}
+
+src_install() {
+	dosbin spine
+	insinto /etc/
+	insopts -m0640 -o root
+	newins spine.conf{.dist,}
+	dodoc ChangeLog README
+}
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-fix-ac-macro.patch
deleted file mode 100644
index 2fab07a96c61..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-fix-ac-macro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@
- AC_LANG(C)
- 
- AM_INIT_AUTOMAKE(spine, 0.8.8d)
--AM_CONFIG_HEADER(config/config.h)
-+AC_CONFIG_HEADERS(config/config.h)
- 
- # static libraries
- AC_ARG_WITH(static,
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-net-snmp.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-net-snmp.patch
deleted file mode 100644
index 43aa4d3f95df..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-net-snmp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -254,14 +254,14 @@
- )
- 
- AC_MSG_CHECKING([if Net-SNMP needs crypto support])
--AC_TRY_COMPILE([#include <net-snmp-config.h>], [exit(USE_OPENSSL != 1);],
-+AC_TRY_COMPILE([#include <net-snmp/net-snmp-config.h>], [exit(USE_OPENSSL != 1);],
-   [  AC_MSG_RESULT(yes)
-      SNMP_SSL=yes
-   ],
-   AC_MSG_RESULT(no)
- )
- 
--AC_TRY_COMPILE([ #include <net-snmp-config.h> 
-+AC_TRY_COMPILE([ #include <net-snmp/net-snmp-config.h> 
-   #include <net-snmp/utilities.h>
-   #include <net-snmp/net-snmp-includes.h>
-   #include <net-snmp/config_api.h>
---- a/common.h
-+++ b/common.h
-@@ -125,7 +125,7 @@
- #  include <priv.h>
- #endif
- 
--#ifdef USE_NET_SNMP
-+#ifdef HAVE_LIBNETSNMP
-  #undef PACKAGE_NAME
-  #undef PACKAGE_VERSION
-  #undef PACKAGE_BUGREPORT
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-polling_time.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-polling_time.patch
deleted file mode 100644
index 98fd8b68527b..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-polling_time.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- a/poller.c
-+++ b/poller.c
-@@ -168,7 +168,6 @@
- 	MYSQL     mysql;
- 	MYSQL_RES *result;
- 	MYSQL_ROW row;
--	MYSQL_FIELD *field;
- 
- 	db_connect(set.dbdb, &mysql);
- 
-@@ -218,8 +217,7 @@
- 				"status, status_event_count, status_fail_date, "
- 				"status_rec_date, status_last_error, "
- 				"min_time, max_time, cur_time, avg_time, "
--				"total_polls, failed_polls, availability, snmp_sysUptimeInstance, snmp_sysDescr, snmp_sysObjectID, "
--                "snmp_sysContact, snmp_sysName, snmp_sysLocation"
-+				"total_polls, failed_polls, availability "
- 			" FROM host"
- 			" WHERE id=%i", host_id);
- 
-@@ -289,8 +287,7 @@
- 				"status, status_event_count, status_fail_date, "
- 				"status_rec_date, status_last_error, "
- 				"min_time, max_time, cur_time, avg_time, "
--				"total_polls, failed_polls, availability, snmp_sysUptimeInstance, snmp_sysDescr, snmp_sysObjectID, "
--				"snmp_sysContact, snmp_sysName, snmp_sysLocation"
-+				"total_polls, failed_polls, availability "
- 			" FROM host"
- 			" WHERE id=%i", host_id);
- 
-@@ -379,44 +376,38 @@
- 
- 			if (row) {
- 				/* initialize variables first */
--				host->id                      = 0;					// 0
--				host->hostname[0]             = '\0';				// 1
--				host->snmp_session            = NULL;				// -
--				host->snmp_community[0]       = '\0';				// 2
--				host->snmp_version            = 1;					// 3
--				host->snmp_username[0]        = '\0';				// 4
--				host->snmp_password[0]        = '\0';				// 5
--				host->snmp_auth_protocol[0]   = '\0';				// 6
--				host->snmp_priv_passphrase[0] = '\0';				// 7
--				host->snmp_priv_protocol[0]   = '\0';				// 8
--				host->snmp_context[0]         = '\0';				// 9
--				host->snmp_port               = 161;				// 10
--				host->snmp_timeout            = 500;				// 11
--				host->snmp_retries            = set.snmp_retries;	// -
--				host->max_oids                = 10;					// 12
--				host->availability_method     = 0;					// 13
--				host->ping_method             = 0;					// 14
--				host->ping_port               = 23;					// 15
--				host->ping_timeout            = 500;				// 16
--				host->ping_retries            = 2;					// 17
--				host->status                  = HOST_UP;			// 18
--				host->status_event_count      = 0;					// 19
--				host->status_fail_date[0]     = '\0';				// 20
--				host->status_rec_date[0]      = '\0';				// 21
--				host->status_last_error[0]    = '\0';				// 22
--				host->min_time                = 0;					// 23
--				host->max_time                = 0;					// 24
--				host->cur_time                = 0;					// 25
--				host->avg_time                = 0;					// 26
--				host->total_polls             = 0;					// 27
--				host->failed_polls            = 0;					// 28
--				host->availability            = 100;				// 29
--				host->snmp_sysUpTimeInstance  = 0;					// 30
--				host->snmp_sysDescr[0]        = '\0';				// 31
--				host->snmp_sysObjectID[0]     = '\0';				// 32
--				host->snmp_sysContact[0]      = '\0';				// 33
--				host->snmp_sysName[0]         = '\0';				// 34
--				host->snmp_sysLocation[0]     = '\0';				// 35
-+				host->id                      = 0;
-+				host->hostname[0]             = '\0';
-+				host->snmp_session            = NULL;
-+				host->snmp_community[0]       = '\0';
-+				host->snmp_version            = 1;
-+				host->snmp_username[0]        = '\0';
-+				host->snmp_password[0]        = '\0';
-+				host->snmp_auth_protocol[0]   = '\0';
-+				host->snmp_priv_passphrase[0] = '\0';
-+				host->snmp_priv_protocol[0]   = '\0';
-+				host->snmp_context[0]         = '\0';
-+				host->snmp_port               = 161;
-+				host->snmp_timeout            = 500;
-+				host->snmp_retries            = set.snmp_retries;
-+				host->max_oids                = 10;
-+				host->availability_method     = 0;
-+				host->ping_method             = 0;
-+				host->ping_port               = 23;
-+				host->ping_timeout            = 500;
-+				host->ping_retries            = 2;
-+				host->status                  = HOST_UP;
-+				host->status_event_count      = 0;
-+				host->status_fail_date[0]     = '\0';
-+				host->status_rec_date[0]      = '\0';
-+				host->status_last_error[0]    = '\0';
-+				host->min_time                = 0;
-+				host->max_time                = 0;
-+				host->cur_time                = 0;
-+				host->avg_time                = 0;
-+				host->total_polls             = 0;
-+				host->failed_polls            = 0;
-+				host->availability            = 100;
- 
- 				/* populate host structure */
- 				host->ignore_host = FALSE;
-@@ -460,13 +451,6 @@
- 				if (row[28] != NULL) host->failed_polls = atoi(row[28]);
- 				if (row[29] != NULL) host->availability = atof(row[29]);
- 
--				if (row[30] != NULL) host->snmp_sysUpTimeInstance=atoi(row[30]);
--				if (row[31] != NULL) STRNCOPY(host->snmp_sysDescr, row[31]);
--				if (row[32] != NULL) STRNCOPY(host->snmp_sysObjectID, row[32]);
--				if (row[33] != NULL) STRNCOPY(host->snmp_sysContact, row[33]);
--				if (row[34] != NULL) STRNCOPY(host->snmp_sysName, row[34]);
--				if (row[35] != NULL) STRNCOPY(host->snmp_sysLocation, row[35]);
--
- 				/* correct max_oid bounds issues */
- 				if ((host->max_oids == 0) || (host->max_oids > 100)) {
- 					SPINE_LOG(("Host[%i] TH[%i] WARNING: Max OIDS is out of range with value of '%i'.  Resetting to default of 5", host_id, host_thread, host->max_oids));
-@@ -510,12 +494,6 @@
- 						host->ignore_host = FALSE;
- 						if (host_thread == 1) {
- 							update_host_status(HOST_UP, host, ping, host->availability_method);
--
--							if (host->availability_method == AVAIL_SNMP) {
--								get_system_information(host, &mysql);
--
--								
--							}
- 						}
- 					}else{
- 						host->ignore_host = TRUE;
-@@ -531,9 +509,7 @@
- 						"SET status='%i', status_event_count='%i', status_fail_date='%s',"
- 							" status_rec_date='%s', status_last_error='%s', min_time='%f',"
- 							" max_time='%f', cur_time='%f', avg_time='%f', total_polls='%i',"
--							" failed_polls='%i', availability='%.4f', snmp_sysDescr='%s', "
--							" snmp_sysObjectID='%s', snmp_sysUpTimeInstance='%i', "
--							" snmp_sysContact='%s', snmp_sysName='%s', snmp_sysLocation='%s' "
-+							" failed_polls='%i', availability='%.4f' "
- 						"WHERE id='%i'",
- 						host->status,
- 						host->status_event_count,
-@@ -547,12 +523,6 @@
- 						host->total_polls,
- 						host->failed_polls,
- 						host->availability,
--						host->snmp_sysDescr,
--						host->snmp_sysObjectID,
--						host->snmp_sysUpTimeInstance,
--						host->snmp_sysContact,
--						host->snmp_sysName,
--						host->snmp_sysLocation,
- 						host->id);
- 	
- 					db_insert(&mysql, update_sql);
-@@ -1285,10 +1255,6 @@
- 	poll_time = get_time_as_double() - poll_time;
- 	SPINE_LOG_MEDIUM(("Host[%i] TH[%i] Total Time: %5.2g Seconds", host_id, host_thread, poll_time));
- 
--	query1[0] = '\0';
--	snprintf(query1, BUFSIZE, "UPDATE host SET polling_time='%g' WHERE id=%i", poll_time, host_id);
--	db_query(&mysql, query1);
--
- 	mysql_close(&mysql);
- 
- 	#ifndef OLD_MYSQL
-@@ -1343,50 +1309,6 @@
- 
- }
- 
--void get_system_information(host_t *host, MYSQL *mysql)  {
--	snmp_oids_t *snmp_oids;
--
--	if (set.mibs) {
--		int num_oids = 6;
--
--		/* create an array for snmp oids */
--		snmp_oids = (snmp_oids_t *) calloc(num_oids, sizeof(snmp_oids_t));
--
--		/* initialize all the memory to insure we don't get issues */
--		memset(snmp_oids, 0, sizeof(snmp_oids_t)*num_oids);
--
--		STRNCOPY(snmp_oids[0].oid, ".1.3.6.1.2.1.1.1.0");
--		STRNCOPY(snmp_oids[1].oid, ".1.3.6.1.2.1.1.2.0");
--		STRNCOPY(snmp_oids[2].oid, ".1.3.6.1.2.1.1.3.0");
--		STRNCOPY(snmp_oids[3].oid, ".1.3.6.1.2.1.1.4.0");
--		STRNCOPY(snmp_oids[4].oid, ".1.3.6.1.2.1.1.5.0");
--		STRNCOPY(snmp_oids[5].oid, ".1.3.6.1.2.1.1.6.0");
--		snmp_get_multi(host, snmp_oids, num_oids);
--
--		mysql_real_escape_string(mysql, host->snmp_sysDescr, snmp_oids[0].result, strlen(snmp_oids[0].result));
--		mysql_real_escape_string(mysql, host->snmp_sysObjectID, snmp_oids[1].result, strlen(snmp_oids[1].result));
--		host->snmp_sysUpTimeInstance = atoi(snmp_oids[2].result);
--		mysql_real_escape_string(mysql, host->snmp_sysContact, snmp_oids[3].result, strlen(snmp_oids[3].result));
--		mysql_real_escape_string(mysql, host->snmp_sysName, snmp_oids[4].result, strlen(snmp_oids[4].result));
--		mysql_real_escape_string(mysql, host->snmp_sysLocation, snmp_oids[5].result, strlen(snmp_oids[5].result));
--	}else{
--		int num_oids = 1;
--
--		/* create an array for snmp oids */
--		snmp_oids = (snmp_oids_t *) calloc(num_oids, sizeof(snmp_oids_t));
--
--		/* initialize all the memory to insure we don't get issues */
--		memset(snmp_oids, 0, sizeof(snmp_oids_t)*num_oids);
--
--		STRNCOPY(snmp_oids[0].oid, ".1.3.6.1.2.1.1.3.0");
--		snmp_get_multi(host, snmp_oids, num_oids);
--
--		host->snmp_sysUpTimeInstance = atoi(snmp_oids[2].result);
--	}
--
--	free(snmp_oids);
--}
--
- /*! \fn int validate_result(char *result)
-  *  \brief validates the output from the polling action is valid
-  *  \param result the value to be checked for legality
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 4fd2ce89dad9..8916d1fa75a9 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.214 2015/07/24 04:18:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.215 2015/07/25 08:28:14 jer Exp $
+
+*cacti-0.8.8f (25 Jul 2015)
+
+  25 Jul 2015; Jeroen Roovers <jer@gentoo.org> +cacti-0.8.8f.ebuild:
+  Version bump.
 
   24 Jul 2015; Jeroen Roovers <jer@gentoo.org> -cacti-0.8.8d.ebuild:
   Old.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 350fbabb79b5..ad4786a9c1fb 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -3,13 +3,15 @@ Hash: SHA256
 
 AUX postinstall-en.txt 2249 SHA256 7879329884e33f84108d5fbed732941c9fd8a53b56db499bfc0bd282bd61b10d SHA512 8df52b187b301b42382746f9dea43993f7963edf018bc80e94305a743ea5fbb024d670917c0200f4782c0a3bd47abfb879c755ad415581616ae5c6413cf00623 WHIRLPOOL 0739ae29e564e81b4a08a74685efe93ec5248048dd47555befb1e805a9dc3d1606adc9126b5959ccab39f7e30d2ed4d956d78b84efedd54545a1d998986477a2
 DIST cacti-0.8.8e.tar.gz 2594446 SHA256 43b091957faf03a4b0baacc8c327320394c0843476ea34e3beb1416506ad3f55 SHA512 11eeace353b7bacb2e4f065b1557b6978f0315d372f03f25bbdd210aaa494b70661b24502885bb610d8cf042cdcd68c69ea1a6fd1cb7073af29553116500df0c WHIRLPOOL ea5f29a71504f4e1fb4d8981db84b46fb87842921d8f6f422b8a0c2b127e80b785fca60b3b037036396cf9de456240a573cd446118f03a93f25a2406fe22be40
+DIST cacti-0.8.8f.tar.gz 2594409 SHA256 2ea92407c11bf13302558a5bc9e1f3a57bd14a1d9ded48c505ec495762f76738 SHA512 b712a9f8b7bee632cb4982fed72793ac2f4d70aa042784bbd2fd3923a27901f457393aa95bbd63960187e85fe462c35e88fa3cd93e8537a3a68f94bdbf5d7f2b WHIRLPOOL 58c883780fed833df2501b204a21fc8605e76a7b5ac26ebd13f0bf22f45dda6363be35ada8af2a65f4e7db506d103b6739d73699676c1622e7051eb8a89ad555
 EBUILD cacti-0.8.8e.ebuild 1429 SHA256 f72eab087836e724d7cb7a8f1a77dec6f038f420f4754c6ea7f3de1b050fa6ed SHA512 3e5d8d1660ba191e622211d87c289fe26668ed9a4010e9f3b52382d269df0339ac9793c02db712562d2e0c2e5b89aed8b33e2e7d5db744889de748d6328c99b4 WHIRLPOOL dc62067bab1e1b4563bd19031a5b229a538fc95e660cc8b6e25f575ddf890665202d3f4fc9c39c65a43f3a3e3d74d804d4d30b328498ed2d3ff3ceecfea328f5
-MISC ChangeLog 30352 SHA256 f0655db9ead5a3bb62d83b280bd38bf15a13dd72fa4338cd7bddb1472ffd1af0 SHA512 290ecf128114ccea53d136d3c09839ada5eb826fe9c12cd9cdcf97eb834ff30cc682ca4ed405f8a515f601d0802f67d167341fd19914f92e8a5a6593ff071f27 WHIRLPOOL 3b611ab156105e20dcadbba5999fe5b6986e9de45903a1951654d5e9c1afb604ce7d4002582cbfdd19035e0fbd3b7f98467b0cf26e977af709f5ea735629e9c3
+EBUILD cacti-0.8.8f.ebuild 1434 SHA256 5f7a181e872cf90a5d99a7bf7ab19a110a33395f7eafed90773ea2e4dd3e153a SHA512 8eaabb0b20e0643d40b11c53046550b2d8c009d98e6d0cffc7970b127aa9919ae2b7b3ae640864a69dc580f6885f3d77329a5feb66402a04ea7e569d10f9124b WHIRLPOOL 43c6d132920bb995abc88e86e1fd76a663bb5387e3bc4b4f0a294f92c8a178d559af03c92f9ddd18e99984500b55bead21008cb0dbb386991f7e21ba138df111
+MISC ChangeLog 30467 SHA256 36b345341f9a47ef2d54bd1272e9d54fade878bc9aa0a983f52e9739c58f4a97 SHA512 e0890043839852c1b0e41962ac38e6e881e1d1b9eba6055c969b276e8a3d878a9aa0291c0b01fc8053442ab3d722ded00736b20b59cf8135df7ee617502af542 WHIRLPOOL 8fae89c873c85a58a937879bf554c316096d744a3e86c809fcc02ff8c278f5c56603af8cedf841bce462c52ccfe24c1af9550d81484b6f81c399b7066c51bff5
 MISC metadata.xml 714 SHA256 87c3b48a554466e6e0a75944751f2e73326aef52d13d16110aaf6df770aca530 SHA512 6476909d8b29f1a56d7c7e26e8bc4edef5c46aee49ab18175f8727812764d1f1ae89781d09cf8de1ea42edc3f022432e6d52d42b75109e95c07998d7250bb40d WHIRLPOOL 6ce5f9fc982b7da218ea2dba530a5971f3acab63a996828c145bcd3c9ba049183ddd249325728fe6613148438e02dc5eafee18659bd6c977c740b35d82fcb6f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEUEAREIAAYFAlWxvLMACgkQVWmRsqeSphPk8QCfbpIq5775AFXyA6FjLCzRvz5t
-DQgAmImpb7RGHe7sb/NVYtNb0NejChw=
-=VQtU
+iEYEAREIAAYFAlWzSJ8ACgkQVWmRsqeSphNCLQCdHkau1s2CsNvWVVuU6NjWTKtB
+icMAn17yAoTHbmoUKPTPYgkQgygG7poS
+=vtIB
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/cacti/cacti-0.8.8f.ebuild b/net-analyzer/cacti/cacti-0.8.8f.ebuild
new file mode 100644
index 000000000000..39cfb4add0ce
--- /dev/null
+++ b/net-analyzer/cacti/cacti-0.8.8f.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.8f.ebuild,v 1.1 2015/07/25 08:28:14 jer Exp $
+
+EAPI=5
+
+inherit depend.php eutils webapp
+
+# Support for _p* in version.
+MY_P=${P/_p*/}
+
+DESCRIPTION="Cacti is a complete frontend to rrdtool"
+HOMEPAGE="http://www.cacti.net/"
+SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="snmp doc"
+
+need_httpd
+
+RDEPEND="
+	dev-lang/php[cli,mysql,session,sockets,xml]
+	dev-php/adodb
+	net-analyzer/rrdtool[graph]
+	virtual/cron
+	virtual/mysql
+	snmp? ( >=net-analyzer/net-snmp-5.2.0 )
+"
+
+src_prepare() {
+	sed -i -e \
+		's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
+		"${S}"/include/global.php || die
+
+	rm -rf lib/adodb || die # don't use bundled adodb
+}
+
+src_compile() { :; }
+
+src_install() {
+	webapp_src_preinst
+
+	rm LICENSE README || die
+	dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt}
+	use doc && dohtml -r docs/html/
+	rm -rf docs
+
+	edos2unix `find -type f -name '*.php'`
+
+	dodir ${MY_HTDOCSDIR}
+	cp -r . "${D}"${MY_HTDOCSDIR}
+
+	webapp_serverowned ${MY_HTDOCSDIR}/rra
+	webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
+	webapp_configfile ${MY_HTDOCSDIR}/include/config.php
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 971e2e434a43..14b0d1eb143d 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/netperf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.71 2014/10/29 09:40:30 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.72 2015/07/25 08:26:32 jer Exp $
+
+*netperf-2.7.0 (25 Jul 2015)
+
+  25 Jul 2015; Jeroen Roovers <jer@gentoo.org> +netperf-2.7.0.ebuild,
+  +files/netperf-2.7.0-includes.patch:
+  Version bump.
 
   29 Oct 2014; Jeroen Roovers <jer@gentoo.org> -netperf-2.5.0-r1.ebuild:
   Old.
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index 7a805eb60799..a33aa54275f4 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -4,15 +4,18 @@ Hash: SHA256
 AUX netperf-2.2-conf 103 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60 WHIRLPOOL 30bb26aab461eb024e80fdbb663ea334f0112d7bb1c6d6d4c83ccd017efab4a945a1ed2f6073a122de7a9e6888a4fd11787744ce8d236f22ab3b88a93ad61eb2
 AUX netperf-2.2-init 433 SHA256 82df403bbf2dcb0086f4e7563b7ac678b65f8f7b5411312abadaa1594af659b7 SHA512 8151488c05001f2475201f3ebff3213d8a5afef5f75a2b726bae363c688f6c2363a756a9514921bffaf9eb7d7405114d27c8e5b98d3f53eb3a52db75a5236760 WHIRLPOOL 995662769c2ea31bcd0b45c987dddcec536f9df69d4f6d6c062123e30834dc96c482627592ce9b97811548a9edcfb6660aef0cdfb844ae49ff4ec92ec02e0b39
 AUX netperf-2.6.0-log-dir.patch 261 SHA256 c5449f723cc26e3ebada62d954e5b8dbad3b0996db18401c816fa756905eedbb SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 WHIRLPOOL 197919f1204465ad813849ab6b6f4ee24f7fe2f5aaf7072ab6f4159a5713163041dffa6e721a066552b0b7746b353b84255a0aceca478993ee229f37dbbb20fd
+AUX netperf-2.7.0-includes.patch 468 SHA256 dcd9ca94d89cf6624d52b9dd8aa7e68d7ac47032ce964049d0faa591731f6270 SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f WHIRLPOOL cd740bf0a4a3029f63b44ff0f33e55ae4e7c09a897ff5eb4770269a36c342be7c8c0c77f7a55eb0c277fdc75890a3ca8cd0bc83ad5dcca3b0305f489491ec3c8
 AUX netperf-fix-scripts.patch 819 SHA256 2dd29e6134f769cfff036945ebbb63e6f10338c95a1d5705c374f63c2d81ac30 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a WHIRLPOOL eaf301c87e6fd04fbeb6bc2eb33f69036f885dfc8025257a0494d15bb201472d8e2e2b806e01f4634c5f52e3dd43c0f8a13d3b8010b84129ccb808c3ea68a2f0
 DIST netperf-2.6.0.tar.bz2 1032953 SHA256 cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3 WHIRLPOOL b602c8660bae59648cbbe9eed47ee9d86b0ae714bc0c2906e80a14d0ce18951f125f3331f90acd776850b04506e37030545084677f6be512477ea37f76d972e7
+DIST netperf-2.7.0.tar.bz2 1024430 SHA256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad WHIRLPOOL 66c81e418750d67bfa15d6f1e3cd7a3a65f1168ebb080263cf70e0f3fe023a8128bfc559249268ec8e597ef3db5acdf5509861f12f8f49c6b2586e679014e34a
 EBUILD netperf-2.6.0-r1.ebuild 1783 SHA256 ed5d725ee9383b4326246c73936a5211b8d63d4978f83312f0136fa146f823f0 SHA512 3d88d05fd77a75ab2c375a85ae9639fcde42efdca44c1c45a5fb3cf9fad9ed964b1ff3f96b12efc0881bc9ceba11ea4162fc561bbca28528123237d9e5cffac1 WHIRLPOOL 058965d2d4c973c96740c1bf0230f2f7208b82b34a485038932db2171d7fc1b12483f57d208fdab20733100743fff450986c5853508c9ce8b9b4d2e809f3e003
-MISC ChangeLog 10250 SHA256 5d025bcd9389e3dbe25010ca31144d3257d8f6e3fb75cad0d333960350545090 SHA512 82c59fc3806e9265f21ca881f797044628fef41c4fe9462e680d9107e4cfebe469d45ad30f585967074f4dfdda2845007ed81ebd7ef8dd621c29a5441ecda712 WHIRLPOOL 8f17782fbf4f5fd6ffcd09d5128ccae91311677460bdda7d4c32e486039d8f7bb4cdde889a6eb405df2bf75341a5a66e042862d3014b158c9e73b630e083f3fe
+EBUILD netperf-2.7.0.ebuild 1840 SHA256 67c52e834d9926b925c6703e6e768cc48a74127c671a290edc737b810a1e62d7 SHA512 ae706d9a989be45ebf73d1191a67738ee8801c7cb0a9d5919d1130e533e148326d2f8885030ea1839a2cd9cbe0189e32ed68b701c521ec54eb46f6c355592298 WHIRLPOOL 8e555fce1e865861c00345906093ea659dc84e3aa90a4c14692ef1f1cc81a0dd3059ae1b8a9204c7c20b446829275bcbd7ceb4566a193c01d1d85dba93ae32e2
+MISC ChangeLog 10406 SHA256 526c3eff24ed9f2f0c19e644def228b125b9e4927c8f1112cdf1680c0fecab69 SHA512 3e7c21a4d2532f6099b7dc4471fb6d1980f3c91448f02798e799a7e82a8843e66c17b8199b79f0386fee5f177a743aef2924b94bd17cc03e31dd4fa323f5569b WHIRLPOOL 3b1dda403052008ea7e1ca1f3adf42667dc29dc5eef255c9389e71ad4892d8cb48d52463893cce0180eff1223316b4c21326594a86add9e7a79a2001e8488574
 MISC metadata.xml 320 SHA256 6eed60337859b545349520e6129046903f8bc2d0a88f6fd766e2eefa7ff37c9c SHA512 d4e3e554fcf15505996ba787a0f25764a1579a5e363baba742c131f8874ba48b8e4991fb5c7ad7f5a2f3d3469ede3823cb4745787a7c4ca24e2b2826917177e9 WHIRLPOOL beece57646dca4b5bdf342129266ed690658885f6e7aea3c8cc3d6485a2fe54e91208a487bfbc97764230173888f10ad71985c99f377e2ca9586f8f81564f433
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRQtg8ACgkQVWmRsqeSphM50wCdFLG7hkh9L29c/xVuFfbxwYWE
-MYMAn1jRNuqx121bMylyO26764zl7fiy
-=r8x0
+iEYEAREIAAYFAlWzSDkACgkQVWmRsqeSphOd8ACdEWojxMXGrrutKzlRBHlwq2hE
+TboAnjMK+oF6Gm1IVmBmpb5aTQElUiAi
+=3XGE
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/files/netperf-2.7.0-includes.patch b/net-analyzer/netperf/files/netperf-2.7.0-includes.patch
new file mode 100644
index 000000000000..63c3cea40f4e
--- /dev/null
+++ b/net-analyzer/netperf/files/netperf-2.7.0-includes.patch
@@ -0,0 +1,22 @@
+--- a/src/net_uuid.c
++++ b/src/net_uuid.c
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h> /* read(), close() */
+ 
+ #if defined(HAVE_INTTYPES_H)
+ #include <inttypes.h>
+--- a/src/netlib.c
++++ b/src/netlib.c
+@@ -81,6 +81,9 @@
+ #include <endian.h>
+ #endif
+ 
++#if defined(HAVE_SENDFILE)
++#include <sys/sendfile.h> /* sendfile() */
++#endif
+ 
+ #ifndef WIN32
+  /* at some point, I would like to get rid of all these "sys/"
diff --git a/net-analyzer/netperf/netperf-2.7.0.ebuild b/net-analyzer/netperf/netperf-2.7.0.ebuild
new file mode 100644
index 000000000000..004c306b402f
--- /dev/null
+++ b/net-analyzer/netperf/netperf-2.7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.7.0.ebuild,v 1.1 2015/07/25 08:26:32 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more"
+SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+HOMEPAGE="http://www.netperf.org/"
+LICENSE="netperf"
+SLOT="0"
+IUSE="demo sctp"
+
+DEPEND=">=sys-apps/sed-4"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-fix-scripts.patch \
+		"${FILESDIR}"/${PN}-2.6.0-log-dir.patch \
+		"${FILESDIR}"/${PN}-2.7.0-includes.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 \
+		|| die
+
+	# netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’
+	# nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’
+	append-cppflags -D_GNU_SOURCE
+}
+
+src_configure() {
+	econf \
+		$(use_enable demo) \
+		$(use_enable sctp)
+}
+
+src_install () {
+	default
+
+	# move netserver into sbin as we had it before 2.4 was released with its
+	# autoconf goodness
+	dodir /usr/sbin
+	mv "${D}"/usr/{bin,sbin}/netserver || die
+
+	# init.d / conf.d
+	newinitd "${FILESDIR}"/${PN}-2.2-init netperf
+	newconfd "${FILESDIR}"/${PN}-2.2-conf netperf
+
+	# documentation and example scripts
+	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 || die
+}