version bump for bug 324641 , thanks to spacefreak for testing ; dropped ~ppc keyword due to missing keyword on net-analyzer/mk-livestatus dep (bug 429088)

(Portage version: 2.1.10.65/cvs/Linux x86_64)

4 files changed, 144 insertions, 1 deletions

diff --git a/net-analyzer/nagvis/ChangeLog b/net-analyzer/nagvis/ChangeLog
index 703a730de587..b090b09bef65 100644
--- a/net-analyzer/nagvis/ChangeLog
+++ b/net-analyzer/nagvis/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nagvis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/ChangeLog,v 1.10 2012/07/01 22:09:16 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/ChangeLog,v 1.11 2012/07/31 18:49:50 axs Exp $
+
+*nagvis-1.6.6 (31 Jul 2012)
+
+  31 Jul 2012; Ian Stakenvicius <axs@gentoo.org> +nagvis-1.6.6.ebuild,
+  +files/nagvis-1.6.6-base-path.patch,
+  +files/nagvis-1.6.6-global-definitions.patch:
+  version bump for bug 324641 , thanks to spacefreak for testing ; dropped ~ppc
+  keyword due to missing keyword on net-analyzer/mk-livestatus dep (bug 429088)
 
   01 Jul 2012; Matti Bickel <mabi@gentoo.org> -nagvis-1.4.4.ebuild:
   remove old version.
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
new file mode 100644
index 000000000000..771076c4eaa7
--- /dev/null
+++ b/net-analyzer/nagvis/files/nagvis-1.6.6-base-path.patch
@@ -0,0 +1,13 @@
+--- a/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:14:23.000000000 -0400
++++ b/share/server/core/classes/GlobalMainCfg.php	2012-05-31 11:17:10.000000000 -0400
+@@ -1215,8 +1215,8 @@
+      * @author	Roman Kyrylych <rkyrylych@op5.com>
+      */
+     private function getBasePath() {
+-        // Go 3 levels up from nagvis/share/nagvis to nagvis base path
+-        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../../..') . '/';
++        // Go 2 levels up from share/nagvis to nagvis base path
++        return realpath(dirname($_SERVER['SCRIPT_FILENAME']) . '/../..') . '/';
+         // Note: the method below causes problems when <docroot>/nagvis is a symlink to <nagvis-base>/share
+         // return realpath(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))).'/';
+     }
diff --git a/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
new file mode 100644
index 000000000000..9786b970179f
--- /dev/null
+++ b/net-analyzer/nagvis/files/nagvis-1.6.6-global-definitions.patch
@@ -0,0 +1,30 @@
+--- a/share/server/core/defines/global.php	2012-05-13 05:44:27.000000000 -0400
++++ b/share/server/core/defines/global.php	2012-05-31 11:20:39.000000000 -0400
+@@ -64,7 +64,7 @@
+ define('DEBUGLEVEL', 6);
+ 
+ // Path to the debug file
+-define('DEBUGFILE', '../../../var/nagvis-debug.log');
++define('DEBUGFILE', '../../var/nagvis-debug.log');
+ 
+ // It is possible to define a conf.d directory for splitting the main
+ // configuration in several files. Only the values defined in the CONST_MAINCFG
+@@ -78,14 +78,14 @@
+ // The last value wins.
+ //
+ // Path to the main configuration file
+-define('CONST_MAINCFG', '../../../etc/nagvis.ini.php');
+-define('CONST_MAINCFG_CACHE', '../../../var/nagvis-conf');
++define('CONST_MAINCFG', '../../etc/nagvis.ini.php');
++define('CONST_MAINCFG_CACHE', '../../var/nagvis-conf');
+ 
+ // Path to the main configuration conf.d directory
+-define('CONST_MAINCFG_DIR', '../../../etc/conf.d');
++define('CONST_MAINCFG_DIR', '../../etc/conf.d');
+ 
+ // The directory below the NagVis root which is shared by the webserver
+-define('HTDOCS_DIR', 'share');
++define('HTDOCS_DIR', '');
+ 
+ // Needed minimal PHP version
+ define('CONST_NEEDED_PHP_VERSION', '5.0');
diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
new file mode 100644
index 000000000000..afd0c85ab3f7
--- /dev/null
+++ b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.6.6.ebuild,v 1.1 2012/07/31 18:49:50 axs Exp $
+
+EAPI=4
+
+inherit eutils confutils depend.php depend.apache
+
+DESCRIPTION="NagVis is a visualization addon for the well known network managment system Nagios."
+HOMEPAGE="http://www.nagvis.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 automap"
+
+DEPEND=""
+RDEPEND="|| ( net-analyzer/nagios net-analyzer/icinga )
+	automap? ( >=media-gfx/graphviz-2.14 )
+	apache2? ( dev-lang/php[apache2] )
+	net-analyzer/mk-livestatus
+	dev-lang/php[gd,nls,json,session,pdo,sqlite3,sockets,mysql,unicode,xml]"
+
+need_php_httpd
+want_apache2
+
+pkg_setup() {
+	confutils_require_built_with_all dev-lang/php gd nls json session pdo sqlite3 sockets mysql unicode xml
+	depend.apache_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-base-path.patch
+	epatch "${FILESDIR}"/${P}-global-definitions.patch
+	grep -Rl "/usr/local" "${S}"/* | xargs sed -i s:/usr/local:/usr:g ||die
+	sed -i s:@NAGVIS_WEB@:/nagvis:g "${S}"/etc/apache2-nagvis.conf-sample ||die
+	sed -i s:@NAGVIS_PATH@:/usr/share/nagvis/:g "${S}"/etc/apache2-nagvis.conf-sample ||die
+	sed -i s:/usr/nagios/var/rw/live:/var/nagios/rw/live:g "${S}"/etc/nagvis.ini.php-sample ||die
+}
+
+src_install() {
+	dodoc README INSTALL
+
+	insinto /usr/share/nagvis
+	doins -r share/{config.php,index.php,frontend,netmap,server,userfiles}
+	doins -r docs
+
+	diropts -o apache -g root
+	dodir /var/nagvis/tmpl/{cache,compile}
+	diropts
+	dosym /var/nagvis /usr/share/nagvis/var
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR}"
+		newins etc/apache2-nagvis.conf-sample 98_${PN}.conf
+	fi
+
+	insinto /etc/nagvis
+	doins -r etc/{conf.d,automaps,geomap,.htaccess,nagvis.ini.php-sample}
+	fowners apache:root /etc/nagvis
+	fperms 0664 /etc/nagvis/nagvis.ini.php-sample
+	dosym /etc/nagvis /usr/share/nagvis/etc
+
+	diropts -o apache -g root -m0775
+	insopts -o apache -g root -m0664
+	doins -r etc/maps
+	diropts
+	insopts
+
+	# move image maps dir from usr to var and symlink it back
+	dodir /var/nagvis/userfiles/images
+	mv "${D}"/usr/share/nagvis/userfiles/images/maps "${D}"/var/nagvis/userfiles/images/ ||die
+	fowners apache:root /var/nagvis/userfiles/images/maps
+	dosym /var/nagvis/userfiles/images/maps /usr/share/nagvis/userfiles/images/maps
+}
+
+pkg_postinst() {
+	elog "Before running NagVis for the first time, you will need to set up"
+	elog "/etc/nagvis/nagvis.ini.php"
+	elog "A sample is in"
+	elog "/etc/nagvis/nagvis.ini.php-sample"
+	if use apache2 ; then
+		elog
+		elog "For web interface make sure to add -D NAGVIS to APACHE2_OPTS in"
+		elog "/etc/conf.d/apache2 and to restart apache2. A default configuration"
+		elog "has been placed at /etc/apache2/modules.d/98_${PN}.conf"
+	fi
+	elog ""
+	elog "Default user/password are: nagiosadmin/nagiosadmin"
+	elog "                                 guest/guest"
+}