* [gentoo-commits] gentoo-x86 commit in net-im/jabberd: ChangeLog metadata.xml jabberd-1.6.1.1-r1.ebuild jabberd-1.6.1.1.ebuild
@ 2008-06-20 19:16 Thomas Anderson (gentoofan23)
0 siblings, 0 replies; only message in thread
From: Thomas Anderson (gentoofan23) @ 2008-06-20 19:16 UTC (permalink / raw
To: gentoo-commits
gentoofan23 08/06/20 19:16:50
Modified: ChangeLog metadata.xml
Added: jabberd-1.6.1.1-r1.ebuild
Removed: jabberd-1.6.1.1.ebuild
Log:
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)
Revision Changes Path
1.106 net-im/jabberd/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/ChangeLog?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/ChangeLog?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/ChangeLog?r1=1.105&r2=1.106
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ChangeLog 18 Jun 2008 12:24:55 -0000 1.105
+++ ChangeLog 20 Jun 2008 19:16:49 -0000 1.106
@@ -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:
1.8 net-im/jabberd/metadata.xml
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/metadata.xml?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/metadata.xml?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/metadata.xml?r1=1.7&r2=1.8
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd/metadata.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- metadata.xml 9 Jun 2008 20:22:03 -0000 1.7
+++ metadata.xml 20 Jun 2008 19:16:50 -0000 1.8
@@ -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>
1.1 net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild?rev=1.1&content-type=text/plain
Index: jabberd-1.6.1.1-r1.ebuild
===================================================================
# 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-r1.ebuild,v 1.1 2008/06/20 19:16:50 gentoofan23 Exp $
WANT_AUTOMAKE="1.9"
inherit autotools eutils
DESCRIPTION="Open-source Jabber server"
HOMEPAGE="http://www.jabber.org"
SRC_URI="http://download.jabberd.org/jabberd14/jabberd14-${PV}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
IUSE="mysql postgres"
RDEPEND=">=net-im/jabber-base-0.01
>=dev-libs/pth-1.4.0
dev-libs/expat
net-dns/libidn
mysql? ( virtual/mysql )
postgres? ( virtual/postgresql-server )
net-libs/gnutls
dev-libs/popt"
DEPEND="${RDEPEND}
dev-util/pkgconfig
!net-im/jabberd2"
S=${WORKDIR}/jabberd14-${PV}
pkg_setup() {
if use ipv6; then
ewarn "Without full ipv6 support, jabberd will show the error:"
ewarn ' "mio unable to listen"'
ewarn "To fix this, emerge jabberd without the ipv6 USE flag."
fi
}
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
econf \
--sysconfdir=/etc/jabber \
$(use_with mysql) \
$(use_with postgres postgresql) \
|| die "econf failed"
emake || die "emake failed"
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed"
# net-im/jabber-base provides needed directories
rm -rf "${D}/var"
mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
sed -i \
-e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
-e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
-e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
-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:'
elog ' net-im/jit - ICQ transport'
elog ' net-im/pymsn-t - MSN transport'
elog ' net-im/jud - Jabber User Directory'
elog ' net-im/yahoo-transport - Yahoo IM system'
elog ' net-im/mu-conference - Jabber multi user conference'
echo
ewarn 'If upgrading from an older version, please stop jabberd BEFORE'
ewarn 'updating the init.d script, or you will end with a "dead" server.'
ewarn
ewarn 'The configuration filename has changed:'
ewarn ' Configure your server in /etc/jabber/jabberd.xml'
echo
ebeep
}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-20 19:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-20 19:16 [gentoo-commits] gentoo-x86 commit in net-im/jabberd: ChangeLog metadata.xml jabberd-1.6.1.1-r1.ebuild jabberd-1.6.1.1.ebuild Thomas Anderson (gentoofan23)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox