diff options
| -rw-r--r-- | net-im/bitlbee/ChangeLog | 8 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-3.0.4.ebuild | 166 | ||||
| -rw-r--r-- | net-im/bitlbee/files/bitlbee.initd | 6 |
3 files changed, 176 insertions, 4 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog index 6cef683a6cfa..7b878c12e183 100644 --- a/net-im/bitlbee/ChangeLog +++ b/net-im/bitlbee/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/bitlbee # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.148 2011/11/14 23:31:48 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.149 2011/12/04 21:18:10 radhermit Exp $ + +*bitlbee-3.0.4 (04 Dec 2011) + + 04 Dec 2011; Tim Harder <radhermit@gentoo.org> +bitlbee-3.0.4.ebuild, + files/bitlbee.initd: + Version bump. Update init script to fix deprecated flag usage. *bitlbee-3.0.3-r1 (14 Nov 2011) diff --git a/net-im/bitlbee/bitlbee-3.0.4.ebuild b/net-im/bitlbee/bitlbee-3.0.4.ebuild new file mode 100644 index 000000000000..cc3d5da5771c --- /dev/null +++ b/net-im/bitlbee/bitlbee-3.0.4.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.4.ebuild,v 1.1 2011/12/04 21:18:10 radhermit Exp $ + +EAPI="4" +inherit eutils multilib + +DESCRIPTION="irc to IM gateway that support multiple IM protocols" +HOMEPAGE="http://www.bitlbee.org/" +SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple ssl test twitter +yahoo xinetd" # ldap - Bug 195758 + +COMMON_DEPEND="purple? ( net-im/pidgin ) + libevent? ( dev-libs/libevent ) + !libevent? ( >=dev-libs/glib-2.4 ) + otr? ( net-libs/libotr ) + gnutls? ( net-libs/gnutls ) + !gnutls? ( + nss? ( dev-libs/nss ) + !nss? ( ssl? ( dev-libs/openssl ) ) + )" + # ldap? ( net-nds/openldap )" +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig + test? ( dev-libs/check )" + +RDEPEND="${COMMON_DEPEND} + virtual/logger + xinetd? ( sys-apps/xinetd )" + +REQUIRED_USE="^^ ( purple || ( jabber msn oscar yahoo ) ) + msn? ( || ( gnutls nss ssl ) ) + jabber? ( !nss )" + +pkg_setup() { + if use jabber && ! use gnutls && ! use ssl ; then + einfo + elog "You have enabled support for Jabber but do not have SSL" + elog "support enabled. This *will* prevent bitlbee from being" + elog "able to connect to SSL enabled Jabber servers. If you need to" + elog "connect to Jabber over SSL, enable ONE of the following use" + elog "flags: gnutls or ssl" + einfo + fi + + enewgroup bitlbee + enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee +} + +src_prepare() { + sed -i \ + -e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \ + -e "s/nobody/bitlbee/" \ + -e "s/}/ disable = yes\n}/" \ + doc/bitlbee.xinetd || die "sed failed in xinetd" + + sed -i \ + -e "s@mozilla-nss@nss@g" \ + configure || die "sed failed in configure" + + epatch "${FILESDIR}"/${PN}-3.0-configure.patch +} + +src_configure() { + # ldap hard-disabled for now + local myconf="--ldap=0" + + # setup plugins, protocol, ipv6 and debug + for flag in debug ipv6 msn jabber oscar plugins purple twitter yahoo ; do + if use ${flag} ; then + myconf="${myconf} --${flag}=1" + else + myconf="${myconf} --${flag}=0" + fi + done + + # set otr + if use otr && use plugins ; then + myconf="${myconf} --otr=plugin" + else + if use otr ; then + ewarn "OTR support has been disabled automatically because it" + ewarn "requires the plugins USE flag." + fi + myconf="${myconf} --otr=0" + fi + + # setup ssl use flags + if use gnutls ; then + myconf="${myconf} --ssl=gnutls" + einfo "Using gnutls for SSL support" + elif use ssl ; then + myconf="${myconf} --ssl=openssl" + einfo "Using openssl for SSL support" + elif use nss ; then + myconf="${myconf} --ssl=nss" + einfo "Using nss for SSL support" + else + myconf="${myconf} --ssl=bogus" + einfo "You will not have any encryption support enabled." + fi + + # set event handler + if use libevent ; then + myconf="${myconf} --events=libevent" + else + myconf="${myconf} --events=glib" + fi + + # NOTE: bitlbee's configure script is not an autotool creation, + # so that is why we don't use econf. + ./configure --prefix=/usr --datadir=/usr/share/bitlbee \ + --etcdir=/etc/bitlbee --plugindir=/usr/$(get_libdir)/bitlbee \ + --strip=0 ${myconf} || die "econf failed" + + sed -i \ + -e "/^EFLAGS/s:=:&${LDFLAGS} :" \ + Makefile.settings || die "sed failed" +} + +src_install() { + emake install install-etc install-doc install-dev DESTDIR="${D}" + + keepdir /var/lib/bitlbee + fperms 700 /var/lib/bitlbee + fowners bitlbee:bitlbee /var/lib/bitlbee + + dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README} + dodoc doc/user-guide/user-guide.txt + dohtml doc/user-guide/*.html + + doman doc/bitlbee.8 doc/bitlbee.conf.5 + + if use xinetd ; then + insinto /etc/xinetd.d + newins doc/bitlbee.xinetd bitlbee + fi + + newinitd "${FILESDIR}"/bitlbee.initd bitlbee + newconfd "${FILESDIR}"/bitlbee.confd bitlbee + + keepdir /var/run/bitlbee + fowners bitlbee:bitlbee /var/run/bitlbee + + exeinto /usr/share/bitlbee + cd utils + doexe convert_purple.py bitlbee-ctl.pl +} + +pkg_postinst() { + chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee + chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee + + einfo + elog "The utils included in bitlbee are now located in /usr/share/bitlbee" + elog + elog "NOTE: The IRSSI script is no longer provided by BitlBee." + elog + elog "The bitlbeed init script has been replaced by bitlbee." + elog "You must update your configuration." + einfo +} diff --git a/net-im/bitlbee/files/bitlbee.initd b/net-im/bitlbee/files/bitlbee.initd index b68a078e5e28..e703c028dff0 100644 --- a/net-im/bitlbee/files/bitlbee.initd +++ b/net-im/bitlbee/files/bitlbee.initd @@ -1,8 +1,8 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or # later -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd,v 1.2 2010/03/04 17:47:00 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd,v 1.3 2011/12/04 21:18:10 radhermit Exp $ DAEMON=/usr/sbin/bitlbee PIDFILE=/var/run/bitlbee/bitlbee.pid @@ -14,7 +14,7 @@ depend() { start () { ebegin "Starting bitlbee" start-stop-daemon --start --quiet \ - -c bitlbee:bitlbee --exec ${DAEMON} -- -P ${PIDFILE} \ + -u bitlbee:bitlbee --exec ${DAEMON} -- -P ${PIDFILE} \ ${BITLBEE_OPTS} eend $? } |