bup

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 132 insertions, 16 deletions

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 44abaf231507..1f362e5bc836 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.2 2014/06/16 15:35:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.3 2014/07/17 03:05:42 prometheanfire Exp $
+
+*icinga2-2.0.1 (17 Jul 2014)
+
+  17 Jul 2014; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.0.1.ebuild:
+  bup
 
 *icinga2-2.0.0 (16 Jun 2014)
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index f0a2658d54a4..8dac49b27afe 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST icinga2-2.0.0.tar.gz 533346 SHA256 c8a0717b0726d084fc93f695e51f35c80afb853a184a9bae8927d95830ef6e1a SHA512 b28658c29fd247e4023b82447168276fbe1402cf84eaca8b90420add56db16e77c74849adf1c2e72cd0484741abc7b9c438927bae9e2932711093771ef3a593d WHIRLPOOL 1c9c349dcc1778cdb4484ab3b65970790316b321d01600cf67d0623cbb08d8385f4a31a5a4b3a3d0a2a83d2c3ec154e4513273def3f26aff82b919dd93fd089e
+DIST icinga2-2.0.1.tar.gz 538638 SHA256 7076ce1781454884b5b922cd7c0f1e7bf146435a7f3e49b2cc5887df28e179e5 SHA512 c1faa5e8922497625d95f202a9e9c4a3f4a7210ef2eb3ade77ff9464690cdf913e5bc2ab3e3b8a6e3739e8c5f7676b78f6b2a09ffb79f843be66866914b64e7f WHIRLPOOL 0dbd9067d4492a77e2050d296c90da78090dc9c02fe71284677af01cc6537aa0dbb2100260aaf4a97c9b26df31e5936794c90ebb0d4a18256d02ddfaf550d926
 EBUILD icinga2-2.0.0.ebuild 3168 SHA256 f33c80f93cd909e753a5f5753c4f54708bf7fe030067e92c1bbde29cc75471bc SHA512 9616c6f4a6f8afd0d1b69b0d372279306beaa717396cf5a4931b58a72c0cc8dcd7a898268685df8de09a5ac78e301fb3ec42b99d84f90fc61a2a8e232c715b8d WHIRLPOOL 58ac0fbcdb357d0c19fe430d710970046919c9ac85b74c5db35d3595a3685b61e49275e1faa0e64ddf6e40cf2efa4033fd51b2b7cfaf01f13146ffa87588c791
-MISC ChangeLog 526 SHA256 f1e6d838402c5b05be1c8ffae862704a12fe75a34f9ac493dfd55163d34574a3 SHA512 a224e1ea71ba776682ce84c9ff264423ea18977c44aec1b947a39e3860f3ab841efcfa4584072b3c3c9d07343e035d305562b74a5e3e3e298ed7f453df8e666b WHIRLPOOL 2419f75861244d40fa6a4ea40a50c0103c7beac037f5210283425d16e1ef20e48de6548d5483d549e62991ab38117de4e045f62137584b066a4890345343f438
+EBUILD icinga2-2.0.1.ebuild 3316 SHA256 c6b5044cff61c03623e7f3157d053c933f85c4ee48c7167f01c1f4bb411fe7cd SHA512 65924a00968603bc0847966b771422e975c5f4284133b6c2a8162d9bdb7c27d64c85b2c3b469c1d640924d049499684bf23817a111aed779a991bcea7e2e1588 WHIRLPOOL c36e0cb22ef4e7d702e6e7d535f2fa2cd7b01b0cefba6aa8361fa925fd70537b0d8c4310d29047d72fcb8b5eae2c669cdf5c91d26c7b45ed18b46a93ad9d0ace
+MISC ChangeLog 643 SHA256 31597d1c67e787fe04b2c1c89eef46ec4e5cc821b1317a2ff81c96c5a0dd7827 SHA512 70b94e85c5209c4508196a6f26f94d60f7678bae0e791aac41778e48fd131df25f6f1324fb1f914c614843b95d37c1abbdb8b3e65b2f147255e9c504fed67f7b WHIRLPOOL c73c39248ab829ece45a17a04f8d7b7100d94912557d7cc25edcaaa704c1cb900289cd5d5ba0a59e9380be2c6266bf6f2802072461dba321f8f67c562e2932fe
 MISC metadata.xml 484 SHA256 b8c4326958ead6f6bdab93edda5d82a63e0608d93a14bcc975bfaa1d26121253 SHA512 124d4a6c2770ed91b9d8f5037d8bb350b26a2cbdf814331564303ca8aec347152eb584cc2214fa54747f85c270e5832c0b5cb431ef9e7e4b9341c865b1d5e7fc WHIRLPOOL d82ec9268326bd65c3912a9ef730d33c189af7858d3a760c2fcc188d855e013aa741f1b4ccc3fb829d7ea2ecfb670c1ddd4633231a23e891a32eb62ff003ece3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTnw6vAAoJECRx6z5ArFrDsOsQAMeRlmq/5X0P6hDh9wLUzcNs
