Version bump

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

5 files changed, 111 insertions, 71 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index cc1abfe604db..e037b1b40bf4 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.33 2011/08/07 12:22:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.34 2011/08/12 19:20:58 dertobi123 Exp $
+
+*pnp4nagios-0.6.14 (12 Aug 2011)
+
+  12 Aug 2011; Tobias Scherbaum <dertobi123@gentoo.org>
+  -pnp4nagios-0.4.12.ebuild, +pnp4nagios-0.6.14.ebuild,
+  +files/pnp4nagios-0.6.14-makefile.patch:
+  Version bump
 
   07 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> pnp4nagios-0.6.7.ebuild:
   ppc/ppc64 stable wrt #330539
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index 920cd7275605..8665d08a440d 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,23 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 pnp-0.4.12.tar.gz 311844 RMD160 a5e0a6370d2fd7743841c37e4751674b0c239e90 SHA1 2e7084e41020d9f12d4448a72c58c11ea05dcce4 SHA256 8b74ff0fd32a08e416d0f760c36166aec67bfc1e839dd3c07c1dc08db69d96fb
 DIST pnp4nagios-0.6.11.tar.gz 1952829 RMD160 c9a47a0faf9838c967fc514dcb204de7dc74b654 SHA1 bb1a7a6d3821dea16a5ed16e784e74b762a3e807 SHA256 baeecc02bf86441c97c29fb6427b1d5cbb1c736a7f4557a14ab8a56d1781409c
+DIST pnp4nagios-0.6.14.tar.gz 2840339 RMD160 9f7cccd1bc8de468d6d90bd6e4d033e5279524d1 SHA1 8c8214472bd6f4f750a63787450834ccb7102ff3 SHA256 0cce6870f96487446fac3cfe4c36cb6cacf5aec5aafbb9d2808c8736bac09e7c
 DIST pnp4nagios-0.6.7.tar.gz 1874012 RMD160 6378be98b399e19bf19e8cc89cd6a33cdfa5c12c SHA1 ad5c2a4dec26620f56c9929ee7a2f788214ffe53 SHA256 010128d1ed13afed1cc313264b10807b60b7dc596d0e9e86c0ac7208d0df5878
-EBUILD pnp4nagios-0.4.12.ebuild 1412 RMD160 00c35968f2e6013a72f3848ab949ef85d1b3347e SHA1 acfecb2e83a786a8423b8cdfb3ba002a758e77b4 SHA256 eb1e13cd938b5a98eabe4d3897c1474e50389feda7818035c6a1ac00328c9821
 EBUILD pnp4nagios-0.6.11.ebuild 1690 RMD160 e8950d5f6cd71d183eea25dc79ceb4424d9f8968 SHA1 64fa3ef0262ea1fc5227eb36de5dc6b13c918502 SHA256 b8fa997ad8fccb67d55442f197f58ab70a3bf81b3e2463db587b405b0420bfda
+EBUILD pnp4nagios-0.6.14.ebuild 1700 RMD160 dfdaa6332b5e267ce0f847fb78455d20edd5c657 SHA1 8bf17036c3da74896ca317180f7aee0817bd06f9 SHA256 0d387d3970852f57628cc73f7fab12625d13813d456c367cb23026f0f11b9957
 EBUILD pnp4nagios-0.6.7.ebuild 1678 RMD160 745d527884272cc30d86a21ff64f45b2d9e8ccac SHA1 27c736826721467ebf79137eaeea5244c886b866 SHA256 c5ad1fd2864ba2c3f9e80742cd88584b186c884052431d79012d2d21a1b85e12
-MISC ChangeLog 5517 RMD160 04ea662c84612eb668c624e234002cccfeaef9bb SHA1 50a3121ae49e52bd2464c2bbd22c379463a17518 SHA256 e796ade50373d094481b65f28bfae6fec583ee5d3280765001101e616c694f00
+MISC ChangeLog 5722 RMD160 57ce0e303c68ddfe9c4305b4baf0663e5f0b682b SHA1 1b0f58c7edc1e328e50f3701adddf728daff70f6 SHA256 f959578e2e77c5e588a8f9005615767f00a374faa4aae14f2750008844740dff
 MISC metadata.xml 260 RMD160 ac6f569eb1667b364a6d503a3f273505ff0ee274 SHA1 07ea89243966d135d235f7e464a480ab0e698d6b SHA256 eafa2ff6e208c288e02395e29355263b6c969ae23f19ec118835c14f2fcee05f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk4+g3gACgkQIiMqcbOVdxQdyQQAlkxcDq9nxBldUF0rprE6BPin
