Revision bump to fix bug #229935. Also remove references to the resolver component. Reorder dependencies to be alphabetically ordered by USE flags, no content of dependencies changed. Force building of anon, fs, and pipe, we have to have something usable even if all USE flags are off.

Package-Manager: portage-2.1.4.4

3 files changed, 25 insertions, 39 deletions

diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog
index 3083029fa626..9dcded5d8eb0 100644
--- a/net-im/jabberd2/ChangeLog
+++ b/net-im/jabberd2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/jabberd2
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.16 2008/06/28 22:23:10 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.17 2008/06/29 11:08:48 gentoofan23 Exp $
+
+*jabberd2-2.2.0-r2 (29 Jun 2008)
+
+  29 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  -jabberd2-2.2.0-r1.ebuild, +jabberd2-2.2.0-r2.ebuild:
+  Revision bump to fix bug #229935. Also remove references to the resolver
+  component. Reorder dependencies to be alphabetically ordered by USE flags,
+  no content of dependencies changed. Force building of anon, fs, and pipe, we
+  have to have something usable even if all USE flags are off.
 
   28 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
   jabberd2-2.2.0-r1.ebuild:
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 219adada3016..f1d2546a3a03 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -5,13 +5,13 @@ AUX jabberd2-2.2.0-apr_base64.patch 627 RMD160 4d6d94ffe80e4f891943723d15f7074a9
 AUX jabberd2-2.2.0.init 1625 RMD160 7e0d90a32df91da1e2e00df20aa25df081e34eb8 SHA1 07d90136a1c4fad30384a76a6366d2ae36310271 SHA256 a2d48c850063019e1763d62061b1c0ab3af0a1f32356f4caf5b27a7aa19062c5
 AUX jabberd2-2.2.0.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
 DIST jabberd-2.2.0.tar.bz2 648710 RMD160 4cf76bd8306d8255517d19da4b99d8bc654f4977 SHA1 a3774e165dffc098e9f815ddabc6fad5073d775d SHA256 6b0bf3b56c70ce17dcefd176c83bee3c175d97dd4038ef95931fde05e6de9895
-EBUILD jabberd2-2.2.0-r1.ebuild 3782 RMD160 a4e5443da35418d9ae05d28c2b3e5f8399360015 SHA1 7a5b4d681783d1f1306abfe354e989805475abd0 SHA256 d14e4ce9547ce6192c2522ec348cedb80a5dded5e45ec5bead441fa0e7d3604a
-MISC ChangeLog 3190 RMD160 1163cb57de1d26045d8c6e4f452ba371cfee4a0c SHA1 9586c29a6947d99c041ddb77f62bc7d7d04131bc SHA256 015c9af303c444233e979083d7ad1618da481c9699ccfea35f171d0bc9fdd7eb
+EBUILD jabberd2-2.2.0-r2.ebuild 3059 RMD160 2e14020c6377a3655c3675e260db93f11ab17994 SHA1 d998b64f9b396aba6d9e2f2ac6396f8e6a7edf09 SHA256 b8963791567b41f11edc8e08b25f89458f910d38b22092b4d749a419207642fb
+MISC ChangeLog 3631 RMD160 eafbd033cb9cb186afcbb2916fe492d081275d9a SHA1 5c921456971110ec954c5b764362b8edcdbbd3ba SHA256 3f8a8f9d1860382546191b5d2db9c1e07ef373dedb846f5317c45d17a56de376
 MISC metadata.xml 533 RMD160 e5c0fd1596a3959e5c30ed3e721b2b4754aaa50e SHA1 09a5de789c18f50ba3e3f18183712131d0d7c4ee SHA256 b3efa5e5aa69ae20f1c154b175fa5a83e71d78155dcd1e549821494dbf6a8f09
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhmvUwACgkQF6yMcaBxwHlZTQCgrWFWedaIhFgU9Tz+WqbdJ8ll
-lE0AoILEawMwFpQDmHyL64BxxzwbFx4E
-=Ok/r
+iEYEARECAAYFAkhncL0ACgkQF6yMcaBxwHklhQCfWIZOAhQQRlB0J1BpbOxDERcx
+luYAnj1e5sjpLBcpGj/VHifLpJ5jb0dZ
+=ptiB
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd2/jabberd2-2.2.0-r1.ebuild b/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild
index d19281bb8dbb..7724b350602b 100644
--- a/net-im/jabberd2/jabberd2-2.2.0-r1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.0-r1.ebuild,v 1.2 2008/06/28 22:23:10 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild,v 1.1 2008/06/29 11:08:48 gentoofan23 Exp $
 
 inherit db-use eutils flag-o-matic pam
 
@@ -11,50 +11,26 @@ SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="berkdb debug memdebug mysql ldap pam pipe postgres sqlite ssl zlib"
+IUSE="berkdb debug memdebug mysql ldap pam postgres sqlite ssl zlib"
 
 DEPEND="dev-libs/expat
-	zlib? ( sys-libs/zlib )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
 	net-libs/udns
 	>=net-dns/libidn-0.3
-	ldap? ( net-nds/openldap )
+	>=virtual/gsasl-0.2.26
 	berkdb? ( >=sys-libs/db-4.1.24 )
-	pam? ( virtual/pam )
 	mysql? ( virtual/mysql )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
 	postgres? ( virtual/postgresql-server )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
 	sqlite? ( >=dev-db/sqlite-3 )
-	>=virtual/gsasl-0.2.26"
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	>=net-im/jabber-base-0.01
 	!net-im/jabberd"
 
 S="${WORKDIR}/jabberd-${PV}"
 
-pkg_setup() {
-	if ! use berkdb && ! use postgres && ! use mysql && ! use sqlite; then
-		eerror 'You have no storage backend selected.'
-		eerror 'Please set one of the following USE flags:'
-		eerror '    berkdb'
-		eerror '    postgres'
-		eerror '    mysql'
-		eerror '    sqlite'
-		die 'Please enable one of the storage backends mentioned.'
-	fi
-
-	if ! use berkdb && ! use mysql && ! use postgres \
-	&& ! use pam && ! use ldap; then
-		eerror 'You have no Authentication mechanism selected.'
-		eerror 'Please set one of the following USE flags for authentication:'
-		eerror '    berkdb'
-		eerror '    mysql'
-		eerror '    postgres'
-		eerror '    pam'
-		eerror '    ldap'
-		die 'Please enable one of the authentication mechanisms mentioned.'
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -82,6 +58,7 @@ src_compile() {
 
 	econf \
 		--sysconfdir=/etc/jabber \
+		--enable-fs --enable-pipe --enable-anon \
 		${myconf} \
 		$(use_enable berkdb db) \
 		$(use_enable ldap) \
@@ -99,8 +76,8 @@ src_compile() {
 src_install() {
 	emake 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}
+	fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s}
+	fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s}
 
 	newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed"
 	newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed"