small QA stuff

5 files changed, 10 insertions, 181 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 56581c7fe52f..1ee326db6107 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.31 2004/07/03 11:23:24 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.32 2004/07/03 18:54:29 humpback Exp $
+
+  03 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  -jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, jabberd-2.0.ebuild:
+  Marking ~hppa because of dependencies not stable
 
   02 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
   jabberd-1.4.3-r3.ebuild:
diff --git a/net-im/jabberd/files/digest-jabberd-1.4.3-r2 b/net-im/jabberd/files/digest-jabberd-1.4.3-r2
deleted file mode 100644
index 09bdcd16d472..000000000000
--- a/net-im/jabberd/files/digest-jabberd-1.4.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a3e964d6fa07b5d850302ae0512f94c6 jabberd-1.4.3.tar.gz 258016
-MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
diff --git a/net-im/jabberd/jabberd-1.4.3-r2.ebuild b/net-im/jabberd/jabberd-1.4.3-r2.ebuild
deleted file mode 100644
index 036ea926c86f..000000000000
--- a/net-im/jabberd/jabberd-1.4.3-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r2.ebuild,v 1.10 2004/06/26 02:36:02 humpback Exp $
-
-inherit eutils
-
-S="${WORKDIR}/jabberd-${PV}"
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
-	ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-IUSE="ssl ldap"
-
-DEPEND="!net-im/jabber-server
-	=dev-libs/pth-1.4.0
-	ssl? ( >=dev-libs/openssl-0.9.6i )
-	ldap? ( =net-nds/openldap-2* )"
-
-PDEPEND="msn? ( =net-im/msn-transport-1.2.8_rc1 )
-		 oscar? ( <net-im/aim-transport-20040131-r1 )
-		 yahoo? ( <net-im/yahoo-transport-2.3.1 )
-		 icq? ( <net-im/jit-1.1.6-r3 )"
-
-src_unpack() {
-	unpack jabberd-${PV}.tar.gz
-	cd ${S}
-	use ldap	&& unpack xdb_ldap-1.0.tar.gz
-	epatch ${FILESDIR}/multiple-xml-patch-00
-	mv jabber.xml multiple.xml
-}
-
-src_compile() {
-	# These can cause problems with certain configure scripts used...
-	unset LC_ALL LC_CTYPE
-
-
-	local myconf
-	cd ${S}
-	use ssl && myconf="--enable-ssl"
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	mv jabberd/jabberd.c jabberd/jabberd.c.orig
-	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
-	rm -f jabberd/jabberd.c.orig
-	./configure ${myconf} || die
-	make || die
-
-	if use ldap; then
-		cd ${S}/xdb_ldap/src
-		make all || die
-	fi
-}
-
-src_install() {
-	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r6 jabber
-	dodir /usr/sbin /etc/jabber /usr/lib/jabberd /var/log/jabber /usr/include/jabberd
-	touch ${D}/var/log/jabber/error.log
-	touch ${D}/var/log/jabber/record.log
-	dodir /var/spool/jabber
-	keepdir /var/spool/jabber/
-	keepdir /var/log/jabber/
-	dodir /var/run
-
-	exeinto /usr/sbin
-	doexe jabberd/jabberd
-	insinto /usr/lib/jabberd
-	doins platform-settings
-	doins jsm/jsm.so
-	doins xdb_file/xdb_file.so
-	doins pthsock/pthsock_client.so
-	doins dnsrv/dnsrv.so
-	doins dialback/dialback.so
-	if use ldap; then
-		insinto /etc/jabber
-		doins xdb_ldap/jabber.schema
-		doins xdb_ldap/slapd.conf
-		doins config/xdb-ldap.xml
-		insinto /usr/lib/jabberd
-		doins xdb_ldap/src/xdb_ldap.so
-	fi
-	insinto /etc/jabber
-	doins multiple.xml
-	exeinto /etc/jabber
-	doexe ${FILESDIR}/self-cert.sh
-
-	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-	if [ -z $test_group ]
-	then
-		enewgroup jabber
-	fi
-
-	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
-	if [ -z $test_user ]
-	then
-		enewuser jabber -1 /bin/false /var/spool/jabber jabber
-	fi
-
-	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
-
-	fowners jabber:jabber /etc/jabber
-	fowners jabber:jabber /usr/sbin/jabberd
-	fowners jabber:jabber /var/log/jabber
-	fowners jabber:jabber /var/log/jabber/error.log
-	fowners jabber:jabber /var/log/jabber/record.log
-	fowners jabber:jabber /var/spool/jabber
-
-	fperms o-rwx /etc/jabber
-	fperms o-rwx /usr/sbin/jabberd
-	fperms o-rwx /var/log/jabber
-	fperms o-rwx /var/log/jabber/error.log
-	fperms o-rwx /var/log/jabber/record.log
-	fperms o-rwx /var/spool/jabber
-	fperms u+rwx /usr/sbin/jabberd
-
-	fperms g-x /etc/jabber
-	fperms g-x /usr/sbin/jabberd
-	fperms g-x /var/log/jabber
-	fperms g-x /var/log/jabber/error.log
-	fperms g-x /var/log/jabber/record.log
-	fperms g-x /var/spool/jabber
-
-	fperms g+rw /etc/jabber
-	fperms g+rw /usr/sbin/jabberd
-	fperms g+rw /var/log/jabber
-	fperms g+rw /var/log/jabber/error.log
-	fperms g+rw /var/log/jabber/record.log
-	fperms g+rw /var/spool/jabber
-	fperms u+xs /usr/sbin/jabberd
-
-	#Install header files for transports to use
-	cd ${S}/jabberd
-	tar cf - `find . -name \*.h` | (cd ${D}/usr/include/jabberd ; tar xvf -)
-	assert "Failed to install header files to /usr/include/jabberd"
-}
-
-pkg_postinst() {
-
-	einfo
-	einfo "Change 'localhost' to your server's domainname in the"
-	einfo "/etc/jabber/*.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/jabber/self-cert.sh"
-	fi
-	if use ldap; then
-		einfo
-		einfo "In order to use the ldap backend, you need to copy"
-		einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
-		einfo "directory on your ldap server. You will also need to"
-		einfo "include the schema in your slapd.conf file and retsart openldap."
-		einfo "An example slapd.conf file is included in /etc/jabber."
-		einfo "The xdb_ldap backend expects your ldap server to handle"
-		einfo "StartTLS or run in ldaps mode."
-	fi
-	einfo
-	einfo "The various IM transports for jabber are now separate packages,"
-	einfo "which you will need to install separately if you want them:"
-	einfo "net-im/jit - ICQ transport (You can use aim-transport for icq but JIT is better)"
-	einfo "net-im/msn-transport - MSN transport (USE=msn)"
-	einfo "net-im/jud - Jabber User Directory"
-	einfo "net-im/yahoo-transport - Yahoo IM system (USE=yahoo)"
-	einfo "net-im/aim-transport - AOL transport (USE=oscar)"
-	einfo "net-im/mu-conference - Jabber multi user conference"
-	einfo
-	einfo "Please read /usr/share/doc/${PF}/README.Gentoo.gz"
-	einfo
-}
diff --git a/net-im/jabberd/jabberd-1.4.3-r3.ebuild b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
index e8cdf40bb486..c0e958155c5b 100644
--- a/net-im/jabberd/jabberd-1.4.3-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r3.ebuild,v 1.9 2004/07/03 11:23:24 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r3.ebuild,v 1.10 2004/07/03 18:54:29 humpback Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc hppa ~sparc"
+KEYWORDS="x86 ~ppc ~hppa ~sparc"
 IUSE="ssl ldap ipv6 msn oscar yahoo icq"
 
 DEPEND="!net-im/jabber-server
diff --git a/net-im/jabberd/jabberd-2.0.ebuild b/net-im/jabberd/jabberd-2.0.ebuild
index 2c304f7865c7..678111a9bd3d 100644
--- a/net-im/jabberd/jabberd-2.0.ebuild
+++ b/net-im/jabberd/jabberd-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.ebuild,v 1.7 2004/06/24 22:54:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.ebuild,v 1.8 2004/07/03 18:54:29 humpback Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.jabberstudio.org/files/jabberd2/${PN}-${MY_PV}.tar.gz"
 SLOT="1"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="ldap ipv6 mysql postgres pam berkdb"
+IUSE="ldap ipv6 mysql postgres pam berkdb ssl"
 
 DEPEND="!net-im/jabber-server
 	>=dev-libs/openssl-0.9.6i
@@ -44,7 +44,7 @@ src_compile() {
 	storage="fs"
 	authreg="anon"
 
-	if use db; then
+	if use berkdb; then
 		storage="${storage} db"
 		authreg="${authreg} db"
 	fi