another bump from feandil

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

5 files changed, 86 insertions, 26 deletions

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 1ba0c2627546..5f1946c2e7ca 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.8 2014/08/30 23:38:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.9 2014/09/01 21:03:51 prometheanfire Exp $
+
+*icinga2-2.1.0-r3 (01 Sep 2014)
+
+  01 Sep 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +files/icinga2-2.1.0-create_var_cache.patch, +icinga2-2.1.0-r3.ebuild,
+  -icinga2-2.1.0-r2.ebuild, metadata.xml:
+  another bump from feandil
 
 *icinga2-2.1.0-r2 (30 Aug 2014)
 
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 755bc6d96f3b..8b0aad9ae281 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX icinga2-2.1.0-create_var_cache.patch 1191 SHA256 350095704b964473a5584d4dc50f043bb075c5a48bf7a12257ba2dfd778b99dc SHA512 803d6b3ec9b23be3934d022d8c2c3c97c1dfb8d8b0786ee979049df205faffd7001258620b852b56dc1dc06a3c9ce45cc8070007137c92e273d25b1ff8c6f80c WHIRLPOOL 6dce723e209307099fab40e028d8062a56ab94d7c688e814fd3fea8179e824a5f165b0277b318f12de8a627313be0b23ad23ee5272c4f7bbdf8184e926992730
 DIST icinga2-2.0.2.tar.gz 546107 SHA256 b21c4c4bc2152ed3850d34ef3eed03588e508a9080c10f15750e9a115d856ced SHA512 2d754f605dafbcf0290566241d776c20269f13f243ba509ddf33cf86c012e633c78beb226b904b487c6180a1fe6c5e50816e33960f1cba7c3df901649e4f0c7d WHIRLPOOL 0a5e61343a528fd88828a5b1acd2e704554af71eb750cc52dd92fd7c4cc390a752943041a6723d23d5c79dc23b3bcdcb2eeb42047ba226e4e2c905589502b60c
 DIST icinga2-2.1.0.tar.gz 567861 SHA256 6aad43c69385db3463ca0a3f14f7373d03a967451eb976a89955d1c99f9300e6 SHA512 683bd8944eced5036b328ca7f942b43620ba9d2e1ae2c7ad067416b778c693e97d95e082240cb293826b4e6241de9fd2fe97afacd385c5f578e47b821d358a3d WHIRLPOOL f10844592c0ebc41e15346f49ef3760d69980a8b742cae3c2d5b21f5075e2959c60499890d29d7e4893e740c133f09a5202565b6a91223cabaedc6afe88d49cb
 EBUILD icinga2-2.0.2.ebuild 3316 SHA256 c438bf7caf9e3ba325f6e9fade01b5d66224284a31d2c17cfdd5dde536c3e40c SHA512 0abc1c4fe803415b8df6bdc2fe4ed165aabe5d8ed959d9af6f684a38ebaf80157ed647a225ca03ede26313c62efa539a27a9198f4bf76d1c0deba448050cfdc6 WHIRLPOOL ab600c5dc261616faac3fcf1fd9ceac7c0055ccb7a393e16fdc615e9b437cb3a73b66a3fce54dddff0a41e394686152dd2f75d9512cd1a03652638377209e835
-EBUILD icinga2-2.1.0-r2.ebuild 3399 SHA256 fab29952b44fa5b5dfc2ed8b095a65b93f465c9b800a5571b60c61b340f99389 SHA512 3c8ec56de5faecdf3be365c8b357b315102fcbf48e0039e4ecfadfc8a8ff42151fd4be0e7f62821fa3c0de7b1f719c14d21e3498199e00d74279efd3ab5a20bd WHIRLPOOL bbe1895e35a155ca8e8f672fc185d90bb6724f66d0dcc6e3d75cabdea1b4ec6cec2f7a148f8fd334bbcf620445bc0d87b26e0de980da6bf04dfffa71690f4fea
-MISC ChangeLog 1352 SHA256 95af4f6b6d3e4359b7aea7282911432e1f62a54bcae425ecc1195197d0323eea SHA512 97f82dff3acc4cc308ffcf80754dfebf151d79bec1ab6454dcf710df856915f7b4261843b746dd20e8c342e686b270aaf89709eb47da7a9f11bf32fbf052bc24 WHIRLPOOL 91042ff2f0b5e514400fed65800f8eb249bf1188f40008d7758da406eb6e23641d3b1a0a55f89059252cbe9943191c2f03e67da59864050182025e84d4f10383
-MISC metadata.xml 482 SHA256 2ea9b8c09d267b7c22857decedcd03d68f5db8ccc63f58a0433ea7a1ec574d0d SHA512 70c4618107e6f2bdde9875134d1910868b74ab5e513154d82bf87221dea09ef9cb97b74e1b8515a0ffca6ccf82f45d4738cbe1f4479966cc4db8a053d5a2d592 WHIRLPOOL 77e5f0b6cf81ae193fa6e1c43695891309c7296733de79a2d64b7d6b1ba00e68690a726cc790ff0a9492a6e89297dba2bd7faa2f85f23f44ace9c4a437ed2b75
+EBUILD icinga2-2.1.0-r3.ebuild 4088 SHA256 e32ce41a8f7dc34547add00fc3a19b955ed61c12c318e59941789f1b5760aaf5 SHA512 1f23d0f0c8459a7b1d5425d87a7a7196d2e9f84da29c2dd4c68a915c52c04054a5d358815ef6db239d5c3bf99ce03458e6bb2ad66b8d5a9bbb55b771b7256c0e WHIRLPOOL 0ad132d651cdc1855febf528a38af55ee94671951404283d183a3f1380d0dfcd4cba064fbd7774695316b38ff0d17ceed18c3c523c5321aef8532bac094e4721
+MISC ChangeLog 1586 SHA256 25926d2a9c056cb8f77760877e5b58567994a4f9c7ee7f34c42d6927a687f56a SHA512 f845893807295bdae22963daefb60e088358614da4ae07e1a5cf89ac582ab104918d99227c76a501b3cb62beb778e0c9278836f341dd78d07024ba1756b8a0f9 WHIRLPOOL 938559c5155aa13da867e8fcf3f6d355e72fa2fe819d9d6f2c6ff60714ff7ec9f886b05fc09135ea78ba45d6f542fff4cc9228f970dd2ddd0b1f9da75991657f
+MISC metadata.xml 564 SHA256 daa07d6dcd6d70107892b050d674f083db74476ffa98623ebbe5d22fe752fe93 SHA512 635f538b78ad2e2b18c49959c7b2b7c06582270738522f10bf7bcac0820fd0222761af4e80ab6756d0e98d11fd6a66763cd9cbc1ccd261694d2de25d68817f8f WHIRLPOOL 513a2dd6f6d39994720e9f62275f840e5efedd77115d033b0957de3b5d21b82efb315a8e3efd386a409aeee254ec05f7aa0fff2ec14888a5c45a2533b3e15c7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUAmBrAAoJECRx6z5ArFrDqmsP/As6zCUXFNjA3rl4+2cTpHCw
-NhYnhdcsBdq2fLhdR9EOSYDNw+UCXIC6/Vhu1NBZgySfV5Vm9G5IDrBKi5NbaspI
-Gz5xiUP2l/Po0pXuYsbYz04oSitfTrCl9eIpga2jcstBR9auI7HCMEB744uf51if
-EbEfrfid0XAb7noULSiHOf6dNszETvl4nefbm29BQw0zpQrcGxPbPvVL/DohC2un
-CPO1sxrk4qd8hljhmIcT83O/yF2khiYvCUtfKWRqpQEvt6YaxKFgIQEZvy3wq5/C
-V2sba+3s38S2kfeSljajVxC4OcGgZ3dm11ytZhNIsna20gB3002PE/D7A7YuXB8Y
-i9dtcVNkYoRW++/YZ+TvsfCVzqON20w0ncYa3e/tWh/ozEv3+9SCAub6gb3C6gui
-nP/G7zqJVLBnR1huyEafEPC3AcFJ8jAS2k4g1lsyRvhLCsw/midP479HDrScYZmT
-mkhC/dXEjbBE0/WMJdmcxTI/VwR95rSeodTiYcWlgtq2tKTt7btpsG7ZkIlgUvnB
-Oy47L5irkI03m+j8Jlx1k3D6RKR+ol5KwpHZsxyXPenwO2OYbA1U2izEDXDsiULW
-+9mWdoIi6k3Ut806RUVLpC1eRSSsqzkzXiZpuo7nfTgM9ClUoIfv77+wUf7BcdrK
-u2eJeuQ4EzfSbgfLMMKV
-=PHNQ
+iQIcBAEBCAAGBQJUBN9JAAoJECRx6z5ArFrDbSsP+gOy5Z2+x9GbD5mw61tz2pNS
+iZ3yMHAKSRUXLTh7rxIlV5i3oCiOFszVLd1OhsgByIt8MID6GBXE5u8dVqMmrQvw
+rXyaQgP6gNMPLb9nHWiCKY6cJiAPKBogmJeunGjQ/flV91bwF2W7g2tXa/SRc9lV
+aMmQGp6+xD6qpYbR4bt/cAjXo3DekoA9B2z9hLopJpILXktGtYGLOs25LWv5u42e
+LWLUut2ISqpOJ2kzFSy1OWKw6Lp2BzFkqMKGeCM1O2T2eyG/GNwkgiQ76DDhCHiG
+INHGmhaEewMesaa2T9yiadaL5EwXxcf8i2BF0HvtePiXPEgpnWEWtk86ZH42AQ7m
+TrjUHc88u4ZuZX0pRrIwjtdAXUlOjl/La+kvYmd+NyiK9UAoBNYj7Eg89VOrNmRv
+wGXTvg9JGAUBeAe5ZXc/6NXS0wtTRQuVDUYY8PmM+rmbKHlQZW/WfINM8/MpseNl
+gxiKS6cTA+a+FfzPRvq+CX7+vXTyzMj4/900F149aAXJ0p5edZWtw3sbDj/E+ClX
+p8zD2zq7DnqpCFhvX+TbeQotAlnhX1zZWmj6mYNzNse9jx7jkyRHVYqbRZBEN1SU
+LOHP+2LGe2VDAKwrLlrTWfch7I920I16kNu3PnkhPMGNMAFBE7c9hxrra0PN2W3W
+b1JqFGLTCkQ4tH4yHjdy
+=Xlqx
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch b/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch
new file mode 100644
index 000000000000..e4bee6c5656d
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch
@@ -0,0 +1,28 @@
+--- a/etc/initsystem/icinga2-prepare-dirs
++++ b/etc/initsystem/icinga2-prepare-dirs
+@@ -31,3 +31,7 @@
+ mkdir -p $ICINGA2_RUN_DIR/icinga2/cmd
+ chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_RUN_DIR/icinga2/cmd
+ chmod 2750 $ICINGA2_RUN_DIR/icinga2/cmd
++
++mkdir -p $ICINGA2_STATE_DIR/cache/icinga2
++chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_STATE_DIR/cache/icinga2
++chmod 750 $ICINGA2_STATE_DIR/cache/icinga2
+--- a/etc/initsystem/icinga2.init.d.cmake
++++ b/etc/initsystem/icinga2.init.d.cmake
+@@ -46,7 +46,6 @@
+ # Start Icinga 2
+ start() {
+ 	printf "Starting Icinga 2: "
+-	@CMAKE_INSTALL_FULL_SBINDIR@/icinga2-prepare-dirs $SYSCONFIGFILE
+ 
+ 	if ! $DAEMON -c $ICINGA2_CONFIG_FILE -d -e $ICINGA2_ERROR_LOG -u $ICINGA2_USER -g $ICINGA2_GROUP > $ICINGA2_STARTUP_LOG 2>&1; then
+ 		echo "Error starting Icinga. Check '$ICINGA2_STARTUP_LOG' for details."
+@@ -105,6 +106,7 @@
+ # Check the Icinga 2 configuration
+ checkconfig() {
+ 	printf "Checking configuration: "
++	@CMAKE_INSTALL_FULL_SBINDIR@/icinga2-prepare-dirs $SYSCONFIGFILE
+ 
+ 	if ! $DAEMON -c $ICINGA2_CONFIG_FILE -C -u $ICINGA2_USER -g $ICINGA2_GROUP > $ICINGA2_STARTUP_LOG 2>&1; then
+                 if [ "x$1" = "x" ]; then
diff --git a/net-analyzer/icinga2/icinga2-2.1.0-r2.ebuild b/net-analyzer/icinga2/icinga2-2.1.0-r3.ebuild
index 8922bcc08a6c..2dc126b5c116 100644
--- a/net-analyzer/icinga2/icinga2-2.1.0-r2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.1.0-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0-r2.ebuild,v 1.1 2014/08/30 23:38:04 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.1.0-r3.ebuild,v 1.1 2014/09/01 21:03:51 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,14 +15,14 @@ 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 +plugins"
+IUSE="+mysql postgres classicui nano-syntax +plugins +vim-syntax"
 
 DEPEND="dev-util/cmake
 		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-libs/openssl
-		dev-libs/boost
+		>=dev-libs/boost-1.41
 		sys-devel/bison
-		sys-devel/flex
+		>=sys-devel/flex-2.5.35
 		mysql? ( virtual/mysql )
 		postgres? ( dev-db/postgresql-base )"
 
@@ -40,6 +40,11 @@ pkg_setup() {
 	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
@@ -92,17 +97,35 @@ src_install() {
 	fi
 
 	keepdir /etc/icinga2
-	keepdir /var/lib/icinga
-	keepdir /var/lib/icinga/archives
-	keepdir /var/lib/icinga/rw
-	keepdir /var/lib/icinga/spool/checkresults
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	keepdir /var/lib/icinga2/api/log
+	keepdir /var/spool/icinga2/perfdata
 
 	#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 /etc/icinga2 || die "Failed chown of /etc/icinga2"
 	fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of /var/lib/icinga2"
+	fowners icinga:icinga /var/spool/icinga2 || die "Failed chown of /var/spool/icinga2"
+	fowners icinga:icingacmd /var/log/icinga2 || die "Failed chown of /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() {
diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 24cd8abd2bc0..c155a88f8f7a 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -10,6 +10,7 @@ Distributed, general purpose, network monitoring engine.
 </longdescription>
 	<use>
 		<flag name="classicui">Adds support for the old interface</flag>
+		<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>
 	</use>
 </pkgmetadata>