New test version.

Package-Manager: portage-2.1.2_pre2-r2

6 files changed, 162 insertions, 14 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 81148609c30e..2112ccda7f07 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.78 2006/10/04 17:55:11 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.79 2006/10/04 20:48:58 nelchael Exp $
+
+*jabberd-2.0.11-r1 (04 Oct 2006)
+
+  04 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd-2.0.11.init, metadata.xml, +jabberd-2.0.11-r1.ebuild:
+  New test version.
 
   04 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> -jabberd-2.0.9.ebuild,
   -jabberd-2.0.10.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 65fe760873fa..f632e2c8e5a4 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -65,6 +65,10 @@ 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.init 624 RMD160 5e41e3be21ae8d5fe95f569c524c19b1c89ba42d SHA1 bcb763873a5db7858bb8dc9ce1331c83120dce10 SHA256 eeda58bb94c29311ff1b738dbbca3fa69dba277cfb84e0c7ff183d258e37bc61
+MD5 cabea842faf5e5b0282b796366de66de files/jabberd-2.0.11.init 624
+RMD160 5e41e3be21ae8d5fe95f569c524c19b1c89ba42d files/jabberd-2.0.11.init 624
+SHA256 eeda58bb94c29311ff1b738dbbca3fa69dba277cfb84e0c7ff183d258e37bc61 files/jabberd-2.0.11.init 624
 AUX multiple-xml-patch-00 5934 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d SHA1 27f0aab6b2ec468dd9a1d3b7633555db83ade23f SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7
 MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d files/multiple-xml-patch-00 5934
@@ -110,18 +114,22 @@ 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.11-r1.ebuild 2434 RMD160 8e04ca3b7b599696ff219d7ba0625f078cd5e2b8 SHA1 0b2c9a1ce5533898beda3931da36834a402255df SHA256 abcb47bd549e3a11aea58e52448f342b58777ce37bd0c4ede7199231a0665a09
+MD5 2805aaf5e0628d7a1bd8b7e71758d162 jabberd-2.0.11-r1.ebuild 2434
+RMD160 8e04ca3b7b599696ff219d7ba0625f078cd5e2b8 jabberd-2.0.11-r1.ebuild 2434
+SHA256 abcb47bd549e3a11aea58e52448f342b58777ce37bd0c4ede7199231a0665a09 jabberd-2.0.11-r1.ebuild 2434
 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
-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
-SHA256 b21a9806e3be38cc94ca812e9864c537237905bdb18347461fae9ba26bb1f690 metadata.xml 453
+MISC ChangeLog 12997 RMD160 17578d5467139aabba5ce0596e569491bfd75cc2 SHA1 e9af9de2ad7cd643386dd87cac46239a272218c2 SHA256 4de20b3726a270765ceac9f78925a7b6713843621f252c630201a3c4fb160bf1
+MD5 95d233b7bf56bb0495d164807f0850fc ChangeLog 12997
+RMD160 17578d5467139aabba5ce0596e569491bfd75cc2 ChangeLog 12997
+SHA256 4de20b3726a270765ceac9f78925a7b6713843621f252c630201a3c4fb160bf1 ChangeLog 12997
+MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
+MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
+RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
+SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
 RMD160 3f5222d7c706f069b3623ee2f5c7f5034869a741 files/digest-jabberd-1.4.3-r5 201
 SHA256 33c61cd470b9348e0670e1025620c251a2ace5e9581e6acba6dc4574f8f5586e files/digest-jabberd-1.4.3-r5 201
@@ -131,10 +139,13 @@ SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/di
 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
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFI/WUgo/w9rxVVVERAglNAJ4nuwd3J/PAIQDCvSuptduO6Y1CXACghBbO
-Fejd57jLc25jIzSkLCKi/ww=
-=5wAR
+iD8DBQFFJB5Pgo/w9rxVVVERAsqdAKCLqefaDykpaFNm3ouwLgkhQwZpeACfWlUV
+V/4nXNpSEilzF58P65gIjtM=
+=arDg
 -----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
new file mode 100644
index 000000000000..351198e2b0be
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0.11-r1
@@ -0,0 +1,3 @@
+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/jabberd-2.0.11.init b/net-im/jabberd/files/jabberd-2.0.11.init
new file mode 100644
index 000000000000..f0b75a3eb1b0
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-2.0.11.init
@@ -0,0 +1,24 @@
+#!/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.1 2006/10/04 20:48:58 nelchael Exp $
+
+depend() {
+	need net
+	use mysql postgresql slapd
+	provide jabber-server
+}
+
+start() {
+	ebegin "Starting Jabber Server"
+	start-stop-daemon --start -c jabber:jabber \
+		-b --make-pidfile --pidfile /var/run/jabber/jabberd.pid \
+		-q -x /usr/bin/jabberd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Jabber Server"
+	start-stop-daemon --stop -q --pidfile /var/run/jabber/jabberd.pid
+	eend $?
+}
diff --git a/net-im/jabberd/jabberd-2.0.11-r1.ebuild b/net-im/jabberd/jabberd-2.0.11-r1.ebuild
new file mode 100644
index 000000000000..43daaea57040
--- /dev/null
+++ b/net-im/jabberd/jabberd-2.0.11-r1.ebuild
@@ -0,0 +1,105 @@
+# 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.11-r1.ebuild,v 1.1 2006/10/04 20:48:58 nelchael Exp $
+
+inherit autotools 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="berkdb debug ipv6 ldap mysql pam pipe postgres ssl"
+
+DEPEND="!=net-im/jabberd-2.0.11
+	dev-libs/openssl
+	net-dns/libidn
+	ldap? ( net-nds/openldap )
+	berkdb? ( >=sys-libs/db-4.1.25 )
+	!mysql? (
+		!postgres? ( >=sys-libs/db-4.1.25 )
+	)
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+
+	if ! use postgres && ! use mysql && ! use berkdb; then
+		ewarn
+		ewarn "For this version of jabberd you should have"
+		ewarn "at least one of 'mysql', 'postgres' and/or 'berkdb'"
+		ewarn "in the USE variable."
+		ewarn
+		ewarn "Compiling with default berkdb support."
+		ewarn
+		ebeep
+	fi
+
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	# Remove substituting $sysconfdir with $sysconfdir/jabberd
+	sed -i -e '762s,^,dnl ,' configure.in
+
+}
+
+src_compile() {
+
+	eautoreconf
+
+	local dbengine=
+	if ! use postgres && ! use mysql && ! use berkdb; then
+		dbengine="--enable-db"
+	else
+		dbengine="$(use_enable mysql) $(use_enable postgres pgsql) $(use_enable berkdb db)"
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--sysconfdir=/etc/jabber \
+		${dbengine} \
+		$(use_enable pipe) \
+		$(use_enable pam) \
+		$(use_enable ldap) \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
+		|| 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"
+
+	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"
+
+	dodoc AUTHORS PROTOCOL README
+	docinto tools
+	for i in db-setup.{mysql,pgsql} migrate.pl pipe-auth.pl; do
+		dodoc tools/${i}
+	done
+
+}
diff --git a/net-im/jabberd/metadata.xml b/net-im/jabberd/metadata.xml
index e7f596ac2832..bd66f19a782e 100644
--- a/net-im/jabberd/metadata.xml
+++ b/net-im/jabberd/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-im</herd>
   <maintainer>
     <email>nelchael@gentoo.org</email>
-    <description>net-im/jabberd-1* only</description>
   </maintainer>
+  <herd>net-im</herd>
   <longdescription>
     This is the original implementation of jabberd server.
     This serves as the basis for running a jabber server in Gentoo.