version bump

(Portage version: 2.1_pre3-r1)

4 files changed, 126 insertions, 13 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 0f8a66bb1d97..5cec30cd4c48 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.62 2005/12/31 13:42:21 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.63 2006/02/01 15:50:31 wschlich Exp $
+
+*jabberd-2.0.10 (01 Feb 2006)
+
+  01 Feb 2006; Wolfram Schlich <wschlich@gentoo.org> +jabberd-2.0.10.ebuild:
+  version bump
 
   31 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   jabberd-1.4.3-r4.ebuild:
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index 4458d30f32b7..26d14810b906 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2de904c8e65edf417cff840bc509f6fd ChangeLog 10029
+MD5 4d8012ed67fad9b54eee95f2dd8269ce ChangeLog 10153
 MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
 MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
+MD5 8524e0a5eec488ceb069462f4650cf1b files/digest-jabberd-2.0.10 66
 MD5 4817e867644d7d7bd2e1a0724571fbe9 files/digest-jabberd-2.0.9 65
 MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
 MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
@@ -23,12 +21,6 @@ MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
 MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
 MD5 910a3e146346e8d123c3cee270e3a920 jabberd-1.4.3-r4.ebuild 5809
 MD5 798d2dd93ed39fc9c20919226a8d51b1 jabberd-1.4.3-r5.ebuild 5844
+MD5 0035a60171fb33b17c943c9cbbf9432d jabberd-2.0.10.ebuild 3393
 MD5 95d2d330856a7b80ead26d0c334d5571 jabberd-2.0.9.ebuild 3621
 MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtorJAiZjviIA2XgRAumPAJ9b6nlpfjDOE1WPFVVKePEVV5zj8wCdEY92
-9V20RYBcu9Pn7VTBw/WDd/M=
-=IjgB
------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
new file mode 100644
index 000000000000..c2ba03530be0
--- /dev/null
+++ b/net-im/jabberd/files/digest-jabberd-2.0.10
@@ -0,0 +1 @@
+MD5 e8df4a9a5680009071204d423cff2de0 jabberd-2.0s10.tar.gz 772817
diff --git a/net-im/jabberd/jabberd-2.0.10.ebuild b/net-im/jabberd/jabberd-2.0.10.ebuild
new file mode 100644
index 000000000000..3ec66f3f6548
--- /dev/null
+++ b/net-im/jabberd/jabberd-2.0.10.ebuild
@@ -0,0 +1,115 @@
+# 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.1 2006/02/01 15:50:31 wschlich 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() {
+	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"
+
+	## add user and group
+	enewgroup jabber
+	enewuser jabber -1 -1 /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
+}