Remove jabberd 2.x ebuilds, moved to net-im/jabberd2.

Package-Manager: portage-2.1.3.19

11 files changed, 32 insertions, 425 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index ce2b15434a12..c726ef6d3b7d 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.100 2007/06/16 15:34:02 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.101 2007/11/10 21:27:51 nelchael Exp $
+
+  10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/jabberd-2.0.11-configure.in.patch, -files/jabberd-2.0.11.init,
+  -files/jabberd-2.1.6.init, metadata.xml, jabberd-1.4.4-r3.ebuild,
+  -jabberd-2.0.11-r1.ebuild, -jabberd-2.1.6.ebuild:
+  Remove jabberd 2.x ebuilds, moved to net-im/jabberd2.
 
   16 Jun 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   jabberd-2.1.6.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index d84f38a0434c..3da18ca7c226 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jabberd-1.4.4-crypt.patch 605 RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 SHA1 3befde7962b643050e61d04bd87483ed192483a1 SHA256 0a96fea2745058546bada3b234be4a803df836ba2b65052737b000867e932eca
 MD5 3de1d023b07d0bf247a71329eb70355d files/jabberd-1.4.4-crypt.patch 605
 RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 files/jabberd-1.4.4-crypt.patch 605
@@ -30,47 +33,26 @@ AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1
 MD5 3b4be327293fb0abc0cdb5dcac80d033 files/jabberd-1.4.4.init 554
 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e files/jabberd-1.4.4.init 554
 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac files/jabberd-1.4.4.init 554
-AUX jabberd-2.0.11-configure.in.patch 396 RMD160 86c99a761a23e55ebce98bdffba060e18073826f SHA1 59d16a3ce6f30bdea79c67fe9051a6c4624ddac9 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f
-MD5 0d6acfc3d4a22d09d4d17ffd202d38d8 files/jabberd-2.0.11-configure.in.patch 396
-RMD160 86c99a761a23e55ebce98bdffba060e18073826f files/jabberd-2.0.11-configure.in.patch 396
-SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f files/jabberd-2.0.11-configure.in.patch 396
-AUX jabberd-2.0.11.init 1701 RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 SHA1 95958ed179ec3c8b20dc4a2934c1a8adae08b92b SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a
-MD5 15e304cfa6bdf41c2633da7fe6063ace files/jabberd-2.0.11.init 1701
-RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 files/jabberd-2.0.11.init 1701
-SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a files/jabberd-2.0.11.init 1701
-AUX jabberd-2.1.6.init 1525 RMD160 a3149ca68f3089ecb2e054756041ad2476947574 SHA1 1d42bcce73d934f61fda10a6dcbbebe6c8a2b297 SHA256 e9898a4a4a452d1d642f59d36a4d22ec4e914207f7f7846e1ed33a589ecd39df
-MD5 54b8406f9b09bc7d8355417e0716edb4 files/jabberd-2.1.6.init 1525
-RMD160 a3149ca68f3089ecb2e054756041ad2476947574 files/jabberd-2.1.6.init 1525
-SHA256 e9898a4a4a452d1d642f59d36a4d22ec4e914207f7f7846e1ed33a589ecd39df files/jabberd-2.1.6.init 1525
 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
