bup

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

3 files changed, 180 insertions, 15 deletions

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index d524990e1ec3..f60b5c28e987 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.34 2015/03/27 19:47:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.35 2015/04/22 21:24:15 prometheanfire Exp $
+
+*icinga2-2.3.4 (22 Apr 2015)
+
+  22 Apr 2015; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.3.4.ebuild:
+  bup
 
 *icinga2-2.3.3 (27 Mar 2015)
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index cb3b3c505994..fabe56312bea 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -4,24 +4,26 @@ Hash: SHA256
 AUX icinga2.confd 135 SHA256 ba821687a15008781a9e5953e66b4290891af4f15736902cb2e78cc8b95ae568 SHA512 f194b7a7d202bc5b8a611722b21a5cf8cf91afda15dc1b1b007050b34fbd7462952268fcb6eddd94e05d474364e7873ae691ccf0049b79c89e48f780b03b0520 WHIRLPOOL baa19b2a4bb4361b1ad093ec019b199fb41a64825cb434a9e2e48ff5eb14e82bf3a09fa0167afa86140a774c6f8fa034f2049881f7b84874f5f24702cc09c97e
 AUX icinga2.initd 2371 SHA256 eb9ffcd27504764a694eddd8499ad0f32e084114ca7da74cd24ed924d8100be1 SHA512 305526e0392fb163baa237a24cfc3f8c79954b78f1c00ba6eac97c54b4d9ab38dc8d312f04d8f2e550009263524af80a4ccb98f970dc31e0f00e2606c9ca2332 WHIRLPOOL c83ba02aaba5aaa5a4eb942d9bd51369a1d546be73a88b7f2e35a0e45945ca3c6e9df94704b1a6b3dce391abca9881a28b29ccec2e0db9f0b3acbb812ea429f4
 DIST icinga2-2.3.3.tar.gz 777211 SHA256 c2310acd872adc027b050a55ed98e9891cc3ff19b2c431c8290d005d03a04b1a SHA512 4c483123489ed28f1f8f96b05d200bb6518eb99532c97d8197a76ddfd55f59aa41d0174a20735f5191db65ad6829072698d5fe6caf95e5e364e1d2d7bafaae32 WHIRLPOOL cfa4f5ea6759300af08a9fd7b5ce33285f4332c367fbf52b3e1728519ee6c97d67cd890d31cac927513d81048aeb802acfe681c29ee07ba8fbd3ceec16767aab
+DIST icinga2-2.3.4.tar.gz 782506 SHA256 3a6d23214c90c1e308df784254659c51962f4c49b13093aff2095e1dfa06cdaa SHA512 dfd12f23561610a4cbe8798c73125a15071f1bcbb22873d06b4e849b94e51383130b3707410646b31f9b0eaa6b2c348e477f393c645c95f26ea53ccfdbc9f4ea WHIRLPOOL 5d9a0fcd5f3e9cf2233f7ef2e064662b07bb14891ec95ce4e291f050089763a5d9b40d5dde238cc9c1a907a91cdc3df56795c8c843aaa91086c5522e973ad432
 EBUILD icinga2-2.3.3.ebuild 4213 SHA256 a0b54152908595fca2174a6134b80158f83651a3d3ab19c9c7473e7ee6914152 SHA512 75dc7e071fad3d1013a2ca0b5444b899df0b41a2f51f0ad6553d0d2027dbbd7ce212e4a8970062c8a28683c59ace9ea19d8666cf2486b4985b9674eb5a53f247 WHIRLPOOL f9a2e6dd653fe3ca7667ad21a3b35d8ec3e32b861757a9bfafe2c634c17b27a3a86309cbba9dc9e0754b0183ee8bde600e9e1a7f6e84546da2e2c1669aa2564b
+EBUILD icinga2-2.3.4.ebuild 4243 SHA256 f60b44c46b439709654f73a7bdaf3c5e4bdbf53281d70b65379d3aa4addf8acc SHA512 21092f7a636df8cc1f5b355dd881a4b479c55539d15d14a49f261fd9db6eb5d2bb3cabcab017f932b96fcf55181e48f4927d95f444e4fa9265318a6ac9589bfc WHIRLPOOL 416ea88c3aa4e7e4ce6929e77efe9a39f24b9b374d1e166d623eb206b1506d3fab4f66a84e58c8060b5af98a45180925502293aaf22576dc7f430b67129dffbf
 EBUILD icinga2-9999.ebuild 4201 SHA256 1fcd5a04954257675031b3725532b2fdce6dde00a4c23f04d5538b59c8718e64 SHA512 a88103fe685c2c834e6d0e67ee2b1fa9c7775b4ed46395a0060d9e1fc70b454f83628067e51ff115d39306e914a5395e5fb1741370e69b06cacaecf29f0ea3f3 WHIRLPOOL d992c1c4fd8920a3605b0b04185e5384977eda9d594d39e2fbf574dbca03023660ec98021402758ab54ce1b50c26d41fc5dd73c0ed104d61351bbb40b318a06b
