[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-graphite/files/, www-apps/icingaweb2-module-graphite/

2018-05-26 Thread Aaron Bauman 
commit: 10d8c1f67b3bd910fd7f9d1beb52da9d8322e76a
Author: Louis Sautier  gmail  com>
AuthorDate: Sat May 26 20:50:51 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat May 26 21:46:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d8c1f6

www-apps/icingaweb2-module-graphite: fix SRC_URI for 1.0.1, EAPI=7

Also update HOMEPAGE and fix DESCRIPTION, remove deprecated patch from
live ebuild and add upstream info to metadata.xml.

Package-Manager: Portage-2.3.38, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8601

 www-apps/icingaweb2-module-graphite/Manifest   |  2 +-
 .../files/patch-unquote-service.patch  | 54 --
 ... => icingaweb2-module-graphite-1.0.1-r1.ebuild} | 12 ++---
 .../icingaweb2-module-graphite-.ebuild | 18 +++-
 www-apps/icingaweb2-module-graphite/metadata.xml   |  4 ++
 5 files changed, 16 insertions(+), 74 deletions(-)

diff --git a/www-apps/icingaweb2-module-graphite/Manifest 
b/www-apps/icingaweb2-module-graphite/Manifest
index 2713871762c..72dd4c96786 100644
--- a/www-apps/icingaweb2-module-graphite/Manifest
+++ b/www-apps/icingaweb2-module-graphite/Manifest
@@ -1 +1 @@
-DIST icingaweb2-module-graphite-1.0.1.tar.gz 5988 BLAKE2B 
43f98d853643377cc8088e60845c603563ec5f3bee8d1e9f48e884677c7bfbc82da5603e1aae05634616a52bd387c1685bf2605d1abcae0a96cc88dad303dd1c
 SHA512 
594a8d2a141bdf682fa37dc7b677a78f255dfa3d05071878a416b7426ed6355abc2a2864394e333a00c08aba8fd4f898e42c5a49ffeaf689a16de175f6ddb333
+DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B 
e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac
 SHA512 
1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a

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 3dde1f45a96..000
--- 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 
-Date: Tue, 12 Apr 2016 03:14:16 +
-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

[gentoo-commits] repo/gentoo:master commit in: www-apps/icingaweb2-module-graphite/files/, www-apps/icingaweb2-module-graphite/

2016-10-16 Thread Matt Thode 
commit: e6fcfc42675d1aadb5b1098b5fcf0995ec0f8ba0
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Oct 17 01:25:53 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Oct 17 01:25:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6fcfc42

www-apps/icingaweb2-module-graphite: add upstream patch, they are SLOW

Package-Manager: portage-2.3.0

 .../files/patch-unquote-service.patch  | 54 ++
 .../icingaweb2-module-graphite-.ebuild |  2 +
 2 files changed, 56 insertions(+)

diff --git 
a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch 
b/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
new file mode 100644
index ..3dde1f4
--- /dev/null
+++ b/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch
@@ -0,0 +1,54 @@
+From 3e5921b96b17ea4d0a5f32a39940a9b762e5c3a4 Mon Sep 17 00:00:00 2001
+From: Matthew Thode 
+Date: Tue, 12 Apr 2016 03:14:16 +
+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-.ebuild 
b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-.ebuild
index 2e6dc77..eae7fca 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-.ebuild
@@ -23,6 +23,8 @@ DEPEND=">=net-analyzer/icinga2-2.1.1
>=www-apps/icingaweb2-2.0.0"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/patch-unquote-service.patch" )
+
 src_install() {
insinto "/usr/share/icingaweb2/modules/graphite/"
doins -r "${S}"/*