fix FindBin patch, remove old versions

(Portage version: 2.0.51-r14)

9 files changed, 65 insertions, 464 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 95057f9d9a83..ebd3a4c344dd 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.55 2005/06/13 15:50:24 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.56 2005/07/08 10:11:06 wschlich Exp $
+
+*jabberd-2.0.8-r2 (08 Jul 2005)
+
+  08 Jul 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/jabberd-2.0.8-r2-FindBin.patch, -files/jabberd-2.0s8-FindBin.patch,
+  -jabberd-2.0-r2.ebuild, -jabberd-2.0.8-r1.ebuild,
+  +jabberd-2.0.8-r2.ebuild, -jabberd-2.0.8.ebuild,
+  -jabberd-2.0_p20050119.ebuild:
+  fix FindBin patch, remove old versions
 
 *jabberd-2.0.8-r1 (13 Jun 2005)
 
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index c621325d5677..cabc3c414382 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,16 +1,10 @@
-MD5 840cff925443c5fc7e28613b15e51098 ChangeLog 8915
+MD5 70b998229dc49f98690184102c148e8c ChangeLog 9256
 MD5 1de04ab5d7e18332a5d73790aadf336f jabberd-1.4.3-r4.ebuild 5813
-MD5 f81b4c2b73367e5bed25722aa45e2533 jabberd-2.0-r2.ebuild 4965
-MD5 d63e76997504582699be99d08abd1fa8 jabberd-2.0.8.ebuild 3551
-MD5 786349de4f04c6c1a5a16f2cae544e3b jabberd-2.0_p20050119.ebuild 3525
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
 MD5 dbb285912f47ec8143993f9a79081817 jabberd-1.4.3-r5.ebuild 5813
-MD5 54c6489cedb8260270727f38f9eee46a jabberd-2.0.8-r1.ebuild 3598
+MD5 c538beb1e8beb8bb6736cd074d06e3a9 jabberd-2.0.8-r2.ebuild 3672
 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
-MD5 0d59ca6b46e061b4b1d1673fce93487f files/digest-jabberd-2.0-r2 65
-MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8 65
-MD5 241fdbe6af83f9f39f14becf5e051ba2 files/digest-jabberd-2.0_p20050119 74
 MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
 MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
 MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
@@ -27,5 +21,5 @@ MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
 MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
 MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
-MD5 39b3dda311a8426d661901b3c22fdbf0 files/jabberd-2.0s8-FindBin.patch 1367
-MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8-r1 65
+MD5 5cd694a78ebb4a4fabf831fa52a781c1 files/jabberd-2.0.8-r2-FindBin.patch 1748
+MD5 d8d135b77fd2ec99c355191b584e600a files/digest-jabberd-2.0.8-r2 65
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.8-r2 b/net-im/jabberd/files/digest-jabberd-2.0.8-r2
new file mode 100644
index 000000000000..f3bef4a18c1c
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0.8-r2
@@ -0,0 +1 @@
+MD5 96753c5e74676ace0841a4cee9f13fdb jabberd-2.0s8.tar.gz 757149
diff --git a/net-im/jabberd/files/jabberd-2.0.8-r2-FindBin.patch b/net-im/jabberd/files/jabberd-2.0.8-r2-FindBin.patch
new file mode 100644
index 000000000000..289121aa8d07
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-2.0.8-r2-FindBin.patch
@@ -0,0 +1,46 @@
+diff -ur jabberd-2.0s8.orig/tools/jabberd.in jabberd-2.0s8/tools/jabberd.in
+--- jabberd-2.0s8.orig/tools/jabberd.in	2004-12-07 18:08:38.000000000 +0100
++++ jabberd-2.0s8/tools/jabberd.in	2005-06-14 00:01:29.000000000 +0200
+@@ -14,7 +14,7 @@
+ 
+ use strict;
+ use Getopt::Std;
+-use FindBin qw($Bin);
++#use FindBin qw($Bin);
+ use FileHandle;
+ use IPC::Open3;
+ use IO::Select;
+@@ -25,6 +25,7 @@
+ #-----------------------------------------------------------------------------
+ # Define some initial variables and default them as needed.
+ #-----------------------------------------------------------------------------
++my $Bin = "@bindir@";
+ my $VERSION = "@VERSION@";
+ my $config_dir = "@sysconfdir@";
+ my $config = $config_dir."/jabberd.cfg";
+diff -ur jabberd-2.0s8.orig/tools/Makefile.am jabberd-2.0s8/tools/Makefile.am
+--- jabberd-2.0s8.orig/tools/Makefile.am	2005-04-14 21:43:52.000000000 +0200
++++ jabberd-2.0s8/tools/Makefile.am	2005-06-14 00:01:29.000000000 +0200
+@@ -3,7 +3,8 @@
+ 
+ edit = sed \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+-	-e 's,@VERSION\@,$(VERSION),g'
++	-e 's,@VERSION\@,$(VERSION),g' \
++	-e 's,@bindir\@,$(bindir),g'
+ 
+ $(bin_SCRIPTS): $(EXTRA_DIST)
+ 	@echo "generating $@ from $@.in"; \
+diff -ur jabberd-2.0s8.orig/tools/Makefile.in jabberd-2.0s8/tools/Makefile.in
+--- jabberd-2.0s8.orig/tools/Makefile.in	2005-04-20 09:37:33.000000000 +0200
++++ jabberd-2.0s8/tools/Makefile.in	2005-06-14 00:02:27.000000000 +0200
+@@ -152,7 +152,8 @@
+ EXTRA_DIST = db-setup.mysql db-setup.pgsql jabberd.in jabberd.rc pipe-auth.pl migrate.pl db-update.mysql db-setup.oracle
+ edit = sed \
+ 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
+-	-e 's,@VERSION\@,$(VERSION),g'
++	-e 's,@VERSION\@,$(VERSION),g' \
++	-e 's,@bindir\@,$(bindir),g'
+ 
+ all: all-am
+ 
diff --git a/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch b/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch
deleted file mode 100644
index a4c398d5f118..000000000000
--- a/net-im/jabberd/files/jabberd-2.0s8-FindBin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: tools/jabberd.in
-===================================================================
-RCS file: /home/cvs/jabberd2/tools/jabberd.in,v
-retrieving revision 1.3.2.1
-diff -u -r1.3.2.1 jabberd.in
---- tools/jabberd.in	7 Dec 2004 17:08:38 -0000	1.3.2.1
-+++ tools/jabberd.in	12 Jun 2005 11:01:11 -0000
-@@ -14,7 +14,7 @@
- 
- use strict;
- use Getopt::Std;
--use FindBin qw($Bin);
-+#use FindBin qw($Bin);
- use FileHandle;
- use IPC::Open3;
- use IO::Select;
-@@ -25,6 +25,7 @@
- #-----------------------------------------------------------------------------
- # Define some initial variables and default them as needed.
- #-----------------------------------------------------------------------------
-+my $Bin = "@bindir@";
- my $VERSION = "@VERSION@";
- my $config_dir = "@sysconfdir@";
- my $config = $config_dir."/jabberd.cfg";
-Index: tools/Makefile.am
-===================================================================
-RCS file: /home/cvs/jabberd2/tools/Makefile.am,v
-retrieving revision 1.10.2.2
-diff -u -r1.10.2.2 Makefile.am
---- tools/Makefile.am	14 Apr 2005 19:48:03 -0000	1.10.2.2
-+++ tools/Makefile.am	12 Jun 2005 11:01:11 -0000
-@@ -3,7 +3,8 @@
- 
- edit = sed \
- 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
--	-e 's,@VERSION\@,$(VERSION),g'
-+	-e 's,@VERSION\@,$(VERSION),g' \
-+	-e 's,@bindir\@,$(bindir),g'
- 
- $(bin_SCRIPTS): $(EXTRA_DIST)
- 	@echo "generating $@ from $@.in"; \
diff --git a/net-im/jabberd/jabberd-2.0-r2.ebuild b/net-im/jabberd/jabberd-2.0-r2.ebuild
deleted file mode 100644
index d22a90102f76..000000000000
--- a/net-im/jabberd/jabberd-2.0-r2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0-r2.ebuild,v 1.3 2005/01/31 23:05:41 humpback Exp $
-
-inherit eutils
-
-MY_PV="2.0s4"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://www.jabberstudio.org/files/jabberd2/${PN}-${MY_PV}.tar.gz"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="ldap ipv6 mysql postgres pam berkdb ssl"
-
-DEPEND="!net-im/jabber-server
-	>=dev-libs/openssl-0.9.6i
-	>=net-dns/libidn-0.3.5
-	ldap? ( >=net-nds/openldap-2.1 )
-	berkdb? ( >=sys-libs/db-4.1.25 )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
-
-pkg_setup() {
-	if ! use postgres && ! use mysql && ! use berkdb;  then
-		eerror
-		eerror "For this version of jabberd you must have"
-		eerror "at least one of 'mysql', 'postgres' and/or 'berkdb'"
-		eerror "in the USE variable in /etc/make.conf."
-		eerror
-		die "Look at the error message above."
-	fi
-}
-
-src_unpack() {
-	unpack ${PN}-${MY_PV}.tar.gz
-	cd ${WORKDIR}/${PN}-${MY_PV}
-	epatch ${FILESDIR}/patch-c2s-buffers
-}
-
-src_compile() {
-	enables="--enable-fs"
-
-	if use berkdb; then
-		enables="${enables} --enable-db"
-	fi
-	if use mysql; then
-		enables="${enables} --enable-mysql"
-	else
-		enables="${enables} --disable-mysql"
-	fi
-	if use postgres; then
-		enables="${enables} --enable-pgsql"
-	fi
-	if use pam; then
-		enables="${enables} --enable-pam"
-	fi
-	if use ldap; then
-		enables="${enables} --enable-ldap"
-	fi
-
-	if use ipv6; then
-		enables="${enables} --enable-ipv6"
-	fi
-
-	cd ${S}
-
-
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-debug \
-		${enables} || die
-	make || die
-
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /etc/jabberd
-	dodir /var/jabberd
-	dodir /var/jabberd/pid
-	dodir /var/jabberd/log
-	dodir /var/jabberd/db
-	touch ${D}/var/jabberd/log/c2s.log
-	touch ${D}/var/jabberd/log/resolver.log
-	touch ${D}/var/jabberd/log/router.log
-	touch ${D}/var/jabberd/log/s2s.log
-	touch ${D}/var/jabberd/log/sm.log
-	doexe ${FILESDIR}/self-cert.sh
-	insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
-	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r7 jabber
-
-	dodoc AUTHORS PROTOCOL README
-
-	docinto tools ; dodoc tools/db-setup.mysql tools/db-setup.pgsql tools/migrate.pl tools/pipe-auth.pl
-
-	#Must change this, enewgroup/enewuser are supposed to do chek stuff
-	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-	if [ -z $test_group ]
-	then
-		enewgroup jabber
-	fi
-
-	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
-	if [ -z $test_user ]
-	then
-		enewuser jabber -1 /bin/false /var/spool/jabber jabber
-	fi
-
-	fowners jabber:jabber /etc/jabberd
-	fowners jabber:jabber /etc/jabberd/c2s.xml
-	fowners jabber:jabber /etc/jabberd/c2s.xml.dist
-	fowners jabber:jabber /etc/jabberd/jabberd.cfg
-	fowners jabber:jabber /etc/jabberd/jabberd.cfg.dist
-	fowners jabber:jabber /etc/jabberd/resolver.xml
-	fowners jabber:jabber /etc/jabberd/resolver.xml.dist
-	fowners jabber:jabber /etc/jabberd/router-users.xml
-	fowners jabber:jabber /etc/jabberd/router-users.xml.dist
-	fowners jabber:jabber /etc/jabberd/router.xml
-	fowners jabber:jabber /etc/jabberd/router.xml.dist
-	fowners jabber:jabber /etc/jabberd/s2s.xml
-	fowners jabber:jabber /etc/jabberd/s2s.xml.dist
-	fowners jabber:jabber /etc/jabberd/self-cert.sh
-	fowners jabber:jabber /etc/jabberd/sm.xml
-	fowners jabber:jabber /etc/jabberd/sm.xml.dist
-	fowners jabber:jabber /etc/jabberd/templates
-
-	fowners jabber:jabber /var/jabberd
-	fowners jabber:jabber /var/jabberd/db
-	fowners jabber:jabber /var/jabberd/log
-	fowners jabber:jabber /var/jabberd/pid
-	fowners jabber:jabber /var/jabberd/log/c2s.log
-	fowners jabber:jabber /var/jabberd/log/resolver.log
-	fowners jabber:jabber /var/jabberd/log/router.log
-	fowners jabber:jabber /var/jabberd/log/s2s.log
-	fowners jabber:jabber /var/jabberd/log/sm.log
-	fperms 660 /etc/jabberd/c2s.xml
-	fperms 660 /etc/jabberd/c2s.xml.dist
-	fperms 660 /etc/jabberd/jabberd.cfg
-	fperms 660 /etc/jabberd/jabberd.cfg.dist
-	fperms 660 /etc/jabberd/resolver.xml
-	fperms 660 /etc/jabberd/resolver.xml.dist
-	fperms 660 /etc/jabberd/router-users.xml
-	fperms 660 /etc/jabberd/router-users.xml.dist
-	fperms 660 /etc/jabberd/router.xml
-	fperms 660 /etc/jabberd/router.xml.dist
-	fperms 660 /etc/jabberd/s2s.xml
-	fperms 660 /etc/jabberd/s2s.xml.dist
-	fperms 760 /etc/jabberd/self-cert.sh
-	fperms 660 /etc/jabberd/sm.xml
-	fperms 660 /etc/jabberd/sm.xml.dist
-	fperms 660 /etc/jabberd/templates
-	fperms o-rwx /usr/bin/jabberd
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "Change 'localhost' to your server's domainname in the"
-	einfo "/etc/jabberd/*.xml configs first"
-	einfo "Server admins should be added to the "jabber" group"
-	if use ssl; then
-		einfo
-		einfo "To enable SSL connections, execute /etc/jabberd/self-cert.sh"
-		einfo
-	fi
-}
diff --git a/net-im/jabberd/jabberd-2.0.8-r1.ebuild b/net-im/jabberd/jabberd-2.0.8-r2.ebuild
index db6749725547..8dce75c7ae99 100644
--- a/net-im/jabberd/jabberd-2.0.8-r1.ebuild
+++ b/net-im/jabberd/jabberd-2.0.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.8-r1.ebuild,v 1.1 2005/06/13 15:50:24 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.8-r2.ebuild,v 1.1 2005/07/08 10:11:06 wschlich Exp $
 
 inherit eutils flag-o-matic
 
@@ -22,6 +22,8 @@ DEPEND="!net-im/jabber-server
 	berkdb? ( >=sys-libs/db-4.1.25 )
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}
+	dev-lang/perl" # for the /usr/bin/jabberd wrapper script
 
 pkg_setup() {
 	if ! use postgres && ! use mysql && ! use berkdb;  then
@@ -37,7 +39,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch "${FILESDIR}/${MY_P}-FindBin.patch"
+	epatch "${FILESDIR}/${P}-FindBin.patch"
 }
 
 src_compile() {
diff --git a/net-im/jabberd/jabberd-2.0.8.ebuild b/net-im/jabberd/jabberd-2.0.8.ebuild
deleted file mode 100644
index 5bf73ea7965c..000000000000
--- a/net-im/jabberd/jabberd-2.0.8.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.8.ebuild,v 1.1 2005/04/28 21:29:12 wschlich Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd.jabberstudio.org/2/"
-MY_P="${PN}-2.0s8"
-SRC_URI="http://files.jabberstudio.org/jabberd2/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="debug ldap ipv6 mysql postgres pam berkdb ssl"
-
-DEPEND="!net-im/jabber-server
-	>=dev-libs/openssl-0.9.6i
-	>=net-dns/libidn-0.3.5
-	ldap? ( >=net-nds/openldap-2.1 )
-	berkdb? ( >=sys-libs/db-4.1.25 )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
-
-pkg_setup() {
-	if ! use postgres && ! use mysql && ! use berkdb;  then
-		eerror
-		eerror "For this version of jabberd you must have"
-		eerror "at least one of 'mysql', 'postgres' and/or 'berkdb'"
-		eerror "in the USE variable in /etc/make.conf."
-		eerror
-		die "Look at the error message above."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	local myopts="--enable-fs"
-	use berkdb >&/dev/null && myopts="${myopts} --enable-db"
-	use mysql >&/dev/null && myopts="${myopts} --enable-mysql" || myopts="${myopts} --disable-mysql"
-	use postgres >&/dev/null && myopts="${myopts} --enable-pgsql"
-	use pam >&/dev/null && myopts="${myopts} --enable-pam"
-	use ldap >&/dev/null && myopts="${myopts} --enable-ldap"
-	use ipv6 >&/dev/null && myopts="${myopts} --enable-ipv6"
-
-	use debug && {
-		append-flags -O -ggdb -DDEBUG
-		RESTRICT="${RESTRICT} nostrip"
-		myopts="${myopts} --enable-debug"
-	}
-
-	econf ${myopts} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-#	DON'T USE EINSTALL HERE! it breaks the Makefile's sysconfdir!
-#	einstall || die "make install failed"
-	make DESTDIR=${D} install || die "make install failed"
-
-	## add user and group
-	enewgroup jabber
-	enewuser jabber -1 /bin/false /var/jabberd jabber
-
-	## set binary permissions
-	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-	fperms o= /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-
-	## jabberd working directory
-	dodir /var/jabberd{,/{db,log,pid}}
-	fowners jabber:jabber /var/jabberd{,/{db,log,pid}}
-	for i in router resolver sm c2s s2s; do
-		for j in log pid; do
-			touch ${D}/var/jabberd/${j}/${i}.${j}
-			fowners jabber:jabber /var/jabberd/${j}/${i}.${j}
-		done
-	done
-
-	#ä jabberd config & init script
-	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.bundled jabber
-#	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.gentoo jabber
-	exeinto /etc/jabberd; newexe ${FILESDIR}/self-cert.jabberd-2.sh self-cert.sh
-	# directories
-	fowners jabber:jabber /etc/jabberd{,/templates}
-	fperms 770 /etc/jabberd{,/templates}
-	# ssl script
-	fowners jabber:jabber /etc/jabberd/self-cert.sh
-	fperms 770 /etc/jabberd/self-cert.sh
-	# config files
-	for i in jabberd.cfg {router,router-users,resolver,sm,c2s,s2s,templates/roster}.xml; do
-		fowners jabber:jabber /etc/jabberd/${i}{,.dist}
-		fperms 660 /etc/jabberd/${i}{,.dist}
-	done
-
-	## documentation
-	dodoc AUTHORS PROTOCOL README
-	docinto tools
-	for i in db-setup.{mysql,pgsql} migrate.pl pipe-auth.pl; do
-		dodoc tools/${i}
-	done
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Change 'localhost' to your server's domainname in the"
-	einfo "/etc/jabberd/*.xml configs first"
-	einfo "Server admins should be added to the "jabber" group"
-	if use ssl; then
-		einfo
-		einfo "To enable SSL connections, execute /etc/jabberd/self-cert.sh"
-	fi
-	einfo
-}
diff --git a/net-im/jabberd/jabberd-2.0_p20050119.ebuild b/net-im/jabberd/jabberd-2.0_p20050119.ebuild
deleted file mode 100644
index e6fb748bdd51..000000000000
--- a/net-im/jabberd/jabberd-2.0_p20050119.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0_p20050119.ebuild,v 1.2 2005/03/12 11:26:45 wschlich Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://www.marquard.net/jabber/files/${P/_p/cvs}.tar.gz"
-MY_P="${PN}-2.0cvs"
-S="${WORKDIR}/${MY_P}"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="debug ldap ipv6 mysql postgres pam berkdb ssl"
-
-DEPEND="!net-im/jabber-server
-	>=dev-libs/openssl-0.9.6i
-	>=net-dns/libidn-0.3.5
-	ldap? ( >=net-nds/openldap-2.1 )
-	berkdb? ( >=sys-libs/db-4.1.25 )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
-
-pkg_setup() {
-	if ! use postgres && ! use mysql && ! use berkdb;  then
-		eerror
-		eerror "For this version of jabberd you must have"
-		eerror "at least one of 'mysql', 'postgres' and/or 'berkdb'"
-		eerror "in the USE variable in /etc/make.conf."
-		eerror
-		die "Look at the error message above."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	local myopts="--enable-fs"
-	use berkdb >&/dev/null && myopts="${myopts} --enable-db"
-	use mysql >&/dev/null && myopts="${myopts} --enable-mysql" || myopts="${myopts} --disable-mysql"
-	use postgres >&/dev/null && myopts="${myopts} --enable-pgsql"
-	use pam >&/dev/null && myopts="${myopts} --enable-pam"
-	use ldap >&/dev/null && myopts="${myopts} --enable-ldap"
-	use ipv6 >&/dev/null && myopts="${myopts} --enable-ipv6"
-
-	use debug && {
-		append-flags -O -ggdb -DDEBUG
-		RESTRICT="${RESTRICT} nostrip"
-		myopts="${myopts} --enable-debug"
-	}
-
-	econf ${myopts} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-#	DON'T USE EINSTALL HERE! it breaks the Makefile's sysconfdir!
-#	einstall || die "make install failed"
-	make DESTDIR=${D} install || die "make install failed"
-
-	## add user and group
-	enewgroup jabber
-	enewuser jabber -1 /bin/false /var/jabberd jabber
-
-	## set binary permissions
-	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-	fperms o= /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
-
-	## jabberd working directory
-	dodir /var/jabberd{,/{db,log,pid}}
-	fowners jabber:jabber /var/jabberd{,/{db,log,pid}}
-	for i in router resolver sm c2s s2s; do
-		for j in log pid; do
-			touch ${D}/var/jabberd/${j}/${i}.${j}
-			fowners jabber:jabber /var/jabberd/${j}/${i}.${j}
-		done
-	done
-
-	#ä jabberd config & init script
-	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.bundled jabber
-#	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.gentoo jabber
-	exeinto /etc/jabberd; doexe ${FILESDIR}/self-cert.sh
-	# directories
-	fowners jabber:jabber /etc/jabberd{,/templates}
-	fperms 770 /etc/jabberd{,/templates}
-	# ssl script
-	fowners jabber:jabber /etc/jabberd/self-cert.sh
-	fperms 770 /etc/jabberd/self-cert.sh
-	# config files
-	for i in jabberd.cfg {router,router-users,resolver,sm,c2s,s2s,templates/roster}.xml; do
-		fowners jabber:jabber /etc/jabberd/${i}{,.dist}
-		fperms 660 /etc/jabberd/${i}{,.dist}
-	done
-
-	## documentation
-	dodoc AUTHORS PROTOCOL README
-	docinto tools
-	for i in db-setup.{mysql,pgsql} migrate.pl pipe-auth.pl; do
-		dodoc tools/${i}
-	done
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Change 'localhost' to your server's domainname in the"
-	einfo "/etc/jabberd/*.xml configs first"
-	einfo "Server admins should be added to the "jabber" group"
-	if use ssl; then
-		einfo
-		einfo "To enable SSL connections, execute /etc/jabberd/self-cert.sh"
-	fi
-	einfo
-}