BUP!

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

3 files changed, 43 insertions, 30 deletions

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index aaae94a0a29b..44abaf231507 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.1 2014/06/15 19:49:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.2 2014/06/16 15:35:03 prometheanfire Exp $
+
+*icinga2-2.0.0 (16 Jun 2014)
+
+  16 Jun 2014; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.0.0.ebuild,
+  -icinga2-2.0.0_beta2.ebuild:
+  BUP!
 
 *icinga2-2.0.0_beta2 (15 Jun 2014)
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index e72ae8a28707..f0a2658d54a4 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST v2.0.0-beta2.tar.gz 564751 SHA256 5c95a2c1824e54d5ba61f214fbefda9154db62799734b098ea85e56cf2319ba3 SHA512 c95e3958191f1ee8745ad2eedc8c856e301af8c005f73c9b1abb2354897503c69f9bdda3b69575ba0dfa08c4510dffdb620c34f1046ab0475615ff8cfb244205 WHIRLPOOL d34adc40ba6c0a912e12692c8609d278754efdf5fba7be0b1e7b43c44c385b42e889ee4b3ead0d898b494b6c4c6be20e831a22ced37558d4116c8f1afc41ff1f
-EBUILD icinga2-2.0.0_beta2.ebuild 3126 SHA256 25b8547ea4050dbfa00cc12c44a1ef18c8773edef9e4d85cf0c3277eabb5062c SHA512 5ad3d90817f58baeb76168b9399b128bfed041de7dab1e85608bc77bf9a33c3dcfc74037f02c54ccbf328a50a67e641883e765d141319eea366a5cbeefd510f4 WHIRLPOOL e11a8003df97e4b72ab6c0ba55cf31efd33feb0481c5de6e16d87baf1c53720f3100633e9716cd20e5f9c0b2be99b97783e611521ea30c8488a9a113990008f3
-MISC ChangeLog 377 SHA256 9dba42756b4f3e72a79350b37c91649a1b7273a258256e8c3cf01af7afc120f8 SHA512 08d2f9f1c7316f308a34389af537e80e79f375472318839597d89b1364dd2c3ec3d6a4568fe9d71f61a951d9c2b2213e1ca5d0e7dc0842154304ba9fd195af1b WHIRLPOOL 8c689292ee79ddda66eee8d185bb48a9272a3867f46c0fd74df7253e21f6df1f4584ec9a3769281a34bc113c42c7d445da94605e54715d67b1fc97dde1ef06b1
+DIST icinga2-2.0.0.tar.gz 533346 SHA256 c8a0717b0726d084fc93f695e51f35c80afb853a184a9bae8927d95830ef6e1a SHA512 b28658c29fd247e4023b82447168276fbe1402cf84eaca8b90420add56db16e77c74849adf1c2e72cd0484741abc7b9c438927bae9e2932711093771ef3a593d WHIRLPOOL 1c9c349dcc1778cdb4484ab3b65970790316b321d01600cf67d0623cbb08d8385f4a31a5a4b3a3d0a2a83d2c3ec154e4513273def3f26aff82b919dd93fd089e
+EBUILD icinga2-2.0.0.ebuild 3168 SHA256 f33c80f93cd909e753a5f5753c4f54708bf7fe030067e92c1bbde29cc75471bc SHA512 9616c6f4a6f8afd0d1b69b0d372279306beaa717396cf5a4931b58a72c0cc8dcd7a898268685df8de09a5ac78e301fb3ec42b99d84f90fc61a2a8e232c715b8d WHIRLPOOL 58ac0fbcdb357d0c19fe430d710970046919c9ac85b74c5db35d3595a3685b61e49275e1faa0e64ddf6e40cf2efa4033fd51b2b7cfaf01f13146ffa87588c791
+MISC ChangeLog 526 SHA256 f1e6d838402c5b05be1c8ffae862704a12fe75a34f9ac493dfd55163d34574a3 SHA512 a224e1ea71ba776682ce84c9ff264423ea18977c44aec1b947a39e3860f3ab841efcfa4584072b3c3c9d07343e035d305562b74a5e3e3e298ed7f453df8e666b WHIRLPOOL 2419f75861244d40fa6a4ea40a50c0103c7beac037f5210283425d16e1ef20e48de6548d5483d549e62991ab38117de4e045f62137584b066a4890345343f438
 MISC metadata.xml 484 SHA256 b8c4326958ead6f6bdab93edda5d82a63e0608d93a14bcc975bfaa1d26121253 SHA512 124d4a6c2770ed91b9d8f5037d8bb350b26a2cbdf814331564303ca8aec347152eb584cc2214fa54747f85c270e5832c0b5cb431ef9e7e4b9341c865b1d5e7fc WHIRLPOOL d82ec9268326bd65c3912a9ef730d33c189af7858d3a760c2fcc188d855e013aa741f1b4ccc3fb829d7ea2ecfb670c1ddd4633231a23e891a32eb62ff003ece3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTnfjoAAoJECRx6z5ArFrDLzgQAN1W2XuyB/v5LTRWsT8ovCz1
