Cleanup, version bump and add hint on how to configure apache for pnp4nagios (#232474)

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64

5 files changed, 25 insertions, 84 deletions

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index f12fe8fc1c2c..d671a45e887a 100644
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.4 2008/09/29 18:04:20 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.5 2008/11/29 17:09:29 dertobi123 Exp $
+
+*pnp4nagios-0.4.12 (29 Nov 2008)
+
+  29 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -pnp4nagios-0.4.7.ebuild, -pnp4nagios-0.4.10.ebuild,
+  -pnp4nagios-0.4.11.ebuild, +pnp4nagios-0.4.12.ebuild:
+  Cleanup, version bump and add hint on how to configure apache for pnp4nagios
+  (#232474)
 
 *pnp4nagios-0.4.11 (29 Sep 2008)
 
diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index a7447b5673f2..4ce45dc32abb 100644
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,8 +1,4 @@
-DIST pnp-0.4.10.tar.gz 301021 RMD160 c9cc75d30f59415a669453a06277197eef622d2e SHA1 6a9ef1d4b551c30dd59570f9fb8088c140547a42 SHA256 35392c83fc9468eba38187e17b773090dff923f7b74c86c3c11e2574b99c214d
-DIST pnp-0.4.11.tar.gz 309027 RMD160 dcf919897c72e0d3da351882e6068365ee809dcc SHA1 c69ba8b0f483c86f01d557795b990a5ee0238e75 SHA256 c98543b8dc5ca05978e71805ce82094ca2f8bc50d707ac0bd50e394c61ea5ef8
-DIST pnp-0.4.7.tar.gz 299261 RMD160 d1c8bc1a4b6a97e13ffb686d99dc41c333a0b4d9 SHA1 a326149d0a449c9c9af718c622d80a3b4c40f6e3 SHA256 34307d9e7a045b921403d98ea52149296ebf988de93834ad40e922d298ae703c
-EBUILD pnp4nagios-0.4.10.ebuild 990 RMD160 e88ec007a793862ebcb2a7c307ebe469a6f4b454 SHA1 702c39fa1d24bbbd4f9201cb8b952913c0ea3ea7 SHA256 9aa9c5b4cb7769d1b236ea3e0b53765be3b762f63b436c02eaee021fac00520c
-EBUILD pnp4nagios-0.4.11.ebuild 995 RMD160 11108e78ce5579a467f13e48108e1fb650036725 SHA1 a1a94ab12d568f8835906a15db0c8f1a8877ee48 SHA256 7d913c67d04c416f3720e7eeb356456f09699ff9e912114244610324b0427145
-EBUILD pnp4nagios-0.4.7.ebuild 881 RMD160 e26980ae29c2f07e86e1239bc5c02d28b3006753 SHA1 43294f0271851d2f3f8663e47965ccd46cf70122 SHA256 f3dd5c3f7859f43481a00187496a0936291aad5084e6fc091537e508ed8f0be9
-MISC ChangeLog 770 RMD160 4faad7886128684bf5c7f0f1af717f5a6fd6471c SHA1 29a003554eafd785ba4a0d97ba9809322f02f9ee SHA256 e317d79f4f17e5dcbdb675e22401ce162eda809cbd1bdee532b41b1f571f68cc
+DIST pnp-0.4.12.tar.gz 311844 RMD160 a5e0a6370d2fd7743841c37e4751674b0c239e90 SHA1 2e7084e41020d9f12d4448a72c58c11ea05dcce4 SHA256 8b74ff0fd32a08e416d0f760c36166aec67bfc1e839dd3c07c1dc08db69d96fb
+EBUILD pnp4nagios-0.4.12.ebuild 1355 RMD160 302929c6f382832b4e64b2aa4116559acee67572 SHA1 6a9245894eb0d2bb7ec6612cdf52dacea69de3a1 SHA256 3a530d3f1b5ba7d91c8b02ec8b31a5b723c7cb6d9cc07ccb466e4a7a4b498e65
+MISC ChangeLog 1063 RMD160 296fa514439de48662f94481836e57bdc7c3e4ae SHA1 4581b2d90ab6b282b78e1f7e88641d60ca0a28ba SHA256 dfba06ddcfa9d9708661ac4ea229127827c35f95f51c8a320c2bc87eac7bb0a3
 MISC metadata.xml 253 RMD160 4e50c93f565251de34e9e3a11855049e27003980 SHA1 1749d68550fe9c9cfc589ed8698a0540f5398b83 SHA256 d1c9e3db952314c276bfa0f4bfecd9a44965d23b88e2796e377bb84694d373b4
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild
deleted file mode 100644
index 15d7af60df31..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.11.ebuild,v 1.1 2008/09/29 18:04:20 dertobi123 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="~x86 ~amd64 ~ppc"
-
-DEPEND=">=dev-lang/php-4.3
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}"
-
-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"
-}
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.10.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
index 8cc44b74cfb9..c73cdd3cf16f 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.10.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.10.ebuild,v 1.1 2008/06/27 12:18:43 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.12.ebuild,v 1.1 2008/11/29 17:09:29 dertobi123 Exp $
 
 inherit confutils
 
@@ -39,3 +39,15 @@ src_compile() {
 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.4.7.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.7.ebuild
deleted file mode 100644
index 92fd8f1c1b43..000000000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.4.7.ebuild,v 1.2 2008/06/08 13:34:34 dertobi123 Exp $
-
-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="~x86 ~amd64"
-
-DEPEND=">=dev-lang/php-4.3
-	>=net-analyzer/rrdtool-1.2
-	net-analyzer/nagios-core"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf --prefix=/usr/nagios --datadir=/usr/nagios/share/pnp \
-		--sysconfdir=/usr/nagios/etc/pnp \
-		--with-perfdata-dir=/usr/nagios/share/perfdata || die "econf failed"
-	emake all || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" fullinstall || die "emake install failed"
-}