Drop old ebuild still using 'jabber' instead of 'xmpp' USE (#216300)

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 6 insertions, 261 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 85e9e1fa5f6b..172932de088a 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,11 @@
 # 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.180 2015/05/16 11:06:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.181 2015/06/02 18:57:22 pacho Exp $
+
+  02 Jun 2015; Pacho Ramos <pacho@gentoo.org> -bitlbee-3.0.5-r1.ebuild,
+  -files/bitlbee-3.0-configure.patch, -files/bitlbee-3.0.5-parallel-make.patch,
+  -files/bitlbee-3.0.6-configure.patch, -files/bitlbee-3.2.1-tests.patch:
+  Drop old ebuild still using 'jabber' instead of 'xmpp' USE (#216300)
 
   16 May 2015; Pacho Ramos <pacho@gentoo.org> bitlbee-3.2.2.ebuild:
   Rename jabber to xmpp USE (#216300)
diff --git a/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild b/net-im/bitlbee/bitlbee-3.0.5-r1.ebuild
deleted file mode 100644
index 421195a181c3..000000000000
--- a/net-im/bitlbee/bitlbee-3.0.5-r1.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.5-r1.ebuild,v 1.11 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}"/${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
-
-	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-configure.patch b/net-im/bitlbee/files/bitlbee-3.0-configure.patch
deleted file mode 100644
index 811f9d59e4a0..000000000000
--- a/net-im/bitlbee/files/bitlbee-3.0-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- bitlbee-3.0/configure.orig	2010-10-21 17:51:31.000000000 -0700
-+++ bitlbee-3.0/configure	2010-10-26 22:07:44.620843056 -0700
-@@ -609,14 +609,6 @@
- 	fi
- fi
- 
--case "$CC" in
--*gcc* )
--	echo CFLAGS+=-MD -MF .depend/\$@.d >> Makefile.settings
--	for i in . lib protocols protocols/*/; do
--		mkdir -p $i/.depend
--	done
--esac
--
- if [ "$msn" = 0 ]; then
- 	echo '#undef WITH_MSN' >> config.h
- else
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
deleted file mode 100644
index f3da13dbc03b..000000000000
--- a/net-im/bitlbee/files/bitlbee-3.0.5-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/bitlbee-3.0.6-configure.patch b/net-im/bitlbee/files/bitlbee-3.0.6-configure.patch
deleted file mode 100644
index a89e718af045..000000000000
--- a/net-im/bitlbee/files/bitlbee-3.0.6-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- bitlbee-3.0.6/configure
-+++ bitlbee-3.0.6/configure
-@@ -655,14 +655,6 @@
- 	fi
- fi
- 
--case "$CC" in
--*gcc* )
--	echo CFLAGS+=-MMD -MF .depend/\$@.d >> Makefile.settings
--	for i in . lib protocols protocols/*/; do
--		mkdir -p $i/.depend
--	done
--esac
--
- if [ "$msn" = 0 ]; then
- 	echo '#undef WITH_MSN' >> config.h
- else
diff --git a/net-im/bitlbee/files/bitlbee-3.2.1-tests.patch b/net-im/bitlbee/files/bitlbee-3.2.1-tests.patch
deleted file mode 100644
index be09807658bf..000000000000
--- a/net-im/bitlbee/files/bitlbee-3.2.1-tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- bitlbee-3.2.1/tests/check_nick.c
-+++ bitlbee-3.2.1/tests/check_nick.c
-@@ -30,7 +30,7 @@
- 	for (i = 0; get[i]; i++) {
- 		char copy[60];
- 		strcpy(copy, get[i]);
--		nick_strip(copy);
-+		nick_strip(NULL, copy);
- 		fail_unless (strcmp(copy, expected[i]) == 0, 
- 					 "(%d) nick_strip broken: %s -> %s (expected: %s)", 
- 					 i, get[i], copy, expected[i]);
-@@ -45,7 +45,7 @@
- 	int i;
- 
- 	for (i = 0; nicks[i]; i++) {
--		fail_unless (nick_ok(nicks[i]) == 1,
-+		fail_unless (nick_ok(NULL, nicks[i]) == 1,
- 					 "nick_ok() failed: %s", nicks[i]);
- 	}
- }
-@@ -58,7 +58,7 @@
- 	int i;
- 
- 	for (i = 0; nicks[i]; i++) {
--		fail_unless (nick_ok(nicks[i]) == 0,
-+		fail_unless (nick_ok(NULL, nicks[i]) == 0,
- 					 "nick_ok() succeeded for invalid: %s", nicks[i]);
- 	}
- }