gentoo resync : 25.08.2020

4 files changed, 8 insertions, 86 deletions

diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
index 8a7e6061b111..756f467dc032 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest
+++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest
@@ -1,7 +1,5 @@
-AUX nagios-plugins-linux-madrisan-25-fix-fno-common.patch 1276 BLAKE2B 2dbae02f3b64590e091e2f6d4ce8d3462046eec02ed2a1234858e553c862922623fca7a1bc171d3381ac62f6953b9425f1e2a9bee11d8d42759002d9d11da50d SHA512 bc8e3a1870cc327d7519c248f33b4aa20e2689d48e76bffdcb0ca388a85b110d5484b115c78353e3369f0fe2d004325d43299eb1f03973c570de6a8efca2d15c
-AUX nagios-plugins-linux-madrisan-25-fix-musl-build.patch 928 BLAKE2B 829f26bcfe2a298f3f6bd2763127de2ab8deba5c859cfaf3915365f5b5254defe0ee30f706cd9efaefa8945eb451b252aff6f3417cb5df841d837167561dd495 SHA512 c52dd38fc6c25a41368c45cc0235fad2acbcef2b4db67c65f0c28be9322890193ca30ba0777363f413184142b2c85523ca3d6f98f8aabd7d6ef3c0117dea8086
-DIST nagios-plugins-linux-madrisan-25.tar.xz 371712 BLAKE2B 60637426d9ced289a1acdf61c3e7c5a2b3227afb20079ef93d445057b2127d12a6c76ab5a780571ac8bdd6ac3b55de2761722236d2ed7a057ab84559d97610e9 SHA512 64961a16e24802d66c48d0c33bd63d75aba8492f38dd83a57ee2e7cb728cf6876c7869622256c4249a9e9da39b744a332df6ecad80f6039861887bb5c8d806ec
 DIST nagios-plugins-linux-madrisan-26.tar.xz 379480 BLAKE2B e30fa00c029506ffd76e9c16f409f62f00ab481894d6b35dd34470dab5f2a18b2fc18bd06ae5e6a7179ed23f36c785c9a403258b9066e5a08f6a139ab0192088 SHA512 61c523ddf7a98ae01caf543a7e38903478346ce380884a7cd2a2e592db806e73fb996675aa701e2bbf57b31ed062886daba4af70cc2875e1c296537de01c588d
-EBUILD nagios-plugins-linux-madrisan-25-r1.ebuild 1272 BLAKE2B 51adbec0b1afcd79c4bc6d098db0133d3efc00e1e0977800017c933eebd8b23aa942682844455fb9b89b2d0bc86eeb24ac543b066555d139899e9252ee96c49a SHA512 13262ae5658f5d644156e2767cc44d3c0065958bfe430634d5178e76915d3a3b8ac34d1b1b7db2806238cf6197f3d6ba6d34222253de8349afc5807f9d8986a9
+DIST nagios-plugins-linux-madrisan-27.tar.xz 385324 BLAKE2B ef207e365d044fefa8c0dbef7aae8a50ec9b6c70d60d069574ed423646d1e936e0bd6bbb316070d94f354236f815e508da4ec1b298e89958c8393a041f98a908 SHA512 5d93912f2237449e29e963cca260fbe7a735f47e7c2752402e2f371289e2875e4fea35f191705d7a2f01ac49381e039b720f43c8c794e85ee0bbbb01d212a10a
 EBUILD nagios-plugins-linux-madrisan-26-r1.ebuild 1109 BLAKE2B bb928c9469801250b5822b0ac690c4f3c2f70dd338360d7e80c87cc64ce1d18481202a41b8336d3cc759f5f3fcafc6dde3522731cbd9db792df2189879f76cbd SHA512 02675534d758fabaa9ac1cbbbfa2c6e0ee236a77ab3a45c6649f115467d8a1554df09c70d358f8049389a624f3408973b15d6d4e3eefcffd7a5b0125d065e416