-MISC ChangeLog 5609 SHA256 f413684ed8657ae57d2daa09f35b1d90fe6c00630bcf7f5cc4679edf05064a41 SHA512 83ee749e49168540feb30347860b89879a4b2e5e9ec59c1641f676d8aba5c223fa2049e116ef9c89af837368895a2e218af6aa322b88e43d64acf3ab92bf6bd1 WHIRLPOOL 97fd85423f520a1dfd71ada1a63ccdb8fe00ab55ec86d8eeb187b6cf217671050c3aa68fa4782f5e870523a9ac1eeff88d015872f79ceb7497f6c15bcf015788
+MISC ChangeLog 5726 SHA256 8280e1c634459d373a049ed99dbc2545bf23eb7870e3984fa3c888e915c7bbae SHA512 0abe74936dcaea103c547ad4cc01b3f22a67c8615118cff890b84117973a62bf96f3966df52ced078af3584a06d4891b633c1db2720f75a1d081efc390e8799b WHIRLPOOL 7490ba28f2e5728b577434cae965f9672036e181ac1f6b09b75c587869c5b53bc3947c3774cd465f01b5302c7632e4e0529cd722cf0d7994282c367a126b9ac3
 MISC metadata.xml 460 SHA256 54f38cf1099a4bcab2120d5802f1915549718b4ac2b20b1b0245754919659101 SHA512 c860be59be0782980a7546f1d5e324a33b8310bf6c5e473457bdaa99bbdef52397c05d5f264c77e329ef7b2d1776bd2a027569946d787e04d2aa475b82cc33c6 WHIRLPOOL b37e6784f1fb6d06e357529db586311e745e20513f559864993fd640b9df611af0fb8aff57f4b5164596d949f3e428d400fb0cc789d8c1c0135da37deaabcad4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVFbPgAAoJEGSje+quGaToZf0P/2nsVjUG5DHs5TQB1CFykW/h
-DbYcXbifTrcp2J53mzy29tMnqA5xoM86sgLSfQdvNyVyB5C0bx6ULFMaFFXqsdry
-THo+qu12Rr1CA3sG23tTRhS1FkVUOkvRiwVfx0Kg9ju4MD/6SSMV+g15tgaZGI9G
-otyxclmFGyCDJwArK5tx0a2xgx+eEjh8ePGN81oZH6FjRBpjWoat8PkMvrDftwOj
-2g7alczlrZxqvO3NbX+08wh7EMJ2Xy+I7wr0KOKBtiRmxWmgqqmMOZhf7NKr1p7O
-5Jveztwy8SXHJZejReATp27DmUJSudH9sZp3AR4hfQ9oh+OVG5qBO0XqC+P26++N
-EEEScLY3i4syNsoXHuDc8xg0rH9Dp8hwsVIyKtSllbT9YNCR0wTLe3jn6OnfwlYB
-oTgga0qc7hezOy0ZHWDGvxgw93hZ5+hyrwKTRN1YQXmXJmBwWTH3LKBI3+Isfgf4
-Hl8IcUQS6tCxQsgAPdpSSIGSVBjR5aVtaReRBiz9IBqtmE/Y+wEG/k47vsF+HNUT
-gcPEewaA8lRXwyyQxFXq5RbzZrHLsC9bVr3IWxSy88A6oG0XR0ogYch2rw+pRpFM
-IkWlU2O2Z/PKJV225Ml4YkiWFDAFlfLvx9q7SJGYifgarll4I7/HuPXYC+sm980j
-ku2HGuwjE5zL+OnyXs+y
-=aqrR
+iQIcBAEBCAAGBQJVOBGRAAoJEGSje+quGaTocpYP/0HfMXrnQtVMUXII5sQ3Ph2o
+zLJCFBg18BbA3vYlcyk2tN3CqNG5zDrtkPvLUCbZsN4++Vx7T9X8msaQKxzBT/y1
+gxB2RgCdgCZCiNTapELXXgw7aKCHCssQLpewnBrGmZSaur5Ho6LafNovCUMDPkl4
+2EXM/IIIX+E5UwRjiOealI5Hfjg7RMIKKTfN9TxgHFjlsXSv20HeaPFRKYmaTKEW
+fleRmhbYGUKnfd3sE/CoJPfrFgJK91ZRZOYCMe3VdPWW2KOK72GNXVOHoObwLQUD
+zjY+wAtGS9slCuwMB2ym7jx5x8UE5+/D/64xhP4SXSBvx3wJvfncp9Us7GwM0Ucw
+s4JKfUXpR8ehJGr/i2GeXuou9ol76TK1S8jt8hkBIBJPOg/Uuy0Ue9XxarRBCDi3
+VJK+7Chpdm7/moSL0gQxU1JciB5LJ8KQ1/hWbNAHcMfQbDrL+YLTCOIV3f25+/ZR
+z2bpPPR9i9LDlfJVZRHsS0NZGl7oRvlCf6SjzmdALhhxTQy/6U0P3wMbFQkzi4rJ
+1WHd455o5GX6rR73nh+k3bBB2jel7OMfG3tVrLb14/5xr7R02MOtGTUP5uKTUsZz
+nmdecLloPvOsJ6fvVbdP/SNrgeT7VHterk5ITZyowInzy6cSxS+rCJYd36+4CWIn
+mhMB09YL39ZRnosM4KlY
+=eOWG
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/icinga2-2.3.4.ebuild b/net-analyzer/icinga2/icinga2-2.3.4.ebuild
new file mode 100644
index 000000000000..847468db3cfd
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.3.4.ebuild
@@ -0,0 +1,158 @@
+# 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.3.4.ebuild,v 1.1 2015/04/22 21:24:15 prometheanfire Exp $
+
+EAPI=5
+inherit cmake-utils depend.apache eutils systemd toolchain-funcs user versionator
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+SRC_URI="http://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres classicui minimal 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="!minimal? ( || ( 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=(
+		-DICINGA2_UNITY_BUILD=FALSE
+		-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:icinga /var/spool/icinga2/perfdata
+	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"
+}