-PHbdtSS56TCRK95ffGF1W427k39fRp2b5m23ILBu33HdO6yv6StD6kg6KbpEvkoX
-rBoAVAzA4Yb5HeQOBi0rMKo/YokatCiKTcZ3kg/VjekJOotVrTz6GJfg2GTxGAhi
-Uencm+JDsa5+NuXLQSYR+2BwwjrCOA+Nkf4KyQaHNm6SriEDBEfdYYNgbgQG1JXn
-zSi0J7VbFYKPDv2lizJ+YIFBQ3R+J1QTNiyHcaOMSHvddLK37/epsS/dqzUrkc+V
-Uye3+sCW6lcwFkjHBbXh4CjTmtmwGMjy3d5W1NzCnViH5KGmbp5lFhCgzzCtdT/V
-eFupSLORbzgvSpWuYp5KOLpe1c5i0stJdVvL29L0dHVr5XkhvmiKUvewDsNCXRRn
-BQt9URdQC6NRbwTFrsC1TFoNMJsydwViGRhrvojpaY8wd1J7OYBbeCE1oYh1dGPt
-4ksS7ocbovmkeBI1QOxFbiyDZ5dPVmagcqgIu93vtvLbMp+Qwh9yIgEpw2vdE6z0
-B4nGPz0IDu73Pzz5v96F+yIyBRwmHySG7hfXjWW0GUhAR7HpdTGZTZGF+EeJt2f0
-WUC5yiad0K1IbAoDKjJwrwNmxCiLQ4M7rwswFdnEswJZbiJ+EPnxGJf2V2jOgIxJ
-sHoVpooaFDV3dULDtgLj
-=jPfB
+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
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/icinga2-2.0.0_beta2.ebuild b/net-analyzer/icinga2/icinga2-2.0.0.ebuild
index d73af1f395dd..f0ff4f6984d7 100644
--- a/net-analyzer/icinga2/icinga2-2.0.0_beta2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.0.0.ebuild
@@ -1,15 +1,15 @@
 # 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.0_beta2.ebuild,v 1.1 2014/06/15 19:49:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.0.0.ebuild,v 1.1 2014/06/16 15:35:03 prometheanfire Exp $
 
 EAPI=5
-inherit depend.apache eutils cmake-utils toolchain-funcs user versionator
+inherit depend.apache eutils cmake-utils toolchain-funcs user versionator systemd
 
-MY_PV=$(replace_version_separator 3 '-')
 DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils. Reloaded"
 HOMEPAGE="http://icinga.org/icinga2"
-SRC_URI="http://github.com/Icinga/icinga2/archive/v${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
+#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"
@@ -40,9 +40,18 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=ON
+		-DCMAKE_BUILD_TYPE=None
+		-DCMAKE_INSTALL_PREFIX=/usr
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
+		-DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+		-DICINGA2_USER=icinga
+		-DICINGA2_GROUP=icingacmd
+		-DICINGA2_COMMAND_USER=icinga
+		-DICINGA2_COMMAND_GROUP=icingacmd
 	)
+#		-DUSE_SYSTEMD=ON
 
 	cmake-utils_src_configure
 }
@@ -56,7 +65,7 @@ src_install() {
 		emake DESTDIR="${D}" install
 	#fi
 
-	cd "${WORKDIR}"/icinga2-${MY_PV}
+	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 \
@@ -71,16 +80,14 @@ src_install() {
 
 	if use mysql ; then
 		docinto schema
-		newdoc "${WORKDIR}"/icinga2-${MY_PV}/components/db_ido_mysql/schema/mysql.sql mysql.sql
+		newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/mysql.sql mysql.sql
 		docinto schema/upgrade
-		#newdoc "${WORKDIR}"/icinga2-${MY_PV}/components/db_ido_mysql/schema/upgrade/${PV}.sql mysql-upgrade-1.12.0.sql
-		newdoc "${WORKDIR}"/icinga2-${MY_PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
+		#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-${MY_PV}/components/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+		newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/pgsql.sql pgsql.sql
 		docinto schema/upgrade
-		newdoc "${WORKDIR}"/icinga2-${MY_PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-		#newdoc "${WORKDIR}"/icinga2-${MY_PV}/components/db_ido_pgsql/schema/upgrade/${PV}.sql pgsql-upgrade-1.12.0.sql
+		#newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
 	fi
 
 	keepdir /etc/icinga2