-6ld98YKWN8oIw2qPYZNmXOYSOV8J9s/FkgeCsrd12HIK1DYgzdgyVTwa+GF196Yq
-RadsGgQ3gJHQc8D7TOiOL0GsXp6qWGfopQ4E/nAIRoRCaEIEcAu4I+yhcvuhG7bI
-pdf+wqEWN7jgY4zGv7zcudfdYn+urbO4X71LBaU/V8MZa0xS6pyOUFUyZCWM3Llw
-2HUK6v8vguG+wrZOZKSa49MnP3CLEeIXyZR06AmtllPa+TR7TzDYxXL9FBqjsUS6
-8HPbuNidO53nVLr1qqIntFXTKIVTVBfwj5sEb6f44pUISUq3ghKlJ7hMdYm7Y8oz
-GAcG3VWOFME7NdriTgXVqjQ7cnVUnLni8tLjvrDvW7hhPqOHJIWFzg75MZcAMHMq
-ucTO12v4XSo16fmwRPmHiAFRMoBH4+C2RFG7302PvH29cH+sjHAp0WYS04KocFtZ
-LUnGdxS6v0S8N8sdRcDudafjY3auJf+cPX1Y4+ovyokFE8LaR7lUJRzeegPQ0HNp
-OByYCft/VLQ9SLCpFFsC1aH/g00iJxTwaowLCYlY6Wu4b8IP10w6P51gitHeynFR
-n7hF3gBNLD26RtJKnHvzOUUHfdb1TVhylMMTeVJO7Dn8GSAm9AtdbS7sveOYgbms
-+I4R4cCyopmeTQWgsEzS
-=9ur5
+iQIcBAEBCAAGBQJTxz2cAAoJECRx6z5ArFrD9akP/jMr17ilmFdXwzUGFPtFYm5d
+/eVE8rRaEo+akkwq7vhqQATNCIZFWxVUbet8xeF6p2uvunII1XhIWQ2SjNknwzA8
+ggs9OjKahFheslorjKivrGftbdRUNKwQcnYT6Z0nbCkOn2npwHOtvyhMfeCPXbSp
+Sihgj2AhETa4RYxYllaCk9mx33svom8kqXc509L5pD8qiVngQj253I6GrSds/VKI
+HbR7fyEHvwbrRfBNG9c442W2PXIKnryNVQSbCf2rGf31JJz2DKZ16MQwuSARdNbX
+6erEUEHfSthFJ0v4BQtWIBS70FYcBc/fBpd2zHL41yix8fNr+oISG12RwGAZQr0/
+m5DtEMnUtmVtAQBxadu/KRq0dgYQQYGJbDRTHTqn7RdcTwKZHHT/l8prV+c8lA+e
+x0bJWm3s1WIn8MWOJlXx9Hg3wHmnUCXcwqbO/rN7ovTYDdjiIXOEp9EQFFbt2frE
+62i1WolO59qItCHRjemSNXwEfraNtdYEgnTt2fS1JwsulfBmFWW8NJqA9vh5jNIu
+RBqOXoI9BPQvfXW6RJwLkpmQP+l7+6G7b3gQmxmmiivryP6w5vop2pAvbMDYsCIx
+ZshH+lU5Kk3dQyEF/b2SvwAymBXVB9/EQDOV6KWtQZA5Y7sXzmzcBjjOEmmRt9NE
+HgwjVA4EhdBvfsxZTw/J
+=m5ym
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/icinga2-2.0.1.ebuild b/net-analyzer/icinga2/icinga2-2.0.1.ebuild
new file mode 100644
index 000000000000..295f024347dc
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.0.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.0.1.ebuild,v 1.1 2014/07/17 03:05:42 prometheanfire Exp $
+
+EAPI=5
+inherit depend.apache eutils cmake-utils toolchain-funcs user versionator systemd
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils. Reloaded"
+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 +plugins"
+
+DEPEND="dev-util/cmake
+		dev-libs/openssl
+		dev-libs/boost
+		sys-devel/bison
+		sys-devel/flex
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql-base )"
+
+RDEPEND="${DEPEND}
+	plugins? ( net-analyzer/nagios-plugins )
+	classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="|| ( mysql postgres )"
+
+want_apache2
+
+pkg_setup() {
+	enewgroup icinga
+	enewgroup icingacmd
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd"
+}
+
+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
+	)
+	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
+
+	if use mysql ; then
+		docinto schema
+		newdoc "${WORKDIR}"/icinga2-${PV}/components/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}/components/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/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	#remove dirs that shouldn't be installed
+	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 /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of /var/lib/icinga2"
+}
+
+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"
+}