Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

6 files changed, 6 insertions, 769 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 86dd352f524b..9d72b0f91345 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.177 2015/04/08 18:03:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.178 2015/04/14 19:53:30 mrueg Exp $
+
+  14 Apr 2015; Manuel Rüger <mrueg@gentoo.org> -bitlbee-3.0.6.ebuild,
+  -bitlbee-3.2.1-r2.ebuild, -bitlbee-3.2.1.ebuild, -bitlbee-3.2.ebuild:
+  Remove old.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> bitlbee-3.2.1-r2.ebuild,
   bitlbee-3.2.1.ebuild, bitlbee-3.2.2.ebuild, bitlbee-3.2.ebuild:
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 9ce544394cc7..ca52320c9fd1 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX bitlbee-3.0-configure.patch 393 SHA256 615e0cadb52abea5c133f8588b7d772c787bee725f11a986bed90226e5da4acd SHA512 9e28f030a952989082489ddd456ff2d1c334aadeb7047ca9e4a551867130c1ec99438321158ecdbb9b757675a2092eac46b973966f742630b3a017bba9851ead WHIRLPOOL 075f35b0042cba28a8e8e9db97f185b867fc149cd8711be5eaba831fc34d6ba81934873800335a2eddbebc4f64f9dbdca1c7395028087dad13325c39043bb35b
 AUX bitlbee-3.0.5-parallel-make.patch 455 SHA256 ba2fbcad2de8e18229f415f19c3bb13817f00d42b5941efb60e83141fff6c718 SHA512 08bc1d76e4f26ec379c3a483800db061fe460eaf56401c33f2e41691235e550ec61acff6667483549549046c43a0af18b8e7792b7428db4172fffb1bcefd4805 WHIRLPOOL 600b21c266eadda27366952afc2bf2ad1960a3dea5580663c642a6916f56b65d2637827f1e13ba39de45fad23b57c5c701765d6076b042ceeade785572d5b289
 AUX bitlbee-3.0.6-configure.patch 321 SHA256 12bc44ebf9630ce3debc988a095d1bbc70015410b8584b66ae7603f50eb03b6a SHA512 253852c254fbc39a309d7dcac5cf797d1757fb9b2303133c81973dc6d25223f00d97668a513d5bd2bae8f7764e7bb9f8f31da4620be9bfb8cd220dcf0d4e979c WHIRLPOOL cd7e3f29dff0255119ee3619ae2b0b6f6f4c18bbdc9d5e93a81cd51ddaa4a7d50ee50750e49f0e0f200f0f7396a8b3969dea53a48dba045ed9f8566c4db4f4df
@@ -11,34 +8,8 @@ AUX bitlbee.confd-r1 291 SHA256 cab8b8cb8709f27a5fa9f1cfce4b58db24f5cd38b8e6badb
 AUX bitlbee.initd 667 SHA256 2eaef8071b34c1a3d55271d283b31e25e081791e48a6a55eb394912e4954ba48 SHA512 b3e7f7b07fa106e44981ab311bf874584c1ae2189e90865b4d49cc1046e52cbe96c2e04156bbf36796b376766fca0afbd579e6053da06f0bdf027e5687f99fa2 WHIRLPOOL 5dfbfe88391358066f78a802ab77ac8f50117124db47c866ef7559bbaa6614e3080c82ab83fb91419a7a48a44a73efdbe7f8bf22a607a6c3c172c64ff271226d
 AUX bitlbee.initd-r1 785 SHA256 e3986ada935afcca4f873c2f3409423f90a454962c38ddcccc56a763f8369826 SHA512 98cdfbb7ab09d4f63118a6c2edd795ba186c0d5cff900c37855aa76e68f3e1bfe8ba95323fc13bafa56e7f0a4afc7e7a32207bf9ef6d479b4d3c03db95d3253d WHIRLPOOL 31ec03761f87866559038c339a63f4b559f1545d1d3f4ff5cc385ae0957953f73f349c25894eab9128c69a7583908bad31d21c837f7d9c4989842bfce56ee954
 DIST bitlbee-3.0.5.tar.gz 727982 SHA256 a2b18ae0355650b7ec326b8ea7082eb06bb8f8816ad3b4985fe97f729ce84e59
