commit: 8b834fa574a2595f283a10129173bc297c86b6fa
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 17 15:56:53 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jul 17 16:02:12 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b834fa5
net-analyzer/icinga2: 2.9.0 bup
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-analyzer/icinga2/Manifest | 1 +
.../{icinga2-9999.ebuild => icinga2-2.9.0.ebuild} | 21 ++++-----------------
net-analyzer/icinga2/icinga2-9999.ebuild | 21 ++++-----------------
3 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a04866da9ea..4ab458d6d22 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1 +1,2 @@
DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B
f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5
SHA512
b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114
+DIST icinga2-2.9.0.tar.gz 2192684 BLAKE2B
b27da06a8b1d70108c792ccbef67a8082b7bb1ec9326ffdcd56406e8bf00e00fa7ef7cbedae803835cc7576bfb1db07cac4e6d1c8338d67e0ff071b821a661ea
SHA512
e95f29f9a7e2ba9ad2ca16972fad23a9d18ee0470fbfd70f0bbc8efba9cdcce77d7c5abd2fca98e7b30c64f0014f89f9edd494473769efa6a6e01c08ebdcc1a4
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild
b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
similarity index 92%
copy from net-analyzer/icinga2/icinga2-9999.ebuild
copy to net-analyzer/icinga2/icinga2-2.9.0.ebuild
index ebdd790be87..3085070c612 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2";
LICENSE="GPL-2"
SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax
+plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax
+plugins systemd +vim-syntax"
WX_GTK_VER="3.0"
CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
net-analyzer/nagios-plugins
) )
mail? ( virtual/mailx )
- classicui? ( net-analyzer/icinga[web] )
- studio? ( x11-libs/wxGTK:3.0 )"
+ classicui? ( net-analyzer/icinga[web] )"
REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
@@ -50,9 +49,6 @@ want_apache2
pkg_setup() {
depend.apache_pkg_setup
- if use studio ; then
- setup-wxwidgets
- fi
enewgroup icinga
enewgroup icingacmd
enewgroup nagios # for plugins
@@ -74,6 +70,7 @@ src_configure() {
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_GROUP=icingacmd
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+ -DUSE_SYSTEMD=$(usex systemd ON OFF)
-DLOGROTATE_HAS_SU=ON
)
# default to off if minimal, allow the flags to be set otherwise
@@ -98,16 +95,6 @@ src_configure() {
-DICINGA2_LTO_BUILD=OFF
)
fi
- # STUDIO
- if use studio; then
- mycmakeargs+=(
- -DICINGA2_WITH_STUDIO=ON
- )
- else
- mycmakeargs+=(
- -DICINGA2_WITH_STUDIO=OFF
- )
- fi
cmake-utils_src_configure
}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild
b/net-analyzer/icinga2/icinga2-9999.ebuild
index ebdd790be87..3085070c612 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2";
LICENSE="GPL-2"
SLOT="0"
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax
+plugins studio +vim-syntax"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax
+plugins systemd +vim-syntax"
WX_GTK_VER="3.0"
CDEPEND="
@@ -41,8 +41,7 @@ RDEPEND="
net-analyzer/nagios-plugins
) )
mail? ( virtual/mailx )
- classicui? ( net-analyzer/icinga[web] )
- studio? ( x11-libs/wxGTK:3.0 )"
+ classicui? ( net-analyzer/icinga[web] )"
REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
@@ -50,9 +49,6 @@ want_apache2
pkg_setup() {
depend.apache_pkg_setup
- if use studio ; then
- setup-wxwidgets
- fi
enewgroup icinga
enewgroup icingacmd
enewgroup nagios # for plugins
@@ -74,6 +70,7 @@ src_configure() {
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_GROUP=icingacmd
-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+ -DUSE_SYSTEMD=$(usex systemd ON OFF)
-DLOGROTATE_HAS_SU=ON
)
# default to off if minimal, allow the flags to be set otherwise
@@ -98,16 +95,6 @@ src_configure() {
-DICINGA2_LTO_BUILD=OFF
)
fi
- # STUDIO
- if use studio; then
- mycmakeargs+=(
- -DICINGA2_WITH_STUDIO=ON
- )
- else
- mycmakeargs+=(
- -DICINGA2_WITH_STUDIO=OFF
- )
- fi
cmake-utils_src_configure
}
