Remove old

Package-Manager: portage-2.2_rc80/cvs/Linux x86_64

5 files changed, 6 insertions, 942 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index b58daa271768..1aa4f359cf30 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.37 2010/09/12 16:09:28 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.38 2010/09/12 20:24:04 patrick Exp $
+
+  12 Sep 2010; Patrick Lauer <patrick@gentoo.org> -zabbix-1.8-r1.ebuild,
+  -zabbix-1.8.1.ebuild, -zabbix-1.8.2.ebuild:
+  Remove old
 
   12 Sep 2010; Joseph Jezak <josejx@gentoo.org> zabbix-1.8.3.ebuild:
   Marked ppc stable for bug #335071.
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 6d6733ebfcc8..632f40842a12 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.6/init.d/zabbix-agentd 582 RMD160 051a6bf6e8d8181258f99ddb3964881ff78d0954 SHA1 757d60d5f681ea9dd2c32347f6eb787d2c23a5ce SHA256 e6b10adda63ff234bd3c11fd19fd30970dcbda292b2fcfa1c382d9d0b7a795f1
 AUX 1.4.6/init.d/zabbix-server 564 RMD160 f05bfbcbfc163db19076656e995ddc72fbb7a78e SHA1 141f08ae3966fd935df89589eea62554c3b69bb3 SHA256 eb5ea05e53d8bbf502cf3f6b873c9275dba793446b0f5ab11ed7a169d757b3c9
 AUX 1.4.6/postinstall-en.txt 147 RMD160 c0aa1d85021eb046f9c92415fa8e95f9296b046d SHA1 cb5e16baa4cc0a1bf728d94a14fe5e0a85aebcf4 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f
@@ -26,20 +23,7 @@ AUX 1.6.6/zabbix_server.conf 3933 RMD160 7e0cfe262911d5a42ce590071e2852ec8d76e8b
 AUX 1.6.6/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8
 AUX zabbix-1.8.2-as-needed.patch 2328 RMD160 8a69c4b6267c0e280e0135bbd13915b5d02b6c52 SHA1 e838d87010f9105ab4c0873998575ead783ca8c3 SHA256 6ca4044ba72c7417cb7d6273582d93c4266b3528d77c1c450c12b7d013a6551e
 AUX zabbix-as-needed.patch 2296 RMD160 2f369ec35e3245d191433613dc5e82fc4a21f2e0 SHA1 809b8a94e49a9677f520a601b5dc599c33843992 SHA256 7e8d9b6f478c4a2fbfc822400e51dd01dbe46a0c28522520db167e46e36a0c29
-DIST zabbix-1.8.1.tar.gz 3607414 RMD160 2f444b7292855bb4b9aaf4830871ebeb49e28b47 SHA1 ac8d4e73eebd1a86b9fdc5df3035df67e7efa5e0 SHA256 ef487766f22527d79fd7a2631b615c34d04103038341f1dc16eceb77172d8a7c
-DIST zabbix-1.8.2.tar.gz 3706540 RMD160 6333bb4c676422956a60c01caee3c67c9c05dde2 SHA1 59573efdffe481f1e0d020f4e75b670daa837ded SHA256 ba1d00454551c1c6f0d270f76718b69ce9f54c427e22acb5a13ccbc9e621fd81
 DIST zabbix-1.8.3.tar.gz 4106152 RMD160 f0d54c1cd8865c952945a8ec3958e7ebdd9a92d5 SHA1 68f5d1f12897bc69c6ff5deea2bad82b0c1f5761 SHA256 37262d751c9661a361380bf1480d277d81621d8a49c60a81667cbe258021065c
