Revbump to add support for building skype plugin (bug #405043).

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

4 files changed, 206 insertions, 1 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index c81205b6de20..3d17f529723c 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.152 2012/02/23 16:20:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.153 2012/03/17 05:46:06 radhermit Exp $
+
+*bitlbee-3.0.5-r1 (17 Mar 2012)
+
+  17 Mar 2012; Tim Harder <radhermit@gentoo.org> +bitlbee-3.0.5-r1.ebuild,
+  +files/bitlbee-3.0.5-parallel-make.patch, metadata.xml:
+  Revbump to add support for building skype plugin (bug #405043).
 
   23 Feb 2012; Brent Baude <ranger@gentoo.org> bitlbee-3.0.4.ebuild:
   Marking bitlbee-3.0.4 ppc for bug 405011
diff --git a/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild b/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
new file mode 100644
index 000000000000..b9b7d7d0c6bd
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild,v 1.1 2012/03/17 05:46:06 radhermit Exp $
+
+EAPI="4"
+PYTHON_DEPEND="skype? 2:2.5"
+
+inherit eutils multilib python
+
+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
+skype 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
+	skype? ( app-text/asciidoc )
+	test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/logger
+	skype? (
+		dev-python/skype4py
+		net-im/skype
+	)
+	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
+
+	if use skype ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+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"
+
+	use skype && python_convert_shebangs 2 protocols/skype/skyped.py
+
+	epatch "${FILESDIR}"/${PN}-3.0-configure.patch
+	epatch "${FILESDIR}"/${P}-parallel-make.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 skype 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
+
+	if use skype ; then
+		newdoc protocols/skype/NEWS NEWS-skype
+		newdoc protocols/skype/README README-skype
+	fi
+
+	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-3.0.5-parallel-make.patch b/net-im/bitlbee/files/bitlbee-3.0.5-parallel-make.patch
new file mode 100644
index 000000000000..f3da13dbc03b
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-3.0.5-parallel-make.patch
@@ -0,0 +1,11 @@
+--- bitlbee-3.0.5/Makefile
++++ bitlbee-3.0.5/Makefile
+@@ -130,7 +130,7 @@
+ 	install -m 0644 $(_SRCDIR_)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+ 	install -m 0644 $(_SRCDIR_)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+ 	install -m 0755 $(_SRCDIR_)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+-	make -C protocols/skype install-doc
++	$(MAKE) -C protocols/skype install-doc
+ endif
+ 
+ systemd:
diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index b81f35a38144..04fef69d418a 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name='otr'>Enable support for encrypted conversations</flag>
 		<flag name='plugins'>Enable support for plugins</flag>
 		<flag name='purple'>Use libpurple instead of the built-in IM protocol support</flag>
+		<flag name='skype'>Enable Skype support</flag>
 		<flag name='twitter'>Enable Twitter protocol support</flag>
 	</use>
 	<longdescription>