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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

11 files changed, 19 insertions, 537 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/Manifest b/net-im/bitlbee/Manifest
index e0401cb1c322..c5564734967a 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,25 +1,19 @@
 -----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
 AUX bitlbee-3.2.1-configure.patch 327 SHA256 cb1284ef8548d78fe42ad626bf5224cd45f577e9a59dcb0038c1aa18851ffb1f SHA512 5414caaeb566670345f70d0d78e94e5cb119bdd6938deb6ba4666bf026d006dd33d394acbcf1304ed3181cbc698fbe69dcc8b332b975c28bddd95ce1968ae491 WHIRLPOOL faa56d1480626c1a7acd1af95613612c6745cfc72e9c6fad925d53cf8cb10c769f605baee850feff5fd687f859ac161af40426cb22f9215a89915749dc24762d
-AUX bitlbee-3.2.1-tests.patch 763 SHA256 57c1c7bc39209e364d440df85188fa05d6a1f3d2c8b671e3c47da85ebe2dc86a SHA512 a0ad20b5ba0e43fdbf5c2e17be6b0d02283706993a516eed92798fa7757a3dc420b55626f5708e32e122b77c76b8594b02783e514026a8a23791e671fbb9036e WHIRLPOOL c0262bc4250170e9e9207806460209f158c95d525dcc91e24a94fdd780ed7358b36be3aea4afc3d031422eab48819b2b6d730ea516dbfabd30eb39ee5cb7fd2a
 AUX bitlbee.confd 62 SHA256 105afc0382fc5adc03ed644dba4e78817015a55432349f259a286ac3c1b06628 SHA512 36d3bdd518d4f790fac54401f9b27cc8f2af9946b13c1692b3011faf434d8e3159e47553c7f2500f4a47e0c45d8a1c805efa9065caff8db1b051e80fc30d028d WHIRLPOOL 3de14fd8c3cdcd9eae4f0357643109d836aa86c4dfd0fb05407fa523f188daf934536c101a8985556017c3aaba0371cd9d491f1ab589d6db16a70d1de47dbf10
 AUX bitlbee.confd-r1 291 SHA256 cab8b8cb8709f27a5fa9f1cfce4b58db24f5cd38b8e6badb91dac0809e6ca8de SHA512 e5dcb6bdfd382b28011c5fc93273d45bfd9af0c652e4f8db1c0d11615b38c5dbb7042d9b33fa5bdce844593e85a5776f2b19f75e9a67a2c46dc88b90f260e11e WHIRLPOOL aaaa218138aee18301c36ef6a59c344e313159d19472971aa95d0809c2ae81ea61df03129ff625270c9e426d9d79b843fad4212bb102cee7b98e387cd31eb1bd
 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.2.2.tar.gz 661757 SHA256 ba38939281f23e8a0e71022c7be0cb68f6544248404362c5e20245fa7a67558e SHA512 5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2 WHIRLPOOL cbc3552289949e5e10281d65f617f38075016c813bf2cbb13e09af913ea8545c46a69225bf4f523e1a73f955d7309b8c7b94e23affdedf5dce2760eee55203ae
-EBUILD bitlbee-3.0.5-r1.ebuild 4863 SHA256 f770bcfec2853005f8e3df6bebd85ea23d1d18f18f9ab17e061bcb781dd2ba1d SHA512 81a609e5dabde71dd896817f75ef8bb2bfaeb73e2de08f8be4b165d07404dd7e8b7869c66ae25497e6ec101848a0e909e4c40aa7dd04e2ce73879e4ba052b807 WHIRLPOOL 9f9d1cf2010c0b7f7d8f429128f332c9842ef8b1b1f00f753e37cf36cee8d0e4a11973adab27f532b71024d04ea7c7d339e65b2c3c8626c28a130d0e0390ae52
 EBUILD bitlbee-3.2.2.ebuild 4870 SHA256 1eaaf0e73e195d74c96014c7fc16a175656d8db164739033d9e8ac44922a4a7f SHA512 1a88593688f75c3965c59786d9b48bf27374f4d5fc7da7242efdfc900619a64db50d2ff2fdb3690aedcf47f4ef78d5412ffd1526187a8990768b4b4cdf0bc01e WHIRLPOOL 6ac5814967d819223d8ce55e679893ce0b5b3e856c192e1243d3352d384c6c9123a99fbad400607184a347ba19a860f61ccd1905044fa3659901cc1d3f7c0404
