gentoo resync : 06.12.2017

5 files changed, 4 insertions, 78 deletions

diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 7085c488aaac..8a4180ed843f 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,13 +1,9 @@
-AUX cacti-spine-0.8.8d-mysql.patch 283 BLAKE2B e30baae95edb5862fbf59e811ad7a8dfe8cc873d4e87da475b740be9545fb3cb78a44151dfcd844a156c91cf538de407defe3d003cd1529b9a05647ce2405c80 SHA512 0291015f09a9f74cb3e9132c3fe751105928217d6f9c8e4312501d161ef30b6277114a3600c160704af7e43a75cea6c06f75dd6a8777fedee4b8d0909ef67642
 AUX cacti-spine-0.8.8d-ping.patch 235 BLAKE2B ab0390faaa8cd7b473ae2341a0f80d4eb87678bcf219bdf6d35ac2e6885047c87a26454f5bf0d3bbf618fccfcec06c31639bdc9f35e4c0267cf8f4de5bc13cb9 SHA512 93ea39cefbe20741a372c644f79bc2bde80e8ba81cbdfa4425523a642c0853aafe12a46bfd84a5d2161a9afed4ff8fd933cf72adbabcd54e936da8dd7d89d265
 AUX cacti-spine-0.8.8g-net-snmp.patch 673 BLAKE2B 90badfc18bbeb3cd4a6f381ac732eb07ae371a25b4951728f129df617096f9c62203643cf2c42008e534c7ce0d51fa0a14e8e24a595d2e5dabbfc2badf5dda97 SHA512 4eadde6b71eb20df4baf42241e7ec9b4e99af6d5f2023ea044ec27c379a8e7c4d3accced97091764ce1c946e30eebafb18c7f598be280e9b6b0b255c27f4ef57
-AUX cacti-spine-0.8.8h-fix-ac-macro.patch 217 BLAKE2B 7f697e5b17b21f903bb4c6b5d21e8509cc6540f5bab2ae2034b0b310b066c1ec4985831a85cba058d00f91540521f6bf559c7510732987b96212433f69b64fa3 SHA512 f247fab6d074d9022f9b7f62d698ab8b293c4e90de883f8fc9bbe71ec147a886ce94f8b9d58e7d52f168ccbf4caf0a24029ca0594c151fec579efb540cf65d09
-DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf
-DIST cacti-spine-1.1.20.tar.gz 801877 SHA256 a8ccb24980099fbb6ee0a16f397f10fb9b3320db6a02c4e61b1483445d405f99 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f WHIRLPOOL 1948229141f99fb04c799b46b323a047c47dc3c94303cb50f56018af8cbc1fe4d2c3a5b8c1683629802b3600e6e69b8ab5ce636e0d9c84ba61e9beadde11f2f1
-DIST cacti-spine-1.1.21.tar.gz 801907 SHA256 031c7eeea7e64b20754cccfcc65851443847a31765893ddcc528da4e384ca4bf SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0 WHIRLPOOL 6521e622329c1a6e6ca5b8c97717380a4bc2fadde37af42fa6c1fd83f82a35ebc5cefce9788a360ff46abc62a9918e327404188f6c9b611b0064e1a86b41cab0
-DIST cacti-spine-1.1.25.tar.gz 802127 SHA256 d5452d320781107a2cbc289247ecf8c0b29f55379a0c008b020843508c7e435d SHA512 d9c4a924ce08d363a1ce7327172b6c83d606ccfb2b623b3b5a0f6df534a031caedbe55314cd415a58484c89df49d5e682853e5001849bd8e9767190fdc367809 WHIRLPOOL 0c2d5ec02c110b5ef5545ca1be769a2632c2bedd9c7627ef7f9a53995a956151627a10293fcfb19f34e223cb8c6cde914a2b399f14c2426a57bbdfe5f2046617
-EBUILD cacti-spine-0.8.8h.ebuild 999 BLAKE2B b0df075d0f9a82a03c5b33fe2f4ea07331cf817293d8b5484b29e2c4b2bf34178601e65a03cf4247de32b4f4c6cb053416c47dc01808c0b6f867cc79f814acd6 SHA512 5b1226090b6cc63715b45e46a5d258b25ab67d596894212c755fc8c3602db4d8f96f9c26208b7bf4c3c27b11ef57cc3cda9913d709fc7d5f1ed9b44c5f52c241
+DIST cacti-spine-1.1.20.tar.gz 801877 BLAKE2B 35da513691967e507b9d10c373de571e2ef84aa20021d1bcfb2bc446a99fbbd2c68ebcd99dc47bece4387faa6596a7b109d8a61f02a3b2413cb89bfbcaa22e89 SHA512 df552157e64da04f57493351831a0602dea9ca3219ce3936884aec894e6698559d429ec62936a307b43fd49eff674c670d7e0a047924b5f03c30abeeec91491f
+DIST cacti-spine-1.1.21.tar.gz 801907 BLAKE2B cdcda765d349db12df1c672c4469770297d09a3946f19f1e686c251ef30d5be1e3f772efeeb3f344b21ecdba29275dde1b683025ae7c16b10561486397a484f3 SHA512 0dfdd3444639a471bc5c0d35ea3898532f2ebf16679677fee8ad291221ed607b54acc7fbf25e78da7c5597eeaed6b870ad7af66a95e20f95afce3270c8da5dd0
+DIST cacti-spine-1.1.28.tar.gz 802006 BLAKE2B 79e833b6afb619a1d2361bad38c3a52dc1e29b296864670f830a3bc998e7e456638523da15032751d56c65aefe0480477e70b741b23882a2a38adb2262aef601 SHA512 2255823d29342b49babebbae175c29fc7054b05ec5ae5897609960d808409f46e6d0cfcba2038dfad9598bc23532794f6cf26032a0566d2d2d2c57d622d37ab1
 EBUILD cacti-spine-1.1.20.ebuild 860 BLAKE2B b82110544f92f70c2ab512b6f30b709df621a7dd90557edc6c4d6d27fef9b5121004159c981e2a57eb857e6101b1d6b42c5c0b9451881cd7cae6f7bea416d94e SHA512 dc1c9f975baea6553163fd29c13fff1bb3a99e268b2bab5fca31619e9880f579545ccf75a508525889ccd9d96923f29703f1860e5b35acbcbee69a12b064fb1a
 EBUILD cacti-spine-1.1.21.ebuild 862 BLAKE2B 7165f0d06307e442cdcbc3160f0fc1548188fd0ad7f3f6dd9a16dc0322e616c1c38dc85a7382c59b4a7809e9cd46ee83684cbbbc2a9dc398f493a3d83123bcb8 SHA512 2c241b9da06c6e069736d7f517f56cd2690e2a89a4c1d11c148761d0d8cae05aee0a48d74d264ec166c8d74477b7d3738170a37577119c2bc3a8ef2d697811c2
