| 1 |
commit: 8b834fa574a2595f283a10129173bc297c86b6fa |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 17 15:56:53 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 17 16:02:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b834fa5 |
| 7 |
|
| 8 |
net-analyzer/icinga2: 2.9.0 bup |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 11 |
|
| 12 |
net-analyzer/icinga2/Manifest | 1 + |
| 13 |
.../{icinga2-9999.ebuild => icinga2-2.9.0.ebuild} | 21 ++++----------------- |
| 14 |
net-analyzer/icinga2/icinga2-9999.ebuild | 21 ++++----------------- |
| 15 |
3 files changed, 9 insertions(+), 34 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest |
| 18 |
index a04866da9ea..4ab458d6d22 100644 |
| 19 |
--- a/net-analyzer/icinga2/Manifest |
| 20 |
+++ b/net-analyzer/icinga2/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114 |
| 23 |
+DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea SHA512 e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4 |
| 24 |
|
| 25 |
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-2.9.0.ebuild |
| 26 |
similarity index 92% |
| 27 |
copy from net-analyzer/icinga2/icinga2-9999.ebuild |
| 28 |
copy to net-analyzer/icinga2/icinga2-2.9.0.ebuild |
| 29 |
index ebdd790be87..3085070c612 100644 |
| 30 |
--- a/net-analyzer/icinga2/icinga2-9999.ebuild |
| 31 |
+++ b/net-analyzer/icinga2/icinga2-2.9.0.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2017 Gentoo Foundation |
| 34 |
+# Copyright 1999-2018 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
EAPI=6 |
| 38 |
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2" |
| 39 |
|
| 40 |
LICENSE="GPL-2" |
| 41 |
SLOT="0" |
| 42 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
| 43 |
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax" |
| 44 |
WX_GTK_VER="3.0" |
| 45 |
|
| 46 |
CDEPEND=" |
| 47 |
@@ -41,8 +41,7 @@ RDEPEND=" |
| 48 |
net-analyzer/nagios-plugins |
| 49 |
) ) |
| 50 |
mail? ( virtual/mailx ) |
| 51 |
- classicui? ( net-analyzer/icinga[web] ) |
| 52 |
- studio? ( x11-libs/wxGTK:3.0 )" |
| 53 |
+ classicui? ( net-analyzer/icinga[web] )" |
| 54 |
|
| 55 |
REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
| 56 |
|
| 57 |
@@ -50,9 +49,6 @@ want_apache2 |
| 58 |
|
| 59 |
pkg_setup() { |
| 60 |
depend.apache_pkg_setup |
| 61 |
- if use studio ; then |
| 62 |
- setup-wxwidgets |
| 63 |
- fi |
| 64 |
enewgroup icinga |
| 65 |
enewgroup icingacmd |
| 66 |
enewgroup nagios # for plugins |
| 67 |
@@ -74,6 +70,7 @@ src_configure() { |
| 68 |
-DICINGA2_GROUP=icingacmd |
| 69 |
-DICINGA2_COMMAND_GROUP=icingacmd |
| 70 |
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
| 71 |
+ -DUSE_SYSTEMD=$(usex systemd ON OFF) |
| 72 |
-DLOGROTATE_HAS_SU=ON |
| 73 |
) |
| 74 |
# default to off if minimal, allow the flags to be set otherwise |
| 75 |
@@ -98,16 +95,6 @@ src_configure() { |
| 76 |
-DICINGA2_LTO_BUILD=OFF |
| 77 |
) |
| 78 |
fi |
| 79 |
- # STUDIO |
| 80 |
- if use studio; then |
| 81 |
- mycmakeargs+=( |
| 82 |
- -DICINGA2_WITH_STUDIO=ON |
| 83 |
- ) |
| 84 |
- else |
| 85 |
- mycmakeargs+=( |
| 86 |
- -DICINGA2_WITH_STUDIO=OFF |
| 87 |
- ) |
| 88 |
- fi |
| 89 |
|
| 90 |
cmake-utils_src_configure |
| 91 |
} |
| 92 |
|
| 93 |
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild |
| 94 |
index ebdd790be87..3085070c612 100644 |
| 95 |
--- a/net-analyzer/icinga2/icinga2-9999.ebuild |
| 96 |
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild |
| 97 |
@@ -1,4 +1,4 @@ |
| 98 |
-# Copyright 1999-2017 Gentoo Foundation |
| 99 |
+# Copyright 1999-2018 Gentoo Foundation |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
|
| 102 |
EAPI=6 |
| 103 |
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2" |
| 104 |
|
| 105 |
LICENSE="GPL-2" |
| 106 |
SLOT="0" |
| 107 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" |
| 108 |
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax" |
| 109 |
WX_GTK_VER="3.0" |
| 110 |
|
| 111 |
CDEPEND=" |
| 112 |
@@ -41,8 +41,7 @@ RDEPEND=" |
| 113 |
net-analyzer/nagios-plugins |
| 114 |
) ) |
| 115 |
mail? ( virtual/mailx ) |
| 116 |
- classicui? ( net-analyzer/icinga[web] ) |
| 117 |
- studio? ( x11-libs/wxGTK:3.0 )" |
| 118 |
+ classicui? ( net-analyzer/icinga[web] )" |
| 119 |
|
| 120 |
REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
| 121 |
|
| 122 |
@@ -50,9 +49,6 @@ want_apache2 |
| 123 |
|
| 124 |
pkg_setup() { |
| 125 |
depend.apache_pkg_setup |
| 126 |
- if use studio ; then |
| 127 |
- setup-wxwidgets |
| 128 |
- fi |
| 129 |
enewgroup icinga |
| 130 |
enewgroup icingacmd |
| 131 |
enewgroup nagios # for plugins |
| 132 |
@@ -74,6 +70,7 @@ src_configure() { |
| 133 |
-DICINGA2_GROUP=icingacmd |
| 134 |
-DICINGA2_COMMAND_GROUP=icingacmd |
| 135 |
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes |
| 136 |
+ -DUSE_SYSTEMD=$(usex systemd ON OFF) |
| 137 |
-DLOGROTATE_HAS_SU=ON |
| 138 |
) |
| 139 |
# default to off if minimal, allow the flags to be set otherwise |
| 140 |
@@ -98,16 +95,6 @@ src_configure() { |
| 141 |
-DICINGA2_LTO_BUILD=OFF |
| 142 |
) |
| 143 |
fi |
| 144 |
- # STUDIO |
| 145 |
- if use studio; then |
| 146 |
- mycmakeargs+=( |
| 147 |
- -DICINGA2_WITH_STUDIO=ON |
| 148 |
- ) |
| 149 |
- else |
| 150 |
- mycmakeargs+=( |
| 151 |
- -DICINGA2_WITH_STUDIO=OFF |
| 152 |
- ) |
| 153 |
- fi |
| 154 |
|
| 155 |
cmake-utils_src_configure |
| 156 |
} |
Archives