-MISC ChangeLog 27978 SHA256 e1badf0fafeb63b8a9aa5e2ad92aa42d4002147bf8cfaa3575d8eeea428908e1 SHA512 09e9434f95cfaf5758614f00da6431cfbfe433e51780819e7fe80d798f274ceb0a972b8518b3c25c4c4d6f90646d7837746736f08958ca251c495654fec49dc6 WHIRLPOOL a783159c598c5ff57becb5c1f4dd85bc42a19a0d448be86c3b0b103f25286b9ae4a27c77495b5ec05980b81cc919bb920a7259e4d008a0e8f154b601618478d6
+MISC ChangeLog 28276 SHA256 161b732da5da4a11fe8f95a5b6f1e5402bf64e27db6ee5473156a43592154a9f SHA512 48a1e7747383acba844d18b72e05b2163121844c8253f93a522259d059213b24e0d9c61228a13ef0ef7be6ab7253ceffb58827209cc1ea320ea7dfbcfa18816d WHIRLPOOL ea169a87e98b9be976e78b16f3940bcc535f2d53acc67a621789d1b2bc5dc7ac9a3481a7ea0cac920917ee24f32bda938186e34a4c481e072d436b8e17905fc5
 MISC metadata.xml 1013 SHA256 c0059a06732d902f41537aa682fc705ae7b09ab0d3ed49ade65ed18636ea3b77 SHA512 9f7c3fd74181988e03d3c569e2d55ee83df40804bf4c2496c05acd5a4a8b21db575b1d55b92a26e34c37c3fe4b4a2a771cd8adc80779c570a541751550a2f93e WHIRLPOOL 94eedc807937a9a46b830c1c629317916aa6e6a31e589ad0a70d4653660bf033fe049f6bcbf11260356e9271e9766875829486c71620e010ef6c844320a809da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVXJLoACgkQCaWpQKGI+9R6JACggcW/bvNq/5nwnAkEYKwP5rva
