bump of icinga2 and allowing monitoring-plugins to be used bug 541162

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

3 files changed, 178 insertions, 5 deletions

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 6fc253f2a5e1..5ea2a4ef50ee 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.23 2015/02/14 08:47:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.24 2015/03/03 19:22:46 prometheanfire Exp $
+
+*icinga2-2.2.4 (03 Mar 2015)
+
+  03 Mar 2015; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.2.4.ebuild:
+  bump of icinga2 and allowing monitoring-plugins to be used bug 541162
 
   14 Feb 2015; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove short <longdescription>.
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 2c1dc13a6b50..0a454b618fd7 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -5,14 +5,26 @@ AUX icinga2.confd 135 SHA256 ba821687a15008781a9e5953e66b4290891af4f15736902cb2e
 AUX icinga2.initd 2003 SHA256 3a41a4d5a730838f8779f87e9d2eb0b5e0e229ed9af04156e7f050430c445f58 SHA512 5ba05ae3a619014a22d0da4ea0cc82d01d0471a4827bb4b7e4134b12a18d1aa226c8e81f14345a95f8e7f11a33ea4295e6c2a3a46aba8b15ee6cdf3e641b6e67 WHIRLPOOL c1284f49b4ac5119eda0f96089452a097f5a02855bd27da22c45db62d8f9c4a3315433ca2da02af6b57c037ad62b6c9a708e3cc6af3beb58bf6970efe086598d
 DIST icinga2-2.2.1.tar.gz 683579 SHA256 3daf73b30cfeca6b29c8ca715c006b4e612324165a0583eb072a51d0925eea6d SHA512 0cf80b67129b989fff9c2faf3e7455fe941b30bc48e337ba1a29294974d18e4b0462b2d1b11b8508add2c76340b7044e4575ef3d189bedb4e1a31daf80dfc2d3 WHIRLPOOL 880e13f9e0ce69433342a564c8a5e5f45a513a30334d40a349d8463c263066986205537a62d279b0ef3894c12dd2ff981a7ac6a0667d76b3fc4c4aebf76c1412
 DIST icinga2-2.2.3.tar.gz 690095 SHA256 1cd6eebc5f9427d03ed12f188f73af0fe26b5b34f2bbdf29fe31024a0d8846b1 SHA512 0d1fc86fa90e5aa5d82515da490db1292e873fe2115d90239defeefa88f2045981464fd0193900fcf21c7a3dc961f6dd2da4cbd0fc8bd03002b182908af62603 WHIRLPOOL a04267d4d23e32fb20b53f14c2816d670afe335bf6854d9d0c1216a40d4163d32161a9ba7fd3540093c9202805fd71c72aacddad27ca97a00f3363a5305abe47
+DIST icinga2-2.2.4.tar.gz 691978 SHA256 0329e7ad10e5716407653eb73c2545616a633d7a70c6b7fcc2df9953169ee9aa SHA512 cd3493d378101698fb42e16f0050606e935833b1486f01a9c7c2b44828ba48aa36bbc0f9e94924474f360b354f63bb12073f208dfead203188eedbfc7f91f278 WHIRLPOOL ebee4180472896baacc4a3e631612d0749cf573f6e6bd136453728020305d10d0caec355689ea8092cc0b54000a4e08f6a8dc71c9b56d681d180ed7068636363
 EBUILD icinga2-2.2.1-r2.ebuild 4252 SHA256 61eaecea0bbf1bcd0ba39a848b391f328e116692d81e9d9613887923c654045c SHA512 41115eb7e64f1fff55382b5244a42a3ec711308b1e68132937c860009525b36e4ed0dc0602799910d0949b8c98c4e0e312a52d729bc28b338f93368705920ad2 WHIRLPOOL f72927eedf8f81b612ebc5e4cca035e309ffed8693c65bd24d7dcad6095983a381786b3cf7415623f912e06cab65af2cdef8080c0d1973e18c739ac8fc4d3faf
 EBUILD icinga2-2.2.3-r1.ebuild 4169 SHA256 9936d2b3991c5bc1fab9f1fdd9c2d5ac6f010cd64be9a87a14cb9527bf70f9ea SHA512 cb1dfae4f8596cbbfd9b74b950f450761e16bf27c9efd48a9811e111112aa99843420d53890bbb1f12168bf6a07710dd9dd887226fcf4be4e49c90c446c9ea25 WHIRLPOOL add533e360290fd6a254e2be6e34ab0089e303a943bf0cd2446d48dda72172a3eef4b93aa495a5d0089da93dcd0f180a6f800c2d968c4af55b1b2ad317168de8
