Remove old.

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

7 files changed, 16 insertions, 712 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 1b236e345b69..7f306fece001 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,11 @@
 # 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.157 2012/06/14 20:44:12 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.158 2012/06/14 20:48:02 radhermit Exp $
+
+  14 Jun 2012; Tim Harder <radhermit@gentoo.org> -bitlbee-3.0.3.ebuild,
+  -bitlbee-3.0.3-r1.ebuild, -files/bitlbee-3.0.3-msn-login-fix.patch,
+  -bitlbee-3.0.4.ebuild, -bitlbee-3.0.5.ebuild:
+  Remove old.
 
   14 Jun 2012; Michael Weber <xmw@gentoo.org> bitlbee-3.0.5-r1.ebuild:
   ppc stable (bug 409213)
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 8db44ffa8726..c6623f603a76 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+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
-DIST bitlbee-3.0.4.tar.gz 744599 RMD160 cd6b244f95e266f6c1c3e25c365752fedfc00627 SHA1 2c2742948d1ed2c83ee5db2d2fbff5e8b656b8c4 SHA256 64788e7ef7a175dcda915fad3a8e41990ce4bee3ccdbb4bfb0a2d5a78729ccdb
 DIST bitlbee-3.0.5.tar.gz 727982 RMD160 4e3ac7d396c400328300b9c43581bdb890190814 SHA1 74afdff87be49ce060771a6ae10d7643cd57b9b6 SHA256 a2b18ae0355650b7ec326b8ea7082eb06bb8f8816ad3b4985fe97f729ce84e59
-EBUILD bitlbee-3.0.3-r1.ebuild 4515 RMD160 e00756694d1cdfdee21b336744065526ea3d2020 SHA1 69d140298b1a7ae39a827f32cc35493935213a1d SHA256 fcfeb08889277847db1fd04fb62deb3f41c50dc02dc5dc46e1c089874ab623c6
-EBUILD bitlbee-3.0.3.ebuild 4433 RMD160 e7aa9a200be02503e1e04db2198f722e1b653eda SHA1 c3aa4101e0801d3c31c20155e9e7fd2c11a45e1b SHA256 999fb5971d2cbc820ff26181632dec68d77837c90745ff69577baeea58b2b183
-EBUILD bitlbee-3.0.4.ebuild 4434 RMD160 4875c2198fbc2ab2cc7e5968087b196869c97ea8 SHA1 c3a7a3e4c6e8ae855bfad0565bc88d720fdb99af SHA256 ad139913f3354cac61972b2aef344883621e175d25f1c3c6ce89e10329d17fe1
 EBUILD bitlbee-3.0.5-r1.ebuild 4863 RMD160 c93dd97e350fabeb94c7164d09cf761c9ad0ee32 SHA1 ea8db67bfb20301ed7f36d6348ab863245ff751e SHA256 c217833408454c00f76ee99c9b661950f8dbe8f2afbfc2fec1e8411f61edf178
-EBUILD bitlbee-3.0.5.ebuild 4436 RMD160 33c54919beb87ca319cdddc2acf7302b281f9214 SHA1 9906a7b8ff881c4427490d3a73ba25649e4390e8 SHA256 cf409613cb6c4223991a97f4c0b8f350f54da50d7dc519e570e04c8777e1552e
-MISC ChangeLog 24360 RMD160 a7cab2603e6c20f4b33f2bc812c9afbfec780eea SHA1 7615fe1d578c43190aa54ab0695fb65d1a3bb0a3 SHA256 e3caac5aa6cd4084aefe477bceeef37f41aad1014df234adffa3516233ba16ce
+MISC ChangeLog 24571 RMD160 c5e959a8bfcaef2eb4afb2d585e19a01be7b309a SHA1 b30c4885864b2c6f45d1ee4646495c6de9a15397 SHA256 b326ca8645073a35d63a75a4988846f7da34b4252c15c0562eb7cba5bc8ac987
 MISC metadata.xml 1075 RMD160 418efd220155122e3b91d22ac132b743e94a2cd0 SHA1 8a3161f31515cfcad21c3537b93385949762d98f SHA256 2d88e6eedbc5089e23f646c4ad16acbae51444e0caf81618ab2d93e2374622f0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/aTPsACgkQknrdDGLu8JDrxgD/TypBZtSITtOYzof+5rfpgIyK
-y/ii8JclltVx8Pr31X8A/1Y20NU7hnA6vJ8GXigbt9Q9un2aXV61ssnQwJ9FQPPC
-=FodN
+iQEcBAEBCgAGBQJP2k4IAAoJEEqz6FtPBkyjKcgIAJaT0wg8fFK53dqc+u6vkKFk
+9p+NkraMDBKZmZ/zd/t1sUyz2zjeVA8q99ne+k0h6Oui2CTn4gZebnI8UgTr8oq5
+h3OzEXCXoASCS33UiCYvbO4QeTflmsR/WIlVQi7d6jXhYWRnOwkZdeiUHSrWV9If
+Be0ybu+aZ3JYvSuTG60FfxcgOr6utfgJ4fD+vWlxt4ppCq8ouM2Z1RbZB82xGzOS
+S3MIj+QYkG3f4mlbg90OXQtGKXcQRnigVXi7/fRmzDKSdG5/ZP510U/8D/lHfGdK
+VB2GW1qdZcY5CT/Mejx/F2f6YdT5hZrTY4jitxbIpmc/zlWW2XM6FiK+g1tbLcc=
+=8eXh
 -----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-3.0.3-r1.ebuild b/net-im/bitlbee/bitlbee-3.0.3-r1.ebuild
deleted file mode 100644
index 812dde86d0f0..000000000000
--- a/net-im/bitlbee/bitlbee-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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.3-r1.ebuild,v 1.2 2012/05/04 06:22:12 jdhore 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}
-	virtual/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
-
-	# fix for msn login issues
-	epatch "${FILESDIR}"/${P}-msn-login-fix.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/bitlbee-3.0.3.ebuild b/net-im/bitlbee/bitlbee-3.0.3.ebuild
deleted file mode 100644
index 575fe11677ec..000000000000
--- a/net-im/bitlbee/bitlbee-3.0.3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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.3.ebuild,v 1.7 2012/05/04 06:22:12 jdhore 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}
-	virtual/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/bitlbee-3.0.4.ebuild b/net-im/bitlbee/bitlbee-3.0.4.ebuild
deleted file mode 100644
index ef2cda103340..000000000000
--- a/net-im/bitlbee/bitlbee-3.0.4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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.4.ebuild,v 1.4 2012/05/04 06:22:12 jdhore 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}
-	virtual/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/bitlbee-3.0.5.ebuild b/net-im/bitlbee/bitlbee-3.0.5.ebuild
deleted file mode 100644
index 3fb9b1aeb727..000000000000
--- a/net-im/bitlbee/bitlbee-3.0.5.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# 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.ebuild,v 1.2 2012/05/04 06:22:12 jdhore 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}
-	virtual/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-3.0.3-msn-login-fix.patch b/net-im/bitlbee/files/bitlbee-3.0.3-msn-login-fix.patch
deleted file mode 100644
index 1fcc8bde6795..000000000000
--- a/net-im/bitlbee/files/bitlbee-3.0.3-msn-login-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fix for msn login failures
-
-http://bugs.bitlbee.org/bitlbee/changeset/devel,824
---- lib/http_client.c.old
-+++ lib/http_client.c
-@@ -313,7 +313,7 @@
- 		req->status_code = -1;
- 	}
- 	
--	if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )
-+	if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 )
- 	{
- 		char *loc, *new_request, *new_host;
- 		int error = 0, new_port, new_proto;
-@@ -374,10 +374,13 @@
- 			/* So, now I just allocated enough memory, so I'm
- 			   going to use strcat(), whether you like it or not. :-) */
- 			
--			sprintf( new_request, "GET %s HTTP/1.0", url->file );
-+			s = 0;
-+			sprintf( new_request, "%s %s HTTP/1.0\r\nHost: %s",
-+				req->status_code == 303 || req->request[0] == 'G' ? "GET" : "POST", url->file, url->host );
-+			s = ' ';
- 			
--			s = strstr( req->request, "\r\n" );
--			if( s == NULL )
-+			if( !( ( s = strstr( req->request, "\r\nHost: " ) ) &&
-+				( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) )
- 			{
- 				req->status_string = g_strdup( "Error while rebuilding request string" );
- 				g_free( new_request );