-DIST zabbix-1.8.tar.gz 3549582 RMD160 1eba1aacb7579bf560057fe9cc1d667bf36ac608 SHA1 fa82721b745ccaa84c33602f4016c4057b5245b3 SHA256 6743f01f27116ead7b48927ac184708bb920541c88e63602fe1f2b7401866eec
-EBUILD zabbix-1.8-r1.ebuild 7959 RMD160 6768a6fd7e692176548f5c20796904f1874aa2b1 SHA1 5196a78cbe7c06839964606007771331bd0ecd95 SHA256 4b4f05a836c9351ad90ebd22e637db354669d12ed0a5a1f45830d29316e8f3e5
-EBUILD zabbix-1.8.1.ebuild 7958 RMD160 916893aebcc37537fc07797c14098c42e31e37ab SHA1 120d3119cca2463de4b216cf802d8a98f0b03126 SHA256 de79bec79ca1168bfdf1c00ecc77508f0276c1ee12136fa799ca88d8ea195641
-EBUILD zabbix-1.8.2.ebuild 8032 RMD160 f529502b7f7659b736dca285229fb0467f889215 SHA1 d655a83c703eddabd2212e34b3a4666a4655cbd8 SHA256 639e0b4b0deaf872d76ced15c6c6dbcb58cf01dd168d4f6cf84c43b2f7c8e7d2
 EBUILD zabbix-1.8.3.ebuild 8017 RMD160 0c003b2d6a73a7d7615e091a8ece77642fe0329b SHA1 82dbd1410ea500e05bec1c96e1f8756b8e827ec5 SHA256 9cd4993df6f9ca7ae6caa0cdb6a16f1e8f2d7335a3474cdae6b536351a69b4df