-MISC ChangeLog 4056 SHA256 1ea1520442321d153022075c0d41cc15e3584155ec7ac2765a265c25e970c004 SHA512 aece44af9646600dcc0dd268193c88022da87fcec451b1fbe1aea79e0f657ec985f253dc4669d206de1695d10b60ca7c0d42a1b49c7712274d9067518cfa0e61 WHIRLPOOL 6f79c5051465d79c81ea5464ceaa2efe6da64360b8bd1890694c050f25fd1b35730b767e6ffa136350dc5e761eae69624d01630b7425bb2048655f143554f686
+EBUILD icinga2-2.2.4.ebuild 4210 SHA256 ca18a937a205a53743e4fd886d41ee966c70a32b1a22e64493b2197a975e42c5 SHA512 0fbbda1340b564320d5dcd378e544d776d964ac53ed17842e86f8b41ccf8d347015eac8a3285c0c08ec07916efc704b4ddc0bd045171433284bb48af9199fe80 WHIRLPOOL a83951df66b52f1a7647e0ce858bdbbdfc952f8a6938e99a47a950b9ee918b67e22be01fd8d5737c71d346a72ab44cee2e6967a96227841769202f175855b3c5
+MISC ChangeLog 4250 SHA256 d34214ce0c030d5f4cf1d63527a6c5d9199c8a1421b8cd646c14fcb331f0ab0c SHA512 8f8a510d43712c3a31ec48ab0583e2114d85e9f614ac74ac792ae341ebf99e55c3db4e2c1bbe3765995235a0c602cfd817ded3c341c929a0d1259f2ecada7fad WHIRLPOOL dd0206206d4c67951efbcd6db61433a41ab1dee3f0fe9f07a879bcb3bcfc16ef4d59ccefbfe78f72130618a9c8829eaaf9978fd0925515511c5b7a19a5073c39
 MISC metadata.xml 460 SHA256 54f38cf1099a4bcab2120d5802f1915549718b4ac2b20b1b0245754919659101 SHA512 c860be59be0782980a7546f1d5e324a33b8310bf6c5e473457bdaa99bbdef52397c05d5f264c77e329ef7b2d1776bd2a027569946d787e04d2aa475b82cc33c6 WHIRLPOOL b37e6784f1fb6d06e357529db586311e745e20513f559864993fd640b9df611af0fb8aff57f4b5164596d949f3e428d400fb0cc789d8c1c0135da37deaabcad4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTfC54ACgkQVWmRsqeSphPbkgCfWnJ85uIjfSWe97kAsov9hDH/
-r9MAn3DbNhgBqzDepKmYDd88WHVnZywu
-=iA7D
+iQIcBAEBCAAGBQJU9gozAAoJEGSje+quGaTod2EQAMHNnOM090Yv5VfZ1DEzwrIg
+p/QWlUx5jfY5K6SOXF9uQP9Rw/qm1siDxNrzTN2TTuZ/KOLn+rhsmogoNgRLpHYf
+3w3kd3pKc3ug9ScRgWPba3itaKfRP7RZd5onAO4+4OQ5vyeWrgGlBgfkdRZ+6uuG
+zK0apVj86pJHd3J3vEV0xOrDwTbOJjhWSUl1z6yeLx3vPHGbCVZDICtWluMegmKy
+RYUO3H/GuUGvo1UbrDD/7yG4lB5E31YzR7sYU/sXsIApcRAjGMT0Jc9NNVyCqDIk
+aFscYgVRI9qri/CNTqCRpISE9XGMcAQIgm60CcjI+Q6F4+SMsROyjoXm7v6Vsk05
+3JjU3Xt/xI5E6FUoaGognUx+IwpfrQLhIz5HwzZsVZNixj/i/KODrs+U7ZwUnNVN
+3BZ1ahgua9BWRBgvX6BGECPcGexaQeT+GxWEHDkxSUB7+EsL9U2S/u6sarbKg73R
+CorAcJUkK9rSjUMFBJkG0m7IyFoRvS+gUxYufn9ItR1ZUQolA/pFvSyzX+9X4Khf
+L+y7TZXSCObEmtqIGuthNbmT9u5RRfW3r+QvXszpRacYcKVLMANKGzO+Bx7TD6at
+aG9N5jWsH69Sp+B3UNKUv+ETJupriVYxOS28x/SaO9W2EQZ6Woy+RWEK+NIAORXn
+p/wSuTe1mkyoOWjRQYMA
+=nai2
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/icinga2-2.2.4.ebuild b/net-analyzer/icinga2/icinga2-2.2.4.ebuild
new file mode 100644
index 000000000000..bffdb4026921
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.2.4.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.4.ebuild,v 1.1 2015/03/03 19:22:46 prometheanfire Exp $
+
+EAPI=5
+inherit depend.apache eutils cmake-utils toolchain-funcs user versionator systemd
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+#PV=$(replace_version_separator 3 '-')
+SRC_URI="http://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+#S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui nano-syntax +plugins +vim-syntax"
+
+DEPEND="dev-util/cmake
+		dev-libs/openssl
+		>=dev-libs/boost-1.41
+		sys-devel/bison
+		>=sys-devel/flex-2.5.35
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql )"
+
+RDEPEND="${DEPEND}
+	plugins? ( || (
+		net-analyzer/monitoring-plugins
+		net-analyzer/nagios-plugins
+	) )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewgroup icingacmd
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
+		-DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+	)
+	if use postgres; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_PGSQL=OFF
+		)
+	fi
+	if use mysql; then
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=ON
+		)
+	else
+		mycmakeargs+=(
+			-DICINGA2_WITH_MYSQL=OFF
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+	cd $BUILDDIR
+
+	#if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+
+		emake DESTDIR="${D}" install
+	#fi
+
+	cd "${WORKDIR}"/icinga2-${PV}
+	if ! declare -p DOCS >/dev/null 2>&1 ; then
+		local d
+		for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
+				FAQ CREDITS CHANGELOG ; do
+			[[ -s "${d}" ]] && dodoc "${d}"
+		done
+	elif declare -p DOCS | grep -q "^declare -a " ; then
+		dodoc "${DOCS[@]}"
+	else
+		dodoc ${DOCS}
+	fi
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
+	elif use postgres ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		docinto schema/upgrade
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
+	fi
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
+
+	rm -r "${D}var/run" || die "failed to remove  /var/run"
+	rm -r "${D}var/cache" || die "failed to remove /var/cache"
+
+	fowners icinga:icinga /etc/icinga2
+	fowners icinga:icinga /var/lib/icinga2
+	fowners icinga:icinga /var/spool/icinga2
+	fowners icinga:icingacmd /var/log/icinga2
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/syntax/vim/ftdetect
+		doins -r tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+pkg_postinst() {
+	elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
+	elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
+}