Revision bump; fixes bug #228021, bug #228375, and bug #226411; Also removing nelchael from metadata.xml as he is no longer maintaining this package; Remove USE flags that do nothing; Disable conditional gnutls dependency as its always necessary

(Portage version: 2.1.4.4)

5 files changed, 65 insertions, 24 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 576e7a23713c..91bb46cf2bc0 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.105 2008/06/18 12:24:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.106 2008/06/20 19:16:49 gentoofan23 Exp $
+
+*jabberd-1.6.1.1-r1 (20 Jun 2008)
+
+  20 Jun 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  files/jabberd-1.6.1.1-sandbox.patch,
+  +files/jabberd-1.6.1.1-undefineddebug.patch, metadata.xml,
+  -jabberd-1.6.1.1.ebuild, +jabberd-1.6.1.1-r1.ebuild:
+  Revision bump; fixes bug #228021, bug #228375, and bug #226411; Also
+  removing nelchael from metadata.xml as he is no longer maintaining this
+  package; Remove USE flags that do nothing; Disable conditional gnutls
+  dependency as its always necessary
 
   18 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/jabberd-1.6.1.1.init:
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch b/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch
index 57440180b3c1..5653f1e76652 100644
--- a/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-sandbox.patch
@@ -1,14 +1,11 @@
-diff -ur jabberd14-1.6.1.1.orig/po/Makefile.in jabberd14-1.6.1.1.patched/po/Makefile.in
---- jabberd14-1.6.1.1.orig/po/Makefile.in	2007-07-19 04:24:44.000000000 +0600
-+++ jabberd14-1.6.1.1.patched/po/Makefile.in	2008-01-11 18:05:36.000000000 +0500
-@@ -335,8 +335,8 @@
+--- jabberd14-1.6.1.1-orig/po/Makefile.am	2007-04-07 15:43:17.000000000 -0400
++++ jabberd14-1.6.1.1/po/Makefile.am	2008-06-18 13:35:10.000000000 -0400
+@@ -11,6 +11,6 @@
  
  install-data-hook:
  	-for f in $(LANGS); do \
 -	    test -z "$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(localedir)/$${f%.po}/LC_MESSAGES"; \
 -	     msgfmt -o "$(localedir)/$${f%.po}/LC_MESSAGES/jabberd14.mo" $$f; \
