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

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 224 insertions, 3 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/Manifest b/net-im/bitlbee/Manifest
index a1c1746c18f2..e91430903a80 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX bitlbee-3.0-configure.patch 393 RMD160 eb546e7271549cd56b87168ccf0ccb3ffb80742d SHA1 7762bae624acf765d3905b46b84448762694a25f SHA256 615e0cadb52abea5c133f8588b7d772c787bee725f11a986bed90226e5da4acd
 AUX bitlbee-3.0.3-msn-login-fix.patch 1117 RMD160 4b2e70e0eb1c440f517fbc088a4bd296adf702a4 SHA1 eaecf7de0f18069d44187e116400c7827a43260b SHA256 547fd543af651d519695324bbebbf208c333f2d17bfbd0742435e09a33d6ae5c
+AUX bitlbee-3.0.5-parallel-make.patch 455 RMD160 c7c12d72766a924d7bf7d604572812a3c2825be8 SHA1 991cb9e36c34d8adb2467332ca33f889e13b7bc0 SHA256 ba2fbcad2de8e18229f415f19c3bb13817f00d42b5941efb60e83141fff6c718
 AUX bitlbee.confd 62 RMD160 f71fff4ab4fe49eebc071d693896f567291bee54 SHA1 80beb974922b2ff6cf9732a7bce1eb03cc10d870 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628
 AUX bitlbee.initd 610 RMD160 21aa241b6e69b0991b4ddad44cd7c5000b594b66 SHA1 f53b2bdd5eaed801e81916320e5a3719d78d8213 SHA256 fc20fb40dbc8d2daf321dcc4d05854d0f3d89e7601b174c741b42dbb5ec7a830
 DIST bitlbee-3.0.3.tar.gz 676417 RMD160 4b537871eef1bb5b6839105bc7bc9f2567e5b8e1 SHA1 4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff SHA256 82ca758937ce7bedaab49edec75f4ad45a3102ac3beaa932b64c34fbb1e3af25
@@ -8,6 +12,18 @@ DIST bitlbee-3.0.5.tar.gz 727982 RMD160 4e3ac7d396c400328300b9c43581bdb890190814
 EBUILD bitlbee-3.0.3-r1.ebuild 4515 RMD160 dea59433fda09b95cf70b05e01825345f4b7261f SHA1 93d62950e2df7eb549ed3843e544b30c6a47fd61 SHA256 95766a7790ee9735ab514c6c05dec4a722df341e6719e1d497bbfa4496f299e8
 EBUILD bitlbee-3.0.3.ebuild 4438 RMD160 c2f7439307701c30ab6d8b60966348ed75dedba3 SHA1 be603acc6fef1d6e44fcde4d46ad6ebddd516b54 SHA256 06da79c62eb09481bad54b641152cdc10bd9d3a6c9c4ea4ea84348ceb2cdd66e
 EBUILD bitlbee-3.0.4.ebuild 4435 RMD160 d032540c2e1b711766a6047f9e230147cba20a0b SHA1 b6073d0a44cef5ffb38591810b2f4440f96120f9 SHA256 a338e6e5049c7e7d46fd5e61ba997ab5cf879006bc9dca75e44e8aaae04704c8
+EBUILD bitlbee-3.0.5-r1.ebuild 4873 RMD160 99aa4bd0e62bf8e586755f79657bc3dd7a7c8087 SHA1 4a2cf9da407e66f0977e284e947b044e5a5547a9 SHA256 f0d9dc95524269c703a44f9fa8692110ac59043bebbfe90f4e1ee53a675d650c
 EBUILD bitlbee-3.0.5.ebuild 4440 RMD160 9785056fd320715a00e8af6cd9c0e4701f8d8818 SHA1 6b0153cf85bb296186587027e6195fe8e9d7ac3a SHA256 1317264532a3817b40683249e7f4a5d9f4b037bdce66fc2ae06301af503f5731
-MISC ChangeLog 23599 RMD160 9a53a07a0ad656e66277c927b8a58551291486af SHA1 779e1b6be239d10bcc366d20994654284f514c03 SHA256 4b9d1f4a2e6728af06445a43fd78b5796c5bcc96090bc197eec93ac5a30be3f1
-MISC metadata.xml 1026 RMD160 a2745a59703295794f17246716edd8610c10c776 SHA1 59fc3b090bd0b0d6c72ff1c77dcbd96f7207d608 SHA256 e6760ca4cd330d1c84b127e73144a2310f9e0215562246156ce9519112e73726
+MISC ChangeLog 23835 RMD160 61bed19976fc9a107111a37b86c893db9d5c5d14 SHA1 007e931e4248aad5f8e62beb82565379d7843b7f SHA256 4540ef2c60455e36f8d7c269c78617338daf9b8f50165a9b07c050d95135b32a
+MISC metadata.xml 1075 RMD160 418efd220155122e3b91d22ac132b743e94a2cd0 SHA1 8a3161f31515cfcad21c3537b93385949762d98f SHA256 2d88e6eedbc5089e23f646c4ad16acbae51444e0caf81618ab2d93e2374622f0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPZCUkAAoJEEqz6FtPBkyjoTUIAJLZCUAgp8ptzXr+Mkc3lX3p
+hMCGhvZRc5XTSQ1fEtRLPCs29TynSmdojnet9r8hjDrtt6De1fR2aZ7C3y9FCrrN
+jrpnQpE+M6DvolR8hoLMHW2DijBU84TSnBKcoUNj8P6o88/YBhuMk+ssfrsuupB8
+dUdXTkyjjx8gkbSG0fflciH2gZMuMTfg3SlstJevMX3QYLLcVP4b4Q/QMi8uzgHM
+WfEjDF8HRz5OJoLgpMD/8HXJ/fx2YFUr2h48GDtj5f8oXFtAEDCz2liUAE/Ue3Et
+kEBlh21XI6TFAgj6g2iYclN3SanANdohpSwZOSWfn9QdSe6Z5xiR8Ogam1DjpiE=
+=Jpnz
+-----END PGP SIGNATURE-----
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>