www-misc/monitorix: version bump; patches are not needed anymore, they're included upstream

svn path=/sunrise/; revision=9149

5 files changed, 11 insertions, 76 deletions

diff --git a/www-misc/monitorix/ChangeLog b/www-misc/monitorix/ChangeLog
index b33616894..ec598511d 100644
--- a/www-misc/monitorix/ChangeLog
+++ b/www-misc/monitorix/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Sep 2009; Markus Rennings (mren) <mren@mrmx.de>
+  -files/1.3.1-evms.patch, -monitorix-1.3.1.ebuild, +monitorix-1.3.2.ebuild,
+  -files/monitorix.conf.patch:
+  version bump; patches are not needed anymore, they're included upstream
+
   27 Aug 2009; Markus Rennings (mren) <mren@mrmx.de> monitorix-1.3.1.ebuild:
   added missing dep, thx to David for the hint
 
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index ee94511a7..3582e47bb 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,6 +1,4 @@
-AUX 1.3.1-evms.patch 990 RMD160 e6ce0e06751ba461497abd43625feb8f26110344 SHA1 0d3bb79b38727057565e7c0426e2b7ace8e313e5 SHA256 89261fcea47aebe4f7f1e39918555f43ba05c4c1a8fec29180cab97dfff09220
-AUX monitorix.conf.patch 925 RMD160 c7faa57c6c7a5eb0048f04d6db37f57405d27be7 SHA1 b47e38922af73a5eabea60a61e86c46cc6e3be89 SHA256 2ca343e8652e8b5e29a0abd0ed3ac9205b000922b4ad5191b3aa96be21ab87db
-DIST monitorix-1.3.1.tar.gz 150959 RMD160 3c03c33e2ec5d533d306904f455a11531b99bc81 SHA1 462e5445cc66fb6b9e59218c4395aa75d79a7d05 SHA256 b5c8782d5b98255b7ef75ae26d4131033ac425f1a13c9039fadad7486c085996
-EBUILD monitorix-1.3.1.ebuild 2338 RMD160 3d2526f027ba40664ba65ac40d638abf1ec24aa8 SHA1 16e0ead33ebf71a881044d1b320eb7316328b5d1 SHA256 a5e05670641304776988f781fbed961ee2934d952501beaba974c5c2e2e2ae67
-MISC ChangeLog 1003 RMD160 8025848301f416bb29c9d305916093f59ccb877b SHA1 95372f1658963b267e4982869c8980c717cb1107 SHA256 5b43128e18ef144fd483c91ca8a56c6036cd51e70d1da01a733b8a8245529b79
+DIST monitorix-1.3.2.tar.gz 154130 RMD160 5c3639db004c3a11c39bb1daa641c77f0e85c5dc SHA1 b44ca3ecea6263dfc613b94214c7fc2c032b6fbd SHA256 505bd1a51705d66259967db0dbb45111aca3d80edc3c1f3cca7b86725c6fb985
+EBUILD monitorix-1.3.2.ebuild 2319 RMD160 057b2da1ace4790b3e2bb0bb83c55af5f5e33a0f SHA1 d336d4c663d8326ab9f9e879f5d595ad98d75a8d SHA256 1312df733f9fb6bf35e8f940d8b7e0a4c72b0ac5339d42136529652c9025cea1
+MISC ChangeLog 1239 RMD160 552d510a39c19074e0f0d29f139581411731ad83 SHA1 72c35306100b5f427c03997fc606e2f2725c6ef9 SHA256 f2b3043ec270c85cd1a3cb98469afe48d76a0eb882da70f73d495ef71418309b
 MISC metadata.xml 285 RMD160 14c03bdcabba50a240b6f81468518ecb9a9260c2 SHA1 f1cb6d0492c498ffa08d16442a510bda679f43e9 SHA256 49a0e28498b88a6e7b8d15996ad998d8345f9ef128b4ee6329e1547d64ee6653
diff --git a/www-misc/monitorix/files/1.3.1-evms.patch b/www-misc/monitorix/files/1.3.1-evms.patch
deleted file mode 100644
index fcaafc9d5..000000000
--- a/www-misc/monitorix/files/1.3.1-evms.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- monitorix.pl.orig	2009-08-05 14:47:05.000000000 +0200
-+++ monitorix.pl	2009-08-11 18:26:42.000000000 +0200
-@@ -81,6 +81,7 @@
- our @PC_MAIL;
- our $IPTABLES;
- our $PVS = "pvs";
-+our $EVMS = "evms_query";
- 
- # The current two locations where the configuration file can reside.
- if(-f "/etc/monitorix.conf") {
-@@ -1069,7 +1070,7 @@
- 	my @monthlist = ("Desembre",
- 	   		"Gener",
- 	   		"Febrer",
--	   		"Març",
-+	   		"Març",
- 	   		"Abril",
- 	   		"Maig",
- 	   		"Juny",
-@@ -3038,6 +3039,7 @@
- 		my $lvm_disk;
- 		my $is_cciss;
- 		my $is_md;
-+		my $found = 0;
- 	
- 		$root_disk = `df -P / | grep / | awk -F " " '{ print \$1 }'`;
- 		chomp($root_disk);
-@@ -3048,6 +3050,11 @@
- 			$root_disk =~ s/.$//;
- 			$is_cciss = 1;
- 		}
-+		if($root_disk =~ m/\/dev\/evms\//) {
-+			$root_disk = `$EVMS disks $root_disk`;
-+			$found = 1;
-+		}
-+		if(!$found) {
- 		if(stat("/proc/mdstat")) {
- 			my $tmp;
- 			my $md_root_disk = $root_disk;
-@@ -3100,6 +3107,7 @@
- 			}
- 
- 		}
-+		}
- 	}
- 
- 	chomp($ROOT_TOTAL,
diff --git a/www-misc/monitorix/files/monitorix.conf.patch b/www-misc/monitorix/files/monitorix.conf.patch
deleted file mode 100644
index 1ffdf81d2..000000000
--- a/www-misc/monitorix/files/monitorix.conf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- monitorix.conf.orig	2009-08-11 01:04:55.000000000 +0200
-+++ monitorix.conf	2009-08-11 01:05:56.000000000 +0200
-@@ -31,7 +31,7 @@
- # General
- our $TITLE = "FIBRANET NSP, SL";	# your company name
- our $HOSTNAME = "";			# hostname of this server
--our $OSTYPE = "Linux-RHFC";		# choose your OS type (see below)
-+our $OSTYPE = "Linux-Gentoo";		# choose your OS type (see below)
- our $IDATE = "01 Jan 2000";		# initial statistics date
- our $SAMBAVER = "3";			# Samba version (2 or 3)
- our $MULTIHOST = "N";			# Enable multihost feature
-@@ -223,7 +223,7 @@
- 
- our %HTTP_LOG = ("Linux-RHFC"	=> "/var/log/httpd/access_log",
- 		"Linux-Debian"	=> "/var/log/apache2/access.log",
--		"Linux-Gentoo"	=> "/var/log/apache2/access.log",
-+		"Linux-Gentoo"	=> "/var/log/apache2/access_log",
- 		"Linux-Slack"	=> "/var/log/httpd/access.log",
- 		"Linux-SuSE"	=> "/var/log/apache2/access_log",
- 		"Linux-Generic"	=> "/var/log/httpd/access_log",
diff --git a/www-misc/monitorix/monitorix-1.3.1.ebuild b/www-misc/monitorix/monitorix-1.3.2.ebuild
index 219db92d2..8122fdfd8 100644
--- a/www-misc/monitorix/monitorix-1.3.1.ebuild
+++ b/www-misc/monitorix/monitorix-1.3.2.ebuild
@@ -31,10 +31,9 @@ need_httpd_cgi
 
 src_prepare() {
 	local IDATE=$(date +'%Y-%m-%d')
-	epatch "${FILESDIR}/${PN}.conf.patch"
-	sed -i -e "s|\(our \$IDATE = \"\)01 Jan 2000|\1${IDATE}|" ${PN}.conf \
-		|| die "sed failed"
-	epatch "${FILESDIR}/${PV}-evms.patch"
+	sed -i -e "s|\(our \$IDATE = \"\)01 Jan 2000|\1${IDATE}|" \
+		   -e "s|\(our \$OSTYPE = \"Linux-\)RHFC|\1Gentoo|" ${PN}.conf \
+		   || die "sed failed"
 }
 
 src_install() {