-DIST jabberd-2.0s11.tar.gz 777466 RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d SHA1 c938d95fc17634b889ba9b1d7d27115593b13e3d SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
-DIST jabberd-2.1.6.tar.gz 1237808 RMD160 fd67cf5aa580ae5bfa969c712e403ba5f9d8899b SHA1 83b923358f02686ec9797bcbfc1892c00dac6d6a SHA256 de525e18028c002e89790f41f79dd46fa08fa07f302b55b72dc151e47e84daff
-EBUILD jabberd-1.4.4-r3.ebuild 3063 RMD160 598e99493ebe47a916c1c6e2fb6e924398b1f7d1 SHA1 322f93309d1778ba731650349dfdcb81283f8082 SHA256 f1074e00c2dfbe9084dfd9842238bafdb168b69bf7c388ff60a45bc4ce3e806b
-MD5 94930c19bae62d8288f984887b4823b2 jabberd-1.4.4-r3.ebuild 3063
-RMD160 598e99493ebe47a916c1c6e2fb6e924398b1f7d1 jabberd-1.4.4-r3.ebuild 3063
-SHA256 f1074e00c2dfbe9084dfd9842238bafdb168b69bf7c388ff60a45bc4ce3e806b jabberd-1.4.4-r3.ebuild 3063
-EBUILD jabberd-2.0.11-r1.ebuild 2296 RMD160 65c90c7c98dd4479e41cefd709c8d978d6a954f1 SHA1 9df16440e636bbcaf444d96b6ed648cc009aa1f1 SHA256 cc0f46b870e66636035b0a0b0d8578ffe20bc955bd4a78de67810eca4e24c022
-MD5 f8f39d1a57b8074a95791b64a1c95b84 jabberd-2.0.11-r1.ebuild 2296
-RMD160 65c90c7c98dd4479e41cefd709c8d978d6a954f1 jabberd-2.0.11-r1.ebuild 2296
-SHA256 cc0f46b870e66636035b0a0b0d8578ffe20bc955bd4a78de67810eca4e24c022 jabberd-2.0.11-r1.ebuild 2296
-EBUILD jabberd-2.1.6.ebuild 2626 RMD160 cef28dbc0d1e3d55c6dd289443e1fcdfdda3787e SHA1 934b274a53dc2c80b1f18b45ad2fba1c493641a3 SHA256 bf8a4d5dee3d9729407b731be87ca7bcdbe14c40657f5e5c087ce94b3457726d
-MD5 bc917a6e5bbd9ea7610521807318a5c3 jabberd-2.1.6.ebuild 2626
-RMD160 cef28dbc0d1e3d55c6dd289443e1fcdfdda3787e jabberd-2.1.6.ebuild 2626
-SHA256 bf8a4d5dee3d9729407b731be87ca7bcdbe14c40657f5e5c087ce94b3457726d jabberd-2.1.6.ebuild 2626
-MISC ChangeLog 16014 RMD160 72ce5f510bdc4381e4e9e7e9570a2bcddb51e113 SHA1 4cfec7fed8582d4c3550c37a3f5cc3e9397c7e37 SHA256 49dfa8e29f86b052c298e251eae724f59cd3c7775d3fd888f06c47a22563ab6a
-MD5 59928fbbb3cab32ed3c376ecdd61052d ChangeLog 16014
-RMD160 72ce5f510bdc4381e4e9e7e9570a2bcddb51e113 ChangeLog 16014
-SHA256 49dfa8e29f86b052c298e251eae724f59cd3c7775d3fd888f06c47a22563ab6a ChangeLog 16014
-MISC metadata.xml 515 RMD160 b5cb7e85c1a974a72a4c8005929ab606ed4c0984 SHA1 909bf6c7c362a30f06c04870454de338f5f070e7 SHA256 5f30ffc2f104453847ccfb8f37f647e5e20a40896620765cf8965ac3a635c9f6
-MD5 cf7552103edb4e062cea986875a624f5 metadata.xml 515
-RMD160 b5cb7e85c1a974a72a4c8005929ab606ed4c0984 metadata.xml 515
-SHA256 5f30ffc2f104453847ccfb8f37f647e5e20a40896620765cf8965ac3a635c9f6 metadata.xml 515
+EBUILD jabberd-1.4.4-r3.ebuild 3083 RMD160 7f5d22dfeec896c03b3de4cbe567a29180581096 SHA1 35d7a30ff25e08b87491b7116ffdc64b745b7119 SHA256 29169365a7fb696255d3e132e95f57871465ce3a8c8346046d9fb3a492ac67b0
+MD5 b28daa830cb15a958884526a6779bef2 jabberd-1.4.4-r3.ebuild 3083
+RMD160 7f5d22dfeec896c03b3de4cbe567a29180581096 jabberd-1.4.4-r3.ebuild 3083
+SHA256 29169365a7fb696255d3e132e95f57871465ce3a8c8346046d9fb3a492ac67b0 jabberd-1.4.4-r3.ebuild 3083
+MISC ChangeLog 16314 RMD160 101eccb08755f1d51404968272da911c40d571ac SHA1 f6542e70b32fd0c2edfdb65d89dbbc10167edc6b SHA256 8d4f1ab0f583cef34d38f1dca69aca29f9d4fb106048fb016628f54c17fa83ac
+MD5 8caa38b177d59c454450f6f2ff0c3b47 ChangeLog 16314
+RMD160 101eccb08755f1d51404968272da911c40d571ac ChangeLog 16314
+SHA256 8d4f1ab0f583cef34d38f1dca69aca29f9d4fb106048fb016628f54c17fa83ac ChangeLog 16314
+MISC metadata.xml 257 RMD160 ae6649dcd8bbf930b513b7ad8d8567e2ec46cfbb SHA1 1e455227ed8a4f14bc6be320f7e5bac7919adb35 SHA256 40ae7db9e0e108febaa253fd65ffa44fbc953ce7c27bc93857c89bc7127efc33
+MD5 83c4234aaaf0bbd631a1b060006945b7 metadata.xml 257
+RMD160 ae6649dcd8bbf930b513b7ad8d8567e2ec46cfbb metadata.xml 257
+SHA256 40ae7db9e0e108febaa253fd65ffa44fbc953ce7c27bc93857c89bc7127efc33 metadata.xml 257
 MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r3 241
 RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r3 241
 SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r3 241