-h+4An2gPYWGHR6/1Zgri/cTilNEAJ/kd
-=ZhDY
+iEYEAREIAAYFAlVt/JMACgkQCaWpQKGI+9T5OACeLESiVYG5Xmha+wxhUJkQGQYo
+jdwAn2/S83lSnoQRiaOo29u3Y6tei/eN
+=0agB
 -----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
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]);
- 	}
- }
diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 895db018685f..de0cf5da7f19 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/qutim
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.38 2015/05/16 11:00:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.39 2015/06/02 18:58:23 pacho Exp $
+
+  02 Jun 2015; Pacho Ramos <pacho@gentoo.org>
+  -files/qutim-0.3.1-cmake-2.8.12-qt-build.patch, -qutim-0.3.1-r1.ebuild:
+  Drop old ebuild still using 'jabber' instead of 'xmpp' USE (#216300)
 
   16 May 2015; Pacho Ramos <pacho@gentoo.org> qutim-0.3.2.ebuild:
   Rename jabber to xmpp USE (#216300)
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index 516f9e82fb55..5db2df9bff1d 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -2,18 +2,15 @@
 Hash: SHA256
 
 AUX qutim-0.3.1-cmake-2.8.12-kde-build.patch 677 SHA256 5ab5117780d5260ed6be8a2853637196ac12f296b71dd2f7afbcc6d548d3d394 SHA512 e8a020d185cd776e6af614d2431c39358844c57f63fb7135ea76fd0cac7a98595b843053e9683dd1d4b7ccf56fe43f007233d0c8483a47e431029485831b8dc4 WHIRLPOOL 83a9867f348cf3a57d244b7084c696b39d31550dc934d0d242b876fccce86f3b757bb1343395cc8dd0a19fc7d4296858d94d9aa782aeb9afdf0e6bf40375e40c
-AUX qutim-0.3.1-cmake-2.8.12-qt-build.patch 4506 SHA256 c9354118436e71c978c0fca535342d0a682c87a124ec0055a2a547aae0abe58b SHA512 1750775dddb9ece43704f11cb76f00fe7fd750710ad5a27a27a1e45f6e244ec352e4714b5b47727fff27720b3f70e983fbca649f671498153f1ef1662c6cbfb0 WHIRLPOOL 555bf3c86232fbb9ff4cbb44138d9e326dca6751f1dcc74130ccef7c13212edccbeab3ba6a4e7ea6547ffd4a6ffd377746700b2a4ad08910f4fa76721d44d9f4
 AUX qutim-0.3.2-astral-migrate-qt-telepaphy.patch 5761 SHA256 865b38868e90a599b9123eb5d42e6946c39e98871ee5e39aea3fe4b08b82a956 SHA512 e930fe3f6d33fc27c5cc578fceb09280c72201290e0e3eb97f57d8fd08616e4234b526db1a0445f78ef0338b1b6c83f60ff8be1123a8a5639a5b9d58f51d2f26 WHIRLPOOL 7c16f5f04fa367e48da1e20242d20a4b7c84024a7aa860a6ab70f8b8b7102e3b9d965d13666083e275ff3232248faf1811393d64ff1f7bff3bf2957cfe87de60
-DIST qutim-0.3.1.tar.bz2 12056208 SHA256 a85f2bbb1d8010ee5506b0e82185a21a950d2fa36f72373a192070859e4944e1 SHA512 c3902aad605596bca943a2de706dcf1c35a0cf55df1309d8d0a7a4950a5900bc60829d6a785e408cbb66f21ba6ac3e5315d8d5140eed476ebee3bcb94cd3bc57 WHIRLPOOL 06a04a87f7cf24cf9440d263c835bb3273336838f9a927fc0debccec44861e057b5c97e5ab24d6f89c42edca6f183023396116fd0f5a32d04abfc01fdb27222a
 DIST qutim-0.3.2.tar.xz 10232436 SHA256 326bd4048cdee2913b6a01900d15736c54b431b4ec1a11c88e567920c2948849 SHA512 0767552e31d6e999f6622f14a48e2da7f4497b4a958550189dce38709689cb5f12e9b91a55b5d94d1a24f3e8149cf8453dea56b7e5a8c1758a6579c4142f01cb WHIRLPOOL dac2bb0c43e4bc195c2374aa885ae8174317eccb8e02d011902f4416b3808bf598507e1c74668f1ff04a53bd828d8695c93cc83e04342fdb92688b44236eb2a5
-EBUILD qutim-0.3.1-r1.ebuild 3623 SHA256 0895b47872ac2b44d3fc85e562be32e921e45046416fc2f4990a543e6086f920 SHA512 e8571eb1d903660cb7810f8beb26de42258df3b9bb5c1f30ff6c043b00eb7f6cf7f738481481364b13cb7195e70b355c93c6d59dab28d27c5c0b94a97742dc65 WHIRLPOOL 2ab08021d7211cb8926af9e7952ce1ed267eee14686bfa89384aaac5a9e726a35db27912bbd8c8ee1ecdf3132cbced1e522f5ba2deeb4e2876c015b1d3fbbc7a
 EBUILD qutim-0.3.2.ebuild 5772 SHA256 68636777b4261527535680dc2ef3fcae2e955018e2f44b125b63923720985b75 SHA512 a474f66f0ba894a6f372fe96567319920fe046451f3799b4d27bb63b477410d5159aebaf687f90b277ab89825f4dff81ad44379647801e4b320ca1888e1038bb WHIRLPOOL 5f3563a181fcc9eb8be4c2ee9b50b83cd9c593adbc4c1d531ce2109888b1bc63810900e02c447df806d139341686fe9131d30f7740928dcda91758a46d2b84e4
-MISC ChangeLog 6380 SHA256 cba6b94f59a8d746727a68cb86e5a958aab31f4f975f1dedb7cd8b309da7db98 SHA512 d1bb1ba74bd0833feed580a44d0b02e5560565c693f7681fa6e28a0ff66f33360463bfbde27e288cec54401cafc2a53899a2b695da0f4c5b7e385a9c4c54a1e6 WHIRLPOOL 72650e22152fecaa59357cb6055b4c8fadb1d5c812349080e847150a95e6ee4ed92ab53895c45fe196a4bd0603489c0028baa00731c16eb05e381f4b11d752aa
+MISC ChangeLog 6572 SHA256 2fdc0fc9b49d71a09b2e0daa0c8b3a42e475937be32afdddae5e867f61072075 SHA512 fe39a40b295cf1bd85ec3f2dd0a567d2aa94864460b28bd7ea9ede4b8b800d41d380491fb9814098ffd79bee92dc03646933713d25285999acd08dc127a9a90d WHIRLPOOL 317fe989a8da30de34b86a16e6b416809804f3fbe3e999dbfa0702eeead654e2b4fd8d1758bd8e38bf916fac2bdf05f000f0dba8cca8d2af54b890f9a3dc8821
 MISC metadata.xml 2434 SHA256 73b5c832bc3d5eb0787755eadae66cbc21c74d63cf395a58d5f3a8ed8d81b586 SHA512 13c5934ca4c08f919ca822d3f3c129de3728fa7f6f135395d96496c78f745dfc1e8bac3f6640d9bc8ecea38310af32fc532c8b0d3d0d13ecb7c4c5e07a66cb7e WHIRLPOOL 59841e549ad2993588e4a2e09251f1ab86756577366d3cc045ee4707eb05166e5a7e04d7425b46d76b422d0bdb3f06af2f8bb6fdea508d3bfbedc13b80ae971f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVXI04ACgkQCaWpQKGI+9QNTgCfVkFnfBkVQUtVJMBlkYwFcQ4f
-FLAAn2RZxNF7Kv+NSlJBLikZmaliXVL3
-=uf1j
+iEYEAREIAAYFAlVt/NAACgkQCaWpQKGI+9TVBgCfXsNNTwP2QcC1ZKVkxD5SDULz
+3DoAnjn+6DVx50DXP8uh8AYO5/2Cfr87
+=YXdV
 -----END PGP SIGNATURE-----
diff --git a/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-qt-build.patch b/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-qt-build.patch
deleted file mode 100644
index cda262a906a4..000000000000
--- a/net-im/qutim/files/qutim-0.3.1-cmake-2.8.12-qt-build.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 3ef38bdfe771bfff0247c668c044405c0f1b4145 Mon Sep 17 00:00:00 2001
-From: Alexander Golubev <fatzer2@gmail.com>
-Date: Mon, 3 Nov 2014 03:21:44 +0300
-Subject: [PATCH 1/2] fix build with cmake-2.8.12 introduced changes in qt4
- macroses
-
----
- core/cmake/QutIMMacros.cmake | 90 +++++++++++++++++++++++++-------------------
- 1 file changed, 52 insertions(+), 38 deletions(-)
-
-diff --git a/core/cmake/QutIMMacros.cmake b/core/cmake/QutIMMacros.cmake
-index 588f464..41e961d 100644
---- a/core/cmake/QutIMMacros.cmake
-+++ b/core/cmake/QutIMMacros.cmake
-@@ -31,43 +31,57 @@ if(NOT CPACK_INCLUDED)
- endif()
- 
- #TODO separate to external macro
--MACRO(QUTIM_WRAP_CPP outfiles)
--	# get include dirs
--	QT4_GET_MOC_FLAGS(moc_flags)
--	QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
--
--	FOREACH (it ${moc_files})
--		GET_FILENAME_COMPONENT(_abs_FILE ${it} ABSOLUTE)
--		GET_FILENAME_COMPONENT(_abs_PATH ${_abs_FILE} PATH)
--		GET_FILENAME_COMPONENT(_basename ${it} NAME_WE)
--
--		SET(_HAS_MOC false)
--
--		IF(EXISTS ${_abs_PATH}/${_basename}.cpp)
--			SET(_header ${_abs_PATH}/${_basename}.cpp)
--			FILE(READ ${_header} _contents)
--			STRING(REGEX MATCHALL "# *include +[^ ]+\\.moc[\">]" _match "${_contents}")
--			IF(_match)
--				SET(_HAS_MOC true)
--				FOREACH (_current_MOC_INC ${_match})
--					STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
--					SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
--					QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "")
--					MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
--				ENDFOREACH (_current_MOC_INC)
--			ENDIF()
--		ENDIF()
--		IF(NOT _HAS_MOC)
--			FILE(READ ${_abs_FILE} _contents)
--                        STRING(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}")
--			IF(_match2)
--				QT4_MAKE_OUTPUT_FILE(${_abs_FILE} moc_ cxx outfile)
--				QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}")
--				SET(${outfiles} ${${outfiles}} ${outfile})
--			ENDIF()
--		ENDIF()
--	ENDFOREACH(it)
--ENDMACRO (QUTIM_WRAP_CPP)
-+macro(QUTIM_WRAP_CPP outfiles)
-+	if(NOT CMAKE_AUTOMOC)
-+		# get include dirs
-+		qt4_get_moc_flags(moc_flags)
-+		if(CMAKE_VERSION VERSION_LESS "2.8.12")
-+			qt4_extract_options(moc_files moc_options ${ARGN})
-+		else()
-+			qt4_extract_options(moc_files moc_options moc_target ${ARGN})
-+		endif()
-+
-+		foreach(it ${moc_files})
-+			get_filename_component(_abs_file ${it} ABSOLUTE)
-+			get_filename_component(_abs_PATH ${_abs_file} PATH)
-+			get_filename_component(_basename ${it} NAME_WE)
-+
-+			set(_HAS_MOC false)
-+
-+			if(EXISTS ${_abs_PATH}/${_basename}.cpp)
-+				set(_header ${_abs_PATH}/${_basename}.cpp)
-+				file(READ ${_header} _contents)
-+				string(REGEX MATCHALL "# *include +[^ ]+\\.moc[\">]" _match "${_contents}")
-+				if(_match)
-+					set(_HAS_MOC true)
-+					foreach(_current_MOC_INC ${_match})
-+						string(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
-+						set(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
-+						if(CMAKE_VERSION VERSION_LESS "2.8.12")
-+							qt4_create_moc_command(${_abs_file} ${_moc} "${_moc_INCS}" "")
-+						else()
-+							qt4_create_moc_command(${_abs_file} ${_moc} "${_moc_INCS}" "${moc_options}" "${moc_target}")
-+						endif()
-+						macro_add_file_dependencies(${_abs_file} ${_moc})
-+					endforeach (_current_MOC_INC)
-+				endif()
-+			endif()
-+			if(NOT _HAS_MOC)
-+				file(READ ${_abs_file} _contents)
-+				string(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}")
-+				if(_match2)
-+					qt4_make_output_file(${_abs_file} moc_ cxx outfile)
-+					if(CMAKE_VERSION VERSION_LESS "2.8.12")
-+						qt4_create_moc_command(${_abs_file} ${outfile} "${moc_flags}" "${moc_options}")
-+					else()
-+						qt4_create_moc_command(${_abs_file} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
-+					endif()
-+					set(${outfiles} ${${outfiles}} ${outfile})
-+				endif()
-+			endif()
-+		endforeach(it)
-+	endif()
-+endmacro(QUTIM_WRAP_CPP)
- 
- macro(QUTIM_ADD_ARTWORK_DIR art_dir)
- 	FILE(GLOB ARTWORKS ${art_dir} "${art_dir}/*")
-@@ -331,7 +345,7 @@ QUTIM_EXPORT_PLUGIN(${plugin_name}Plugin)
- #    set_target_properties( ${plugin_name} PROPERTIES COMPILE_FLAGS "-D${plugin_name}_MAKE" )
- 	if( QUTIM_${plugin_name}_STATIC )
- 	if( NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/${plugin_name}helper.cpp" )
--		file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/${plugin_name}helper.cpp"
-+		file( WRITE "${CMAKE_CURRENT_BINARY_DIR}/${plugin_name}helper.cpp" 
- "#include <QtCore/QtPlugin>
- 
- Q_IMPORT_PLUGIN(${plugin_name})
--- 
-2.0.4
-
diff --git a/net-im/qutim/qutim-0.3.1-r1.ebuild b/net-im/qutim/qutim-0.3.1-r1.ebuild
deleted file mode 100644
index b4388b2b2a23..000000000000
--- a/net-im/qutim/qutim-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,137 +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/qutim/qutim-0.3.1-r1.ebuild,v 1.4 2015/02/22 18:41:22 mgorny Exp $
-
-EAPI=5
-
-LANGS="ar be bg cs de en_GB ru sk uk zh_CN"
-
-inherit qt4-r2 cmake-utils
-
-DESCRIPTION="Qt4-based multi-protocol instant messenger"
-HOMEPAGE="http://www.qutim.org"
-SRC_URI="http://www.qutim.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aspell awn ayatana crypt dbus debug doc histman hunspell irc jabber kde kinetic mrim
-	multimedia oscar otr phonon purple qml sdl +ssl vkontakte webkit +xscreensaver"
-
-REQUIRED_USE="
-	oscar? ( ssl )
-"
-
-# Minimum Qt version required
-QT_PV="4.7.0:4"
-
-CDEPEND="
-	x11-libs/libqxt
-	>=dev-qt/qtcore-${QT_PV}[ssl?]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	aspell? ( app-text/aspell )
-	awn? ( >=dev-qt/qtdbus-${QT_PV} )
-	ayatana? ( >=dev-libs/libindicate-qt-0.2.2 )
-	crypt? ( app-crypt/qca:2[qt4(+)] )
-	dbus? ( >=dev-qt/qtdbus-${QT_PV} )
-	debug? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	histman? ( >=dev-qt/qtsql-${QT_PV} )
-	hunspell? ( app-text/hunspell )
-	jabber? (
-		app-crypt/qca:2[qt4(+)]
-		>=net-libs/jreen-1.1.0
-	)
-	kde? ( kde-base/kdelibs:4 )
-	kinetic? ( >=dev-qt/qtdeclarative-${QT_PV} )
-	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
-	oscar? ( app-crypt/qca:2[qt4(+)] )
-	otr? (
-		>=net-libs/libotr-3.2.0
-		<net-libs/libotr-4.0.0
-	)
-	phonon? (
-		kde? ( media-libs/phonon[qt4] )
-		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
-	)
-	purple? ( net-im/pidgin )
-	qml? (
-		>=dev-qt/qtdeclarative-${QT_PV}
-		>=dev-qt/qtopengl-${QT_PV}
-	)
-	sdl? ( media-libs/sdl-mixer )
-	vkontakte? ( >=dev-qt/qtwebkit-${QT_PV} )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-	xscreensaver? ( x11-libs/libXScrnSaver )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( dev-util/automoc )
-"
-RDEPEND="${CDEPEND}
-	jabber? ( app-crypt/qca:2[gpg] )
-	oscar? ( app-crypt/qca:2[openssl] )
-"
-
-DOCS=( AUTHORS ChangeLog )
-
-# bug #506614
-PATCHES=(
-	"${FILESDIR}/${P}-cmake-2.8.12-qt-build.patch"
-	"${FILESDIR}/${P}-cmake-2.8.12-kde-build.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# fix automagic dep on libXScrnSaver
-	if ! use xscreensaver; then
-		sed -i -e '/XSS xscrnsaver/d' \
-			core/src/corelayers/idledetector/CMakeLists.txt || die
-	fi
-
-	# remove unwanted translations
-	local lang
-	for lang in ${LANGS}; do
-		use linguas_${lang} || rm -f translations/modules/*/${lang}.{po,ts}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSTEM_JREEN=ON
-		$(cmake-utils_use_with doc DOXYGEN)
-		$(cmake-utils_use doc QUTIM_GENERATE_DOCS)
-		# plugins
-		$(cmake-utils_use aspell ASPELLER)
-		$(cmake-utils_use awn)
-		$(cmake-utils_use ayatana INDICATOR)
-		$(cmake-utils_use crypt AESCRYPTO)
-		$(cmake-utils_use dbus DBUSAPI)
-		$(cmake-utils_use dbus DBUSNOTIFICATIONS)
-		$(cmake-utils_use dbus NOWPLAYING)
-		$(cmake-utils_use debug LOGGER)
-		$(cmake-utils_use histman)
-		$(cmake-utils_use hunspell HUNSPELLER)
-		$(cmake-utils_use kde KDEINTEGRATION)
-		$(cmake-utils_use kinetic KINETICPOPUPS)
-		$(cmake-utils_use multimedia MULTIMEDIABACKEND)
-		$(cmake-utils_use otr OFFTHERECORD)
-		$(cmake-utils_use phonon PHONONSOUND)
-		$(cmake-utils_use qml QMLCHAT)
-		$(cmake-utils_use sdl SDLSOUND)
-		$(cmake-utils_use webkit ADIUMWEBVIEW)
-		-DHAIKUNOTIFICATIONS=OFF
-		-DUNITYLAUNCHER=OFF
-		-DUPDATER=OFF
-		# protocols
-		$(cmake-utils_use irc)
-		$(cmake-utils_use jabber)
-		$(cmake-utils_use mrim)
-		$(cmake-utils_use oscar)
-		$(cmake-utils_use purple QUETZAL)
-		$(cmake-utils_use vkontakte)
-	)
-	cmake-utils_src_configure
-}