-DIST bitlbee-3.0.6.tar.gz 730918 SHA256 4f3e169f9a8e0cdf7976d2e6f41b9a8f6020a262b5731aa0f91fdb66d17446e8 SHA512 01142dbd6b89e1f80d58a337b3cd2fc7256925e59381563a9010153fce5fb863a76e7855a678d70e109519d2f8fe28f17bdeb2c976eb27f0987d72b82b93f891 WHIRLPOOL 07e4e6d9a16be3fb0d62bc2ec27e309f96ffe541c90cf6c2ce8fb254a217773556fc6e97b00dac26852488b632c479197174999eeabe9afd377f2fd0f7892b36
-DIST bitlbee-3.2.1.tar.gz 657595 SHA256 00f411dd7d6d28f30f0e73e46c9cbe88b4006e7f03adfe07b90a97280a290f59 SHA512 5df1ab94602a801024a459ef166e5515e94e202773b8ade838c55967865f706291d3b3fa63bdd7737d461e96cf8af2f191d5ea4451e14149ac28edb9f5bfce9f WHIRLPOOL 37fc1c84ca512d52b9a16ad54af68891839f4cb4f8af8883d5bf5f3597ffa5952dd4d8f9ad4fd7cda3cb654be21ba206a6fdd6811ea3c67eb00acf7233041a36
 DIST bitlbee-3.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae
-DIST bitlbee-3.2.tar.gz 666404 SHA256 1b43828e906f5450993353f2ebecc6c038f0261c4dc3f1722ebafa6ea3e62030 SHA512 e9479c7ffa17269fc3330dccdb48f26dafdc6bc2decbea52af1a8ad029db89bcbc87d502ec7bb60694693ad1033671cc3e546024291d671fc1380be8bd5ebb69 WHIRLPOOL c2aa53cf8fa48155d65578fde6a0aa12d2e9eb74643575ae1d959918949fc4bc9d9c111e4222526782f44e973e278d74893270c371e7fa5cbd1914a175e20771
 EBUILD bitlbee-3.0.5-r1.ebuild 4863 SHA256 f770bcfec2853005f8e3df6bebd85ea23d1d18f18f9ab17e061bcb781dd2ba1d SHA512 81a609e5dabde71dd896817f75ef8bb2bfaeb73e2de08f8be4b165d07404dd7e8b7869c66ae25497e6ec101848a0e909e4c40aa7dd04e2ce73879e4ba052b807 WHIRLPOOL 9f9d1cf2010c0b7f7d8f429128f332c9842ef8b1b1f00f753e37cf36cee8d0e4a11973adab27f532b71024d04ea7c7d339e65b2c3c8626c28a130d0e0390ae52
-EBUILD bitlbee-3.0.6.ebuild 4864 SHA256 fc916d160720da25180eeb338aecc1d856bba3c7bf1c7179a1a273b9286509cb SHA512 a666010394b3a3e65ba4bcf81df6d20a5599ee16c4e15144f1915b4ca7ed10f964b30d1e8ef770ee4fed705e152d2085ee53718e1858a06fbedfc50917360a68 WHIRLPOOL 0428230b7b3c4319f888e08db56c0e870d51f1fe1762a5fc9c8dce3554fb1010d5eda4c5885e696ea4a1f9a468067b8757b9ed9d8e0e0679abd857c14db4cd6e
-EBUILD bitlbee-3.2.1-r2.ebuild 5000 SHA256 4c5e7dbe63c79c02204137420793b418312659bdddf912c5b0f6828cc56c83ad SHA512 0dc441c83d214a793cd73a368e118aba218ccec8251c806e8faa9b71085c13dbf4e9f77b0902667a7a417316d966727ceb60841c795d02a0ce5c33769c046ab2 WHIRLPOOL 666a5916b985ef11a5b694d4135b424b5dc943c8c72ee0a92c685b46aa4955ac4b344a4af989e45802af0beb32ec5ae5ec9af84e03cc3f30c7e87bbd3c0f127c
-EBUILD bitlbee-3.2.1.ebuild 4905 SHA256 84ec769b66369035a35f02dff7c069868638e86d77ac0ce3705ec75c2a3c60e7 SHA512 c987bb4a9eedcb16dc294911a4dd44766a78c46e6cbd591b44eee77fa677b7f772b69032906550dfa42a4461055d4ffe5e52aecec5dbde86a4398fba8d716bc3 WHIRLPOOL d499251ccb3bb36c01953271ebe631e3d1903a7f02844c1e90924266ddd735fdf8dd52d3dee65889d7ee65e1ab0945b744a1c1c6178a32114c1e7f6752a205ee
 EBUILD bitlbee-3.2.2.ebuild 4844 SHA256 b5b9c4e0ad3bc7c681ad7530bbe9bae702dcdc9e5e19e52f37d515a35a3c63df SHA512 05aafb3f7b77e0976eceed7c3a7ba3041865579e593199367bc64394f661f7d3be6bae58760f24b198b30eb930d70126016ae5345bd9e6a029fce72dba8ab2de WHIRLPOOL e7218f945dbeaea2dc4c963149da2bbd9f97f104a3cb7b0dda205b02a9e235c2c40f8b315ad03d96473f0ee141768f8a169cf90c23110fe960edc405d2ff729f
