Version bump, add Apache2 use-flag to allow for automagic integration into Apache...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-analyzer/pnp4nagios/ChangeLog b/net-analyzer/pnp4nagios/ChangeLog
index e4ef581d5bd258455d5f7166993da2ad5b383ae5..728d939eaa7d69e7fd62513249a2b8afd76200b1 100644 (file)
--- a/net-analyzer/pnp4nagios/ChangeLog
+++ b/net-analyzer/pnp4nagios/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/pnp4nagios
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.15 2010/01/29 19:28:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/ChangeLog,v 1.16 2010/04/02 16:50:16 dertobi123 Exp $
+
+*pnp4nagios-0.6.3 (02 Apr 2010)
+
+  02 Apr 2010; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/98_pnp4nagios.conf, -pnp4nagios-0.4.14.ebuild,
+  -pnp4nagios-0.6.2.ebuild, +pnp4nagios-0.6.3.ebuild:
+  Version bump, add Apache2 use-flag to allow for automagic integration into
+  Apache (#302611) (Add -PNP to /etc/conf.d/apache2).
 
   29 Jan 2010; Tobias Scherbaum <dertobi123@gentoo.org>
   pnp4nagios-0.6.2.ebuild:

diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest
index b356818b549cff4a4f6d305d8421997832ebb586..19b34beed46183a36c3ec8a31d4ef371816e3c6e 100644 (file)
--- a/net-analyzer/pnp4nagios/Manifest
+++ b/net-analyzer/pnp4nagios/Manifest
@@ -1,9 +1,8 @@
+AUX 98_pnp4nagios.conf 1025 RMD160 13ada7bbf3ad9b14bccf0d9cd0f0f0a72e4ea807 SHA1 6e080ddf657bccb1beeceb7a80222f5c06c41eb6 SHA256 d4860e09c66e1d20e342a4ab997988ae825e6f4561a9631fd6c608f1c5420a5f
 AUX npcd 766 RMD160 af98e0bc7eae1f348a7d1f6b0f92911f29645b3a SHA1 079b67f8d1ca1bb091dc8fc80d399f1850846b97 SHA256 2a335ee60d3fd872645367c7687905c427f8cc9941b9a5b7939df2d7e029d7d1
 DIST pnp-0.4.12.tar.gz 311844 RMD160 a5e0a6370d2fd7743841c37e4751674b0c239e90 SHA1 2e7084e41020d9f12d4448a72c58c11ea05dcce4 SHA256 8b74ff0fd32a08e416d0f760c36166aec67bfc1e839dd3c07c1dc08db69d96fb
-DIST pnp-0.4.14.tar.gz 455593 RMD160 00b6596124579c273d2e8ddd9078d14d0e45d910 SHA1 a84fe8eadb032ee4527039424a907bf423ace448 SHA256 e0f1ba160ec5757e130af7c5ad11944766d97bc3c3e93d9bf9b782a05902760f
-DIST pnp4nagios-0.6.2.tar.gz 797787 RMD160 f770f69f684521b4782939c43537e485ce8140a2 SHA1 5e68c7100ade25e9c7174a54ff1d9d43dae0fdbb SHA256 9fc1a1b12913336f14573191ff886c0fab7cbe5a13de23b2ea21af11b56d8d79
+DIST pnp4nagios-0.6.3.tar.gz 802617 RMD160 7c51ec301a028e160d9d4d68c0fed9d8cc700cc3 SHA1 6cbc454a2d1644af36fb817a2516ed0539944a71 SHA256 8b1e550df4ad8ca85d68aa2dc78ce03d4d254c4dfdffc3ce3537eecf0143f723
 EBUILD pnp4nagios-0.4.12.ebuild 1412 RMD160 00c35968f2e6013a72f3848ab949ef85d1b3347e SHA1 acfecb2e83a786a8423b8cdfb3ba002a758e77b4 SHA256 eb1e13cd938b5a98eabe4d3897c1474e50389feda7818035c6a1ac00328c9821
-EBUILD pnp4nagios-0.4.14.ebuild 1419 RMD160 1046adc5a1aaa3512eab1c9c30e0041f546a34d9 SHA1 c0549d7b4a0cbd79ccde61526fbad926718fe22c SHA256 ebd9d38e0c85d19e7c3168f8e5f744cea3541083bc9997f40570bb09ca368eae
-EBUILD pnp4nagios-0.6.2.ebuild 1415 RMD160 e1fceb0fda4d54ce5c8749f04872607a82ac00d9 SHA1 520e83352d060daa5996cf9568d64ac65c81f953 SHA256 759fb33fcd3dc30daa5dd0985b73db0086b60c9f747a1c063212a27150bcdac8
-MISC ChangeLog 2469 RMD160 58b26c57cfe040172afab2c511ce26a6859f780b SHA1 0209a00a805be0c171d7964a3f170781e1d7a2e6 SHA256 7ad1409d4f29980989fb7de7cd634e34892920a3742c6e282c94e77f1d5a6ffd
+EBUILD pnp4nagios-0.6.3.ebuild 1341 RMD160 74f453574e1b62e5f42d8d75f043fb7f1bb5149e SHA1 926120e1641d20eb7952d2c668e46d28758dfb6e SHA256 d62052b7e73ae2fc18eea601813b3e53c28d520b496984837f722be533315796
+MISC ChangeLog 2800 RMD160 6570188e1e4e5d22e5d77b98427f7e1ae6a7cc4f SHA1 766dc6c11dd71e923264d6de9aff6ec6fda55704 SHA256 537c3201f5b313d424a14d8e02ed020bdb0fae1c77350e11b6b0007452853171
 MISC metadata.xml 253 RMD160 4e50c93f565251de34e9e3a11855049e27003980 SHA1 1749d68550fe9c9cfc589ed8698a0540f5398b83 SHA256 d1c9e3db952314c276bfa0f4bfecd9a44965d23b88e2796e377bb84694d373b4

diff --git a/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
new file mode 100644 (file)
index 0000000..4879779
--- /dev/null
+++ b/net-analyzer/pnp4nagios/files/98_pnp4nagios.conf
@@ -0,0 +1,22 @@
+<IfDefine PNP>
+        Alias /pnp4nagios /usr/share/pnp/
+        <Directory /usr/share/pnp>
+                AllowOverride AuthConfig
+                Order allow,deny
+                Allow from all
+                <IfModule mod_rewrite.c>
+                        # Turn on URL rewriting
+                        RewriteEngine On
+                        Options FollowSymLinks
+                        # Installation directory
+                        RewriteBase /pnp4nagios
+                        # Protect application and system files from being viewed
+                        RewriteRule ^(application|modules|system) - [F,L]
+                        # Allow any files or directories that exist to be displayed directly
+                        RewriteCond %{REQUEST_FILENAME} !-f
+                        RewriteCond %{REQUEST_FILENAME} !-d
+                        # Rewrite all other URLs to index.php/URL
+                        RewriteRule .* index.php/$0 [PT,L]
+                </IfModule>
+        </Directory>
+</IfDefine>

diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.4.14.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.4.14.ebuild
deleted file mode 100644 (file)
index af2bf9f..0000000
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.4.14.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.14.ebuild,v 1.1 2009/10/27 19:40:42 dertobi123 Exp $
-
-EAPI="2"
-
-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[gd-external,pcre,xml,zlib]
-       >=net-analyzer/rrdtool-1.2
-       net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-       virtual/perl-Getopt-Long
-       virtual/perl-Time-HiRes"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-       econf \
-               --sysconfdir=/etc/pnp \
-               --datarootdir=/usr/share/pnp \
-               --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"
-}
-
-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.2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.3.ebuild
similarity index 62%
rename from net-analyzer/pnp4nagios/pnp4nagios-0.6.2.ebuild
rename to net-analyzer/pnp4nagios/pnp4nagios-0.6.3.ebuild
index 95271f289187fb9cf59024ad2e840ba9cc57276d..156467066aae1f8f7d756480dedd0a666d409129 100644 (file)
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.2.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.3.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.2.ebuild,v 1.3 2010/01/29 19:28:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pnp4nagios/pnp4nagios-0.6.3.ebuild,v 1.1 2010/04/02 16:50:16 dertobi123 Exp $
 
 EAPI="2"
 
