5 files changed, 11 insertions, 264 deletions
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index c1a2c71cf769..65fe760873fa 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -100,9 +100,7 @@ SHA256 c6b447658281c5136b63cc2bdcd1d38463dae57a0dc701b7d90fecacc409f0c4 files/xm
 DIST jabberd-1.4.3-extexpat.diff 309514
 DIST jabberd-1.4.3.tar.gz 258016
 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
-DIST jabberd-2.0s10.tar.gz 772817
-DIST jabberd-2.0s11.tar.gz 98304 RMD160 1120925e6057124f955fdd7c9eb49621c9b1bb4e SHA1 591e89131954e0eb52f063ec04ebed7cee4ced83 SHA256 7e84d38d5032c07c2f7fa32abfebf222d51bfa800caec438ba1c038a514f91d4
-DIST jabberd-2.0s9.tar.gz 769049
+DIST jabberd-2.0s11.tar.gz 777466 RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d SHA1 c938d95fc17634b889ba9b1d7d27115593b13e3d SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
 DIST xdb_ldap-1.0.tar.gz 112204
 EBUILD jabberd-1.4.3-r5.ebuild 5661 RMD160 1f0e632653b498fa1cac8b01d40c0f32f5b4d929 SHA1 8303f49b0032b243145d7075ebd15ba95b111f15 SHA256 0e01b4f86329b4f2252ab07a11e89130add94e7d33c20828e0ba970e0fb32ae4
 MD5 941c18dda002316db4ff04ca00ff9d7e jabberd-1.4.3-r5.ebuild 5661
@@ -112,22 +110,14 @@ EBUILD jabberd-1.4.4-r3.ebuild 3199 RMD160 9d6fb7f263d2ec56e5134faf593deb7ab656b
 MD5 edeb18c1c4022f1684f0c2f123affd80 jabberd-1.4.4-r3.ebuild 3199
 RMD160 9d6fb7f263d2ec56e5134faf593deb7ab656b817 jabberd-1.4.4-r3.ebuild 3199
 SHA256 3fe6136518958e23e1ff8fd6384ed9f0e112fb1ed4aadb5ad6da2923da9c279e jabberd-1.4.4-r3.ebuild 3199
-EBUILD jabberd-2.0.10.ebuild 3494 RMD160 a43d71c49628084c41d02767775c3dde4898018d SHA1 8c5cad380f1c00395dc4ad7d5b3aa4f0e80f4703 SHA256 1cdeac08668b8d609b335f42d8e6c77f8152398f5b940935d2c64678039e6480
-MD5 fb4eb4f8f7c47229416f97a92b0d99d1 jabberd-2.0.10.ebuild 3494
-RMD160 a43d71c49628084c41d02767775c3dde4898018d jabberd-2.0.10.ebuild 3494
-SHA256 1cdeac08668b8d609b335f42d8e6c77f8152398f5b940935d2c64678039e6480 jabberd-2.0.10.ebuild 3494
 EBUILD jabberd-2.0.11.ebuild 3492 RMD160 a13a765b26d7322d43e3c54c50650daf59b84794 SHA1 0e73671d2dfa4bae99c2f391ac65a5f06a918d81 SHA256 949c6f68c557bfa68c67e9da9861d5ee434f392b7fd98aed61fb107af6aa9986
 MD5 c96b7efa391c9d83c36732bab36ac7fd jabberd-2.0.11.ebuild 3492
 RMD160 a13a765b26d7322d43e3c54c50650daf59b84794 jabberd-2.0.11.ebuild 3492
 SHA256 949c6f68c557bfa68c67e9da9861d5ee434f392b7fd98aed61fb107af6aa9986 jabberd-2.0.11.ebuild 3492
-EBUILD jabberd-2.0.9.ebuild 3622 RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b SHA1 b15b4d16380de31752f6d065ba4f8c7a0f1990c2 SHA256 44fad28beb56c42295a9bd4d0b14dafbdab94be0f9114b34b18d235ecb2f0dbe
-MD5 4cfba42324bea977951cd322a4299d77 jabberd-2.0.9.ebuild 3622
-RMD160 249ec6cd2b563d6e3733f44074acb48efa3e817b jabberd-2.0.9.ebuild 3622
-SHA256 44fad28beb56c42295a9bd4d0b14dafbdab94be0f9114b34b18d235ecb2f0dbe jabberd-2.0.9.ebuild 3622
-MISC ChangeLog 12648 RMD160 6ef30f4733760c440481301752dd233b6c29b104 SHA1 59e8e5833ab27cc2f9368e1e1612645dff33c22a SHA256 0bb0af6b227a0da98aaf3297d5f23bc3f877dfb9dd5914313a16cb0e5b077797
-MD5 ce99d57a9bd8a1973fdb40f5979899ad ChangeLog 12648
-RMD160 6ef30f4733760c440481301752dd233b6c29b104 ChangeLog 12648
-SHA256 0bb0af6b227a0da98aaf3297d5f23bc3f877dfb9dd5914313a16cb0e5b077797 ChangeLog 12648
+MISC ChangeLog 12818 RMD160 a25cb270b4b2adee07e9834611b168078f5ce25c SHA1 cb6b48eb15bab3e1c0ba1e4f995aa73db08f0e01 SHA256 51268097a456cfd97a1d5613b5b7abff053e6c68959e9fb3b862772e9d274cec
+MD5 0cc852fe8b8e0a3f92900a9a5d047417 ChangeLog 12818
+RMD160 a25cb270b4b2adee07e9834611b168078f5ce25c ChangeLog 12818
+SHA256 51268097a456cfd97a1d5613b5b7abff053e6c68959e9fb3b862772e9d274cec ChangeLog 12818
 MISC metadata.xml 453 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 SHA1 74ce3349255a107d4ec18bc3e9639a50b8e7cdbe SHA256 b21a9806e3be38cc94ca812e9864c537237905bdb18347461fae9ba26bb1f690
 MD5 e07ef3d6fc255eee85b6dd3480c8f819 metadata.xml 453
 RMD160 bd3a0ba0e9aa3e1652489c731ff97d97ad050bc7 metadata.xml 453
