gentoo resync : 11.02.2018

4 files changed, 106 insertions, 32 deletions

diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest
index 6367cb53d83a..99b47862ddc7 100644
--- a/net-analyzer/smokeping/Manifest
+++ b/net-analyzer/smokeping/Manifest
@@ -3,11 +3,12 @@ AUX smokeping-2.6.9-pod.patch 482 BLAKE2B 8490774fffcdac52d5375bd7155a1246f03a74
 AUX smokeping.conf 32 BLAKE2B ea64af0cebbb847c89503b3d893c902ab2d761afbce6594731d8851cc5f9a81118c9ce9ff76888b0bddcbf6b4341a47a76a74f64aecdc3d1610510714f119ee7 SHA512 75863f16f8b57ca9ae7c7d65076acaf28aac66fa2d52ed78bce2bb3a4938dc75a1e8ed54236c52c3965b170a8348145780dd5c0f3d0fc8c95f4b88085252a4ef
 AUX smokeping.init.3 1737 BLAKE2B 0c1ad0e4c5dd843097eadbdd2e2309f9f89c5f336ae20938680f2629c16e6ee265a56a4aaa26b40243d9d85331775315ac4eb5235eb51c7ff6d981ab2dd3a683 SHA512 87386971b42bf842c6cf59f641576cfcfd7439fe9f10139730b0c73acea610945d634d3effc3a5db793a71e2e625b49184a02813cbf34473dd94ac4a3931ed67
 AUX smokeping.init.4 1757 BLAKE2B a47cbbc27e38333490b615971f795ce3a7a6efebd03ad28244ab3a72368d08eca8cc3ce38bbb92915a604f586a04595d857d83c3adb33b213806f62ef09864bf SHA512 5e32a248899d79ea112595591bd9457c073c8276d8bb124b4f765bc9654bd5dac36866344c8c444c98ba4cde32829d7092067e73db5bd3c38ca75f7679a875f1
+AUX smokeping.init.5 1360 BLAKE2B 4213a42dcd43c1166c5f10d287c9e50be37265f8be6db3a8b9e18351dfbe7259a8ca98eff044cd1c7ef657356e3960e60745aea63a79bdc73fd009b3bd746bd7 SHA512 64adf577c9d7d79c268cf46c40ed7db23c93cbd49897070d9028ee6636794b1c101d1a9d1ff6f92c24512e18bf0f06b10b67117090918920fb8b8189dec85d4f
 AUX smokeping.service 200 BLAKE2B 77110386e5d304c04d00114800c1f42bb5e8b5ce1eab419afd2fa7c59c1a569fe244c7f7c18e01519d82389bf66f5b6935dd212b3bf68ace9b480e981c311001 SHA512 2f8824143b8283ad02274107c5ed0e84f0c1465fc089823e36ef44a42fec68564d8cc4ff5fb0ad6dc0443e21fac5a8cbcbb0a9bea151b57efaff2a082d15f344
-DIST smokeping-2.6.10.tar.gz 415383 BLAKE2B 7a502eddeb634404e379df67470595cf85512d64a5e137f6d7c344ceb606f99275016e1044ec820b2e9217e1d1b567164b636186bfe54e91249d585ef75c646a SHA512 e91ac80ceafccb945ec48cc80020b8cbf2afe29b5f422dc5aaf7c52387eafc498180c293cf82dccc4fdec88ec56f80fb1bd08ebcb2ae9aea563475a069b91f13
-DIST smokeping-2.6.11.tar.gz 417338 BLAKE2B e1ff2fc05fd8d39f42e1cc89831aa36ef0522716d1768dba9bdedf09f6c64cc2b35f30c3b727959dd93ed8922235729a27c85acceb1e1c3ec9c5f60e21455ab9 SHA512 928722832d6e01ffbb7b74542678f7b9d5fc22819c0feae164ce58b8d8a5595800f617c8a672e07cae4b2c4ccbfa4883a11438ba2a172fc2887abc2933388422
 DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d
-EBUILD smokeping-2.6.10-r1.ebuild 4100 BLAKE2B 8b2b8b8dfcb1e992adfb84c6f38d07f1bd6886db16e9a67195e38798a7e6c5d5fe7a6e564a79cfc80ea90ce9bfe42071871f4fb62deedbd4820ef357517cad68 SHA512 6d2a2b5fd8756ee62dfdc6093083b6374da60679f0ce63af585506962b979a7108d336f363b550ee65cda08d3c132cc910ca62271a178ad38cada05a313ba7ea
-EBUILD smokeping-2.6.11-r1.ebuild 4086 BLAKE2B 4a73ecb65aec7f39cdc66ece0fe2071591354e83baddf59188ddae4c6521262366238dffc43d0a2e4c533d512065e97a044385b689eaaa8673fb580b663ef277 SHA512 2cbea948678f9c31a2b315137bfbdcd573918dd3bf66defb7fb0c3d52c107cd09876e017dc75b42d4eacf8b8eccc72c31ed6ac9a64a6a156e49e4c4a7c648515
+DIST smokeping-2.7.0.tar.gz 8914621 BLAKE2B a139fdcaafe37c61695ea2e31e3ddaeb4389f754f28fd41318db120f2ae5f4b5f355ebfb5e0c852b48e2e6872194952bc3733ff5f6bcd2886859a1c276835121 SHA512 17ada10e2cdc7966e81e589dec603fe77bc0a273790734b36342ff2b8ac3d5bca6797f6eb95a6e2e22a576b7bb5d2ca4232b4fb23057b360de9c156d141ed0ca
+DIST smokeping-2.7.1.tar.gz 8919251 BLAKE2B 91f348b573d5a7ce98e8b51c96d9f45bb0af21cae4b049ba113bfc97c60800d8fdea0c05eb5414ec861f07f30170abf64ee34e0e29899528c01283ddab0ecde8 SHA512 c7208a40725e5694813a0545d6f8b663bab49739fe716bed5fd85ed6258c1c0abde4a18a0678988fff067ecc7807c83313abf12c04b935377b0b7158f07d8626
 EBUILD smokeping-2.6.9-r1.ebuild 4195 BLAKE2B 814e0156f457b0a331e1d661d75ce0aa39d38585400f7da8b215880881591c72bc712ff441c85a523d097303e257703c4a6a8d47aa5d02d554c4ec614e29ad68 SHA512 3349666be7eb8693b0158235fd8b9f55f9394abfa49f78bc88de739075d5a57a2ad393264025de0c252fab0d3d0ed2752a85149590f078d7f2d2bb51c487f608
+EBUILD smokeping-2.7.0.ebuild 4334 BLAKE2B 4ea3db6ec3dc725c67ad182029d18fc2706cfcbbcd704ed260c256c1811c6cb98902c0a23ffbea0b209221dc3344ea3c11e59f93b0bdf93c22c2113ac5767308 SHA512 c6f012fa366d646502f4ec9486b711618e10fac1477f31533778572d425dfe1657b7632acf16e1b928c9a7b12f549eb306da1420aa647b5e49fd0f17f303287e
+EBUILD smokeping-2.7.1.ebuild 4146 BLAKE2B 14895ef861cb55aab2a4f47e5c7c1e87b52b563241d160e1b6a8530810e9d4aa366479d8a56882b13dedcb4090d6d47dda42542278499fe1ae720aed436d1676 SHA512 4d29c64bb9ecd576c5c037c84ccae1790873b0fb77232f7afe07e1273ad2085c2a3c609dc3794b10baa708ae8839de642a1e6f42f6d52273c6789cf7dfb1d3a4
 MISC metadata.xml 609 BLAKE2B 80a690cf6d514c95f27e370c0417cdc1787a0e149e7791bdd3684b195d2cf6ada9543d1001fd5353a00e05a01c62272b73e09ec838d9ea927b4c3bcbb274ab15 SHA512 cd5bbbf1af0cadf236c3385628a1392c2e5379958e4f002d71230ed9e7627989cfdee7e0a9fd584f94c4c29bb1756f9ade81df0888f4668f9b3a8ab9e31bf727
diff --git a/net-analyzer/smokeping/files/smokeping.init.5 b/net-analyzer/smokeping/files/smokeping.init.5
new file mode 100644
index 000000000000..3c08c3fdc65e
--- /dev/null
+++ b/net-analyzer/smokeping/files/smokeping.init.5
@@ -0,0 +1,56 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/smokeping"
+command_args="--nodaemon"
+command_background="true"
+command_user="smokeping:smokeping"
+pidfile="/run/${RC_SVCNAME}.pid"
+extra_started_commands="dump reload restore"
+required_files="/etc/smokeping/config"
+
+depend() {
+	need net
+	use dns
+}
+
+start_pre() {
+    export LC_ALL=C
+}
+
+reload() {
+	ebegin "Reloading smokeping"
+	"${command}" --reload 2>&1 >/dev/null
+	eend $?
+}
+
+dump() {
+	ebegin "Dumping smokeping rrd files to XML for backup or upgrade use"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before dumping files!"
+		return 1
+	fi
+	for f in $(find /var/lib/smokeping -name '*.rrd' -print) ; do
+		f_xml=$(dirname $f)/$(basename $f .rrd).xml
+		rrdtool dump "$f" > "${f_xml}"
+		chown root:0 "${f_xml}"
+	done
+	eend $?
+}
+
+restore() {
+	ebegin "Restoring smokeping rrd files from XML dump files"
+	if service_started "${myservice}" ; then
+		eerror "You need to stop smokeping before restoring files!"
+		return 1
+	fi
+	for f in $(find /var/lib/smokeping -name '*.xml' -print) ; do
+		f_rrd=$(dirname $f)/$(basename $f .xml).rrd
+		mv -f "${f_rrd}" "${f_rrd}.bak"
+		chown root:0 "${f_rrd}.bak"
+		rrdtool restore "$f" "${f_rrd}"
+		chown smokeping:smokeping "${f_rrd}"
+	done
+	eend $?
+}
diff --git a/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.0.ebuild
index a5f7c689ef10..47835a3a6b71 100644
--- a/net-analyzer/smokeping/smokeping-2.6.11-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils user systemd
+EAPI=6
+inherit autotools eutils multilib user systemd
 
 DESCRIPTION="A powerful latency measurement tool"
 HOMEPAGE="http://oss.oetiker.ch/smokeping/"
