testing icinga-web 1.8.0

4 files changed, 40 insertions, 26 deletions

diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog
index 716e172..64ab29b 100644
--- a/net-analyzer/icinga-web/ChangeLog
+++ b/net-analyzer/icinga-web/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icinga-web-1.8.0 (19 Nov 2012)
+
+  19 Nov 2012; <mthode@gentoo.org> +icinga-web-1.8.0.ebuild:
+  adding 1.8.0 for testing
+
 *icinga-web-1.6.1-r1 (27 Feb 2012)
 
   27 Feb 2012; mthode <mthode@gentoo.org> +icinga-web-1.6.1-r1.ebuild:
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index f1faaa3..01c68b0 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,4 +1,5 @@
-AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8dd6337b9b7d25269eb2 SHA1 9c84c5d2527bc959f92ece98af1322a9666a9c05 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85
-DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
-EBUILD icinga-web-1.7.1.ebuild 5711 RMD160 fb0e3bd4834a2e226c210889e463ad33394d8d15 SHA1 b0c10b579be253455ea1cf544cd2fac87b1f818d SHA256 abdaa504f32ba753cd0b6d6977fa7833b33bd99d1e4f3a70a3998316a1c96867
-MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
+AUX icinga-web-1.7.1-disable-compression.patch 3120 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85 SHA512 09eccfe66bab2650e0146582511717ecd082139e0e29c95b9ebeccb37706a0a4c23f7c7a051561d65b77c749c7c6fbc3bf3ac0e1fcd405dff647400d23b44056 WHIRLPOOL 185e78e2b62c01d2867c476de329a077bbab77b29777acccd618016a3383a98879dd5b51c78bad47440f56b8497a2b1e10608a1a19466a0a80b6af5cf80f10de
+DIST icinga-web-1.8.0.tar.gz 14612975 SHA256 3e80a63fb15577c60f0b8228b7150897a7203361b2d3866a15d6a20492689398 SHA512 c2da9ec76aa634fb2e3e9018994bcd30892d9067875054f1f13fca35394d89a0c9429807a90fe519ac8896927e6899b2e7e16ae8047769491948c8bbe4ba2485 WHIRLPOOL 69eb3c4c49408ced0504b393163c10ffa678125af6a3e8b3eb4705bd12f3f7f22e0345ca361284ea0892b1d3193da3bf58fe78b6c9f20ce81aee7a7b0c8b6f76
+EBUILD icinga-web-1.8.0.ebuild 5002 SHA256 d3269d81f8da5b8f67f66916eef53869c5673e0315473223f58a5144530f916a SHA512 8555619e90ee1451f8f2734a0f6b7edda4f43bcc0ff49af331608863a2207094019c5f4c70cb16da97536f84a47ec98861ec26e4d3a5483bfcaeffca51321c35 WHIRLPOOL 1ed2c41a315d432e45faa620e5c2e34e62a118c0e0f398771b6e82af18551b3895408a863a8cb93053d9d40a6c0b64f19bfcdb23e0e5b54acc137a82e762e149
+MISC ChangeLog 391 SHA256 bac37c2e3a1f586c756b39862902341e1b3da1ea62f9594968465301d6609f75 SHA512 a6c5f928e63fd80b2f51ad5659db87269fe2a1382faa8438fca5f586a0c89b183ca131415e30338d82f3e482cf698da8b648a8ddd1ebb047e06b5ad852ffbd7d WHIRLPOOL 5a8007ef24a8d6b179c323d9bca717c1fb9c652fd71170c835db1e1b7d3c884c2377b703bdb06fb201178808c01a0536aed73f46c8a0c092ca45be9b7060eba6
+MISC metadata.xml 276 SHA256 7f7323b8d4eeb98e829b91b5b64d875bed129bed7a08c7734617321b62a2733d SHA512 4fcbbc83ea768710b30a7ca90029006511d070cceca7ada374775b664c4dc94f34ab905f90fb45d3d777c2f2551f00d9a9551b6a00a896513e9b9261c2607542 WHIRLPOOL bf5598ca6cb2398cab88dd3ad2af8962c9c42c70ed9e03528253ea11f5b3306c641f7aa3b20a802827e2199a3db2e5e5384ac886496bc55ae5ff83fc68400d09
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.8.0.ebuild
index aee5a8b..182b998 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="apache2 mysql pnp postgres"
 DEPEND="dev-php/phing
-        dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
+		dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
 		pnp? ( net-analyzer/pnp4nagios )"
 RDEPEND="${DEPEND}"
 
@@ -24,8 +24,8 @@ pkg_setup() {
 	if use apache2 ; then
 		depend.apache_pkg_setup
 	fi
-	enewgroup icinga                                                            
-	enewgroup nagios                                                            
+	enewgroup icinga
+	enewgroup nagios
 	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
 }
 
@@ -82,7 +82,7 @@ src_install() {
 	if use apache2 ; then
 		dodir ${APACHE_MODULES_CONFDIR}
 		emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
-		mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
+		mv "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
 	fi
 
 	insinto /usr/share/icinga/icinga-web/contrib
@@ -111,7 +111,6 @@ src_install() {
 		fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
 	fi
 
-
 	if use pnp ; then
 		insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
 		doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
@@ -131,11 +130,11 @@ pkg_postinst() {
 	einfo "  echo \"CREATE DATABASE icinga_web;\" | mysql"
 	einfo "  echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
 	einfo "  echo \"FLUSH PRIVILEGES;\" | mysql"
-    einfo
+	einfo
 	einfo "  cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
 	einfo
 
-    ewarn
+	ewarn
 	ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
 	ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
 	ewarn
@@ -153,19 +152,18 @@ pkg_postinst() {
 	einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
 	einfo
 
-	if use apache2 ; then                                                       
-		einfo                                                                   
-		einfo "apache config was installed into"                                
-		einfo "/etc/apache2/modules.d//99_icinga-web.conf"                      
-		einfo                                                                   
-		einfo "The apache config value for \'ServerTokens\' must be set to at"  
-		einfo "least \'Min\'."                                                  
-		einfo                                                                   
-	else                                                                        
-		einfo                                                                   
-		einfo "If you are not using apache you may need to change some"         
-		einfo "permissions, so that your web server can access files and logs"  
-		einfo                                                                   
+	if use apache2 ; then
+		einfo
+		einfo "apache config was installed into"
+		einfo "/etc/apache2/modules.d//99_icinga-web.conf"
+		einfo
+		einfo "The apache config value for \'ServerTokens\' must be set to at"
+		einfo "least \'Min\'."
+		einfo
+	else
+		einfo
+		einfo "If you are not using apache you may need to change some"
+		einfo "permissions, so that your web server can access files and logs"
+		einfo
 	fi
 }
-
diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
new file mode 100644
index 0000000..75579a0
--- /dev/null
+++ b/net-analyzer/icinga-web/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <use>
+	    <flag name="pnp">Enables pnp4nagios integration</flag>
+    </use>
+    <longdescription lang="en">
+    </longdescription>
+</pkgmetadata>
+