+inherit depend.apache
+
 DESCRIPTION="A performance data analyzer for nagios"
 HOMEPAGE="http://www.pnp4nagios.org"
 
@@ -14,12 +16,19 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-DEPEND=">=dev-lang/php-4.3[gd-external,pcre,filter,reflection,spl,simplexml,xml,zlib]
+DEPEND=">=dev-lang/php-4.3[gd-external,json,pcre,filter,reflection,spl,simplexml,xml,zlib]
        >=net-analyzer/rrdtool-1.2
        net-analyzer/nagios-core"
 RDEPEND="${DEPEND}
        virtual/perl-Getopt-Long
-       virtual/perl-Time-HiRes"
+       virtual/perl-Time-HiRes
+       apache2? ( www-servers/apache[apache2_modules_rewrite] )"
+
+want_apache2
+
+pkg_setup() {
+       depend.apache_pkg_setup
+}
 
 src_configure() {
        econf \
@@ -36,16 +45,10 @@ src_compile() {
 src_install() {
        emake DESTDIR="${D}" install install-config || die "emake install failed"
        doinitd "${FILESDIR}/npcd"
-}
-
-pkg_postinst() {
-       elog "To include the pnp webinterface into your Nagios setup you could use"
-       elog "an Alias in you Apache configuration as follows:"
+       rm "${D}/usr/share/pnp/install.php"
 
-       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>"
+       if use apache2 ; then
+               insinto "${APACHE_MODULES_CONFDIR}"
+               doins "${FILESDIR}"/98_pnp4nagios.conf
+       fi
 }