+EBUILD nagios-plugins-linux-madrisan-27.ebuild 1109 BLAKE2B bb928c9469801250b5822b0ac690c4f3c2f70dd338360d7e80c87cc64ce1d18481202a41b8336d3cc759f5f3fcafc6dde3522731cbd9db792df2189879f76cbd SHA512 02675534d758fabaa9ac1cbbbfa2c6e0ee236a77ab3a45c6649f115467d8a1554df09c70d358f8049389a624f3408973b15d6d4e3eefcffd7a5b0125d065e416
 MISC metadata.xml 612 BLAKE2B 0766fb1263f00a86cb3a04f1214193d59cf52b49738299389cfafd6fbb179c359387cf0267f7cef083cf6b416db39733c30426f8240ffa4d3944d90c7da1fb43 SHA512 990649aed9420b40d725e3a4a78bfe7e9504e216292835c55bdd634310840f85609fe13d35ebe351a9f66ea1b7de12d823bdec42fc91cd1ea797cc7098370e7f
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch
deleted file mode 100644
index 74bddd66e749..000000000000
--- a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4936ca25f3e9a2875ce063033e5e8f3a3590dab2 Mon Sep 17 00:00:00 2001
-From: Davide Madrisan <davide.madrisan@gmail.com>
-Date: Mon, 27 Jan 2020 22:00:41 +0100
-Subject: [PATCH] The build fails when '-fno-common' is added to CFLAGS
-
-As reported by 'sbraz', the build stops with the error message:
-
-   (.bss+0x8): multiple definition of `program_name'
-   (.bss+0x0): multiple definition of `program_name_short'
-
-This flag will be apparently enabled by default in gcc 10.
-
-Fix this build problem by correctly referencing as extern both
-the variables in the header file.
-
-Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
----
- include/progname.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/progname.h b/include/progname.h
-index 576ed16..847122a 100644
---- a/include/progname.h
-+++ b/include/progname.h
-@@ -25,10 +25,10 @@ extern "C" {
- #endif
- 
-   /* String containing name the program is called with.  */
--  const char *program_name;
-+  extern const char *program_name;
- 
-   /* String containing a short version of 'program_name'.  */
--  const char *program_name_short;
-+  extern const char *program_name_short;
- 
-   /* Set program_name, based on argv[0].
-      argv0 must be a string allocated with indefinite extent, and must not be
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-musl-build.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-musl-build.patch
deleted file mode 100644
index 3220be247319..000000000000
--- a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-musl-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit 72547f774641d3ed881cc957a6d6c20d5e3370ec
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Mon Apr 20 16:40:08 2020 +0200
-
-    Fix build with musl by including limits.h when PATH_MAX is used
-    
-    Otherwise, the build fails with:
-    error: PATH_MAX undeclared (first use in this function)
-    
-    Bug: https://bugs.gentoo.org/717038
-
-diff --git a/lib/processes.c b/lib/processes.c
-index cb006ca..e65992d 100644
---- a/lib/processes.c
-+++ b/lib/processes.c
-@@ -26,6 +26,7 @@
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- #include <pwd.h>
- #include <stdio.h>
- #include <stdlib.h>
-diff --git a/plugins/check_fc.c b/plugins/check_fc.c
-index b798377..cfaafa5 100644
---- a/plugins/check_fc.c
-+++ b/plugins/check_fc.c
-@@ -22,6 +22,7 @@
- #include <dirent.h>
- #include <errno.h>
- #include <getopt.h>
-+#include <limits.h>
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild
index e56c277678f3..f76ea708a821 100644
--- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild
+++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-27.ebuild
@@ -15,19 +15,14 @@ SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.t
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="curl"
+IUSE="curl varlink"
 
-DEPEND="curl? ( net-misc/curl:0= )"
+DEPEND="
+	curl? ( net-misc/curl:0= )
+	varlink? ( dev-libs/libvarlink:= )
+"
 RDEPEND="${DEPEND}"
 
-# https://github.com/madrisan/nagios-plugins-linux/issues/48
-# Will be in the next release
-# https://github.com/madrisan/nagios-plugins-linux/pull/52
-PATCHES=(
-	"${FILESDIR}/${P}-fix-fno-common.patch"
-	"${FILESDIR}/${P}-fix-musl-build.patch"
-)
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
@@ -44,6 +39,7 @@ src_configure() {
 		# Most options are already defaults for Gentoo
 		--disable-hardening
 		$(use_enable curl libcurl)
+		$(use_enable varlink libvarlink)
 	)
 	econf "${myconf[@]}"
 }