-MISC ChangeLog 9038 RMD160 4b9a57ecea4308f19a5f111a67a34f714a1c33ad SHA1 67f17e41353c310be375417a4d3e5eb8c5ac231d SHA256 0763ccdec7396788b9c966864deb77b488abc96a7fc98118a9c4a4aee7e86887
+MISC ChangeLog 9172 RMD160 6fd9fbfe239d1e247fd33f0ba867b59d25296b09 SHA1 3fab0d3e3eb22133bb5a8d60353acee14ca57fa2 SHA256 058f0e36f4efd5b70e933ef4cdca01835b11c3fb82df890d7ce31f0191872c5f
 MISC metadata.xml 923 RMD160 4318cea3643c9523c0bf71913d355b31954d079b SHA1 0a121546e57330503091d4c29f03de07d54f578f SHA256 1f7a69cb4461cebb0f1bc62c1a91167a2e69dc9c3640c8c4eb9488643f154c23
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyM+kAACgkQcsIHjyDViGRwAwCbBniA57wNUyf3Ykg2MzADPJ6y
-3MoAoMWw3c9eERiKB57oVglo3fs4V92S
-=H2+2
------END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix/zabbix-1.8-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8-r1.ebuild
deleted file mode 100644
index 96f8b149f659..000000000000
--- a/net-analyzer/zabbix/zabbix-1.8-r1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8-r1.ebuild,v 1.4 2010/06/17 20:44:07 patrick Exp $
-
-EAPI="2"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-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="http://dev.gentooexperimental.org/~dreeevil/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend ipv6 jabber ldap mysql oracle postgres proxy server snmp +sqlite3 openipmi"
-DEPEND="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? ( dev-db/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )"
-RDEPEND="${DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	frontend? ( dev-lang/php[bcmath,ctype]
-		app-admin/webapp-config )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server || useq proxy ; 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 || useq proxy ; 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/documentation.php"
-		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
-
-	if useq server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "Add these lines in the /etc/services :"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown -R 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
-
-	chmod 0640 \
-		"${ROOT}"/etc/zabbix/zabbix_*
-
-	if useq server || useq proxy ; 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_prepare() {
-	epatch "${FILESDIR}/zabbix-as-needed.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(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) \
-		$(use_with openipmi openipmi) \
-		|| die "econf 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}/1.6.6"/zabbix_server.conf \
-			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/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 \
-			/etc/zabbix/zabbix_trapper.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf \
-			/etc/zabbix/zabbix_trapper.conf
-	fi
-
-	if useq proxy; then
-		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_proxy.conf
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
-			"${FILESDIR}/1.6.6"/zabbix_agentd.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/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}/"1.6.6/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.8.1.ebuild b/net-analyzer/zabbix/zabbix-1.8.1.ebuild
deleted file mode 100644
index 5d51dcb325fd..000000000000
--- a/net-analyzer/zabbix/zabbix-1.8.1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.1.ebuild,v 1.2 2010/06/17 20:44:07 patrick Exp $
-
-EAPI="2"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-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="http://dev.gentooexperimental.org/~dreeevil/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="agent curl frontend ipv6 jabber ldap mysql oracle postgres proxy server snmp +sqlite3 openipmi"
-DEPEND="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? ( dev-db/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )"
-RDEPEND="${DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	frontend? ( dev-lang/php[bcmath,ctype]
-		app-admin/webapp-config )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server || useq proxy ; 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 || useq proxy ; 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/documentation.php"
-		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
-
-	if useq server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "Add these lines in the /etc/services :"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown -R 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
-
-	chmod 0640 \
-		"${ROOT}"/etc/zabbix/zabbix_*
-
-	if useq server || useq proxy ; 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_prepare() {
-	epatch "${FILESDIR}/zabbix-as-needed.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(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) \
-		$(use_with openipmi openipmi) \
-		|| die "econf 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}/1.6.6"/zabbix_server.conf \
-			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/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 \
-			/etc/zabbix/zabbix_trapper.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf \
-			/etc/zabbix/zabbix_trapper.conf
-	fi
-
-	if useq proxy; then
-		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_proxy.conf
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
-			"${FILESDIR}/1.6.6"/zabbix_agentd.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/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}/"1.6.6/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.8.2.ebuild b/net-analyzer/zabbix/zabbix-1.8.2.ebuild
deleted file mode 100644
index a2a6362a24c6..000000000000
--- a/net-analyzer/zabbix/zabbix-1.8.2.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-1.8.2.ebuild,v 1.9 2010/08/18 16:47:03 patrick Exp $
-
-EAPI="2"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-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="http://prdownloads.sourceforge.net/zabbix/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 ppc x86"
-IUSE="agent curl frontend ipv6 jabber ldap mysql oracle postgres proxy server snmp +sqlite3 openipmi"
-
-COMMON_DEPEND="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? ( dev-db/postgresql-base )
-	jabber? ( dev-libs/iksemel )
-	curl? ( net-misc/curl )
-	openipmi? ( sys-libs/openipmi )"
-RDEPEND="${COMMON_DEPEND}
-	proxy? ( net-analyzer/fping )
-	server? ( net-analyzer/fping
-		app-admin/webapp-config )
-	frontend? ( dev-lang/php[bcmath,ctype,sockets]
-		app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
-	jabber? ( dev-util/pkgconfig )"
-
-useq frontend && need_php_httpd
-
-pkg_setup() {
-	if useq server || useq proxy ; 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 || useq proxy ; 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/documentation.php"
-		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
-
-	if useq server; then
-		elog
-		elog "For distributed monitoring you have to run:"
-		elog
-		elog "zabbix_server -n <nodeid>"
-		elog
-		elog "This will convert database data for use with Node ID"
-		elog "and also adds a local node."
-		elog
-	fi
-
-	elog "--"
-	elog
-	elog "Add these lines in the /etc/services :"
-	elog
-	elog "zabbix-agent     10050/tcp Zabbix Agent"
-	elog "zabbix-agent     10050/udp Zabbix Agent"
-	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
-	elog "zabbix-trapper   10051/udp Zabbix Trapper"
-	elog
-
-	# repeat fowners/fperms functionality from src_install()
-	# here to catch wrong permissions on existing files in
-	# the live filesystem (yeah, that sucks).
-	chown -R 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
-
-	chmod 0640 \
-		"${ROOT}"/etc/zabbix/zabbix_*
-
-	if useq server || useq proxy ; 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_prepare() {
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable server) \
-		$(use_enable proxy) \
-		$(use_enable agent) \
-		$(use_enable ipv6) \
-		$(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) \
-		$(use_with openipmi openipmi) \
-		|| die "econf 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}/1.6.6"/zabbix_server.conf \
-			"${FILESDIR}/1.6.6"/zabbix_trapper.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/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 \
-			/etc/zabbix/zabbix_trapper.conf
-		fperms 0640 \
-			/etc/zabbix/zabbix_server.conf \
-			/etc/zabbix/zabbix_trapper.conf
-	fi
-
-	if useq proxy; then
-		doinitd \
-			"${FILESDIR}/1.6.6"/init.d/zabbix-proxy
-		dosbin \
-			src/zabbix_proxy/zabbix_proxy
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_proxy.conf
-		dodir \
-			/usr/share/zabbix/database
-		insinto /usr/share/zabbix/database
-		doins -r \
-			upgrades \
-			create
-	fi
-
-	if useq agent; then
-		insinto /etc/zabbix
-		doins \
-			"${FILESDIR}/1.6.6"/zabbix_agent.conf \
-			"${FILESDIR}/1.6.6"/zabbix_agentd.conf
-		doinitd \
-			"${FILESDIR}/1.6.6"/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}/"1.6.6/postinstall-en.txt
-		webapp_configfile \
-			"${MY_HTDOCSDIR}"/include/db.inc.php \
-			"${MY_HTDOCSDIR}"/include/config.inc.php
-		webapp_src_install
-	fi
-}