-MD5 3cbebd7d43212be46daad3e042dce34f files/digest-jabberd-2.0.11-r1 244
-RMD160 4638cd85561494bb4ec40e8af80cc145f8156b23 files/digest-jabberd-2.0.11-r1 244
-SHA256 8d5a3e81789ef9e85b365e2974311b0f46ffb940a2b0bfdbc80457e40014f05b files/digest-jabberd-2.0.11-r1 244
-MD5 92b31f0aafe81593bb14967ca77be310 files/digest-jabberd-2.1.6 244
-RMD160 e9cf0bd58cb97447620f66dcf71c11577a68787d files/digest-jabberd-2.1.6 244
-SHA256 b2e949a7fe6c42414776cb76d0e8c8d38ad4e8788eaf91adefc6639f930a1a91 files/digest-jabberd-2.1.6 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHNiJdgo/w9rxVVVERAprLAKCYHsTLJmb8uzGY7mLMLti+GqpAPQCgvLqJ
+4sqbMvSHtquIdNx4SQZfIXw=
+=3hnZ
+-----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.11-r1 b/net-im/jabberd/files/digest-jabberd-2.0.11-r1
deleted file mode 100644
index 351198e2b0be..000000000000
--- a/net-im/jabberd/files/digest-jabberd-2.0.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 67d1663ed97a5ba707d5d145b1d19c55 jabberd-2.0s11.tar.gz 777466
-RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d jabberd-2.0s11.tar.gz 777466
-SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a jabberd-2.0s11.tar.gz 777466
diff --git a/net-im/jabberd/files/digest-jabberd-2.1.6 b/net-im/jabberd/files/digest-jabberd-2.1.6
deleted file mode 100644
index 654aa790f287..000000000000
--- a/net-im/jabberd/files/digest-jabberd-2.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c0843d23f75b255815dea378947a8ccc jabberd-2.1.6.tar.gz 1237808
-RMD160 fd67cf5aa580ae5bfa969c712e403ba5f9d8899b jabberd-2.1.6.tar.gz 1237808
-SHA256 de525e18028c002e89790f41f79dd46fa08fa07f302b55b72dc151e47e84daff jabberd-2.1.6.tar.gz 1237808
diff --git a/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch b/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch
deleted file mode 100644
index 64a6697dcc97..000000000000
--- a/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru jabberd-2.0s11.vanilla/configure.in jabberd-2.0s11/configure.in
---- jabberd-2.0s11.vanilla/configure.in	2006-10-04 23:14:07.000000000 +0200
-+++ jabberd-2.0s11/configure.in	2006-10-04 23:19:58.000000000 +0200
-@@ -758,9 +758,6 @@
- dnl finishing up
- dnl
- 
--dnl put our config in its own subdir
--sysconfdir="$sysconfdir/jabberd"
--
- dnl done!
- AC_OUTPUT(Makefile \
-           etc/Makefile \
diff --git a/net-im/jabberd/files/jabberd-2.0.11.init b/net-im/jabberd/files/jabberd-2.0.11.init
deleted file mode 100644
index fee8d2ea2c20..000000000000
--- a/net-im/jabberd/files/jabberd-2.0.11.init
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-2.0.11.init,v 1.3 2007/01/09 10:38:59 nelchael Exp $
-
-depend() {
-	need net
-	use mysql postgresql slapd
-	provide jabber-server
-}
-
-function stopJabberServices() {
-
-	eindent
-	for pidfile in /var/run/jabber/*.pid; do
-		if [[ -f "${pidfile}" ]]; then
-			service=$(basename ${pidfile/.pid/})
-			ebegin "Stopping ${service}"
-			start-stop-daemon \
-				--stop \
-				--pidfile ${pidfile}
-			eend $?
-		fi
-	done
-	eoutdent
-
-}
-
-start() {
-
-	einfo "Starting Jabber Server ..."
-	local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
-	local tempPidHack=/var/run/jabber/start_stop_daemon.pid
-	eindent
-	for service in ${services}; do
-
-		cfgfile=${service/*:/}
-		service=${service/:*/}
-		if [[ ! -f "${cfgfile}" ]]; then
-			if [[ -f "/etc/jabber/${service}.xml" ]]; then
-				cfgfile="/etc/jabber/${service}.xml"
-			else
-				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
-				stopJabberServices
-				return 1
-			fi
-		fi
-
-		executable=/usr/bin/${service}
-
-		if [[ ! -f "${executable}" ]]; then
-			eerror "Can't find executable: ${executable}"
-			stopJabberServices
-			return 1
-		fi
-
-		rm -f ${tempPidHack} &> /dev/null
-		ebegin "Starting ${service} (${cfgfile})"
-		start-stop-daemon \
-			--background \
-			--start  \
-			--chuid jabber:jabber \
-			--exec /usr/bin/${service} \
-			--pid ${tempPidHack} \
-			--make-pidfile \
-			-- -c ${cfgfile}
-		eend $?
-		rm -f ${tempPidHack} &> /dev/null
-
-	done
-	eoutdent
-
-}
-
-stop() {
-
-	einfo "Stopping Jabber Server"
-	stopJabberServices
-
-}
diff --git a/net-im/jabberd/files/jabberd-2.1.6.init b/net-im/jabberd/files/jabberd-2.1.6.init
deleted file mode 100644
index 48486eb12f65..000000000000
--- a/net-im/jabberd/files/jabberd-2.1.6.init
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-2.1.6.init,v 1.1 2007/06/07 09:17:37 nelchael Exp $
-
-depend() {
-	need net
-	use mysql postgresql slapd
-	provide jabber-server
-}
-
-function stopJabberServices() {
-
-	eindent
-	for pidfile in /var/run/jabber/*.pid; do
-		if [[ -f "${pidfile}" ]]; then
-			service=$(basename ${pidfile/.pid/})
-			ebegin "Stopping ${service}"
-			start-stop-daemon \
-				--stop \
-				--pidfile ${pidfile}
-			eend $?
-		fi
-	done
-	eoutdent
-
-}
-
-start() {
-
-	einfo "Starting Jabber Server ..."
-	local services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
-	eindent
-	for service in ${services}; do
-
-		cfgfile=${service/*:/}
-		service=${service/:*/}
-		if [[ ! -f "${cfgfile}" ]]; then
-			if [[ -f "/etc/jabber/${service}.xml" ]]; then
-				cfgfile="/etc/jabber/${service}.xml"
-			else
-				eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
-				stopJabberServices
-				return 1
-			fi
-		fi
-
-		executable=/usr/bin/${service}
-
-		if [[ ! -f "${executable}" ]]; then
-			eerror "Can't find executable: ${executable}"
-			stopJabberServices
-			return 1
-		fi
-
-		ebegin "Starting ${service} (${cfgfile})"
-		start-stop-daemon \
-			--background \
-			--start  \
-			--chuid jabber:jabber \
-			--exec /usr/bin/${service} \
-			-- -c ${cfgfile}
-		eend $?
-
-	done
-	eoutdent
-
-}
-
-stop() {
-
-	einfo "Stopping Jabber Server"
-	stopJabberServices
-
-}
diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
index 33f4295414b4..47f0206b1f27 100644
--- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.14 2007/05/06 11:31:22 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.15 2007/11/10 21:27:51 nelchael Exp $
 
 inherit eutils
 
@@ -20,7 +20,8 @@ DEPEND=">=net-im/jabber-base-0.01
 	dev-util/pkgconfig
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql )
-	ssl? ( >=dev-libs/openssl-0.9.6i )"
+	ssl? ( >=dev-libs/openssl-0.9.6i )
+	!net-im/jabberd2"
 
 pkg_setup() {
 
diff --git a/net-im/jabberd/jabberd-2.0.11-r1.ebuild b/net-im/jabberd/jabberd-2.0.11-r1.ebuild
deleted file mode 100644
index 5a28efe37933..000000000000
--- a/net-im/jabberd/jabberd-2.0.11-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.11-r1.ebuild,v 1.8 2007/04/10 08:44:43 nelchael Exp $
-
-inherit autotools eutils versionator
-
-MY_PV=$(replace_version_separator 2 s)
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd.jabberstudio.org/2/"
-SRC_URI="http://jabberstudio.2nw.net/${PN}2/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite ssl"
-
-DEPEND=">=net-im/jabber-base-0.01
-	dev-libs/openssl
-	net-dns/libidn
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-4.1.25
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( =dev-db/sqlite-3* )
-	!=net-im/jabberd-2.0.11"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-configure.in.patch"
-
-	eautoreconf
-
-}
-
-src_compile() {
-
-	local localconf=
-	if use debug; then
-		localconf="${localconf} --enable-debug"
-		use memdebug && localconf="${localconf} --enable-nad-debug --enable-pool-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--sysconfdir=/etc/jabber \
-		--enable-db \
-		${localconf} \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable mysql) \
-		$(use_enable pam) \
-		$(use_enable pipe) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite) \
-		$(use_enable ssl) \
-		|| die "econf failed"
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/jabberd-${PV}.init" jabberd || die "newinitd failed"
-
-	dodoc AUTHORS PROTOCOL README
-	docinto tools
-	for i in db-setup.{mysql,pgsql} migrate.pl pipe-auth.pl; do
-		dodoc tools/${i}
-	done
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/jabberd/pid/,/var/run/jabber/,g' \
-		-e 's,/var/jabberd/log/,/var/log/jabber/,g' \
-		-e 's,/var/jabberd/db,/var/spool/jabber/,g' \
-		*.xml *.xml.dist || die "sed failed"
-	sed -i \
-		-e 's,<module>mysql</module>,<module>db</module>,' \
-		c2s.xml*
-
-}
diff --git a/net-im/jabberd/jabberd-2.1.6.ebuild b/net-im/jabberd/jabberd-2.1.6.ebuild
deleted file mode 100644
index eeae9860a801..000000000000
--- a/net-im/jabberd/jabberd-2.1.6.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.1.6.ebuild,v 1.4 2007/07/12 05:34:48 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd2.xiaoka.com/"
-SRC_URI="http://ftp.xiaoka.com/${PN}2/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite"
-
-DEPEND=">=net-im/jabber-base-0.01
-	dev-libs/expat
-	dev-libs/openssl
-	dev-libs/cyrus-sasl
-	net-dns/libidn
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-4.1.24
-	pam? ( sys-libs/pam )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( >=dev-db/sqlite-3 )
-	!<net-im/jabberd-2.0"
-
-src_compile() {
-
-	local localconf=
-
-	# Note: no gsasl support for now, since
-	#		gsasl-0.2.14 not in portage tree.
-	#
-	#if use !gsasl; then
-	#	localconf="${localconf} --disable-gsasl --enable-cyrus"
-	#fi
-	localconf="${localconf} --disable-gsasl --enable-cyrus"
-
-	if use debug; then
-		localconf="${localconf} --enable-debug"
-		use memdebug && localconf="${localconf} --enable-nad-debug --enable-pool-debug"
-	else
-		if use memdebug; then
-			ewarn
-			ewarn '"memdebug" requires "debug" enabled.'
-			ewarn
-		fi
-	fi
-
-	# Fix missing header in subst/strndup.c in order to make emerge
-	# happy and avoid QA notice. Should this be moved to a external
-	# patch file?
-	sed -i "/stddef.h/ a #include <string.h>" subst/strndup.c
-
-	econf \
-		--sysconfdir=/etc/jabber \
-		--enable-db \
-		${localconf} \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable mysql) \
-		$(use_enable pam) \
-		$(use_enable pipe) \
-		$(use_enable postgres pgsql) \
-		$(use_enable sqlite) \
-		|| die "econf failed"
-	emake || die "make failed"
-
-}
-
-src_install() {
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-	fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-
-	newinitd "${FILESDIR}/jabberd-${PV}.init" jabberd || die "newinitd failed"
-
-	dodoc AUTHORS BUGS PROTOCOL README UPGRADE
-	docinto tools
-	for i in db-setup.{mysql,pgsql,sqlite} migrate.pl pipe-auth.pl; do
-		dodoc tools/${i}
-	done
-
-	cd "${D}/etc/jabber/"
-	sed -i \
-		-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \
-		-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \
-		-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \
-		*.xml *.xml.dist || die "sed failed"
-	sed -i \
-		-e 's,<module>mysql</module>,<module>db</module>,' \
-		c2s.xml*
-	sed -i \
-		-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
-		sm.xml*
-
-}
diff --git a/net-im/jabberd/metadata.xml b/net-im/jabberd/metadata.xml
index ab685c13109a..ec8856b87718 100644
--- a/net-im/jabberd/metadata.xml
+++ b/net-im/jabberd/metadata.xml
@@ -4,15 +4,6 @@
 	<maintainer>
 		<email>nelchael@gentoo.org</email>
 		<name>Krzysiek Pawlik</name>
-		<description>Takes care of jabberd-1*</description>
-	</maintainer>
-	<maintainer>
-		<email>marko.durkovic@gmail.com</email>
-		<name>Marko Durkovic</name>
-		<description>
-			Maintainer by proxy, through nelchael. Takes care of
-			jabberd-2*
-		</description>
 	</maintainer>
 	<herd>net-im</herd>
 </pkgmetadata>