@@ -22,6 +22,7 @@ DEPEND="
 	>=dev-perl/SNMP_Session-1.13
 	>=net-analyzer/fping-2.4_beta2-r2[suid]
 	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
 	dev-perl/CGI-Session
 	dev-perl/Config-Grammar
 	dev-perl/Digest-HMAC
@@ -56,7 +57,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
+	echo ${PV} > VERSION
+
+	eautoreconf
 }
 
 src_configure() {
@@ -70,6 +78,7 @@ src_compile() {
 }
 
 src_install() {
+	dodir /usr/$(get_libdir)
 	default
 
 	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
diff --git a/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild b/net-analyzer/smokeping/smokeping-2.7.1.ebuild
index 698506161260..7f9baf701feb 100644
--- a/net-analyzer/smokeping/smokeping-2.6.10-r1.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils user systemd
+EAPI=6
+inherit autotools eutils multilib user systemd
 
 DESCRIPTION="A powerful latency measurement tool"
 HOMEPAGE="http://oss.oetiker.ch/smokeping/"
@@ -10,40 +10,40 @@ SRC_URI="http://oss.oetiker.ch/smokeping/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-# dropping hppa and sparc because of way too may dependencies not having
-# keywords in those architectures.
 KEYWORDS="~amd64 ~x86"
 
-# removing fcgi useflag as the configure script can't avoid it without patching
-IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet"
+IUSE="apache2 curl dig echoping ipv6 radius"
 
 DEPEND="
-	!apache2? ( virtual/httpd-cgi )
-	apache2? (
-		>=www-apache/mod_perl-2.0.1
-		www-apache/mod_fcgid
-	)
-	curl? ( >=net-misc/curl-7.21.4 )
-	dig? ( net-dns/bind-tools )
-	echoping? ( >=net-analyzer/echoping-6.0.2 )
-	ipv6? ( >=dev-perl/Socket6-0.20 )
-	ldap? ( dev-perl/perl-ldap )
-	radius? ( dev-perl/Authen-Radius )
-	ssh? ( dev-perl/Net-OpenSSH )
-	telnet? ( dev-perl/Net-Telnet )
-	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
 	>=dev-lang/perl-5.8.8-r8
 	>=dev-perl/SNMP_Session-1.13
 	>=net-analyzer/fping-2.4_beta2-r2[suid]
 	>=net-analyzer/rrdtool-1.2[graph,perl]
+	dev-perl/CGI
 	dev-perl/CGI-Session
 	dev-perl/Config-Grammar
 	dev-perl/Digest-HMAC
 	dev-perl/FCGI
 	dev-perl/IO-Socket-SSL
+	dev-perl/IO-Tty
 	dev-perl/Net-DNS
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SNMP
+	dev-perl/Net-Telnet
 	dev-perl/libwww-perl
+	dev-perl/perl-ldap
 	virtual/perl-libnet
+	|| ( dev-perl/CGI-Fast <dev-perl/CGI-4 )
+	!apache2? ( virtual/httpd-cgi )
+	apache2? (
+		>=www-apache/mod_perl-2.0.1
+		www-apache/mod_fcgid
+	)
+	curl? ( >=net-misc/curl-7.21.4 )
+	dig? ( net-dns/bind-tools )
+	echoping? ( >=net-analyzer/echoping-6.0.2 )
+	ipv6? ( >=dev-perl/Socket6-0.20 )
+	radius? ( dev-perl/Authen-Radius )
 "
 
 RDEPEND="${DEPEND}"
@@ -54,7 +54,14 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session
+	default
+
+	sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die
+	sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die
+	rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session
+	echo ${PV} > VERSION
+
+	eautoreconf
 }
 
 src_configure() {
@@ -68,9 +75,10 @@ src_compile() {
 }
 
 src_install() {
+	dodir /usr/$(get_libdir)
 	default
 
-	newinitd "${FILESDIR}"/${PN}.init.4 ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.5 ${PN}
 	systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf
 	systemd_dounit "${FILESDIR}"/"${PN}".service
 
@@ -85,7 +93,7 @@ src_install() {
 		-e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \
 		-e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \
 		-e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \
-	    -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
+		-e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \
 		-e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \
 		-e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \
 		-e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \