gentoo resync : 26.11.2017

4 files changed, 4 insertions, 91 deletions

diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest
index de4500abe0b6..7dbfdd0fcca2 100644
--- a/net-analyzer/nagios-check_rbl/Manifest
+++ b/net-analyzer/nagios-check_rbl/Manifest
@@ -1,8 +1,3 @@
-AUX nagios-check_rbl-1.3.7-perl526.patch 347 SHA256 d11ead366c83234812b058b319571f1ce400be6c50dc5ac40c32355058029a46 SHA512 704b4fbb92d3abf4964dfb2affecf9577df263745d869c213c4a645b85f52c5a9b969088143c46f58b5de0be3549de2c383e52b33a3746f9ae07da9563f8d266 WHIRLPOOL 6e1b9bfa5b5266db42b5da03d84a0a366c5c239c3506b98d66a1957c06640bd73c061703e8c707daaa8b5707394b7dd2f70a2c816c316f1162bfe80196c81d67
-DIST check_rbl-1.3.7-r1.tar.gz 38565 SHA256 dbe76bd24ab9404817f74fd895dfeb1c55d296fe9a8264a4c631c5139ea31247 SHA512 a918090b2c1e93095b155215de559b0d7f35c949e9c9d27c7b6dc91e21391b03d716154dd90ea1a68deeabce5afde3c9e5746190910f18bf1d3e08ff20d02431 WHIRLPOOL 31a13de7cfc650deea83d8c7cf148358046260502c34e3d643ad53c1e96854b0194da80fac3d95cf5fa06b01d9224fb9716ce3e281148ce174f89e75bb418023
-DIST check_rbl-1.4.1.tar.gz 47585 SHA256 6121e01be4b65f4ed34e8387366a616ceef79f74e44322f68ea8d384c193a177 SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb WHIRLPOOL 535cbfad9cb300e51526ea7127ed5c25a2274a0ade4aaa98e3755793fc82ac7adc91a34adba6af2a8d0708869317c33aeccfaaf5bf6c6b2f44974c0db9f99406
-EBUILD nagios-check_rbl-1.3.7-r1.ebuild 2098 SHA256 9b3c7728ed444ceec34261d289960ca1d244e26dca134638083fbf1c630d082a SHA512 f2920984e8e196c39a47b4701ca499813540b1d1bb8089125885dcf5fe206ba5c42dca0100d32a623a44626dccdfba2e0da0a705a41d7771eced4df9764d2514 WHIRLPOOL 92ad2da73dd9bd9e5fe803562afa41192efbb0535a98c39a24f3300113cce28a8627d73023cd4350f33654675e0ed965626adc6af1dff5433a9629230b7f63db
-EBUILD nagios-check_rbl-1.4.1.ebuild 1457 SHA256 b3f1b05a5b3eab9edfa25976b4c465488a62e32482c3563eebef9aae195dc6ce SHA512 d8e3b2411eb5ea6888de3cf8c6f57a125aaa6a61f98ba392167a5abc10fdb02474d518ad383e7e85cd2ffb15c6a81d906657b5701fdc44ac470d5d952b1f66e5 WHIRLPOOL 4968d995d77e7d856b06611e25737f9c05d31ad376a26fdbffe4a5f60b733b0e256938e6642796e2a685be36e8fdca09ae51020a11a62efd426eb4b8dcbd6a65
-MISC ChangeLog 3776 SHA256 b0393d619fe95003b3418e3e4d884e47850a4ffe6105e98eaf00b17c0311de6b SHA512 3170c484e9c39f3edf4d1042e7b8611811dde432013af50a26ddfa403a8eeb8cbe0b87f9eff1b6d5f8c100c4b40bfdde6646c51ca1266c2af4663eeaa548cf26 WHIRLPOOL 17f8aca44c4d64505d3dddfd1698943949dbb5066a41a6cef894c8862df4d6bf5a17399511a9c9f11ab1641b08ee044f499dc2e05a37d64d78261d3b41c8fbbc
-MISC ChangeLog-2015 1356 SHA256 1f897895ad7e60695630e76403454849c7eeab387e0aa4ef96a11afeb3c1f62f SHA512 c27fb2eacd085c8725bb72eb236872bcb82fae407547f8a49a0b50b88275ac4fc1c0458892716e42ce5fa870968472b1705521793ff740684fbf476d79ac5b78 WHIRLPOOL f6d59d6d5a082869d0487302e2c990a52fb554882d6b48a8eff29590a124530baead1e3b9fc53415b6c3aa3570318d7c770183cf5ede06ebd3894671c627c6bc
-MISC metadata.xml 468 SHA256 a3d69541ec3415d47f9a111d580f2a492a98d9cf94a9abfce657ee3c6d99fa5d SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05 WHIRLPOOL ca63f90fc1c86212308162df656eb28e5ee225f199bdafe274e2743058c9afb3ab10fa5b62f4b3ea88443cf6ae0915a04738ff9aaedf216da6447fe6ff101a20
+DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb
+EBUILD nagios-check_rbl-1.4.1.ebuild 1456 BLAKE2B ad3d03252c427da70a304632a41ebbebd7ba1b756047fc0c1bfb1ab6d72753ce2d32b9e5f78e90c390cdde38fe40ed22a8f166ec31926a0e0a0a7d2a60118bb7 SHA512 601fa67e3f51ac0cc4415736ec33993e5f745910b08b5392cd010ff918220d1b860af2ce72911a5597131f6779ffdd220fd708d9fb139c29d8d913aa8b4280c4
+MISC metadata.xml 468 BLAKE2B 31fa2c6ba1b1c2860f89c7f1442fb0388e7285183f28e9656576e8c13bbb05298a9bd13dc78ca9bcc1ce47401eb1c83d56786c1f37481e351d1d0e9b32713986 SHA512 e75e18c5bfb8b7b6cbc4729dc791e687403c00a16705622bb1f956e29dccec25a8ce8179a6908358189edd8c0d8c8e29beaa31039a4d0356d7a75cacfec64d05
diff --git a/net-analyzer/nagios-check_rbl/files/nagios-check_rbl-1.3.7-perl526.patch b/net-analyzer/nagios-check_rbl/files/nagios-check_rbl-1.3.7-perl526.patch
deleted file mode 100644
index b44ae74a0ea6..000000000000
--- a/net-analyzer/nagios-check_rbl/files/nagios-check_rbl-1.3.7-perl526.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ruN check_rbl-1.3.7.orig/Makefile.PL check_rbl-1.3.7/Makefile.PL
---- check_rbl-1.3.7.orig/Makefile.PL	2015-10-24 13:06:09.000000000 -0000
-+++ check_rbl-1.3.7/Makefile.PL	2017-08-04 16:10:49.881515014 -0000
-@@ -1,4 +1,5 @@
- # Load the Module::Install bundled in ./inc/
-+use lib q[.];
- use inc::Module::Install;
- 
- # File version information:
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
deleted file mode 100644
index af314b58ee8f..000000000000
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Needed for perl_rm_files in src_prepare() only.
-inherit perl-functions
-
-DESCRIPTION="Monitor whether or not a host is blacklisted"
-HOMEPAGE="https://github.com/matteocorti/check_rbl"
-
-MY_P="${P/nagios-/}"
-
-# We rename the tarball here because the upstream source changed without
-# a new release. That change happens to fix bug #583966, so we do want
-# the newer tarball. But I think, without the rename, that user might
-# have gotten a checksum failure.
-SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz
-	-> ${MY_P}-r1.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-KEYWORDS="amd64 hppa sparc x86"
-IUSE=""
-
-# The package's INSTALL/Makefile.PL files specify its dependencies.
-#
-#   * Data::Validate::Domain (dev-perl/Data-Validate-Domain)
-#   * Data::Validate::IP (dev-perl/Data-Validate-IP)
-#   * IO::Select (dev-lang/perl)
-#   * Monitoring::Plugin (dev-perl/Monitoring-Plugin)
-#   * Monitoring::Plugin::Getopt (dev-perl/Monitoring-Plugin)
-#   * Monitoring::Plugin::Threshold (dev-perl/Monitoring-Plugin)
-#   * Net::DNS (dev-perl/Net-DNS)
-#   * Readonly (dev-perl/Readonly)
-#
-RDEPEND="dev-lang/perl
-	dev-perl/Data-Validate-Domain
-	dev-perl/Data-Validate-IP
-	dev-perl/Monitoring-Plugin
-	dev-perl/Net-DNS
-	dev-perl/Readonly"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
-
-src_prepare() {
-	default
-
-	# The copy of version.pm that upstream ships causes problems and
-	# isn't necessary. They probably shouldn't be shipping it at all.
-	# See bug #583966 for more information. You should check on
-	# https://github.com/matteocorti/check_rbl/issues/6 every once
-	# in a while to see if this can be removed.
-	perl_rm_files inc/version.pm
-}
-
-src_configure() {
-	perl Makefile.PL INSTALLDIRS=vendor || die
-}
-
-src_install() {
-	default
-
-	local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
-
-	# It's simplest to move this file after it's been installed.
-	dodir "${nagiosplugindir}"
-	mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die
-}
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
index c307c420402b..2c96f81393b1 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 
-KEYWORDS="amd64 ~hppa sparc x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE=""
 
 # No, this is not redundant -- see bug 627082.