@@ -138,19 +128,13 @@ SHA256 33c61cd470b9348e0670e1025620c251a2ace5e9581e6acba6dc4574f8f5586e files/di
 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 8524e0a5eec488ceb069462f4650cf1b files/digest-jabberd-2.0.10 66
-RMD160 8d772c60a5ef7ed469d9a2e9f33939427d64a4e2 files/digest-jabberd-2.0.10 66
-SHA256 aa25128fea5986576fe926dba3b8b1aaedd757e50d6af3a0fae73511bf4dad08 files/digest-jabberd-2.0.10 66
-MD5 605217e89a82b4c95431fd10a112babd files/digest-jabberd-2.0.11 241
-RMD160 3361d2d33017efd68607b5324e0ed9ba79a7c1f3 files/digest-jabberd-2.0.11 241
-SHA256 84d14316b279aadd69d2d5e2a38d5b6684487c7c7b1e118f9332561f3c0fa8e9 files/digest-jabberd-2.0.11 241
-MD5 4817e867644d7d7bd2e1a0724571fbe9 files/digest-jabberd-2.0.9 65
-RMD160 874879ba51467cf292812048ed04f5e71ab66b7a files/digest-jabberd-2.0.9 65
-SHA256 e0558a17b5746d48015656ba100b8c828968a785ad35c728696b79c54cd28922 files/digest-jabberd-2.0.9 65
+MD5 3cbebd7d43212be46daad3e042dce34f files/digest-jabberd-2.0.11 244
+RMD160 4638cd85561494bb4ec40e8af80cc145f8156b23 files/digest-jabberd-2.0.11 244
+SHA256 8d5a3e81789ef9e85b365e2974311b0f46ffb940a2b0bfdbc80457e40014f05b files/digest-jabberd-2.0.11 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFI/THgo/w9rxVVVERAkLQAJ40sX8XprN4t3Jtz94bQ2QozOAFUgCfQOLU
-kHcrhO7NxWjNgc6ldymkK6w=
-=xdqd
+iD8DBQFFI/WUgo/w9rxVVVERAglNAJ4nuwd3J/PAIQDCvSuptduO6Y1CXACghBbO
+Fejd57jLc25jIzSkLCKi/ww=
+=5wAR
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.10 b/net-im/jabberd/files/digest-jabberd-2.0.10
deleted file mode 100644
index c2ba03530be0..000000000000
--- a/net-im/jabberd/files/digest-jabberd-2.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e8df4a9a5680009071204d423cff2de0 jabberd-2.0s10.tar.gz 772817
diff --git a/net-im/jabberd/files/digest-jabberd-2.0.9 b/net-im/jabberd/files/digest-jabberd-2.0.9
deleted file mode 100644
index 47ada989f2ca..000000000000
--- a/net-im/jabberd/files/digest-jabberd-2.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64905ccbbe5c6fe1f583401802a3e303 jabberd-2.0s9.tar.gz 769049
diff --git a/net-im/jabberd/jabberd-2.0.10.ebuild b/net-im/jabberd/jabberd-2.0.10.ebuild
deleted file mode 100644
index bb8b65f62457..000000000000
--- a/net-im/jabberd/jabberd-2.0.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.10.ebuild,v 1.2 2006/05/05 10:41:19 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd.jabberstudio.org/2/"
-MY_P="${PN}-2.0s10"
-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 )"
-RDEPEND="${DEPEND}
-	dev-lang/perl" # for the /usr/bin/jabberd wrapper script
-
-pkg_setup() {
-	## add user and group
-	enewgroup jabber
-	enewuser jabber -1 -1 /var/jabberd jabber
-
-	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"
-	useq berkdb && myopts="${myopts} --enable-db"
-	useq mysql && myopts="${myopts} --enable-mysql" || myopts="${myopts} --disable-mysql"
-	useq postgres && myopts="${myopts} --enable-pgsql"
-	useq pam && myopts="${myopts} --enable-pam"
-	useq ldap && myopts="${myopts} --enable-ldap"
-	useq ipv6 && myopts="${myopts} --enable-ipv6"
-	useq debug && myopts="${myopts} --enable-debug"
-
-	econf ${myopts} --localstatedir=/var || 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"
-
-	## 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.9.ebuild b/net-im/jabberd/jabberd-2.0.9.ebuild
deleted file mode 100644
index b4343432a4ee..000000000000
--- a/net-im/jabberd/jabberd-2.0.9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.9.ebuild,v 1.3 2006/05/05 10:41:19 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://jabberd.jabberstudio.org/2/"
-MY_P="${PN}-2.0s9"
-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 )"
-RDEPEND="${DEPEND}
-	dev-lang/perl" # for the /usr/bin/jabberd wrapper script
-
-pkg_setup() {
-	## add user and group
-	enewgroup jabber
-	enewuser jabber -1 -1 /var/jabberd jabber
-
-	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"
-
-	## 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
-}