version bump, removed old versions

(Portage version: 2.1.5.6)

45 files changed, 59 insertions, 2887 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index 1bfc053331af..afb501c2ff67 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.8 2008/05/19 20:13:57 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.9 2008/07/23 15:47:28 wschlich Exp $
+
+*zabbix-1.4.6 (23 Jul 2008)
+
+  23 Jul 2008; Wolfram Schlich <wschlich@gentoo.org>
+  -files/1.4.1/init.d/zabbix-agentd, -files/1.4.1/init.d/zabbix-server,
+  -files/1.4.1/postinstall-en.txt, -files/1.4.1/zabbix_agent.conf,
+  -files/1.4.1/zabbix_agentd.conf, -files/1.4.1/zabbix_server.conf,
+  -files/1.4.2/init.d/zabbix-agentd, -files/1.4.2/init.d/zabbix-server,
+  -files/1.4.2/initgroups.patch, -files/1.4.2/postinstall-en.txt,
+  -files/1.4.2/zabbix_agent.conf, -files/1.4.2/zabbix_agentd.conf,
+  -files/1.4.2/zabbix_server.conf, -files/1.4.3/init.d/zabbix-agentd,
+  -files/1.4.3/init.d/zabbix-server, -files/1.4.3/postinstall-en.txt,
+  -files/1.4.3/zabbix_agent.conf, -files/1.4.3/zabbix_agentd.conf,
+  -files/1.4.3/zabbix_server.conf, -files/1.4.4/init.d/zabbix-agentd,
+  -files/1.4.4/init.d/zabbix-server, -files/1.4.4/postinstall-en.txt,
+  -files/1.4.4/zabbix_agent.conf, -files/1.4.4/zabbix_agentd.conf,
+  -files/1.4.4/zabbix_server.conf, -files/1.4.5/init.d/zabbix-agentd,
+  -files/1.4.5/init.d/zabbix-server, -files/1.4.5/postinstall-en.txt,
+  -files/1.4.5/zabbix_agent.conf, -files/1.4.5/zabbix_agentd.conf,
+  -files/1.4.5/zabbix_server.conf, +files/1.4.6/init.d/zabbix-agentd,
+  +files/1.4.6/init.d/zabbix-server, +files/1.4.6/postinstall-en.txt,
+  +files/1.4.6/zabbix_agent.conf, +files/1.4.6/zabbix_agentd.conf,
+  +files/1.4.6/zabbix_server.conf, -files/1.4/init.d/zabbix-agentd,
+  -files/1.4/init.d/zabbix-server, -files/1.4/postinstall-en.txt,
+  -files/1.4/zabbix_agent.conf, -files/1.4/zabbix_agentd.conf,
+  -files/1.4/zabbix_server.conf, -zabbix-1.4.ebuild, -zabbix-1.4.1.ebuild,
+  -zabbix-1.4.2.ebuild, -zabbix-1.4.2-r1.ebuild, -zabbix-1.4.3.ebuild,
+  -zabbix-1.4.4.ebuild, -zabbix-1.4.5.ebuild, +zabbix-1.4.6.ebuild:
+  version bump, removed old versions
 
   19 May 2008; Tiziano Müller <dev-zero@gentoo.org> zabbix-1.4.ebuild,
   zabbix-1.4.1.ebuild, zabbix-1.4.2.ebuild, zabbix-1.4.2-r1.ebuild,
