From ab97d9fe0094918d4fabe2a491c72d55698ea09f Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 22 Jun 2009 12:59:26 +0000
Subject: [PATCH] =?utf8?q?=C3=84nderungen=20an=20Nagvis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.brehm-online.com/svn/portage@78 18afd0d2-9f2f-0410-a0ac-b8d70fd81a6b
---
 net-analyzer/nagvis/Manifest                  |  2 +
 ...is-1.3.1.ebuild => nagvis-1.4.1-r1.ebuild} | 39 ++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)
 rename net-analyzer/nagvis/{nagvis-1.3.1.ebuild => nagvis-1.4.1-r1.ebuild} (54%)

diff --git a/net-analyzer/nagvis/Manifest b/net-analyzer/nagvis/Manifest
index b965568..df88994 100644
--- a/net-analyzer/nagvis/Manifest
+++ b/net-analyzer/nagvis/Manifest
@@ -1,6 +1,8 @@
 DIST nagvis-1.3.1.tar.gz 323842 RMD160 7c64ad99dd237e4dfac1295f8a9f04e10bccf382 SHA1 a19fac4736b1fc30a9643f8f024dae0191dac422 SHA256 3b289e98e91684bb81cb25cf77e066ac3609783fb17f8f7704e3196c4064c49f
 DIST nagvis-1.3.2.tar.gz 323347 RMD160 6281103639834648325a5395159a31d7859a6352 SHA1 1a5675e71bf0bccbf5070cbf6693eccba1576ece SHA256 ff1e271d26adb7813da5c29f35fc199c706b7eccbba41de57880b305254980c6
+DIST nagvis-1.4.1.tar.gz 734849 RMD160 70883946d5380f273b402ac45c7021bfbb0d5aa9 SHA1 1b19a503ca0c5ad1498905831e379db1092a0de7 SHA256 4957767e030ed8259dacd53b0c696c0d521c5da598b31163caebb227d56b07bd
 EBUILD nagvis-1.3.1.ebuild 1456 RMD160 0c2a0e8b703d99bbf33d18a1a1b887c1a3fbe210 SHA1 02172551dc94233ab347f718d48fc899ee2a4e37 SHA256 5de7bdb4295c1fc01c3ec4fbbc3984cb6e28efbb7239c31b4bf21fbf94179579
 EBUILD nagvis-1.3.2.ebuild 1469 RMD160 503bbcfceb93960dfbc9c59d67f3491ce21fb4d9 SHA1 4b9af8874015cf678ac7bf752dcecdc1c51938e0 SHA256 603838a5c8c1693468bf6947e676e4b102b918941e14c3aea432137f8821e5d8
+EBUILD nagvis-1.4.1-r1.ebuild 1600 RMD160 6d112d91e8d77ef1f63021821ec1dbb725769546 SHA1 b13deb04122acd9c3e099ace5ea2265154f879eb SHA256 bc28e4cbed586268bb75d75fd6175aaac610101d17e5d046808007787997e898
 MISC ChangeLog 615 RMD160 0c51e43c34b0002698200b4a7eed168df728fa81 SHA1 09eadde69dd163ed51d1c9fe84f9aa80ebee3e5a SHA256 57c323be168b6fd1cb077ea0a2a290a9535d10ad0fadb847ac6b107f6502aa7d
 MISC metadata.xml 413 RMD160 d0dc031bd774200fb07a22fc0a00c4c66b2d34ca SHA1 4092b05d12de4b4623f0134c09200c1554d572f2 SHA256 5a00f497b1fddd8355f447be57a37641f01aa82308071f06873c9aa3ad3862d4
diff --git a/net-analyzer/nagvis/nagvis-1.3.1.ebuild b/net-analyzer/nagvis/nagvis-1.4.1-r1.ebuild
similarity index 54%
rename from net-analyzer/nagvis/nagvis-1.3.1.ebuild
rename to net-analyzer/nagvis/nagvis-1.4.1-r1.ebuild
index f94e2bf..fca3c02 100644
--- a/net-analyzer/nagvis/nagvis-1.3.1.ebuild
+++ b/net-analyzer/nagvis/nagvis-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.3.ebuild,v 1.2 2008/08/03 19:59:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagvis/nagvis-1.4.1.ebuild,v 1.1 2009/06/19 20:13:16 dertobi123 Exp $
 
 inherit eutils confutils depend.php
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="automap"
 
-DEPEND=">=net-analyzer/nagios-3
-		>=net-analyzer/ndoutils-1.4_beta4
+DEPEND=""
+RDEPEND=">=net-analyzer/ndoutils-1.4_beta4
 		automap? ( >=media-gfx/graphviz-2.14 )"
 
 need_php_httpd
@@ -31,18 +31,29 @@ src_install() {
 		rm ${docfile}
 	done
 
-	dodir /usr/share
 	grep -Rl "/usr/local" "${S}"/* | xargs sed -i s:/usr/local:/usr:g
-	mv "${S}" "${D}"/usr/share/nagvis
-	chmod 664 "${D}"/usr/share/nagvis/etc/config.ini.php.dist
-	chmod 775 "${D}"/usr/share/nagvis/images/maps
-	chmod 664 "${D}"/usr/share/nagvis/images/maps/*
-	chmod 775 "${D}"/usr/share/nagvis/etc/maps
-	chmod 664 "${D}"/usr/share/nagvis/etc/maps/*
+
+	dodir /usr/share/nagvis
+	mv "${S}"/{config.php,index.php,nagvis,wui} "${D}"/usr/share/nagvis/
+
+	dodir /var/nagvis
+	dosym /var/nagvis /usr/share/nagvis/var
+	fowners apache:root /var/nagvis
+
+	dodir /etc/nagvis
+	mv "${S}"/etc/* "${D}"/etc/nagvis/
+	dosym /etc/nagvis /usr/share/nagvis/etc
+
+	fperms 664 /etc/nagvis/nagvis.ini.php-sample
+	fperms 775 /etc/nagvis/maps
+	fowners apache:root /etc/nagvis/maps
+	fperms 664 /etc/nagvis/maps/*cfg
+	fowners apache:root /etc/nagvis/maps/*cfg
 }
+
 pkg_postinst() {
 	elog "Before running NagVis for the first time, you will need to set up"
-	elog "/usr/share/nagvis/nagvis/etc/config.ini.php"
+	elog "/etc/nagvis/nagvis.ini.php"
 	elog "A sample is in"
-	elog "/usr/share/nagvis/nagvis/etc/config.ini.php.dist"
+	elog "/etc/nagvis/nagvis.ini.php-sample"
 }
-- 
2.39.5