-+	    test -z "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES"; \
++	    test -z "$(localedir)/$${f%.po}/LC_MESSAGES" || $(mkdir_p) "$(DESTDIR)/$(localedir)/$${f%.po}/LC_MESSAGES"; \
 +	     msgfmt -o "$(DESTDIR)$(localedir)/$${f%.po}/LC_MESSAGES/jabberd14.mo" $$f; \
  	     done
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-undefineddebug.patch b/net-im/jabberd/files/jabberd-1.6.1.1-undefineddebug.patch
new file mode 100644
index 000000000000..633d9b531156
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-undefineddebug.patch
@@ -0,0 +1,35 @@
+diff -aur jabberd14-1.6.1.1-orig/jabberd/jabberd.cc jabberd14-1.6.1.1/jabberd/jabberd.cc
+--- jabberd14-1.6.1.1-orig/jabberd/jabberd.cc	2007-04-07 15:43:18.000000000 -0400
++++ jabberd14-1.6.1.1/jabberd/jabberd.cc	2008-06-19 08:48:00.000000000 -0400
+@@ -51,7 +51,6 @@
+ 
+ #include <popt.h>
+ 
+-xht debug__zones = NULL;		/**< the debugging zones, that are enabled (key = zone string, value = zone string) */
+ extern int deliver__flag;
+ extern xmlnode greymatter__;
+ 
+diff -aur jabberd14-1.6.1.1-orig/jabberd/jabberd.h jabberd14-1.6.1.1/jabberd/jabberd.h
+--- jabberd14-1.6.1.1-orig/jabberd/jabberd.h	2007-07-20 09:51:08.000000000 -0400
++++ jabberd14-1.6.1.1/jabberd/jabberd.h	2008-06-19 08:48:08.000000000 -0400
+@@ -109,6 +109,8 @@
+ #  include <gnutls/openpgp.h>
+ #endif
+ 
++static xht debug__zones = NULL;        /**< the debugging zones, that are enabled (key = zone string, value = zone string) */
++
+ /** Packet types */
+ typedef enum { p_NONE, p_NORM, p_XDB, p_LOG, p_ROUTE } ptype;
+
+--- jabberd14-1.6.1.1-orig/xdb_file/xdbfiletool.cc	2007-07-21 18:36:29.000000000 -0400
++++ jabberd14-1.6.1.1/xdb_file/xdbfiletool.cc	2008-06-19 11:56:33.000000000 -0400
+@@ -37,7 +37,7 @@
+  *     we have to remove these globals (or at least move them
+  *     inside the library
+  */
+-xht debug__zones;
++extern xht debug__zones;
+ 
+ /* end of hack */
+ 
+
diff --git a/net-im/jabberd/jabberd-1.6.1.1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
index 0caa9a7cdf92..8eced4d9ebf0 100644
--- a/net-im/jabberd/jabberd-1.6.1.1.ebuild
+++ b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1.ebuild,v 1.1 2008/06/09 20:22:03 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.1 2008/06/20 19:16:50 gentoofan23 Exp $
 
-inherit eutils
+WANT_AUTOMAKE="1.9"
+inherit autotools eutils
 
 DESCRIPTION="Open-source Jabber server"
 HOMEPAGE="http://www.jabber.org"
@@ -11,7 +12,7 @@ SRC_URI="http://download.jabberd.org/jabberd14/jabberd14-${PV}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="debug ipv6 mysql postgres ssl"
+IUSE="mysql postgres"
 
 RDEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/pth-1.4.0
@@ -19,7 +20,7 @@ RDEPEND=">=net-im/jabber-base-0.01
 	net-dns/libidn
 	mysql? ( virtual/mysql )
 	postgres? ( virtual/postgresql-server )
-	ssl? ( net-libs/gnutls )
+	net-libs/gnutls
 	dev-libs/popt"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -39,23 +40,21 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	#Shamelessly stolen from Freebsd
 	epatch "${FILESDIR}/${P}-gnutls2.2.patch"
+	## Gentoo bug #200616
 	epatch "${FILESDIR}/${P}-sandbox.patch"
 	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-undefineddebug.patch"
+
+	eautoreconf || die "Reconfiguring autotools failed!"
 }
 
 src_compile() {
 	unset LC_ALL LC_CTYPE
 
-	# Broken configure script - can't use "use_enable"
-	local myconf=
-	use debug && myconf="${myconf} --enable-debug --enable-pool-debug"
-	use ipv6  && myconf="${myconf} --enable-ipv6"
-	use ssl   && myconf="${myconf} --enable-ssl"
-
 	econf \
 		--sysconfdir=/etc/jabber \
-		${myconf} \
 		$(use_with mysql) \
 		$(use_with postgres postgresql) \
 		|| die "econf failed"
@@ -80,9 +79,11 @@ src_install() {
 		-e 's,jabber.pid,jabberd14.pid,g' \
 		"${D}"/etc/jabber/jabberd.xml{,.dist} \
 		|| die "sed failed"
+
 }
 
 pkg_postinst() {
+
 	echo
 	elog 'The various IM transports for jabber are now separate packages,'
 	elog 'which you will need to install separately if you want them:'
@@ -99,4 +100,5 @@ pkg_postinst() {
 	ewarn '   Configure your server in /etc/jabber/jabberd.xml'
 	echo
 	ebeep
+
 }
diff --git a/net-im/jabberd/metadata.xml b/net-im/jabberd/metadata.xml
index eeae55170460..74416a1cb3b4 100644
--- a/net-im/jabberd/metadata.xml
+++ b/net-im/jabberd/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>nelchael@gentoo.org</email>
-		<name>Krzysiek Pawlik</name>
-	</maintainer>
-	<maintainer>
-		<email>gentoofan23@gmail.com</email>
+		<email>gentoofan23@gentoo.org</email>
 		<name>Thomas Anderson</name>
 	</maintainer>
 	<herd>net-im</herd>