diff --git a/net-analyzer/zabbix/files/1.4.1/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.1/init.d/zabbix-server
deleted file mode 100644
index e538523efaa0..000000000000
--- a/net-analyzer/zabbix/files/1.4.1/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.1/init.d/zabbix-server,v 1.1 2007/07/24 11:49:19 wschlich Exp $
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-agentd
deleted file mode 100644
index 3bc602f222dd..000000000000
--- a/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-agentd,v 1.1 2007/08/24 14:27:39 wschlich Exp $
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-server
deleted file mode 100644
index 00e3667f3e1e..000000000000
--- a/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.2/init.d/zabbix-server,v 1.1 2007/08/24 14:27:39 wschlich Exp $
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.2/initgroups.patch b/net-analyzer/zabbix/files/1.4.2/initgroups.patch
deleted file mode 100644
index cac41213e2d9..000000000000
--- a/net-analyzer/zabbix/files/1.4.2/initgroups.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- zabbix-1.4.2/src/libs/zbxnix/daemon.c	2007-08-20 21:22:22.000000000 +0200
-+++ zabbix-1.4.2/src/libs/zbxnix/daemon.c	2007-11-25 15:53:31.890046746 +0100
-@@ -90,20 +90,33 @@
- 	pid_t   		pid;
- 	struct passwd		*pwd;
- 	struct sigaction	phan;
-+	char user[7] = "zabbix";
- 
- 	/* running as root ?*/
- 	if((0 == allow_root) && (0 == getuid() || 0 == getgid()))
- 	{
--		pwd = getpwnam("zabbix");
-+		pwd = getpwnam(user);
- 		if (NULL == pwd)
- 		{
- 			zbx_error("User zabbix does not exist.");
- 			zbx_error("Cannot run as root !");
- 			exit(FAIL);
- 		}
--		if( (setgid(pwd->pw_gid) ==-1) || (setuid(pwd->pw_uid) == -1) )
-+		if( (setgid(pwd->pw_gid) ==-1) )
- 		{
--			zbx_error("Cannot setgid or setuid to zabbix [%s].", strerror(errno));
-+			zbx_error("Cannot setgid to zabbix [%s].", strerror(errno));
-+			exit(FAIL);
-+		}
-+
-+		if( (initgroups(user, pwd->pw_gid) == -1) ) 
-+		{
-+			zbx_error("Cannot initgroups to zabbix [%s].", strerror(errno));
-+			exit(FAIL);
-+		}
-+		
-+		if( (setuid(pwd->pw_uid) ==-1) )
-+		{
-+			zbx_error("Cannot setuid to zabbix [%s].", strerror(errno));
- 			exit(FAIL);
- 		}
- 
diff --git a/net-analyzer/zabbix/files/1.4.2/postinstall-en.txt b/net-analyzer/zabbix/files/1.4.2/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.4.2/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.4.2/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4.2/zabbix_agent.conf
deleted file mode 100644
index 42997388900e..000000000000
--- a/net-analyzer/zabbix/files/1.4.2/zabbix_agent.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.2/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4.2/zabbix_agentd.conf
deleted file mode 100644
index e040f17efcc9..000000000000
--- a/net-analyzer/zabbix/files/1.4.2/zabbix_agentd.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-Server=127.0.0.1
-
-# Server port for sending active checks
-ServerPort=10051
-
-# Unique hostname. Required for active checks.
-Hostname=localhost
-
-# Listen port. Default is 10050
-ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-ListenIP=127.0.0.1
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.2/zabbix_server.conf b/net-analyzer/zabbix/files/1.4.2/zabbix_server.conf
deleted file mode 100644
index 12490f881130..000000000000
--- a/net-analyzer/zabbix/files/1.4.2/zabbix_server.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines which server this is.
-# Default value 1
-# This parameter must be between 1 and 255
-Server=1
-
-# Number of pre-forked instances of pollers
-# Default value is 6
-# This parameter must be between 6 and 255
-StartPollers=6
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 2 and 255
-StartTrappers=5
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-ListenIP=127.0.0.1
-
-# Listen port for trapping. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-ListenPort=10051
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Specifies how long we wait for agent (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/var/log/zabbix/zabbix_server.log
-
-#Location for custom alert scripts
-AlertScriptsPath=/var/lib/zabbix/scripts
-
-#Location of 'fping. Default is /usr/sbin/fping
-FpingLocation=/usr/sbin/fping
-
-# Frequency of ICMP pings. Defauls is 30 second.
-PingerFrequency=30
-
-# Database host name
-# Default is localhost
-DBHost=localhost
-
-# Database name
-DBName=zabbix
-
-# Database user
-DBUser=zabbix
-
-# Database password
-# Comment this line if no password used
-DBPassword=zabbix
-
-# Connect to MySQL using Unix socket?
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.4.3/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.3/init.d/zabbix-agentd
deleted file mode 100644
index f731fc08ba91..000000000000
--- a/net-analyzer/zabbix/files/1.4.3/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.3/init.d/zabbix-agentd,v 1.1 2007/12/12 17:21:27 wschlich Exp $
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.3/postinstall-en.txt b/net-analyzer/zabbix/files/1.4.3/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.4.3/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.4.3/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4.3/zabbix_agent.conf
deleted file mode 100644
index 42997388900e..000000000000
--- a/net-analyzer/zabbix/files/1.4.3/zabbix_agent.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.3/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4.3/zabbix_agentd.conf
deleted file mode 100644
index e040f17efcc9..000000000000
--- a/net-analyzer/zabbix/files/1.4.3/zabbix_agentd.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-Server=127.0.0.1
-
-# Server port for sending active checks
-ServerPort=10051
-
-# Unique hostname. Required for active checks.
-Hostname=localhost
-
-# Listen port. Default is 10050
-ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-ListenIP=127.0.0.1
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.3/zabbix_server.conf b/net-analyzer/zabbix/files/1.4.3/zabbix_server.conf
deleted file mode 100644
index 12490f881130..000000000000
--- a/net-analyzer/zabbix/files/1.4.3/zabbix_server.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines which server this is.
-# Default value 1
-# This parameter must be between 1 and 255
-Server=1
-
-# Number of pre-forked instances of pollers
-# Default value is 6
-# This parameter must be between 6 and 255
-StartPollers=6
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 2 and 255
-StartTrappers=5
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-ListenIP=127.0.0.1
-
-# Listen port for trapping. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-ListenPort=10051
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Specifies how long we wait for agent (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/var/log/zabbix/zabbix_server.log
-
-#Location for custom alert scripts
-AlertScriptsPath=/var/lib/zabbix/scripts
-
-#Location of 'fping. Default is /usr/sbin/fping
-FpingLocation=/usr/sbin/fping
-
-# Frequency of ICMP pings. Defauls is 30 second.
-PingerFrequency=30
-
-# Database host name
-# Default is localhost
-DBHost=localhost
-
-# Database name
-DBName=zabbix
-
-# Database user
-DBUser=zabbix
-
-# Database password
-# Comment this line if no password used
-DBPassword=zabbix
-
-# Connect to MySQL using Unix socket?
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-agentd
deleted file mode 100644
index 942ed57b2337..000000000000
--- a/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-agentd,v 1.1 2007/12/17 17:41:44 wschlich Exp $
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-server
deleted file mode 100644
index b159b4412d83..000000000000
--- a/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.4/init.d/zabbix-server,v 1.1 2007/12/17 17:41:44 wschlich Exp $
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.4/postinstall-en.txt b/net-analyzer/zabbix/files/1.4.4/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.4.4/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.4.4/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4.4/zabbix_agent.conf
deleted file mode 100644
index 42997388900e..000000000000
--- a/net-analyzer/zabbix/files/1.4.4/zabbix_agent.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.4/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4.4/zabbix_agentd.conf
deleted file mode 100644
index e040f17efcc9..000000000000
--- a/net-analyzer/zabbix/files/1.4.4/zabbix_agentd.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-Server=127.0.0.1
-
-# Server port for sending active checks
-ServerPort=10051
-
-# Unique hostname. Required for active checks.
-Hostname=localhost
-
-# Listen port. Default is 10050
-ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-ListenIP=127.0.0.1
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.4/zabbix_server.conf b/net-analyzer/zabbix/files/1.4.4/zabbix_server.conf
deleted file mode 100644
index 12490f881130..000000000000
--- a/net-analyzer/zabbix/files/1.4.4/zabbix_server.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines which server this is.
-# Default value 1
-# This parameter must be between 1 and 255
-Server=1
-
-# Number of pre-forked instances of pollers
-# Default value is 6
-# This parameter must be between 6 and 255
-StartPollers=6
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 2 and 255
-StartTrappers=5
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-ListenIP=127.0.0.1
-
-# Listen port for trapping. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-ListenPort=10051
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Specifies how long we wait for agent (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/var/log/zabbix/zabbix_server.log
-
-#Location for custom alert scripts
-AlertScriptsPath=/var/lib/zabbix/scripts
-
-#Location of 'fping. Default is /usr/sbin/fping
-FpingLocation=/usr/sbin/fping
-
-# Frequency of ICMP pings. Defauls is 30 second.
-PingerFrequency=30
-
-# Database host name
-# Default is localhost
-DBHost=localhost
-
-# Database name
-DBName=zabbix
-
-# Database user
-DBUser=zabbix
-
-# Database password
-# Comment this line if no password used
-DBPassword=zabbix
-
-# Connect to MySQL using Unix socket?
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-agentd
deleted file mode 100644
index ead75dbdafa3..000000000000
--- a/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-agentd,v 1.1 2008/03/29 07:05:46 wschlich Exp $
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-server
deleted file mode 100644
index fc890f0aa175..000000000000
--- a/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.5/init.d/zabbix-server,v 1.1 2008/03/29 07:05:46 wschlich Exp $
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.5/postinstall-en.txt b/net-analyzer/zabbix/files/1.4.5/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.4.5/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.4.5/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4.5/zabbix_agent.conf
deleted file mode 100644
index 42997388900e..000000000000
--- a/net-analyzer/zabbix/files/1.4.5/zabbix_agent.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.5/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4.5/zabbix_agentd.conf
deleted file mode 100644
index e040f17efcc9..000000000000
--- a/net-analyzer/zabbix/files/1.4.5/zabbix_agentd.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-Server=127.0.0.1
-
-# Server port for sending active checks
-ServerPort=10051
-
-# Unique hostname. Required for active checks.
-Hostname=localhost
-
-# Listen port. Default is 10050
-ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-ListenIP=127.0.0.1
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.5/zabbix_server.conf b/net-analyzer/zabbix/files/1.4.5/zabbix_server.conf
deleted file mode 100644
index 12490f881130..000000000000
--- a/net-analyzer/zabbix/files/1.4.5/zabbix_server.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines which server this is.
-# Default value 1
-# This parameter must be between 1 and 255
-Server=1
-
-# Number of pre-forked instances of pollers
-# Default value is 6
-# This parameter must be between 6 and 255
-StartPollers=6
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 2 and 255
-StartTrappers=5
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-ListenIP=127.0.0.1
-
-# Listen port for trapping. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-ListenPort=10051
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Specifies how long we wait for agent (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/var/log/zabbix/zabbix_server.log
-
-#Location for custom alert scripts
-AlertScriptsPath=/var/lib/zabbix/scripts
-
-#Location of 'fping. Default is /usr/sbin/fping
-FpingLocation=/usr/sbin/fping
-
-# Frequency of ICMP pings. Defauls is 30 second.
-PingerFrequency=30
-
-# Database host name
-# Default is localhost
-DBHost=localhost
-
-# Database name
-DBName=zabbix
-
-# Database user
-DBUser=zabbix
-
-# Database password
-# Comment this line if no password used
-DBPassword=zabbix
-
-# Connect to MySQL using Unix socket?
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.4.1/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd
index c742a5a82a50..4ab04633df9b 100644
--- a/net-analyzer/zabbix/files/1.4.1/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.1/init.d/zabbix-agentd,v 1.1 2007/07/24 11:49:19 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd,v 1.1 2008/07/23 15:47:30 wschlich Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/zabbix/files/1.4.3/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server
index 0a6e87945ba9..71d2be8e5be9 100644
--- a/net-analyzer/zabbix/files/1.4.3/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.3/init.d/zabbix-server,v 1.1 2007/12/12 17:21:27 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server,v 1.1 2008/07/23 15:47:30 wschlich Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/zabbix/files/1.4.1/postinstall-en.txt b/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt
index 9d13a9f3dbce..9d13a9f3dbce 100644
--- a/net-analyzer/zabbix/files/1.4.1/postinstall-en.txt
+++ b/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt
diff --git a/net-analyzer/zabbix/files/1.4.1/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf
index 42997388900e..42997388900e 100644
--- a/net-analyzer/zabbix/files/1.4.1/zabbix_agent.conf
+++ b/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf
diff --git a/net-analyzer/zabbix/files/1.4.1/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf
index e040f17efcc9..e040f17efcc9 100644
--- a/net-analyzer/zabbix/files/1.4.1/zabbix_agentd.conf
+++ b/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf
diff --git a/net-analyzer/zabbix/files/1.4.1/zabbix_server.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf
index 12490f881130..12490f881130 100644
--- a/net-analyzer/zabbix/files/1.4.1/zabbix_server.conf
+++ b/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf
diff --git a/net-analyzer/zabbix/files/1.4/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4/init.d/zabbix-agentd
deleted file mode 100644
index f9f389236451..000000000000
--- a/net-analyzer/zabbix/files/1.4/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4/init.d/zabbix-agentd,v 1.1 2007/06/08 01:41:21 wschlich Exp $
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4/init.d/zabbix-server
deleted file mode 100644
index f151f975f97d..000000000000
--- a/net-analyzer/zabbix/files/1.4/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.4/init.d/zabbix-server,v 1.1 2007/06/08 01:41:21 wschlich Exp $
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4/postinstall-en.txt b/net-analyzer/zabbix/files/1.4/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.4/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.4/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4/zabbix_agent.conf
deleted file mode 100644
index 42997388900e..000000000000
--- a/net-analyzer/zabbix/files/1.4/zabbix_agent.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4/zabbix_agentd.conf
deleted file mode 100644
index e040f17efcc9..000000000000
--- a/net-analyzer/zabbix/files/1.4/zabbix_agentd.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-Server=127.0.0.1
-
-# Server port for sending active checks
-ServerPort=10051
-
-# Unique hostname. Required for active checks.
-Hostname=localhost
-
-# Listen port. Default is 10050
-ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-ListenIP=127.0.0.1
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4/zabbix_server.conf b/net-analyzer/zabbix/files/1.4/zabbix_server.conf
deleted file mode 100644
index 12490f881130..000000000000
--- a/net-analyzer/zabbix/files/1.4/zabbix_server.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines which server this is.
-# Default value 1
-# This parameter must be between 1 and 255
-Server=1
-
-# Number of pre-forked instances of pollers
-# Default value is 6
-# This parameter must be between 6 and 255
-StartPollers=6
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 2 and 255
-StartTrappers=5
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-ListenIP=127.0.0.1
-
-# Listen port for trapping. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-ListenPort=10051
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Specifies how long we wait for agent (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/var/log/zabbix/zabbix_server.log
-
-#Location for custom alert scripts
-AlertScriptsPath=/var/lib/zabbix/scripts
-
-#Location of 'fping. Default is /usr/sbin/fping
-FpingLocation=/usr/sbin/fping
-
-# Frequency of ICMP pings. Defauls is 30 second.
-PingerFrequency=30
-
-# Database host name
-# Default is localhost
-DBHost=localhost
-
-# Database name
-DBName=zabbix
-
-# Database user
-DBUser=zabbix
-
-# Database password
-# Comment this line if no password used
-DBPassword=zabbix
-
-# Connect to MySQL using Unix socket?
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/zabbix-1.4.1.ebuild b/net-analyzer/zabbix/zabbix-1.4.1.ebuild
deleted file mode 100644
index 8dd2562c5bb1..000000000000
--- a/net-analyzer/zabbix/zabbix-1.4.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.1.ebuild,v 1.2 2008/05/19 20:13:57 dev-zero Exp $
-
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="mirror://sourceforge/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres server snmp sqlite3"
-DEPEND="virtual/libc
-	snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	postgres? ( virtual/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )"
-RDEPEND="${RDEPEND}
-	server? ( net-analyzer/fping )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server; then
-		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-		declare -i dbnum=0
-		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
-		done
-		if [ ${dbnum} -gt 1 ]; then
-			eerror
-			eerror "You can't use more than one database type in Zabbix."
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "Multiple database types selected."
-		elif [ ${dbnum} -lt 1 ]; then
-			eerror
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "No database type selected."
-		fi
-		if useq oracle; then
-			if [ -z "${ORACLE_HOME}" ]; then
-				eerror
-				eerror "The environment variable ORACLE_HOME must be set"
-				eerror "and point to the correct location."
-				eerror "It looks like you don't have Oracle installed."
-				eerror
-				die "Environment variable ORACLE_HOME is not set"
-			fi
-			if has_version 'dev-db/oracle-instantclient-basic'; then
-				ewarn
-				ewarn "Please ensure you have a full install of the Oracle client."
-				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-				ewarn
-			fi
-		fi
-	fi
-
-	if useq frontend; then
-		webapp_pkg_setup
-		require_gd
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-	if useq server; then
-		elog
-		elog "You need to configure your database for Zabbix."
-		elog
-		elog "Have a look at /usr/share/zabbix/database for"
-		elog "database creation and upgrades."
-		elog
-		elog "For more info read the Zabbix manual at"
-		elog "http://www.zabbix.com/manual/v1.4/"
-		elog
-
-		zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown zabbix:zabbix \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	chmod 0750 \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	if useq server; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_server.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_server.conf
-	fi
-	if useq agent; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-	fi
-
-	if useq server; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				ebeep 3
-				epause 5
-				;;
-		esac
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable server) \
-		$(use_enable agent) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with oracle) \
-		$(use_with sqlite3) \
-		$(use_with jabber) \
-		$(use_with curl libcurl) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	if useq server; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_server.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-server
-		dosbin \
-			src/zabbix_server/zabbix_server
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_server.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_agent.conf \
-			${FILESDIR}/${PV}/zabbix_agentd.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog
-
-	if useq frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-		webapp_configfile \
-			${MY_HTDOCSDIR}/include/db.inc.php \
-			${MY_HTDOCSDIR}/include/config.inc.php
-		webapp_src_install
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-1.4.2-r1.ebuild b/net-analyzer/zabbix/zabbix-1.4.2-r1.ebuild
deleted file mode 100644
index 50d0d5077a0a..000000000000
--- a/net-analyzer/zabbix/zabbix-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.2-r1.ebuild,v 1.2 2008/05/19 20:13:57 dev-zero Exp $
-
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="mirror://sourceforge/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres server snmp sqlite3"
-DEPEND="virtual/libc
-	snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	postgres? ( virtual/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )"
-RDEPEND="${RDEPEND}
-	server? ( net-analyzer/fping )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server; then
-		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-		declare -i dbnum=0
-		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
-		done
-		if [ ${dbnum} -gt 1 ]; then
-			eerror
-			eerror "You can't use more than one database type in Zabbix."
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "Multiple database types selected."
-		elif [ ${dbnum} -lt 1 ]; then
-			eerror
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "No database type selected."
-		fi
-		if useq oracle; then
-			if [ -z "${ORACLE_HOME}" ]; then
-				eerror
-				eerror "The environment variable ORACLE_HOME must be set"
-				eerror "and point to the correct location."
-				eerror "It looks like you don't have Oracle installed."
-				eerror
-				die "Environment variable ORACLE_HOME is not set"
-			fi
-			if has_version 'dev-db/oracle-instantclient-basic'; then
-				ewarn
-				ewarn "Please ensure you have a full install of the Oracle client."
-				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-				ewarn
-			fi
-		fi
-	fi
-
-	if useq frontend; then
-		webapp_pkg_setup
-		require_gd
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-	if useq server; then
-		elog
-		elog "You need to configure your database for Zabbix."
-		elog
-		elog "Have a look at /usr/share/zabbix/database for"
-		elog "database creation and upgrades."
-		elog
-		elog "For more info read the Zabbix manual at"
-		elog "http://www.zabbix.com/manual/v1.4/"
-		elog
-
-		zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown zabbix:zabbix \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	chmod 0750 \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	if useq server; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_server.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_server.conf
-	fi
-	if useq agent; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-	fi
-
-	if useq server; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				ebeep 3
-				epause 5
-				;;
-		esac
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PV}/initgroups.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable server) \
-		$(use_enable agent) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with oracle) \
-		$(use_with sqlite3) \
-		$(use_with jabber) \
-		$(use_with curl libcurl) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	if useq server; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_server.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-server
-		dosbin \
-			src/zabbix_server/zabbix_server
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_server.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_agent.conf \
-			${FILESDIR}/${PV}/zabbix_agentd.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog
-
-	if useq frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-		webapp_configfile \
-			${MY_HTDOCSDIR}/include/db.inc.php \
-			${MY_HTDOCSDIR}/include/config.inc.php
-		webapp_src_install
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-1.4.2.ebuild b/net-analyzer/zabbix/zabbix-1.4.2.ebuild
deleted file mode 100644
index 4a1eaa31bede..000000000000
--- a/net-analyzer/zabbix/zabbix-1.4.2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.2.ebuild,v 1.2 2008/05/19 20:13:57 dev-zero Exp $
-
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="mirror://sourceforge/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres server snmp sqlite3"
-DEPEND="virtual/libc
-	snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	postgres? ( virtual/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )"
-RDEPEND="${RDEPEND}
-	server? ( net-analyzer/fping )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server; then
-		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-		declare -i dbnum=0
-		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
-		done
-		if [ ${dbnum} -gt 1 ]; then
-			eerror
-			eerror "You can't use more than one database type in Zabbix."
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "Multiple database types selected."
-		elif [ ${dbnum} -lt 1 ]; then
-			eerror
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "No database type selected."
-		fi
-		if useq oracle; then
-			if [ -z "${ORACLE_HOME}" ]; then
-				eerror
-				eerror "The environment variable ORACLE_HOME must be set"
-				eerror "and point to the correct location."
-				eerror "It looks like you don't have Oracle installed."
-				eerror
-				die "Environment variable ORACLE_HOME is not set"
-			fi
-			if has_version 'dev-db/oracle-instantclient-basic'; then
-				ewarn
-				ewarn "Please ensure you have a full install of the Oracle client."
-				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-				ewarn
-			fi
-		fi
-	fi
-
-	if useq frontend; then
-		webapp_pkg_setup
-		require_gd
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-	if useq server; then
-		elog
-		elog "You need to configure your database for Zabbix."
-		elog
-		elog "Have a look at /usr/share/zabbix/database for"
-		elog "database creation and upgrades."
-		elog
-		elog "For more info read the Zabbix manual at"
-		elog "http://www.zabbix.com/manual/v1.4/"
-		elog
-
-		zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown zabbix:zabbix \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	chmod 0750 \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	if useq server; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_server.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_server.conf
-	fi
-	if useq agent; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-	fi
-
-	if useq server; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				ebeep 3
-				epause 5
-				;;
-		esac
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable server) \
-		$(use_enable agent) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with oracle) \
-		$(use_with sqlite3) \
-		$(use_with jabber) \
-		$(use_with curl libcurl) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	if useq server; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_server.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-server
-		dosbin \
-			src/zabbix_server/zabbix_server
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_server.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_agent.conf \
-			${FILESDIR}/${PV}/zabbix_agentd.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog
-
-	if useq frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-		webapp_configfile \
-			${MY_HTDOCSDIR}/include/db.inc.php \
-			${MY_HTDOCSDIR}/include/config.inc.php
-		webapp_src_install
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-1.4.3.ebuild b/net-analyzer/zabbix/zabbix-1.4.3.ebuild
deleted file mode 100644
index 18bf29d9e1ba..000000000000
--- a/net-analyzer/zabbix/zabbix-1.4.3.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.3.ebuild,v 1.2 2008/05/19 20:13:57 dev-zero Exp $
-
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="mirror://sourceforge/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres server snmp sqlite3"
-DEPEND="virtual/libc
-	snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	postgres? ( virtual/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )"
-RDEPEND="${RDEPEND}
-	server? ( net-analyzer/fping )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server; then
-		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-		declare -i dbnum=0
-		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
-		done
-		if [ ${dbnum} -gt 1 ]; then
-			eerror
-			eerror "You can't use more than one database type in Zabbix."
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "Multiple database types selected."
-		elif [ ${dbnum} -lt 1 ]; then
-			eerror
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "No database type selected."
-		fi
-		if useq oracle; then
-			if [ -z "${ORACLE_HOME}" ]; then
-				eerror
-				eerror "The environment variable ORACLE_HOME must be set"
-				eerror "and point to the correct location."
-				eerror "It looks like you don't have Oracle installed."
-				eerror
-				die "Environment variable ORACLE_HOME is not set"
-			fi
-			if has_version 'dev-db/oracle-instantclient-basic'; then
-				ewarn
-				ewarn "Please ensure you have a full install of the Oracle client."
-				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-				ewarn
-			fi
-		fi
-	fi
-
-	if useq frontend; then
-		webapp_pkg_setup
-		require_gd
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-	if useq server; then
-		elog
-		elog "You need to configure your database for Zabbix."
-		elog
-		elog "Have a look at /usr/share/zabbix/database for"
-		elog "database creation and upgrades."
-		elog
-		elog "For more info read the Zabbix manual at"
-		elog "http://www.zabbix.com/manual/v1.4/"
-		elog
-
-		zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown zabbix:zabbix \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	chmod 0750 \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	if useq server; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_server.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_server.conf
-	fi
-	if useq agent; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-	fi
-
-	if useq server; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				ebeep 3
-				epause 5
-				;;
-		esac
-	fi
-}
-
-#src_unpack() {
-#	unpack ${A}
-#	epatch "${FILESDIR}"/${PV}/some.patch
-#}
-
-src_compile() {
-	econf \
-		$(use_enable server) \
-		$(use_enable agent) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with oracle) \
-		$(use_with sqlite3) \
-		$(use_with jabber) \
-		$(use_with curl libcurl) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	if useq server; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_server.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-server
-		dosbin \
-			src/zabbix_server/zabbix_server
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_server.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_agent.conf \
-			${FILESDIR}/${PV}/zabbix_agentd.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog
-
-	if useq frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-		webapp_configfile \
-			${MY_HTDOCSDIR}/include/db.inc.php \
-			${MY_HTDOCSDIR}/include/config.inc.php
-		webapp_src_install
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-1.4.5.ebuild b/net-analyzer/zabbix/zabbix-1.4.5.ebuild
deleted file mode 100644
index e168d1add5a9..000000000000
--- a/net-analyzer/zabbix/zabbix-1.4.5.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.5.ebuild,v 1.2 2008/05/19 20:13:57 dev-zero Exp $
-
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="mirror://sourceforge/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres server snmp sqlite3"
-DEPEND="virtual/libc
-	snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	postgres? ( virtual/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )"
-RDEPEND="${RDEPEND}
-	server? ( net-analyzer/fping )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server; then
-		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-		declare -i dbnum=0
-		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
-		done
-		if [ ${dbnum} -gt 1 ]; then
-			eerror
-			eerror "You can't use more than one database type in Zabbix."
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "Multiple database types selected."
-		elif [ ${dbnum} -lt 1 ]; then
-			eerror
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "No database type selected."
-		fi
-		if useq oracle; then
-			if [ -z "${ORACLE_HOME}" ]; then
-				eerror
-				eerror "The environment variable ORACLE_HOME must be set"
-				eerror "and point to the correct location."
-				eerror "It looks like you don't have Oracle installed."
-				eerror
-				die "Environment variable ORACLE_HOME is not set"
-			fi
-			if has_version 'dev-db/oracle-instantclient-basic'; then
-				ewarn
-				ewarn "Please ensure you have a full install of the Oracle client."
-				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-				ewarn
-			fi
-		fi
-	fi
-
-	if useq frontend; then
-		webapp_pkg_setup
-		require_gd
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-	if useq server; then
-		elog
-		elog "You need to configure your database for Zabbix."
-		elog
-		elog "Have a look at /usr/share/zabbix/database for"
-		elog "database creation and upgrades."
-		elog
-		elog "For more info read the Zabbix manual at"
-		elog "http://www.zabbix.com/manual/v1.4/"
-		elog
-
-		zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown zabbix:zabbix \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	chmod 0750 \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	if useq server; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_server.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_server.conf
-	fi
-	if useq agent; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-	fi
-
-	if useq server; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				ebeep 3
-				epause 5
-				;;
-		esac
-	fi
-}
-
-#src_unpack() {
-#	unpack ${A}
-#	epatch "${FILESDIR}"/${PV}/some.patch
-#}
-
-src_compile() {
-	econf \
-		$(use_enable server) \
-		$(use_enable agent) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with oracle) \
-		$(use_with sqlite3) \
-		$(use_with jabber) \
-		$(use_with curl libcurl) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	if useq server; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_server.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-server
-		dosbin \
-			src/zabbix_server/zabbix_server
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_server.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_agent.conf \
-			${FILESDIR}/${PV}/zabbix_agentd.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog
-
-	if useq frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-		webapp_configfile \
-			${MY_HTDOCSDIR}/include/db.inc.php \
-			${MY_HTDOCSDIR}/include/config.inc.php
-		webapp_src_install
-	fi
-}
diff --git a/net-analyzer/zabbix/zabbix-1.4.4.ebuild b/net-analyzer/zabbix/zabbix-1.4.6.ebuild
index d8fcccfe227c..2e0610e3e2a8 100644
--- a/net-analyzer/zabbix/zabbix-1.4.4.ebuild
+++ b/net-analyzer/zabbix/zabbix-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.4.ebuild,v 1.2 2008/05/19 20:13:57 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.6.ebuild,v 1.1 2008/07/23 15:47:28 wschlich Exp $
 
 inherit eutils flag-o-matic webapp depend.php
 
