bugfix, mark as stable, clean out old vers

14 files changed, 16 insertions, 679 deletions

diff --git a/net-im/jabber-server/ChangeLog b/net-im/jabber-server/ChangeLog
index 9e55e78553bb..c82115d9fba8 100644
--- a/net-im/jabber-server/ChangeLog
+++ b/net-im/jabber-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/jabber-server
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/ChangeLog,v 1.12 2003/12/08 07:58:08 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/ChangeLog,v 1.13 2003/12/08 23:47:02 luke-jr Exp $
+
+  08 Dec 2003; Luke-Jr <luke-jr@gentoo.org> jabber-server-1.4.2-r2.ebuild,
+  jabber-server-1.4.2-r3.ebuild, jabber-server-1.4.2-r4.ebuild,
+  jabber-server-1.4.3.ebuild, files/config-1.4.2-r1.tbz2,
+  files/config-1.4.2-r3.tbz2, files/hash_map_gcc32.patch, files/jabber.rc6-r1,
+  files/mio_ssl.c.patch:
+  bugfix, mark as stable, clean out old vers
 
   08 Dec 2003; Luke-Jr <luke-jr@gentoo.org> jabber-server-1.4.2-r2.ebuild,
   jabber-server-1.4.2-r3.ebuild, jabber-server-1.4.2-r4.ebuild,
diff --git a/net-im/jabber-server/Manifest b/net-im/jabber-server/Manifest
index ac49d4d44236..f50ca287b444 100644
--- a/net-im/jabber-server/Manifest
+++ b/net-im/jabber-server/Manifest
@@ -1,18 +1,7 @@
-MD5 d91a00189bf6f91b960684f789477e8d ChangeLog 2569
+MD5 4f66b585c271e3dfa142851b784ce169 ChangeLog 2916
 MD5 294f8b0ea0f44ada8012c8dcbc085830 metadata.xml 492
-MD5 192ae23b8639d7054cdc8bfb340208ce jabber-server-1.4.2-r2.ebuild 3847
-MD5 5f8ad6edcef92d57136f6394b3f49484 jabber-server-1.4.2-r3.ebuild 7141
-MD5 a3dccff118892411051c3874a943b6ab jabber-server-1.4.2-r4.ebuild 7310
-MD5 fd71aa36494787aa87e52cc5cd71dc98 jabber-server-1.4.3.ebuild 7334
-MD5 56c6d30985fe5f4ce2ecbc717f2b0f11 files/config-1.4.2-r1.tbz2 3202
-MD5 b9aed79237eda16bfed03ecd55ab1d84 files/config-1.4.2-r3.tbz2 3341
-MD5 9729606a22930fc068220751ef1a6f89 files/digest-jabber-server-1.4.2-r2 426
-MD5 abc7119a63c93e36d8107dd5c42bf16b files/digest-jabber-server-1.4.2-r3 541
-MD5 3f7e7d44eb27017153b85a4e51857d2b files/hash_map_gcc32.patch 328
-MD5 411dedb4aa875912c371c2e0c5997d82 files/jabber.rc6-r1 739
+MD5 a017a161668d77a89baff93bb812e1e5 jabber-server-1.4.3.ebuild 7333
 MD5 cdd557874bd23433279e577b7e7a511d files/jabber.rc6-r3 904
-MD5 bc605a772d428ee0977b948ecdae26d3 files/mio_ssl.c.patch 874
-MD5 de75a0ec597fea156fdbfbd699124e34 files/digest-jabber-server-1.4.2-r4 535
 MD5 1293290534790bda82a6f87d97c399fe files/config-1.4.2-r4.tbz2 3833
 MD5 6eec3798463d34b660b93470f12bb8d5 files/msn-configure-patch-00 1051
 MD5 535f34d7e5a2d886fcf25136882a2798 files/digest-jabber-server-1.4.3 536