-EBUILD bitlbee-3.2.ebuild 4857 SHA256 49c6cadf92806a9974425bfbaed099fb14ca2d0e83fb0f9386fad3ad8a3e580e SHA512 b145f238385a8e92bcca6d57cab9588f41d08c932c536bcdf0a9ef016ead5712b8bafa5c44bc02edf15542237694b29f2c9a7c664d73a201ed3f36459ba83df0 WHIRLPOOL b407d6c3f78eedefabd00618e2aeddf73971013db5a4ea9dcda52a86302ec03df3acb0689c1b0edb05f95432e47195fb95bc5662e53ac7a73af21a60b2666b51
-MISC ChangeLog 27616 SHA256 e8432ae328098702d25bc1d8ee4ed520349a640ae174a7717f5c925090a3c595 SHA512 221a15fd24043b42e7eb3698f7b167a2218e3b6b0ee0148c41b673f01518dedc3fb7b1cac2d6d57bb09da7ee0cdd973624a4c397a304b9bede54f942de1d7e94 WHIRLPOOL 734637d669222c6e8d1602f0aa417583c291dfa1e9a4b55bc3ea96d8092c66587a0ad55671a106cf49212d71d831820e7f41555f47a6dd04098a2c632c5f117e
+MISC ChangeLog 27773 SHA256 2681df42375c28d4d882a9c59c054b659ad599e23d45ed3bf7202fc3ad6fec8c SHA512 256b5763226931d64c4c17b5a66b565d1bc67224544fa60e612c6e7ca566276f79ba3b5eb8846b32abf8c9682fa2d354e7028765b9d64304c1e87e7191c396b6 WHIRLPOOL 2b3bc821fd9f15f6c68612587ed7e7c454923e8da11e77787b56f275c777c36c00ed18b4780f76c1a7834060884a45a92aedaaacab1b3b94e14cc4b277eda097
 MISC metadata.xml 1013 SHA256 c0059a06732d902f41537aa682fc705ae7b09ab0d3ed49ade65ed18636ea3b77 SHA512 9f7c3fd74181988e03d3c569e2d55ee83df40804bf4c2496c05acd5a4a8b21db575b1d55b92a26e34c37c3fe4b4a2a771cd8adc80779c570a541751550a2f93e WHIRLPOOL 94eedc807937a9a46b830c1c629317916aa6e6a31e589ad0a70d4653660bf033fe049f6bcbf11260356e9271e9766875829486c71620e010ef6c844320a809da
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVJW1wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOcbIQAKKF3r7Z0htOQIxr/XzyeD13
-/dTyG/R4nZeJP6zwgxzlOWLtxNE6Nba9ljlBJCftSaJPtagKAW3CxKLZiZCTiBII
-bRn8M6e8WXG7KjS5AGejXb9dLIajYW5WgpeM3x27nDpmyEN2m9YFUJwyz87SFhho
-rGUTbENiHOI2f+cG6aisKkfE/WDFP/aUs473p14OaulIHHja3vW/Onq2W68O/CCy
-fTIsFtbLU/F6q5ETqbq60ffhfDMxS1A9o2wRKw/FkQw7AultJR4kpHorU0d/asgS
-q6a2doO37J6KlGvTl1eVbqW8traMOl5qQn3YDLXNI7bDkgdnvRkksRklsBDrn81E
-iE7CJvSS2QzgB/A7HSOK4pWQXW/UTLNm2Kt+DguOA+ZrzrYl21cSe6QbHgGL7nKU
-dmkkIUiKUshFamE0kxSHkDNkwfpDrbrDlHQCXU3CRebhDDtfrH87yhIaOXyGm02h
-HVLlcVqi/IxoxY5HVdCXzPd/iF6XmTquiULoz5VlC1EnocXWi+dYOlmMokKGI9xF
-WQpJMAetv8ia74e5Ug+PzSuSAD+knSGbDdLr2r+dKS1+9nfShsQrGhuQ5ffbr6L4
-ctv0uu0e0qbiDqXr3TsJjrDgnmLTCFu0dVNw7lXoUPCU7o183YiEJ56+cauvaC0M
-9ycuMoxMhM9ZWiIdKqjo
-=yrAr
------END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.0.6.ebuild b/net-im/bitlbee/bitlbee-3.0.6.ebuild
deleted file mode 100644
index d9a13ce3d1fd..000000000000
--- a/net-im/bitlbee/bitlbee-3.0.6.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.0.6.ebuild,v 1.5 2014/11/02 08:58:11 swift Exp $
-
-EAPI="4"
-PYTHON_DEPEND="skype? 2:2.5"
-
-inherit eutils multilib python user
-
-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 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple selinux
-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-4 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		nss? ( dev-libs/nss )
-		!nss? ( ssl? ( dev-libs/openssl ) )
-	)
-	"
-	# ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	skype? ( app-text/asciidoc )
-	test? ( dev-libs/check )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	selinux? ( sec-policy/selinux-bitlbee )
-	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}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${PN}-3.0.5-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
-
-	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/bitlbee-3.2.1-r2.ebuild b/net-im/bitlbee/bitlbee-3.2.1-r2.ebuild
deleted file mode 100644
index 8bd75c9e6eda..000000000000
--- a/net-im/bitlbee/bitlbee-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.1-r2.ebuild,v 1.3 2015/04/08 18:03:12 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib user python-single-r1
-
-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 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple selinux
-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-4 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		nss? ( dev-libs/nss )
-		!nss? ( ssl? ( dev-libs/openssl ) )
-	)
-	"
-	# ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	selinux? ( sec-policy/selinux-bitlbee )
-	skype? ( app-text/asciidoc )
-	test? ( dev-libs/check )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	skype? (
-		dev-python/skype4py[${PYTHON_USEDEP}]
-		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
-
-	use skype && python-single-r1_pkg_setup
-
-	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"
-
-	use skype && python_fix_shebang protocols/skype/skyped.py
-
-	epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch
-	epatch "${FILESDIR}"/${PN}-3.2.1-tests.patch
-	epatch "${FILESDIR}"/${PN}-3.0.5-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-r1 bitlbee
-	newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
-
-	exeinto /usr/share/bitlbee
-	cd utils
-	doexe convert_purple.py bitlbee-ctl.pl
-}
-
-pkg_postinst() {
-	chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
-	[[ -d "${ROOT}"/var/run/bitlbee ]] &&
-		chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
-
-	einfo
-	elog "The bitlbee init script will now attempt to stop all processes owned by the"
-	elog "bitlbee user, including per-client forks."
-	elog
-	elog "Tell the init script not to touch anything besides the main bitlbee process"
-	elog "by changing the BITLBEE_STOP_ALL variable in"
-	elog "	/etc/conf.d/bitlbee"
-	einfo
-}
diff --git a/net-im/bitlbee/bitlbee-3.2.1.ebuild b/net-im/bitlbee/bitlbee-3.2.1.ebuild
deleted file mode 100644
index bec1df296e76..000000000000
--- a/net-im/bitlbee/bitlbee-3.2.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.1.ebuild,v 1.6 2015/04/08 18:03:12 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib user python-single-r1
-
-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 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple selinux
-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-4 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		nss? ( dev-libs/nss )
-		!nss? ( ssl? ( dev-libs/openssl ) )
-	)
-	"
-	# ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	selinux? ( sec-policy/selinux-bitlbee )
-	skype? ( app-text/asciidoc )
-	test? ( dev-libs/check )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	skype? (
-		dev-python/skype4py[${PYTHON_USEDEP}]
-		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
-
-	use skype && python-single-r1_pkg_setup
-
-	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"
-
-	use skype && python_fix_shebang protocols/skype/skyped.py
-
-	epatch "${FILESDIR}"/${PN}-3.2.1-configure.patch
-	epatch "${FILESDIR}"/${PN}-3.2.1-tests.patch
-	epatch "${FILESDIR}"/${PN}-3.0.5-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
-
-	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/bitlbee-3.2.ebuild b/net-im/bitlbee/bitlbee-3.2.ebuild
deleted file mode 100644
index f6d085cae6ad..000000000000
--- a/net-im/bitlbee/bitlbee-3.2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-3.2.ebuild,v 1.7 2015/04/08 18:03:12 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib user python-single-r1
-
-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 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug gnutls ipv6 +jabber libevent msn nss +oscar otr +plugins purple selinux
-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-4 )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? (
-		nss? ( dev-libs/nss )
-		!nss? ( ssl? ( dev-libs/openssl ) )
-	)
-	"
-	# ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	selinux? ( sec-policy/selinux-bitlbee )
-	skype? ( app-text/asciidoc )
-	test? ( dev-libs/check )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	skype? (
-		dev-python/skype4py[${PYTHON_USEDEP}]
-		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
-
-	use skype && python-single-r1_pkg_setup
-
-	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"
-
-	use skype && python_fix_shebang protocols/skype/skyped.py
-
-	epatch "${FILESDIR}"/${PN}-3.0.6-configure.patch
-	epatch "${FILESDIR}"/${PN}-3.0.5-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
-
-	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
-}