version bump, removed old versions

Package-Manager: portage-2.1.5.6

37 files changed, 2 insertions, 1261 deletions

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