diff --git a/net-im/jabber-server/files/config-1.4.2-r1.tbz2 b/net-im/jabber-server/files/config-1.4.2-r1.tbz2
deleted file mode 100644
index fe8fdd09375b..000000000000
--- a/net-im/jabber-server/files/config-1.4.2-r1.tbz2
+++ /dev/null
diff --git a/net-im/jabber-server/files/config-1.4.2-r3.tbz2 b/net-im/jabber-server/files/config-1.4.2-r3.tbz2
deleted file mode 100644
index 7537ee4c8552..000000000000
--- a/net-im/jabber-server/files/config-1.4.2-r3.tbz2
+++ /dev/null
diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r2 b/net-im/jabber-server/files/digest-jabber-server-1.4.2-r2
deleted file mode 100644
index f847ebecbc02..000000000000
--- a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 10780dbdb93926ea5bb360e1186b939c jabber-1.4.2.tar.gz 690217
-MD5 e4187c0230648a19f7ca60065238bf92 aim-transport-stable-20021112.tar.gz 288900
-MD5 7cff38bc6f2b0adae9e942cffa1b5b70 msn-transport-stable-20011217.tar.gz 33781
-MD5 565c259b23ac27ead83a97c3c7daa3b5 yahoo-t-2.1.1.tar.gz 35742
-MD5 3946cf625278fb5899cad78d49f469d4 Install_AIM_3.5.1670.exe 2452872
-MD5 3217d8026cea7e65b6e4afc394c79921 muconference-0.3.tar.gz 35358
diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r3 b/net-im/jabber-server/files/digest-jabber-server-1.4.2-r3
deleted file mode 100644
index d85fda1ffa27..000000000000
--- a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r3
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 10780dbdb93926ea5bb360e1186b939c jabber-1.4.2.tar.gz 690217
-MD5 950e2661ca99e5bcac5930373f0b0fd4 aim-transport-stable-20030314.tar.gz 305569
-MD5 9251a8e86206e5ce3344b3438b187ec0 Install_AIM.exe 2598120
-MD5 7cff38bc6f2b0adae9e942cffa1b5b70 msn-transport-stable-20011217.tar.gz 33781
-MD5 565c259b23ac27ead83a97c3c7daa3b5 yahoo-t-2.1.1.tar.gz 35742
-MD5 ff07f57d1778fe8de28f6e62da423bd7 mu-conference-0.5.1.tar.gz 46838
-MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
-MD5 a057e8dd5966fa0d26ded03697ba395a jud-0.4.tar.gz 3950
diff --git a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r4 b/net-im/jabber-server/files/digest-jabber-server-1.4.2-r4
deleted file mode 100644
index 736c62630158..000000000000
--- a/net-im/jabber-server/files/digest-jabber-server-1.4.2-r4
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 10780dbdb93926ea5bb360e1186b939c jabber-1.4.2.tar.gz 690217
-MD5 950e2661ca99e5bcac5930373f0b0fd4 aim-transport-stable-20030314.tar.gz 305569
-MD5 9251a8e86206e5ce3344b3438b187ec0 Install_AIM.exe 2598120
-MD5 7180420f99f81ef24d2667cce72ed14b msn-transport-1.2.8pre5.tar.gz 62502
-MD5 565c259b23ac27ead83a97c3c7daa3b5 yahoo-t-2.1.1.tar.gz 35742
-MD5 ff07f57d1778fe8de28f6e62da423bd7 mu-conference-0.5.1.tar.gz 46838
-MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
-MD5 a057e8dd5966fa0d26ded03697ba395a jud-0.4.tar.gz 3950
diff --git a/net-im/jabber-server/files/hash_map_gcc32.patch b/net-im/jabber-server/files/hash_map_gcc32.patch
deleted file mode 100644
index 6e1d2346008b..000000000000
--- a/net-im/jabber-server/files/hash_map_gcc32.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- icqv7-t-0.3.0pre2/MySocketWatcher.h.orig	2002-11-13 21:02:41.000000000 +0100
-+++ icqv7-t-0.3.0pre2/MySocketWatcher.h	2002-11-13 21:03:13.000000000 +0100
-@@ -59,6 +59,7 @@
- using namespace bedrock;
- using namespace std;
- using namespace bedrock::net;
-+using namespace __gnu_cxx;
- 
- class it_Client;
- class MySocketWatcher  {
diff --git a/net-im/jabber-server/files/jabber.rc6-r1 b/net-im/jabber-server/files/jabber.rc6-r1
deleted file mode 100644
index f79b9222a1e2..000000000000
--- a/net-im/jabber-server/files/jabber.rc6-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/files/jabber.rc6-r1,v 1.5 2003/02/14 23:00:48 vapier Exp $
-depend() {
-        need net
-}
-
-start() {
-        ebegin "Starting Jabber Server"
-
-        jabberd -c /etc/jabber/multiple.xml &
-        jabberd -c /etc/jabber/aimtrans.xml &
-        jabberd -c /etc/jabber/msntrans.xml &
-        jabberd -c /etc/jabber/yahootrans.xml &
-        jabberd -c /etc/jabber/muctrans.xml &
-        jabberd -c /etc/jabber/icqtrans.xml &
-
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Jabber Server"
-        killall jabberd
-	sleep 2
-        eend $?
-}
diff --git a/net-im/jabber-server/files/mio_ssl.c.patch b/net-im/jabber-server/files/mio_ssl.c.patch
deleted file mode 100644
index 953737b60afd..000000000000
--- a/net-im/jabber-server/files/mio_ssl.c.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- jabberd/mio_ssl.c	Fri Feb  8 02:39:27 2002
-+++ mio_ssl.c	Tue May 28 12:16:11 2002
-@@ -219,6 +219,7 @@
-     SSL_CTX *ctx = NULL;
-     int fd;
-     int sret;
-+    int flags;
- 
-     if(m->ip == NULL)
-     {
-@@ -228,6 +229,12 @@
- 
-     fd = accept(m->fd, serv_addr, addrlen);
-     
-+    /* set the socket to non-blocking as this is not
-+       inherited */
-+    flags =  fcntl(fd, F_GETFL, 0);
-+    flags |= O_NONBLOCK;
-+    fcntl(fd, F_SETFL, flags);
-+
-     ctx = ghash_get(ssl__ctxs, m->ip);
-     if(ctx == NULL)
-     {
-@@ -235,7 +242,8 @@
-         return -1;
-     }
-     ssl = SSL_new(ctx);
--    log_debug(ZONE, "SSL accepting socket with new session %x", ssl);
-+    log_debug(ZONE, "SSL accepting socket from %s with new session %x",
-+                                   m->ip, ssl);
-     SSL_set_fd(ssl, fd);
-     SSL_set_accept_state(ssl);
-     sret = SSL_accept(ssl);
diff --git a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild
deleted file mode 100644
index 83da0f85e658..000000000000
--- a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild,v 1.26 2003/12/08 07:58:08 luke-jr Exp $
-
-S="${WORKDIR}/jabber-${PV}"
-DESCRIPTION="Open Source Jabber Server & MUC,AIM,MSN,ICQ and Yahoo transports"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://jabberd.jabberstudio.org/downloads/jabber-${PV}.tar.gz
-	mirror://gentoo/aim-transport-stable-20021112.tar.gz
-	mirror://gentoo/msn-transport-stable-20011217.tar.gz
-	http://yahoo-transport.jabberstudio.org/yahoo-t-2.1.1.tar.gz
-	mirror://gentoo/Install_AIM_3.5.1670.exe
-	http://www.jabberstudio.org/files/mu-conference/muconference-0.3.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="ssl"
-
-DEPEND="=dev-libs/pth-1.4.0
-	=dev-libs/glib-1.2*
-	ssl? ( >=dev-libs/openssl-0.9.6g )"
-
-src_unpack() {
-	unpack jabber-${PV}.tar.gz
-	cd ${S}
-	patch -p0 < ${FILESDIR}/mio_ssl.c.patch
-	unpack msn-transport-stable-20011217.tar.gz
-	unpack aim-transport-stable-20021112.tar.gz
-	unpack yahoo-t-2.1.1.tar.gz
-	unpack muconference-0.3.tar.gz
-	mv ${S}/aim-transport-stable-20021012 ${S}/aim-transport
-	cd ${S}/aim-transport
-	cp ${DISTDIR}/Install_AIM_3.5.1670.exe .
-
-}
-
-src_compile() {
-	local myconf
-	cd ${S}
-	use ssl && myconf="--enable-ssl"
-
-	mv jabberd/jabberd.c jabberd/jabberd.c.orig
-	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
-	rm -f jabberd/jabberd.c.orig
-	./configure ${myconf} || die
-	make || die
-
-	cd ${S}/aim-transport
-	./configure || die
-	make || die
-	make install
-
-	cd ${S}/msn-transport
-	./bootstrap || die
-	./configure || die
-	make || die
-
-	cd ${S}/mu-conference
-	make || die
-
-	cd ${S}/yahoo-transport-2
-	make || die
-}
-
-src_install() {
-	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r1 jabber
-	dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
-	touch ${D}/var/log/jabber/error.log
-	touch ${D}/var/log/jabber/record.log
-	keepdir /var/spool/jabber
-	dodir /var/run
-
-	cp ${S}/jabberd/jabberd ${D}/usr/sbin/
-	cp ${S}/aim-transport/src/aimtrans.so ${D}/usr/lib/jabber/
-	cp ${S}/aim-transport/Install_AIM_3.5.1670.exe ${D}/usr/lib/jabber/
-	cp ${S}/msn-transport/src/msntrans.so ${D}/usr/lib/jabber/
-	cp ${S}/mu-conference/src/mu-conference.so ${D}/usr/lib/jabber/
-	cp ${S}/yahoo-transport-2/yahoo-transport.so ${D}/usr/lib/jabber/
-	cp ${S}/jsm/jsm.so ${D}/usr/lib/jabber/
-	cp ${S}/xdb_file/xdb_file.so ${D}/usr/lib/jabber/
-	cp ${S}/pthsock/pthsock_client.so ${D}/usr/lib/jabber/
-	cp ${S}/dnsrv/dnsrv.so ${D}/usr/lib/jabber/
-	cp ${S}/dialback/dialback.so ${D}/usr/lib/jabber/
-
-	cd ${D}/etc/jabber
-	tar -xjf ${FILESDIR}/config-1.4.2-r1.tbz2
-}
-
-pkg_postinst() {
-	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-	if [ -z $test_group ]
-	then
-		groupadd jabber
-	fi
-
-	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
-	if [ -z $test_user ]
-	then
-		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
-	fi
-
-	chown jabber.jabber /etc/jabber
-	chown jabber.jabber /usr/sbin/jabberd
-	chown jabber.jabber /var/log/jabber -R
-	chown jabber.jabber /var/spool/jabber -R
-	chmod o-rwx /etc/jabber
-	chmod o-rwx /usr/sbin/jabberd
-	chmod o-rwx /var/log/jabber -R
-	chmod o-rwx /var/spool/jabber -R
-	chmod u+rwx /usr/sbin/jabberd
-	chmod g-x /etc/jabber
-	chmod g-x /usr/sbin/jabberd
-	chmod g-x /var/log/jabber -R
-	chmod g-x /var/spool/jabber -R
-	chmod g+rw /etc/jabber
-	chmod g+rw /usr/sbin/jabberd
-	chmod g+rw /var/spool/jabber -R
-	chmod g+rw /var/log/jabber -R
-	chmod u+xs /usr/sbin/jabberd
-
-	einfo "Change 'localhost' to your server's domainname in the /etc/jabber/*.xml configs first"
-	einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
-	einfo "(Only if compiled with SSL support (ssl in USE)"
-	einfo "Server admins should be added to the "jabber" group"
-}
diff --git a/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild
deleted file mode 100644
index 259ad5ad07f3..000000000000
--- a/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild,v 1.4 2003/12/08 07:58:08 luke-jr Exp $
-
-S="${WORKDIR}/jabber-${PV}"
-DESCRIPTION="Open Source Jabber Server & JUD,MUC,AIM,MSN,ICQ and Yahoo transports"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://jabberd.jabberstudio.org/downloads/jabber-${PV}.tar.gz
-	!j-noaim? ( mirror://gentoo/aim-transport-stable-20030314.tar.gz
-	http://ftp.newaol.com/aim/win95/Install_AIM.exe )
-	!j-nomsn? ( mirror://gentoo/msn-transport-stable-20011217.tar.gz )
-	!j-noyahoo? (http://yahoo-transport.jabberstudio.org/yahoo-t-2.1.1.tar.gz )
-	!j-nomuconf? ( http://www.jabberstudio.org/files/mu-conference/mu-conference-0.5.1.tar.gz )
-	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )
-	!j-nojud? ( http://download.jabber.org/dists/1.4/final/jud-0.4.tar.gz )"
-#mirror://gentoo/Install_AIM_3.5.1670.exe
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="ssl ldap"
-# Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} j-nomsn j-noaim j-noyahoo j-nomuconf j-nojud"
-
-DEPEND="=dev-libs/pth-1.4.0
-	!j-noyahoo? ( =dev-libs/glib-1.2* !=sys-libs/glibc-2.3.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6i )
-	ldap? ( =net-nds/openldap-2* )
-	!j-nomsn? ( !=sys-libs/glibc-2.3.1 )
-	!j-noaim? ( !=sys-libs/glibc-2.3.1 )
-	!j-nomuconf ? ( !=sys-libs/glibc-2.3.1 )
-	!j-nojud ? ( !=sys-libs/glibc-2.3.1 )"
-
-src_unpack() {
-	unpack jabber-${PV}.tar.gz
-	cd ${S}
-	patch -p0 < ${FILESDIR}/mio_ssl.c.patch
-	use j-nomsn	|| unpack msn-transport-stable-20011217.tar.gz
-	use j-noyahoo	|| unpack yahoo-t-2.1.1.tar.gz
-	use j-nojud	|| unpack jud-0.4.tar.gz
-	use ldap	&& unpack xdb_ldap-1.0.tar.gz
-	if ! use j-nomuconf; then
-		unpack mu-conference-0.5.1.tar.gz
-		mv ${S}/mu-conference-0.5.1 ${S}/mu-conference
-	fi
-	if ! use j-noaim; then
-		unpack aim-transport-stable-20030314.tar.gz
-		mv ${S}/aim-transport-stable-20030314 ${S}/aim-transport
-		cd ${S}/aim-transport
-		cp ${DISTDIR}/Install_AIM.exe .
-	fi
-
-	mkdir ${S}/config -p
-	cd ${S}/config
-	tar -xjf ${FILESDIR}/config-1.4.2-r3.tbz2
-}
-
-src_compile() {
-	# These can cause problems with certain configure scripts used...
-	unset LC_ALL LC_CTYPE
-
-
-	local myconf
-	cd ${S}
-	use ssl && myconf="--enable-ssl"
-
-	mv jabberd/jabberd.c jabberd/jabberd.c.orig
-	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
-	rm -f jabberd/jabberd.c.orig
-	./configure ${myconf} || die
-	make || die
-
-	if ! use j-noaim; then
-	        cd ${S}/aim-transport
-		./configure || die
-	        make || die
-		make install
-	fi
-
-	if ! use j-nomsn; then
-		cd ${S}/msn-transport
-		./bootstrap || die
-		./configure || die
-		make || die
-	fi
-
-	if ! use j-nomuconf; then
-		cd ${S}/mu-conference
-		make || die
-	fi
-
-	if ! use j-nojud; then
-		cd ${S}/jud-0.4
-		make || die
-	fi
-
-	if ! use j-noyahoo; then
-		cd ${S}/yahoo-transport-2
-		make || die
-	fi
-
-	if use ldap; then
-		cd ${S}/xdb_ldap/src
-		make all || die
-	fi
-}
-
-src_install() {
-	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r3 jabber
-	dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
-	touch ${D}/var/log/jabber/error.log
-	touch ${D}/var/log/jabber/record.log
-	keepdir /var/spool/jabber
-	dodir /var/run
-
-	cp ${S}/jabberd/jabberd ${D}/usr/sbin/
-	if ! use j-noaim; then
-		cp ${S}/aim-transport/src/aimtrans.so ${D}/usr/lib/jabber/
-		cp ${S}/aim-transport/Install_AIM.exe ${D}/usr/lib/jabber/
-		cp ${S}/config/aimtrans.xml ${D}/etc/jabber/
-		cp ${S}/config/icqtrans.xml ${D}/etc/jabber/
-	fi
-	if ! use j-nomsn; then
-		cp ${S}/msn-transport/src/msntrans.so ${D}/usr/lib/jabber/
-		cp ${S}/config/msntrans.xml ${D}/etc/jabber/
-	fi
-	if ! use j-nomuconf; then
-		cp ${S}/mu-conference/src/mu-conference.so ${D}/usr/lib/jabber/
-		cp ${S}/config/muctrans.xml ${D}/etc/jabber/
-	fi
-	if ! use j-nojud; then
-		cp ${S}/jud-0.4/jud.so ${D}/usr/lib/jabber/
-		cp ${S}/jud-0.4/README ${D}/etc/jabber/jud.README
-	fi
-	if ! use j-noyahoo; then
-		cp ${S}/yahoo-transport-2/yahoo-transport.so ${D}/usr/lib/jabber/
-		cp ${S}/config/yahootrans.xml ${D}/etc/jabber/
-	fi
-	cp ${S}/jsm/jsm.so ${D}/usr/lib/jabber/
-	cp ${S}/xdb_file/xdb_file.so ${D}/usr/lib/jabber/
-	cp ${S}/pthsock/pthsock_client.so ${D}/usr/lib/jabber/
-	cp ${S}/dnsrv/dnsrv.so ${D}/usr/lib/jabber/
-	cp ${S}/dialback/dialback.so ${D}/usr/lib/jabber/
-	if use ldap; then
-		cp ${S}/xdb_ldap/jabber.schema ${D}/etc/jabber/
-		cp ${S}/xdb_ldap/slapd.conf ${D}/etc/jabber/
-		cp ${S}/xdb_ldap/src/xdb_ldap.so ${D}/usr/lib/jabber/
-		cp ${S}/config/xdb-ldap.xml ${D}/etc/jabber/
-	fi
-	use j-noaim &&
-	 grep -v 'aim data' ${S}/config/multiple.xml >	\
-	 ${S}/config/multiple.xml.new;			\
-	 mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	use j-nomsn &&
-	 grep -v 'msn data' ${S}/config/multiple.xml >	\
-	 ${S}/config/multiple.xml.new;			\
-	 mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	use j-noyahoo &&
-	 grep -v 'yahoo data' ${S}/config/multiple.xml >	\
-	 ${S}/config/multiple.xml.new;				\
-	 mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	use j-nomuconf &&
-	 grep -v 'muconf data' ${S}/config/multiple.xml > 	\
-	 ${S}/config/multiple.xml.new;				\
-	 mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	use j-nojud &&
-	 grep -v 'jud data' ${S}/config/multiple.xml > 		\
-	 ${S}/config/multiple.xml;				\
-	 mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	cp ${S}/config/multiple.xml ${D}/etc/jabber/
-}
-
-pkg_postinst() {
-	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-	if [ -z $test_group ]
-	then
-		groupadd jabber
-	fi
-
-	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
-	if [ -z $test_user ]
-	then
-		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
-	fi
-
-	chown jabber.jabber /etc/jabber
-	chown jabber.jabber /usr/sbin/jabberd
-	chown jabber.jabber /var/log/jabber -R
-	chown jabber.jabber /var/spool/jabber -R
-	chmod o-rwx /etc/jabber
-	chmod o-rwx /usr/sbin/jabberd
-	chmod o-rwx /var/log/jabber -R
-	chmod o-rwx /var/spool/jabber -R
-	chmod u+rwx /usr/sbin/jabberd
-	chmod g-x /etc/jabber
-	chmod g-x /usr/sbin/jabberd
-	chmod g-x /var/log/jabber -R
-	chmod g-x /var/spool/jabber -R
-	chmod g+rw /etc/jabber
-	chmod g+rw /usr/sbin/jabberd
-	chmod g+rw /var/spool/jabber -R
-	chmod g+rw /var/log/jabber -R
-	chmod u+xs /usr/sbin/jabberd
-
-	einfo "Change 'localhost' to your server's domainname in the"
-	einfo "/etc/jabber/*.xml configs first"
-	einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
-	einfo "(Only if compiled with SSL support (ssl in USE)"
-	einfo "Server admins should be added to the "jabber" group"
-	einfo "In order to use the ldap backend, you need to copy"
-	einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
-	einfo "directory on your ldap server. You will also need to"
-	einfo "include the schema in your slapd.conf file and retsart openldap."
-	einfo "An example slapd.conf file is included in /etc/jabber."
-	einfo "The xdb_ldap backend expects your ldap server to handle"
-	einfo "StartTLS or run in ldaps mode."
-	einfo "To complete JUD configuration, read /etc/jabber/jud.README"
-}
diff --git a/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild
deleted file mode 100644
index 5b37e7d6cd9a..000000000000
--- a/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r4.ebuild,v 1.5 2003/12/08 07:58:08 luke-jr Exp $
-
-S="${WORKDIR}/jabber-${PV}"
-DESCRIPTION="Open Source Jabber Server & JUD,MUC,AIM,MSN,ICQ and Yahoo transports"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://jabberd.jabberstudio.org/downloads/jabber-${PV}.tar.gz
-	!j-noaim? ( mirror://gentoo/aim-transport-stable-20030314.tar.gz
-	http://ftp.newaol.com/aim/win95/Install_AIM.exe )
-	!j-nomsn? ( http://msn-transport.jabberstudio.org/msn-transport-1.2.8pre5.tar.gz )
-	!j-noyahoo? (http://yahoo-transport.jabberstudio.org/yahoo-t-2.1.1.tar.gz )
-	!j-nomuconf? ( http://www.jabberstudio.org/files/mu-conference/mu-conference-0.5.1.tar.gz )
-	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )
-	!j-nojud? ( http://download.jabber.org/dists/1.4/final/jud-0.4.tar.gz )"
-#mirror://gentoo/Install_AIM_3.5.1670.exe
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="ssl ldap"
-# Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} j-nomsn j-noaim j-noyahoo j-nomuconf j-nojud"
-
-DEPEND="=dev-libs/pth-1.4.0
-	!j-noyahoo? ( =dev-libs/glib-1.2* !=sys-libs/glibc-2.3.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6i )
-	ldap? ( =net-nds/openldap-2* )
-	!j-nomsn? ( !=sys-libs/glibc-2.3.1 net-ftp/curl )
-	!j-noaim? ( !=sys-libs/glibc-2.3.1 )
-	!j-nomuconf ? ( !=sys-libs/glibc-2.3.1 )
-	!j-nojud ? ( !=sys-libs/glibc-2.3.1 )"
-
-src_unpack() {
-	unpack jabber-${PV}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/mio_ssl.c.patch
-	if ! use j-nomsn; then
-		unpack msn-transport-1.2.8pre5.tar.gz
-		cd msn-transport*
-		epatch ${FILESDIR}/msn-configure-patch-00
-		cd ..
-	fi
-	use j-noyahoo	|| unpack yahoo-t-2.1.1.tar.gz
-	use j-nojud	|| unpack jud-0.4.tar.gz
-	use ldap	&& unpack xdb_ldap-1.0.tar.gz
-	if ! use j-nomuconf; then
-		unpack mu-conference-0.5.1.tar.gz
-		mv ${S}/mu-conference-0.5.1 ${S}/mu-conference
-	fi
-	if ! use j-noaim; then
-		unpack aim-transport-stable-20030314.tar.gz
-		mv ${S}/aim-transport-stable-20030314 ${S}/aim-transport
-		cd ${S}/aim-transport
-		cp ${DISTDIR}/Install_AIM.exe .
-	fi
-
-	mkdir ${S}/config -p
-	cd ${S}/config
-	tar -xjf ${FILESDIR}/config-1.4.2-r4.tbz2
-}
-
-src_compile() {
-	# These can cause problems with certain configure scripts used...
-	unset LC_ALL LC_CTYPE
-
-
-	local myconf
-	cd ${S}
-	use ssl && myconf="--enable-ssl"
-
-	mv jabberd/jabberd.c jabberd/jabberd.c.orig
-	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
-	rm -f jabberd/jabberd.c.orig
-	./configure ${myconf} || die
-	make || die
-
-	if ! use j-noaim; then
-	        cd ${S}/aim-transport
-		./configure || die
-	        make || die
-		make install
-	fi
-
-	if ! use j-nomsn; then
-		cd ${S}/msn-transport*
-		./configure --with-jabberd=${S}/jabberd || die
-		make || die
-	fi
-
-	if ! use j-nomuconf; then
-		cd ${S}/mu-conference
-		make || die
-	fi
-
-	if ! use j-nojud; then
-		cd ${S}/jud-0.4
-		make || die
-	fi
-
-	if ! use j-noyahoo; then
-		cd ${S}/yahoo-transport-2
-		make || die
-	fi
-
-	if use ldap; then
-		cd ${S}/xdb_ldap/src
-		make all || die
-	fi
-}
-
-src_install() {
-	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r3 jabber
-	dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
-	touch ${D}/var/log/jabber/error.log
-	touch ${D}/var/log/jabber/record.log
-	keepdir /var/spool/jabber
-	dodir /var/run
-
-	cp ${S}/jabberd/jabberd ${D}/usr/sbin/
-	if ! use j-noaim; then
-		cp ${S}/aim-transport/src/aimtrans.so ${D}/usr/lib/jabber/
-		cp ${S}/aim-transport/Install_AIM.exe ${D}/usr/lib/jabber/
-		cp ${S}/config/aimtrans.xml ${D}/etc/jabber/
-		cp ${S}/config/icqtrans.xml ${D}/etc/jabber/
-	fi
-	if ! use j-nomsn; then
-		cp ${S}/msn-transport*/src/msntrans.so ${D}/usr/lib/jabber/
-		cp ${S}/config/msntrans.xml ${D}/etc/jabber/
-	fi
-	if ! use j-nomuconf; then
-		cp ${S}/mu-conference/src/mu-conference.so ${D}/usr/lib/jabber/
-		cp ${S}/config/muctrans.xml ${D}/etc/jabber/
-	fi
-	if ! use j-nojud; then
-		cp ${S}/jud-0.4/jud.so ${D}/usr/lib/jabber/
-		cp ${S}/jud-0.4/README ${D}/etc/jabber/jud.README
-	fi
-	if ! use j-noyahoo; then
-		cp ${S}/yahoo-transport-2/yahoo-transport.so ${D}/usr/lib/jabber/
-		cp ${S}/config/yahootrans.xml ${D}/etc/jabber/
-	fi
-	cp ${S}/jsm/jsm.so ${D}/usr/lib/jabber/
-	cp ${S}/xdb_file/xdb_file.so ${D}/usr/lib/jabber/
-	cp ${S}/pthsock/pthsock_client.so ${D}/usr/lib/jabber/
-	cp ${S}/dnsrv/dnsrv.so ${D}/usr/lib/jabber/
-	cp ${S}/dialback/dialback.so ${D}/usr/lib/jabber/
-	if use ldap; then
-		cp ${S}/xdb_ldap/jabber.schema ${D}/etc/jabber/
-		cp ${S}/xdb_ldap/slapd.conf ${D}/etc/jabber/
-		cp ${S}/xdb_ldap/src/xdb_ldap.so ${D}/usr/lib/jabber/
-		cp ${S}/config/xdb-ldap.xml ${D}/etc/jabber/
-	fi
-	if use j-noaim; then
-		grep -v 'aim data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
-		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	fi; if use j-nomsn; then
-		grep -v 'msn data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
-		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	fi; if use j-noyahoo; then
-		grep -v 'yahoo data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
-		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	fi; if use j-nomuconf; then
-		grep -v 'muconf data' ${S}/config/multiple.xml > ${S}/config/multiple.xml.new
-		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	fi; if use j-nojud; then
-		grep -v 'jud data' ${S}/config/multiple.xml > ${S}/config/multiple.xml
-		mv ${S}/config/multiple.xml.new ${S}/config/multiple.xml
-	fi
-	cp ${S}/config/multiple.xml ${D}/etc/jabber/
-}
-
-pkg_postinst() {
-	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-	if [ -z $test_group ]
-	then
-		groupadd jabber
-	fi
-
-	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
-	if [ -z $test_user ]
-	then
-		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
-	fi
-
-	chown jabber.jabber /etc/jabber
-	chown jabber.jabber /usr/sbin/jabberd
-	chown jabber.jabber /var/log/jabber -R
-	chown jabber.jabber /var/spool/jabber -R
-	chmod o-rwx /etc/jabber
-	chmod o-rwx /usr/sbin/jabberd
-	chmod o-rwx /var/log/jabber -R
-	chmod o-rwx /var/spool/jabber -R
-	chmod u+rwx /usr/sbin/jabberd
-	chmod g-x /etc/jabber
-	chmod g-x /usr/sbin/jabberd
-	chmod g-x /var/log/jabber -R
-	chmod g-x /var/spool/jabber -R
-	chmod g+rw /etc/jabber
-	chmod g+rw /usr/sbin/jabberd
-	chmod g+rw /var/spool/jabber -R
-	chmod g+rw /var/log/jabber -R
-	chmod u+xs /usr/sbin/jabberd
-
-	einfo "Change 'localhost' to your server's domainname in the"
-	einfo "/etc/jabber/*.xml configs first"
-	if use ssl >/dev/null; then
-		einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
-	fi
-	einfo "Server admins should be added to the "jabber" group"
-	if use ldap >/dev/null; then
-		einfo "In order to use the ldap backend, you need to copy"
-		einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
-		einfo "directory on your ldap server. You will also need to"
-		einfo "include the schema in your slapd.conf file and retsart openldap."
-		einfo "An example slapd.conf file is included in /etc/jabber."
-		einfo "The xdb_ldap backend expects your ldap server to handle"
-		einfo "StartTLS or run in ldaps mode."
-	fi
-	if ! use j-nojud >/dev/null; then
-		einfo "To complete JUD configuration, read /etc/jabber/jud.README"
-	fi
-}
diff --git a/net-im/jabber-server/jabber-server-1.4.3.ebuild b/net-im/jabber-server/jabber-server-1.4.3.ebuild
index 9df5f8031c3f..f5800b750644 100644
--- a/net-im/jabber-server/jabber-server-1.4.3.ebuild
+++ b/net-im/jabber-server/jabber-server-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.3.ebuild,v 1.2 2003/12/08 07:58:08 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.3.ebuild,v 1.3 2003/12/08 23:47:02 luke-jr Exp $
 
 S="${WORKDIR}/jabberd-${PV}"
 DESCRIPTION="Open Source Jabber Server & JUD,MUC,AIM,MSN,ICQ and Yahoo transports"
@@ -17,7 +17,7 @@ SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="ssl ldap ipv6"
 # Internal USE flags that I do not really want to advertise ...
 IUSE="${IUSE} j-nomsn j-noaim j-noyahoo j-nomuconf j-nojud"
@@ -183,10 +183,10 @@ pkg_postinst() {
 		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
 	fi
 
-	chown jabber.jabber /etc/jabber
-	chown jabber.jabber /usr/sbin/jabberd
-	chown jabber.jabber /var/log/jabber -R
-	chown jabber.jabber /var/spool/jabber -R
+	chown jabber:jabber /etc/jabber
+	chown jabber:jabber /usr/sbin/jabberd
+	chown jabber:jabber /var/log/jabber -R
+	chown jabber:jabber /var/spool/jabber -R
 	chmod o-rwx /etc/jabber
 	chmod o-rwx /usr/sbin/jabberd
 	chmod o-rwx /var/log/jabber -R