From d80b7586ce797e5c999800a2f1932fde8a9901d4 Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Thu, 28 Sep 2006 10:01:29 +0000 Subject: Ebuild cleanup, bug #149377. (Portage version: 2.1.2_pre1-r4) --- net-im/jabberd/ChangeLog | 7 +++- net-im/jabberd/jabberd-1.4.4-r3.ebuild | 67 +++++++++++++++++++--------------- 2 files changed, 43 insertions(+), 31 deletions(-) (limited to 'net-im/jabberd') diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index ee22a4cbb247..fa1a15ec47d8 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/jabberd # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.73 2006/09/27 22:47:25 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.74 2006/09/28 10:01:29 nelchael Exp $ + + 28 Sep 2006; Krzysiek Pawlik + jabberd-1.4.4-r3.ebuild: + Ebuild cleanup, thanks to Paul Bredbury for help in bug + #149377. 27 Sep 2006; Krzysiek Pawlik jabberd-1.4.4-r3.ebuild: diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild index c0abfc0602f1..a068999f9f0c 100644 --- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild +++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild @@ -1,19 +1,20 @@ # 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-1.4.4-r3.ebuild,v 1.2 2006/09/27 22:47:25 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.3 2006/09/28 10:01:29 nelchael Exp $ inherit eutils -S="${WORKDIR}/jabberd-${PV}" -DESCRIPTION="Open Source Jabber Server" +DESCRIPTION="Open-source Jabber server" HOMEPAGE="http://www.jabber.org" SRC_URI="http://download.jabberd.org/jabberd14/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="ssl ipv6 mysql postgres" +IUSE="debug ipv6 mysql postgres ssl" +# Block against jabberd-2* is needed - both packages install the same files. +# jabberd-2* needs to be back at SLOT="0" DEPEND=">=net-im/jabber-base-0.01 >=dev-libs/pth-1.4.0 dev-libs/expat @@ -23,9 +24,6 @@ DEPEND=">=net-im/jabber-base-0.01 !net-im/aim-transport !=net-im/jabberd-2*" -# Block against jabberd-2* is needed - both packages install the same files - collisions! -# jabberd-2* needs to be back at SLOT="0" - pkg_setup() { if use postgres && use mysql; then @@ -34,8 +32,9 @@ pkg_setup() { fi if use ipv6; then - ewarn "You are about to build with ipv6 support, if your system is not using ipv6" - ewarn "hit Control-C now and emerge with \"USE=-ipv6\" or add it to /etc/portage/package.use " + 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 } @@ -53,54 +52,62 @@ src_compile() { unset LC_ALL LC_CTYPE + # Broken configure script - can't use "use_enable" + local myconf= + use debug && myconf="${myconf} --enable-debug" + use ipv6 && myconf="${myconf} --enable-ipv6" + use ssl && myconf="${myconf} --enable-ssl" + econf \ --sysconfdir=/etc/jabber \ - $(use_enable ssl) \ - $(use_enable ipv6) \ + ${myconf} \ $(use_with mysql) \ - $(use_with postgres postgresql )\ + $(use_with postgres postgresql) \ || die "econf failed" # Broken parallel build - emake -j 1 || die + emake -j1 || die "emake failed" } src_install() { - make DESTDIR=${D} install || die "make install failed" + make DESTDIR="${D}" install || die "make install failed" - newinitd ${FILESDIR}/${P}.init jabber + 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" \ - "${D}/etc/jabber/jabberd.xml.dist" + "${D}"/etc/jabber/jabberd.xml{,.dist} \ + || die "sed failed" } pkg_postinst() { - 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" - einfo "net-im/pymsn-t - MSN transport" - einfo "net-im/jud - Jabber User Directory" - einfo "net-im/yahoo-transport - Yahoo IM system" - einfo "net-im/mu-conference - Jabber multi user conference" - einfo - ewarn "If upgrading from older version please stop jabberd BEFORE updating the init.d" - ewarn "script, or you will end with a \"dead\" server." - ewarn - ewarn "Configuration file name has changed:" - ewarn " configure your server in /etc/jabber/jabberd.xml!" + echo + 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' + einfo ' net-im/pymsn-t - MSN transport' + einfo ' net-im/jud - Jabber User Directory' + einfo ' net-im/yahoo-transport - Yahoo IM system' + einfo ' 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.' + echo + ewarn 'The configuration filename has changed:' + ewarn ' Configure your server in /etc/jabber/jabberd.xml' + echo ebeep } -- cgit v1.2.3-65-gdbad