@@ -109,32 +109,32 @@ pkg_postinst() {
 	# here to catch wrong permissions on existing files in
 	# the live filesystem (yeah, that sucks).
 	chown zabbix:zabbix \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix \
+		"${ROOT}"/var/run/zabbix
 	chmod 0750 \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix \
+		"${ROOT}"/var/run/zabbix
 	if useq server; then
 		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_server.conf
+			"${ROOT}"/etc/zabbix/zabbix_server.conf
 		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_server.conf
+			"${ROOT}"/etc/zabbix/zabbix_server.conf
 	fi
 	if useq agent; then
 		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
+			"${ROOT}"/etc/zabbix/zabbix_agent.conf \
+			"${ROOT}"/etc/zabbix/zabbix_agentd.conf
 		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
+			"${ROOT}"/etc/zabbix/zabbix_agent.conf \
+			"${ROOT}"/etc/zabbix/zabbix_agentd.conf
 	fi
 
 	if useq server; then
@@ -202,9 +202,9 @@ src_install() {
 	if useq server; then
 		insinto /etc/zabbix
 		doins \
-			${FILESDIR}/${PV}/zabbix_server.conf
+			"${FILESDIR}"/${PV}/zabbix_server.conf
 		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-server
+			"${FILESDIR}"/${PV}/init.d/zabbix-server
 		dosbin \
 			src/zabbix_server/zabbix_server
 		dodir \
@@ -222,10 +222,10 @@ src_install() {
 	if useq agent; then
 		insinto /etc/zabbix
 		doins \
-			${FILESDIR}/${PV}/zabbix_agent.conf \
-			${FILESDIR}/${PV}/zabbix_agentd.conf
+			"${FILESDIR}"/${PV}/zabbix_agent.conf \
+			"${FILESDIR}"/${PV}/zabbix_agentd.conf
 		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-agentd
+			"${FILESDIR}"/${PV}/init.d/zabbix-agentd
 		dosbin \
 			src/zabbix_agent/zabbix_agent \
 			src/zabbix_agent/zabbix_agentd
@@ -260,10 +260,10 @@ src_install() {
 	if useq frontend; then
 		webapp_src_preinst
 		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
+		webapp_postinst_txt en "${FILESDIR}"/${PV}/postinstall-en.txt
 		webapp_configfile \
-			${MY_HTDOCSDIR}/include/db.inc.php \
-			${MY_HTDOCSDIR}/include/config.inc.php
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
 		webapp_src_install
 	fi
 }
diff --git a/net-analyzer/zabbix/zabbix-1.4.ebuild b/net-analyzer/zabbix/zabbix-1.4.ebuild
deleted file mode 100644
index 4153574c0790..000000000000
--- a/net-analyzer/zabbix/zabbix-1.4.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.4.ebuild,v 1.2 2008/05/19 20:13:57 dev-zero Exp $
-
-inherit eutils flag-o-matic webapp depend.php
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers."
-HOMEPAGE="http://www.zabbix.com/"
-SRC_URI="mirror://sourceforge/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend jabber ldap mysql oracle postgres server snmp sqlite3"
-DEPEND="virtual/libc
-	snmp? ( net-analyzer/net-snmp )
-	ldap? (
-		net-nds/openldap
-		=dev-libs/cyrus-sasl-2*
-		net-libs/gnutls
-	)
-	mysql? ( virtual/mysql )
-	sqlite3? ( =dev-db/sqlite-3* )
-	postgres? ( virtual/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )"
-RDEPEND="${RDEPEND} net-analyzer/fping"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server; then
-		local dbnum dbtypes="mysql oracle postgres sqlite3" dbtype
-		declare -i dbnum=0
-		for dbtype in ${dbtypes}; do
-			useq ${dbtype} && let dbnum++
-		done
-		if [ ${dbnum} -gt 1 ]; then
-			eerror
-			eerror "You can't use more than one database type in Zabbix."
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "Multiple database types selected."
-		elif [ ${dbnum} -lt 1 ]; then
-			eerror
-			eerror "Select exactly one database type out of these: ${dbtypes}"
-			eerror
-			die "No database type selected."
-		fi
-		if useq oracle; then
-			if [ -z "${ORACLE_HOME}" ]; then
-				eerror
-				eerror "The environment variable ORACLE_HOME must be set"
-				eerror "and point to the correct location."
-				eerror "It looks like you don't have Oracle installed."
-				eerror
-				die "Environment variable ORACLE_HOME is not set"
-			fi
-			if has_version 'dev-db/oracle-instantclient-basic'; then
-				ewarn
-				ewarn "Please ensure you have a full install of the Oracle client."
-				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
-				ewarn
-			fi
-		fi
-	fi
-
-	if useq frontend; then
-		webapp_pkg_setup
-		require_gd
-	fi
-
-	enewgroup zabbix
-	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-pkg_postinst() {
-	if useq server; then
-		elog
-		elog "You need to configure your database for Zabbix."
-		elog
-		elog "Have a look at /usr/share/zabbix/database for"
-		elog "database creation and upgrades."
-		elog
-		elog "For more info read the Zabbix manual at"
-		elog "http://www.zabbix.com/manual/v1.4/"
-		elog
-
-		zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )"
-		if [ -n "${zabbix_homedir}" ] && \
-		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
-			ewarn
-			ewarn "The user 'zabbix' should have his homedir changed"
-			ewarn "to /var/lib/zabbix/home if you want to use"
-			ewarn "custom alert scripts."
-			ewarn
-			ewarn "A real homedir might be needed for configfiles"
-			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
-			ewarn "using sendxmpp for Jabber alerts)."
-			ewarn
-			ewarn "To change the homedir use:"
-			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
-			ewarn
-		fi
-	fi
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown zabbix:zabbix \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	chmod 0750 \
-		${ROOT}etc/zabbix \
-		${ROOT}var/lib/zabbix \
-		${ROOT}var/lib/zabbix/home \
-		${ROOT}var/lib/zabbix/scripts \
-		${ROOT}var/log/zabbix \
-		${ROOT}var/run/zabbix
-	if useq server; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_server.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_server.conf
-	fi
-	if useq agent; then
-		chown zabbix:zabbix \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-		chmod 0640 \
-			${ROOT}etc/zabbix/zabbix_agent.conf \
-			${ROOT}etc/zabbix/zabbix_agentd.conf
-	fi
-
-	if useq server; then
-		# check for fping
-		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
-		case "${fping_perms}" in
-			4[157][157][157])
-				;;
-			*)
-				ewarn
-				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
-				ewarn "you have to make /usr/sbin/fping setuid root and executable"
-				ewarn "by everyone. Run the following command to fix it:"
-				ewarn
-				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
-				ewarn
-				ewarn "Please be aware that this might impose a security risk,"
-				ewarn "depending on the code quality of fping."
-				ewarn
-				ebeep 3
-				epause 5
-				;;
-		esac
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable server) \
-		$(use_enable agent) \
-		$(use_with ldap) \
-		$(use_with snmp net-snmp) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with oracle) \
-		$(use_with sqlite3) \
-		$(use_with jabber) \
-		$(use_with curl libcurl) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	keepdir \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	if useq server; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_server.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-server
-		dosbin \
-			src/zabbix_server/zabbix_server
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_server.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			${FILESDIR}/${PV}/zabbix_agent.conf \
-			${FILESDIR}/${PV}/zabbix_agentd.conf
-		doinitd \
-			${FILESDIR}/${PV}/init.d/zabbix-agentd
-		dosbin \
-			src/zabbix_agent/zabbix_agent \
-			src/zabbix_agent/zabbix_agentd
-		dobin \
-			src/zabbix_sender/zabbix_sender \
-			src/zabbix_get/zabbix_get
-		fowners zabbix:zabbix \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_agent.conf \
-			/etc/zabbix/zabbix_agentd.conf
-	fi
-
-	fowners zabbix:zabbix \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-	fperms 0750 \
-		/etc/zabbix \
-		/var/lib/zabbix \
-		/var/lib/zabbix/home \
-		/var/lib/zabbix/scripts \
-		/var/log/zabbix \
-		/var/run/zabbix
-
-	dodoc README INSTALL NEWS ChangeLog
-
-	if useq frontend; then
-		webapp_src_preinst
-		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
-		webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-		webapp_configfile \
-			${MY_HTDOCSDIR}/include/db.inc.php \
-			${MY_HTDOCSDIR}/include/config.inc.php
-		webapp_src_install
-	fi
-}