-EBUILD cacti-spine-1.1.25.ebuild 863 BLAKE2B 0a28fb4df62540d9c43068c169b3e56d8de7cbd550cd845b1dcfd87ac6b1188513e48a02209d308e27b315d3b44dedc8529a57c477ad868e8f8bfeb8a8b25da6 SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa
+EBUILD cacti-spine-1.1.28.ebuild 863 BLAKE2B 0a28fb4df62540d9c43068c169b3e56d8de7cbd550cd845b1dcfd87ac6b1188513e48a02209d308e27b315d3b44dedc8529a57c477ad868e8f8bfeb8a8b25da6 SHA512 0520ba0fdaa6dee66803ac9567c2e49060e48dcad9d9eae868e3c063e601f45686cd1d46897e26a1843fbd2c854df05b3fa68659eda95b391a321777eefe59fa
 MISC metadata.xml 728 BLAKE2B 5e36aa5717b3f0f72d1d5116e9df6223fe4d99040b970fd86baebbc6835fa0c673327114dd867a2e52822fa71731b3e1fc3e93b77344be89de8fe0b9b648286d SHA512 a8aef67f6761ecf0ac98771a82908e67fb9aead1a32f7ececb8c80ae46c1a431abcfc1165ed471dd428bd6c0a5d4bdc2ddbea1c86ae5c917ff9786bacd6d0f38
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
deleted file mode 100644
index c7738d6dba91..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-CDEPEND="
-	dev-libs/openssl:*
-	net-analyzer/net-snmp
-	virtual/mysql
-"
-DEPEND="
-	${CDEPEND}
-	sys-apps/help2man
-"
-RDEPEND="
-	${CDEPEND}
-	>net-analyzer/cacti-0.8.8
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.8.8h-fix-ac-macro.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
-		"${FILESDIR}"/${PN}-0.8.8d-ping.patch \
-		"${FILESDIR}"/${PN}-0.8.8g-net-snmp.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/cacti-spine-1.1.25.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.1.28.ebuild
index d148f4544d01..d148f4544d01 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.1.25.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.1.28.ebuild
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
deleted file mode 100644
index d60653678a2c..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-mysql.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -239,7 +239,7 @@
- fi
- CFLAGS="-I$MYSQL_INC_DIR $CFLAGS"
- 
--AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="-lmysqlclient_r",
-+AC_CHECK_LIB(mysqlclient_r,mysql_init, LIBS="$LIBS -lmysqlclient_r",
-   AC_MSG_ERROR([MySQL libraries not found])
- )
- 
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-fix-ac-macro.patch
deleted file mode 100644
index 3f497ac7bce5..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8h-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.8h)
--AM_CONFIG_HEADER(config/config.h)
-+AC_CONFIG_HEADERS(config/config.h)
- 
- # static libraries
- AC_ARG_WITH(static,