Version bump, bug 424793 and some improvements part #1

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 128 insertions, 25 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index 15be45ca1eae..615ca0922e6d 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.42 2012/06/25 19:45:21 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.43 2012/07/22 21:45:07 idl0r Exp $
+
+*pnp4nagios-0.6.18 (22 Jul 2012)
+
+  22 Jul 2012; Christian Ruppert <idl0r@gentoo.org> +pnp4nagios-0.6.18.ebuild,
+  +files/npcd.initd:
+  Version bump, bug 424793 and some improvements part #1
 
 *pnp4nagios-0.6.14-r1 (25 Jun 2012)
 
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index c645ce2e6997..06526f54e7d5 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,29 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 98_pnp4nagios.conf 1025 RMD160 13ada7bbf3ad9b14bccf0d9cd0f0f0a72e4ea807 SHA1 6e080ddf657bccb1beeceb7a80222f5c06c41eb6 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f
-AUX npcd 759 RMD160 bcaddc280bb45b05241a3298c502a74aa5fe3a99 SHA1 7f17144ac16188c57436a19890cc5e95149bfc09 SHA256 ea4c71df5c0a6bb410c44b08fc5c5428a3adf8c5daa7a12fe1068eaf71613be5
-AUX pnp4nagios-0.6.14-makefile.patch 1057 RMD160 d119342770fcd3a5833acc3e13473cb5880dace4 SHA1 d7ff0eb2fe80b3ffea7ac81b8992fa2a141f23ca SHA256 71fac5f40ba133258754bdd42d503024a7a64da7ae37b96bf6ed20a3c367f2ef
-AUX pnp4nagios-0.6.7-makefile.patch 1075 RMD160 861b355e5d198982616a1ddd66626c89f18dca73 SHA1 162e8ac885e14a7e54af47ca4359f641a32986c4 SHA256 1cf3b39b0dac378a178f5a02693a6925cbeab0bb51f014115af01655f2fcd80a
-DIST pnp4nagios-0.6.14.tar.gz 2840339 RMD160 9f7cccd1bc8de468d6d90bd6e4d033e5279524d1 SHA1 8c8214472bd6f4f750a63787450834ccb7102ff3 SHA256 0cce6870f96487446fac3cfe4c36cb6cacf5aec5aafbb9d2808c8736bac09e7c
-EBUILD pnp4nagios-0.6.14-r1.ebuild 1602 RMD160 4a2190c70193959e2db3ef4b9b0b6858a5358ec9 SHA1 3112f072b421f820580db85b9e4354158664d7a5 SHA256 593c6e6bc20703491bd912e4e43c5aaf3d746cc2eaa278350a71474e40d1b091
-EBUILD pnp4nagios-0.6.14.ebuild 1666 RMD160 7f326b5c8a4b5e601bb0f90bffdadf3681778dea SHA1 ee6b76869894441750fb138a449f3cce1f98ee6b SHA256 2f5f5bd637cf3914263c792cac755689e44d1a941998c8d948a14250ddc5d8e6
-MISC ChangeLog 6752 RMD160 97a9fc2ce2645e137aa6d2a789cae0e805406468 SHA1 c1846d51cd5dfbe64e43ea82dffc57ec935c6773 SHA256 44877889590a5558a597ec8a78c5fb0ec8aa4468c69ec356768ca2a18e365212
-MISC metadata.xml 160 RMD160 2738573ec519cbef4b293bc132f7dd9d02291137 SHA1 29b8b234e0f3a475b50bd4df1ef8b4e5749823ce SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b
+AUX 98_pnp4nagios.conf 1025 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f SHA512 ac7f4cd92951e856c5af44eb8cfa0c75a867364b6d3d76ed5fb2479631f9ae20587f2d0a09ff4810602665558210232ab41ce6abf53859884a956826cbb5bfc2 WHIRLPOOL d28394eb0f63bd02f71c3ddd6c651f06c69354e2c9fd6fbd0bf65433d4721087078d06aa93df795c80f43a422b35f563b763ed7895891c603d6abbf359a197b1
+AUX npcd 759 SHA256 ea4c71df5c0a6bb410c44b08fc5c5428a3adf8c5daa7a12fe1068eaf71613be5 SHA512 54ccf3da9831b407d7a6b21d3409f7a8c854a32ec6eeda6036997059551bcec52e01b2b63a59e5269fef00c1c859dc856c4c6feb2323ff7fb328dd546c576a80 WHIRLPOOL 4e79bc6ee46a3aad0724488f4fa364b2e6916e30065ff8aed834c2e38929d6fd363210870fb3e4868ee65b0e7073b0d736c954f76415eec37aaa4efe62738454
+AUX npcd.initd 477 SHA256 eb1d5bdf589867136aaefa2f47bd808ef41109860d07d3862fd308585b6d7cff SHA512 c7c0ad6a94820f7327561e779968dc73104bf104bfc3077e952866522e89e7db69c2e289c7e4d61fce978416ef1a8e6d10e3f997fb498ce2157a3c23a869da4d WHIRLPOOL 7ff2db763dc3ee6cf24b0d720e1dd58235681ee1580d44aebbac406631c7c22366d871937eda7d64b4f07448fc28737650e42904aa69a687b7dbf0ab7a0672ab
+AUX pnp4nagios-0.6.14-makefile.patch 1057 SHA256 71fac5f40ba133258754bdd42d503024a7a64da7ae37b96bf6ed20a3c367f2ef SHA512 a67e4b66b0f24db25f9b67d982d99a90c20ad229d404537c9963b2e9f1c5df39a46faa34ecdeb1a9e69b46efd96104d97a39a7e326a01d1c2d09dcc149171602 WHIRLPOOL 7e6725dfef952a97f5d682af955560c88895ae71e5aae9a3bb4842b3696d2f6009e6239c0860991d86fe68d64b4bf7c1e668a5059751cbba4b33850f2bc7584f
+AUX pnp4nagios-0.6.7-makefile.patch 1075 SHA256 1cf3b39b0dac378a178f5a02693a6925cbeab0bb51f014115af01655f2fcd80a SHA512 e023d443955fa69527190b2111d336eac4546bd791064f8fa87f20f655f5ec31b8290742157ef30a1ee4de5e9852a606d542f0e12212b3708f123566178824bc WHIRLPOOL 2db4ed2e8cc563672410617881c7b3292158e71e57b6dc9f9f854522050a459d371d3d398da1a8585c42537614eb54cb7154604f038ed6b70bf96c1d43245abc
+DIST pnp4nagios-0.6.14.tar.gz 2840339 SHA256 0cce6870f96487446fac3cfe4c36cb6cacf5aec5aafbb9d2808c8736bac09e7c SHA512 bcc8a6d2c39ce1b068a3755a7fa921f6238c7e626beb20a51da68fcad337ac883d0a45e1d5fc5ff57f3a01afabe8e841b956dad922662659a6495f51ba8625ae WHIRLPOOL fc4b75e49c6e600cb4e9f68d21d8c56af1204264919e4b5afbb2b8ef424e4bc045e5856f1342a2f88f0069e8d85393514854b13f9db5fbb712a0827c091af589
+DIST pnp4nagios-0.6.18.tar.gz 3021603 SHA256 51e385204c346cf9427ffb964f74df21a05f21dd99a95a15a520b645b6ec579e SHA512 ea9afdb61f825110a560e7be1086621a86d4e3ba4425b13549cd2819f6becf6b83919f862814b4038586383e9198502c8511c01ae31dd591d0be389ee1723865 WHIRLPOOL f9101875e8ff7cffd14dbc69dbf18b43d4ca958d857530d14ec25a8fbccacfd592b661d8ada0ad3fcb6b1538ec1049a1c5edffd79a117d919f10e8009e937d8d
+EBUILD pnp4nagios-0.6.14-r1.ebuild 1602 SHA256 593c6e6bc20703491bd912e4e43c5aaf3d746cc2eaa278350a71474e40d1b091 SHA512 f2ad5cd3f834857c30396779154dcd3a5ab98bbcb061ef8c1a6dc65cfb79d83bd92aaea782b4d1eee6c0c95508e1d9e23fe0fe0619493e61ac409a3d8a61f3e5 WHIRLPOOL a9c52928f0f536f1588bd778c4e5a4199af143bc9854272d279fb2af6ac994714f3f79dfa4cee7ff7efd66ab35b1c05683bf7b31896ee479a753e04ec5c56c54
+EBUILD pnp4nagios-0.6.14.ebuild 1666 SHA256 2f5f5bd637cf3914263c792cac755689e44d1a941998c8d948a14250ddc5d8e6 SHA512 7228b21d811a6746fadfba7b336e1101578faa333a5d166dd4c384e234f735f846e0f2ee1d719cc3f14aaae40188f8ed516bfeef2e53b11c687f4849caa19784 WHIRLPOOL 62757afaa6a0e46dae5b44d5142669211c887be59a05cc0a28b2c9e27d0a0608fa844eb6574229ab35867c2a5c9cce503b335bedbb21d62234de64ea3d163c62
+EBUILD pnp4nagios-0.6.18.ebuild 1944 SHA256 cfe7dfbbf2d5f3539e1cd25efc7cf501e6a7d0230eaaaf5fb8a91db8e0a7e579 SHA512 004465a9104ff19d33ec37d3a0ca2e897ff662de72f1e5cdc63a492e31866285a7ec98cab9fa1a3372837d41e7795806c61cd9512c5ff2178ac0af8ea79ac664 WHIRLPOOL 33084b40aa376eb799a8f7bda2079c8278ead25d2f44946a73f0178674ce9a8fd8de0a4d895196e907ca6593de8e2464ed93ed408555fc37944bffce4c0d0a89
+MISC ChangeLog 6935 SHA256 5fca8f2d250090055bbd0c6a9d6f03d1138f320ff9fdec45609b644ab6580672 SHA512 0a69194fda3b7843d1522ba5a184fec5ed4a5c63259d65308f0d669ee01cca73d12082c04d86d8ccff6834a356fab03b56feb564a25ee916a4237ceb842a2ecc WHIRLPOOL 8f464e2bd04fa2341204932818868a9cb5155ffb04c69c87ccda7e07ba5c670cda62b963f0a24d6f30ea319c298ecb53ea0439e6ae33e67ce2216354fc15c0f3
+MISC metadata.xml 160 SHA256 39e232fc7ec88ca0b077cb3950cb39d15cd990842b88d5bfe14f02f34d72f37b SHA512 3ac3a74a7cdf45b14884d967b10e4752f9cb06c579f6d7baf921f9be5450cbe7536c2e5a480ac3c95156eb6abb32e68f74cecc86b9ac0dcc4e0e1b4b255c3e20 WHIRLPOOL f7504ce9e3e8a58d19bba5448305f806c2ae01d0a8d2cf09d6bc6a089a6e1c28a1b12a80bb6020584b5ed21df94e4936b1695a54548704cb8679660b6b807955
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP6L/fAAoJECRx6z5ArFrDni0P/iPGM+Zs5dF8x1Ae5VYR54JH
-xNUUdR+Fz9NoGY4QF8CgV/sG6U21XrD9q34/UH3SZaPNkWV6wh+R/rpYR2XgDIlz
-e4NAF6k3jfczyCjvb1XYnq7p7euIkKCADInnxFKAcRtvMjmSbNXQOFMjJK2wL7WA
-DCUqeuNUBLH/5ECe0L7opqgMx66RUXGDnHlXbymChRb0i0llAAfWW7d42QXu2VcA
-ZAnvEAjn9Pj8300gpCmCPfCUQoLLtxUYIOBzVwuvCRjYgLDD+nhOJGF+7cEmAtBv
-hHGZCRYwhHq+2TwU5YNmazD9HwIGmsDJHsIL5///w9VCpgBy34YZUwBwxzv565kJ
-wyH+Cena8v453+6fICNztOu9GKFKgIT4268YZzYObw44bl1wSwWy6mhEVtoeEyJq
-gx2iY2M+kwsynB/TH8Omzz7rAeBeuCjahky6UX8Ilxb1Np6PW4bODJXSX6pwAwFf
-obJGrDjRk3df0X1sluGmS+dAyueCgTXnWUeWwjPKTlvdgY8pCpoU6OcETLHVWpBo
-/5wo6cHpXdLToOXl8Qbm+DFJbOpkaPY4ihV1c2Xn2zoYVkAuzqn2R0Dj1dWuUEHO
-jpJPBVsBR+K3d/3rFZ182EO7B4Cyj5qdZ369MQv7UXEd4725nbRFS29bzpe//EHf
-3uLdi+TiQyQqRbeK8e1B
-=ZoI8
+iQEcBAEBCAAGBQJQDHRsAAoJEMOx0zmdw4Z1PpEIAK+Qww3ptMbjAqhCNaEvlG5L
+rqZ8JUKvsF+kensHenscYdY566sJfxfBrd3mbU64qnVbNdR5WW9MkhC3m8Ffll7K
+pm335My3TF63CCadsYyZsBvLgyBACV1ljdVL3iPleDZkZhoWajdNKlGD7KkNHVVM
+rLXqlKVx05s78qyJXfR62RtaJwK3cTRxMBxqf9o31AHnBYwUV5XGAhdwhyTFiyi1
+2eXxFQyYWU7RgcJ2sPe80x7uK+kg+JoCVcS//2/FjGbAu6YVUvzTbz+wiky41mE1
+SpTbibbtEmqZY1i7u5rqr39fIk6ZKfMHVmohHMYNBAZH2rpK25r4Fv+v06uO6WA=
+=B8ux
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/pnp4nagios/files/npcd.initd b/net-analyzer/pnp4nagios/files/npcd.initd
new file mode 100644
index 000000000000..abf7aeb7ea76
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/npcd.initd
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/files/npcd.initd,v 1.1 2012/07/22 21:45:07 idl0r Exp $
+
+extra_started_commands="reload"
+
+command="/usr/bin/npcd"
+command_args="-f /etc/pnp/npcd.cfg -d"
+
+depend() {
+	need net
+}
+
+reload() {
+        ebegin "Reloading npcd"
+        kill -HUP `pgrep npcd`
+        eend $? "Failed to reload npcd"
+}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.18.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.18.ebuild
new file mode 100644
index 000000000000..4e4b6e33d646
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.18.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.18.ebuild,v 1.1 2012/07/22 21:45:07 idl0r Exp $
+
+EAPI="4"
+
+inherit depend.apache eutils
+
+DESCRIPTION="A performance data analyzer for nagios"
+HOMEPAGE="http://www.pnp4nagios.org"
+
+SRC_URI="mirror://sourceforge/${PN}/PNP-0.6/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-lang/php[json,simplexml,zlib,xml,filter]
+	>=dev-lang/php-5.3
+	>=net-analyzer/rrdtool-1.2[perl]
+	|| ( net-analyzer/nagios-core net-analyzer/icinga )"
+RDEPEND="${DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-HiRes
+	media-fonts/dejavu
+	apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.6.14-makefile.patch
+}
+
+src_configure() {
+	local var_dir=
+	local user_group=
+
+	if has_version net-analyzer/nagios-core; then
+		var_dir=/var/nagios/
+		user_group=nagios
+	else
+		var_dir=/var/lib/icinga/
+		user_group=icinga
+	fi
+
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=${var_dir}/perfdata \
+		--with-nagios-user=${user_group} \
+		--with-nagios-group=${user_group} \
+		--with-perfdata-logfile=${var_dir}/perfdata.log \
+		--with-perfdata-spool-dir=/var/spool/pnp
+}
+
+src_compile() {
+	# The default target just shows a help
+	emake all
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config || die "emake install failed"
+	newinitd "${FILESDIR}/npcd.initd" npcd
+	rm "${D}/usr/share/pnp/install.php"
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}"/98_pnp4nagios.conf
+	fi
+}
+
+pkg_postinst() {
+	elog "Please make sure to enable URL rewriting in Apache or any other"
+	elog "webserver you're using, to get pnp4nagios running!"
+}