-MBCMyZCyFLcAinD8qXQ81sAsandwuIobL4M++W6paVm3AY/zH66zYq2QcKgurPTb
-pO+L14Hxkw7NVEzVb/woZUfnG6tuB33XrK7+ygnN83po+uTJLB4FY/uTyhovOZMn
-rd3jtlcJGV766TN9KUw=
-=+ne2
------END PGP SIGNATURE-----
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch
new file mode 100644
index 000000000000..469389d3ee31
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.14-makefile.patch
@@ -0,0 +1,32 @@
+diff -Naur pnp4nagios-0.6.14.orig/src/Makefile.in pnp4nagios-0.6.14/src/Makefile.in
+--- pnp4nagios-0.6.14.orig/src/Makefile.in	2011-08-10 17:18:46.000000000 +0200
++++ pnp4nagios-0.6.14/src/Makefile.in	2011-08-10 17:19:51.000000000 +0200
+@@ -83,7 +83,7 @@
+ #
+ ###############################
+ npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD)
+-	$(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
+ 
+ ###############################
+ #
+@@ -118,7 +118,6 @@
+ 
+ install:
+ 	$(MAKE) install-basic
+-	$(MAKE) strip-post-install
+ 
+ install-unstripped:
+ 	$(MAKE) install-basic
+diff -Naur pnp4nagios-0.6.14.orig/configure pnp4nagios-0.6.14/configure
+--- pnp4nagios-0.6.14.orig/configure	2011-08-12 09:01:12.000000000 +0200
++++ pnp4nagios-0.6.14/configure	2011-08-12 09:03:32.000000000 +0200
+@@ -5565,7 +5565,7 @@
+ 		PERFDATA_LOG="${localstatedir}/perfdata.log"
+ 		PERFDATA_DIR="${localstatedir}/perfdata"
+ 		PERFDATA_SPOOL_DIR="${localstatedir}/spool"
+-		mandir="\${prefix}/man"
++		mandir="/usr/share/man"
+ 	;;
+ esac
+ 
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
deleted file mode 100644
index 1fb8a1a367b2..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild,v 1.6 2009/03/18 22:23:26 ranger Exp $
-
-inherit confutils
-
-MY_P=pnp-${PV}
-
-DESCRIPTION="A performance data analyzer for nagios"
-HOMEPAGE="http://www.pnp4nagios.org"
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-
-DEPEND=">=dev-lang/php-4.3
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	virtual/perl-Getopt-Long
-	virtual/perl-Time-HiRes"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	confutils_require_built_with_all dev-lang/php gd pcre xml zlib
-}
-
-src_compile() {
-	econf \
-		--sysconfdir=/etc/pnp \
-		--datarootdir=/usr/share/pnp \
-		--with-perfdata-dir=/var/nagios/perfdata \
-		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" fullinstall || die "emake install failed"
-}
-
-pkg_postinst() {
-	elog "To include the pnp webinterface into your Nagios setup you could use"
-	elog "an Alias in you Apache configuration as follows:"
-
-	elog "\tAlias /nagios/pnp       /usr/share/pnp/"
-	elog "\t<Directory "/usr/share/pnp">"
-	elog "\t\tAllowOverride AuthConfig"
-	elog "\t\tOrder allow,deny"
-	elog "\t\tAllow from all"
-	elog "\t</Directory>"
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild
new file mode 100644
index 000000000000..a3e649fc3731
--- /dev/null
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.14.ebuild,v 1.1 2011/08/12 19:20:58 dertobi123 Exp $
+
+EAPI="2"
+
+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[pcre,reflection,spl] >=dev-lang/php-5.3 )
+	|| ( >=dev-lang/php-4.3[gd-external] >=dev-lang/php-4.3[gd] )
+	>=net-analyzer/rrdtool-1.2
+	net-analyzer/nagios-core"
+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}"/${P}-makefile.patch
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/pnp \
+		--datarootdir=/usr/share/pnp \
+		--mandir=/usr/share/man \
+		--with-perfdata-dir=/var/nagios/perfdata \
+		--with-perfdata-spool-dir=/var/spool/pnp  || die "econf failed"
+}
+
+src_compile() {
+	emake all || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-config || die "emake install failed"
+	doinitd "${FILESDIR}/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!"
+}