gentoo resync : 29.05.2018

5 files changed, 19 insertions, 78 deletions

diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest
index 000a71db6cb8..8bbc23ea5a26 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1,5 +1,4 @@
-AUX patch-unquote-service.patch 2566 BLAKE2B 1eb3f46859c5109c9e35e562a5d0af0a3a0be5f374e2140e8911aef968ae5acb68ac248445246248739add0f3e80416dddebe7eaaef8b7bbda150961d533fff4 SHA512 6365cc7886f3b5d1ceed9b7f46a90ecc80205a0f42aa31e75b53e9384a094503a82a6a86748170af07be021eb08c0bc2ce800b8fffc961401ee3a5290c2b4297
-DIST icingaweb2-module-graphite-1.0.1.tar.gz 5988 BLAKE2B 43f98d853643377cc8088e60845c603563ec5f3bee8d1e9f48e884677c7bfbc82da5603e1aae05634616a52bd387c1685bf2605d1abcae0a96cc88dad303dd1c SHA512 594a8d2a141bdf682fa37dc7b677a78f255dfa3d05071878a416b7426ed6355abc2a2864394e333a00c08aba8fd4f898e42c5a49ffeaf689a16de175f6ddb333
-EBUILD icingaweb2-module-graphite-1.0.1.ebuild 713 BLAKE2B 0d795bbb7ac66003659e857017c68745a534671250252ca35a20b15105ab243752b09bedbbff14c87f5b21c76658102973f39028cc4147ab2d003d9970a3d31d SHA512 392c3e58f37ce7a3963742eba7063e2ccabc185684ce95e22e11aeb98c21d3e0f9e6e57bd0ba394a89cb284dd5cd3d171a7119f65d750ec842a97b94eae95fbe
-EBUILD icingaweb2-module-graphite-9999.ebuild 756 BLAKE2B 04fde5e34c4a0a3455a0680fec5b7cfa76f8e0bbfe0425e1054317c66a6172de975c0c5bec020f88225ee6f900e1687f7a3d38d43b0e300da44384fb3c9636c7 SHA512 717da1e4407afcde50eafb1ce60fc1a04bbc9da3f4406d679959b34f00e46637518342bd822420a447a4a5511a682dbd5ed895819589fd2ea0e4152dfa308ecc
-MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
+DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac SHA512 1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a
+EBUILD icingaweb2-module-graphite-1.0.1-r1.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
+EBUILD icingaweb2-module-graphite-9999.ebuild 655 BLAKE2B e78227eaa1fe9f89451867b77143fe33cee1e9452219490e4f4374e64a67342dd18c07db8fb11fc9df8097df303c7298f0a63ac8b59e34b6ddee47608c940558 SHA512 a75ef3143b498cb55b965c9c937a59bd53c7f4c95227668f08a69511af9bb67989bb26c44e03a2fa2f7bc791580515f76f90432142c296bc220f65775f06e7ed
+MISC metadata.xml 433 BLAKE2B e4b486abac016ae60b7cc2f9f8893bd55f4de4b126ae87a3497d689ffe269cc42d1f6b873febe506aad55ec5a5dc780fdec51dc638aea2152e32e51c65bfd60c SHA512 86d44590ce1d15251e1fc03ff7fc769651fadd0769eb709b0607f61d253de7513fbe4616c4d6a0dd5498f089882d6c362c7e4a768ba4c86e7a6f86368f688591
diff --git a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch b/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
deleted file mode 100644
index 3dde1f45a964..000000000000
--- a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3e5921b96b17ea4d0a5f32a39940a9b762e5c3a4 Mon Sep 17 00:00:00 2001
-From: Matthew Thode <mthode@mthode.org>
-Date: Tue, 12 Apr 2016 03:14:16 +0000
-Subject: [PATCH] remove quotes around $service variable
-
-This fixes https://dev.icinga.org/issues/11572
-
-This still leaves $hostname being quoted, I don't know if that needs to go as well.
----
- application/controllers/ShowController.php | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php
-index f029b81..0457ce9 100644
---- a/application/controllers/ShowController.php
-+++ b/application/controllers/ShowController.php
-@@ -168,7 +168,7 @@ public function hostAction()
-             if (! array_key_exists('icingaHost', $patterns)) continue;
- 
-             foreach ($set->loadTemplates() as $key => $template) {
--                if (strpos($template->getFilterString(), '$service') !== false) continue;
-+                if (strpos($template->getFilterString(), $service) !== false) continue;
- 
-                 $imgParams = array(
-                     'template' => $key,
-@@ -228,7 +228,7 @@ public function serviceAction()
-             if (! array_key_exists('icingaHost', $patterns)) continue;
- 
-             foreach ($set->loadTemplates() as $key => $template) {
--                if (strpos($template->getFilterString(), '$service') === false) continue;
-+                if (strpos($template->getFilterString(), $service) === false) continue;
- 
-                 $imgParams = array(
-                     'template' => $key,
-@@ -289,7 +289,7 @@ public function XXXserviceAction()
- 
-             foreach ($set->loadTemplates() as $key => $template) {
- 
--                if (strpos($template->getFilterString(), '$service') === false) continue;
-+                if (strpos($template->getFilterString(), $service) === false) continue;
- 
-                 $this->view->templates[$key] = $template;
- 
-diff -Naur a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php
---- a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php  2016-10-16 19:10:49.794640399 -0500
-+++ b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php  2016-10-16 19:11:17.136401235 -0500
-@@ -16,6 +16,7 @@
-                 array(
-                     'host'    => $service->host_name,
-                     'service' => $service->service_description,
-+                    'check_command' => $service->service_check_command,
-                 ))
-         );
-     }
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
index 1722cdeaadb2..312bc419e294 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
-HOMEPAGE="http://www.icinga.org/"
+DESCRIPTION="Icinga Web 2 plugin for Graphite"
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/"
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
 else
 	KEYWORDS="~amd64 ~x86"
-	MY_PN="icingaweb2-module-pnp"
-	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
+	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2"
@@ -22,8 +20,6 @@ DEPEND=">=net-analyzer/icinga2-2.4.0
 	>=www-apps/icingaweb2-2.5.0"
 RDEPEND="${DEPEND}"
 
-PATCHES=()
-
 src_install() {
 	insinto "/usr/share/icingaweb2/modules/graphite/"
 	doins -r "${S}"/*
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
index 7e359c940e4c..312bc419e294 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild
@@ -1,29 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-DESCRIPTION="Icinga Web 2 plugin for pnp4nagios"
-HOMEPAGE="http://www.icinga.org/"
+DESCRIPTION="Icinga Web 2 plugin for Graphite"
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/"
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
 else
 	KEYWORDS="~amd64 ~x86"
-	MY_PN="icingaweb2-module-pnp"
-	SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
+	SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=net-analyzer/icinga2-2.1.1
-	>=www-apps/icingaweb2-2.0.0"
+DEPEND=">=net-analyzer/icinga2-2.4.0
+	>=www-apps/icingaweb2-2.5.0"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/patch-unquote-service.patch" )
-
 src_install() {
 	insinto "/usr/share/icingaweb2/modules/graphite/"
 	doins -r "${S}"/*
diff --git a/www-apps/icingaweb2-module-graphite/metadata.xml b/www-apps/icingaweb2-module-graphite/metadata.xml
index 3ffdeb4af3b5..e6871e01f10d 100644
--- a/www-apps/icingaweb2-module-graphite/metadata.xml
+++ b/www-apps/icingaweb2-module-graphite/metadata.xml
@@ -5,4 +5,8 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">Icinga/icingaweb2-module-graphite</remote-id>
+		<bugs-to>https://github.com/Icinga/icingaweb2-module-graphite/issues</bugs-to>
+	</upstream>
 </pkgmetadata>