net-im/gajim: Drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 23 insertions, 516 deletions

diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index b7eba11b6d7e..f805d016afb1 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.206 2014/05/17 13:57:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.207 2014/05/19 14:33:21 jlec Exp $
+
+  19 May 2014; Justin Lecher <jlec@gentoo.org> -gajim-0.15.3-r1.ebuild,
+  -gajim-0.16_beta1.ebuild, -gajim-0.16_beta2.ebuild,
+  -gajim-0.16_beta2-r1.ebuild:
+  Drop old
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> gajim-0.15.4.ebuild:
   Stable for alpha, wrt bug #507032
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index e75761a33aaf..a4b8c1cc3004 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.14-python-version.patch 316 SHA256 b4aba8ebc6241442f9eb1c335ba22c2eb5a3b3a24533cb2f944f3f812e06b687 SHA512 e7fc69f87b3106e171bc8c9db786217e1c903c5e82d2b60035f00203e32b17f73be17e64f1d013afd32ce280c53c32af2c46a6c9f33d25e9cf52db6dfb7ece3e WHIRLPOOL 107ac113d5ae3645155ba9eb1e215eb0d9750e2e440976ab0a3da28da1526b408eb37eeafe74e3a0a1bae79a1af5af724fe2ec9a6d7a044392d0b236479efc92
 AUX 0.14.1-testing.patch 237 SHA256 128da6d0a8ae48132df78f9027dc5ef5d8167e561fe12b1d774c628a5fc33638 SHA512 8c6df58972e22886599f99e1b9d59b088a155dcf1c5ccdff9002d8fd4a12a9ec2d38dc62f30f191342190200c0aebb60a19f2cbf1b2073449ad61bdd0adff6d5 WHIRLPOOL 5fc62c7beadb6c2bd39d2c966ab7bfd9ef857d799f0c06d80a9cece681f8d9bfc19657c8a7463d9743bff61708a8795e01b55d28a794b7d5a812670fa8430f70
@@ -13,33 +13,28 @@ AUX gajim-0.15.3-roster.patch 1450 SHA256 ffbbbfbc6198fff03a566d69f2e6872898dd87
 AUX gajim-0.15.3-starttls.patch 502 SHA256 24a7d4c15be003daa8a10f26730eec27ce75c0e8d0d727c5f5d8c1b7f7305be6 SHA512 5ac3b926d971eb37898a241af7e2b77189ed7874a144d3bb9955ed09f7c1e6f5373e04f94dbaac337903622ebc5825428018e3c2843cafd3e8ba9e50c0bba0f5 WHIRLPOOL 3e84c618d56e19750062e752f67ada26c260b51cc4f2bb749ec5516b5e53be18b1d4627c174ad35ac084f19bc1bad6b2d4bbec6124b40d4fc24d87398770fd7d
 AUX gajim-0.16_beta2-pyopenssl-backport-1.patch 1623 SHA256 47991437de8e6f105533360a6bba8c1f35b5175e811941ff83b956e5c8970eae SHA512 771087b9eb695d07d89d5f9f6a80fa576ffbbacdd11d5b480c77e6f4a619c1e59d32ef5f5b99c69bdc45b748689d2ad0b73b21675df4b0728f60fabda5cbcb8f WHIRLPOOL 6285da2a8cdc7dc38e902fc3bf4445ab5cfc68afdc2e8a51ea2be9771ad24763f9a31a1a6212dcd3faf1b690c644829c0801526509e05b9a88920ee07efdf7e3
 AUX gajim-0.16_beta2-pyopenssl-backport-2.patch 1758 SHA256 f0cf25a15a908e28eacbd569a5198d2994d20bc5642bc519c17dc04efc8158fb SHA512 29980e307b969e717bfdc2b1263fec6c4a56fef947bc70a36ebdf21e229d7ae85a043f1499fcdcde7bff1050cc33938613b1a4fa4c694605c651413ffa3cffcf WHIRLPOOL 03e5359ca4f47c09f89c07eb6d7b5ad0b7af4651391a217c5220bb8b0de12eed27042c20ffb713c8c7e2b59a155d2a1de3676c60e3360aaaed9e589fc01cb05c
-DIST gajim-0.15.3.tar.bz2 4473787 SHA256 4848e98b25b523e28014528a8b89289bf987d5ce9419dd78ccff74a35aa583f4 SHA512 2315a281945b31a0fcfea0892fcdea72b79b4b85f75f4a810fb2d1530585c3325648562d546c3aa26e36f3153da1c96bc7123b255fca691e8d22e02a457b5049 WHIRLPOOL e5efed228b4c9704c00deb0fd68e6601a69a04ca7e18ee9348e729609eb87bf034f5fe23259b50806b7a6002f5155765562772077cfc4c8f430a7a9599e6800a
 DIST gajim-0.15.4.tar.bz2 4473874 SHA256 27acfecf40e2da55e8f7ec5d653acaf0914376f2d42766af27963c008bee4dc0 SHA512 f1f316aa11531dc37f97b2d06fd3e3e4a4d9187de0e0b3fa468283e88e16ee6372d6c49c57dd7bd8b51809e7d3130aee88a178bb64bf29349b27450224c0840e WHIRLPOOL a12c467f7a62f097c2ec64c31f8d336f5d7c7851d36716dffcb1998d1895de385a6b567931abe94eef2e53418122e3a482e3200650893cc1cbd4b0f1fc9db238
-DIST gajim-0.16-beta1.tar.bz2 4617116 SHA256 c51746c5456b03b95dbea9a56d961b447b1c75d603979314355df360265b6cb2 SHA512 ce2317f460b3bf1bef91f0c29bc4da715c0c59680f59a2367f0ee6b93d160e47917bb28beaac0f7c02d51868d2040e8c7ed2447b509ca05eb4429d3eaf4b857a WHIRLPOOL f70c26a1337a306ffdf616edf06cc10e94a8442df14b2cf1b65827182960937dfe37a510a702cb1942298818e82cbd1abd79ac7c180826eca82e132abcb4229d
-DIST gajim-0.16-beta2.tar.bz2 4648729 SHA256 2c88b7682b41d25cac7ccbe71a22be8968d763e72c5050570263f0e536682b16 SHA512 a2e76a99b839146275d32ba5accc4d2c2c88c7f5d42ae76c2e3f476a31de6b4c6dd4088823fb6c8fc6eedab09b3910509d347d19fb33c2672e1df2d49390f7a0 WHIRLPOOL 5cf4559ea9607ac71262b273019fe1e55b712f8bbd94999da68ff37774eb665f5b348c3fbcfc2406f4e781851c180a21b31ee5a6f2a7f5fa520373356be9f412
 DIST gajim-0.16-rc1.tar.bz2 4569343 SHA256 838b7dbfbc5c884741d48a27737916487b088d22ce925d3cb0a40316377c5a10 SHA512 f0ef9e52539c00281a3538e409e2ad25e51dcbf4e2bc157afc845b197fd43a3cd1cfea6ebd4cfe8d33d407dadc98944fead679d2476dafb601b63da4b764db05 WHIRLPOOL 20906bb9c00f6880b7b83b914aa1fe925c5bd132d09ba2b2924a2207f14d757bedc0fbce96caf203ce9152c3270c18e26cb521a5e9d75bfa1c55affc21f77802
-EBUILD gajim-0.15.3-r1.ebuild 2905 SHA256 91cc34c25bf82807efe6d6fdb2a58db7185386242995b32d68230ac1246be6f4 SHA512 7d4eee353f24e87e42624eba986ce8ce87c655a447c202b209460638ba1ecae8933af4c72c24674f8ce5409c3dfd9d2d26c90ce9f2e2bc8821ba18a708c5b76a WHIRLPOOL 0db05c12509250d102b7b865727838c73937582e872823b152ad0e91a672f29eb4f4c87121a7ae2ce717aeec57d0f6707df30f6cf0a97050f3ce80f9ce72a6f5
 EBUILD gajim-0.15.4.ebuild 2936 SHA256 42cfdeaa208ca64967215b81b887b5db2acd78e3c496d919eed053c9c88e9d28 SHA512 3a43bef12fd74c43490f696ed24160977a8554a82efd43b5a52ea766a087533255df1dbb8816bc6e6a807d78d4732fb673597327c717c2c897e120b07586b777 WHIRLPOOL 02e606d46dd84c4caf70dc3d68426b1996d25bde4104d8e76fd76f5dd4d96154e4aab96dba94cc14590428f76b52e15f417874389465f55de86955ed0522a355
-EBUILD gajim-0.16_beta1.ebuild 2907 SHA256 04fd0b42bbbf463b76afac3940d67dbcc96b163f52ed8c552723a7f4b1b968c0 SHA512 76efb93506049af6b51e00533c6db266f74eb40512b4a9a911e1da29d42014bfa5ac104eb51aae8b9d98faf19d47ccc47de12b2b49d2cb094ee91289e45137d1 WHIRLPOOL ba3350e3267f670938386655db865943239f3239e8f8e948dbb92273e376e07d5624c40c6a07f7e87b24f1f609c808b231ef256f4ef8fe7cc6a535bb0033a718
-EBUILD gajim-0.16_beta2-r1.ebuild 3014 SHA256 2666408775aadbc8178a5d3d2df99212aa4532cce0cc5a1592b5603c1b96f2f2 SHA512 c3eecfca020e32da731b32e3d915429afb9a0271f48f9b636ba0a7a7837d8d670f4ebbcf09a249a75e7f1888098a906dcc86bc2355bf42b2fe868c5828c085be WHIRLPOOL 14ba05fdb977769c3b3040f68be0386b6e66b023756da039fc92cfd787afb65b94e6646bcd99509fc63fb4224ded513653f8c318f11e7e052110dcf96bc35f5c
-EBUILD gajim-0.16_beta2.ebuild 2902 SHA256 987ae278f500c023e07f25cee18ec7c170ac305590e9bc7ce7fe0fef7d7e6416 SHA512 e89e8a7bd898a046231aaa038f5ef97b6d559f89c19a92fca662b9cbdda512545b5abaefeb24a03c8c5db5186c91c23f3f9837fd0faebea4d1b01e1c39dbbde2 WHIRLPOOL 9c8848179a5fc003f2ea8fc2a88637cc5628dc80466831bdaa07ebdca343e7bc7c18170fde61e1b41bfd057bc2b7808938fa7e67f66dd94289fd478002feb0db
 EBUILD gajim-0.16_rc1.ebuild 2907 SHA256 1a3388a8869a56bf9eb0e05c8af87b154668976877470d9529dd3988116897a0 SHA512 ba3dd4b2745deba05334fa9895730da6be2c932a94f0c46fb49c3662b4f629cab5048cc7e62fbabe27fdf6df75b11cc356f6df4e6ff33e7a4331d40b439f2c7f WHIRLPOOL 48b81d8f9643616f8935393546d91c00e1ff74ac734ff3b604b65f7255d065301d16dee707a7cb033ef7749bb097d155df9ca1946b87422f5de473ecfa13d660
-MISC ChangeLog 29681 SHA256 a3b554a2dc28c3c056f5e34759d15f13d322cc3878d89679d1acb7b571892954 SHA512 78330dba01f9637e568a0f6a60fb6566eecbcfdbb7d8c2ac385867325595a20ce479ebf8101fd9a391d770aa0053793bc68a9998762feff38956a9c780540c6b WHIRLPOOL 5b23333f5c08c5bdf60de54348a4d4dbb273f63679df3b445522b8e3aac5565cfa04a525deaf22d764591fc2e1e69dabcdd9aa3f4858d4e093807d3d88cad80b
+MISC ChangeLog 29851 SHA256 f37e77deb52ac98a525b09727b9ce01a83438311c07a2f29c54beb7067f23d91 SHA512 26ee2ae564e90cca2c0d0382819f8305dca214b34b87ce3c673adfe73c38292e8ce3591eaa101bd71350bbde8c4d4c506cebf98948450dac8b80ed7fc5de09b4 WHIRLPOOL 0d33d81636a0235563e5e4baff23fa368053968acbdc55ee3a96515ce1d147a4bc267be9978d6291d4c0d1eed068e86e25a6b54fe9ded695b86e027ecdc722f3
 MISC metadata.xml 503 SHA256 781012e83e7e3d1480ed6413a58f8a294e3a1b4c4968b1217c9bf7b41cca3ae5 SHA512 cfc7f159daf5007962ea035289002df56575042d567aa36c495b95dcf7ca7bb931be622599537e9ea67c25b7cb75014acf38a13bda349218af7a5eb576ebb0a4 WHIRLPOOL 3ff97b378ffe5c79d63ba206dec6c346480c42aa4988bed662066efbf5599e0986c83cd1ade54bded8bb2e2ad0ab6ad6f18c791b59f11215c2a52c4503721cbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTd2raAAoJELp701BxlEWfDOkQALoetVv+TfFsXNyJrUMwkkqy
-A9qmUQ6wsEA6c+cInTl+jFl4kheMxBZdlzrwABcuFVpYkJOzCkMl4b+NoQtBcwaC
-W4JhG8Ruoy7YxqCDvG2jWgg9sPwAR549vZ9ce2wwpAHn1UFX2iTfBpi3is/LcvRX
-JELFTKlN6dnl+aFFtyUcYp13kmRM6aJD3Uv9i0RtnbY4BLZt7ox/eSon5WU7UZNq
-8JL2j6GxmAneuRdImhzBTY6PBq+IDU6dXJROzaI9HiWm3DP64C5v17NruKw0l6FB
-D0KTNY/7mUNNH6wn7vLxPw2OS97Ma3MopH1LLB/+5XAlKf4OzY6Ghelpj01tP0B5
-wmpMd0lHh5KNwdZ19LrpS/OeUtSs6aPJPO6s2bG4BQNPVbdwDaMJNVLY7cKbyx67
-tGH+v1G92kOlwAGf7isEqgHJt4HMF6w0wtmemyqgGT3SVIhpOrp8wrW89wcMCRzb
-j1B2mGxxTx8Sx+2Av+fpg6jqb7rnpVemmVrwB18tH4QB/IKa90epw/eDCoPf9/Zp
-ir/8SBAjUuVC9amQyGtlvavUDfH3gex68fI4w/abg9Tld0G9Ljze50CdWaNw36ah
-Ni9Ppcoh6RoreGEJb3BHC7iyvbgDHtrSmT/eBV2m/PyERdLniKs7Sf7zNCF8+Up3
-XIm6SDxaHHIAunKeqErp
-=+L1T
+iQJ8BAEBCgBmBQJTehYyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirILEP/ij2QiCqrOEnalqGkKZ9D0Up
+VumNYcCPXN65oolHwwTj4OXjW9WYpMVvaAvC/xRmMZr7ufKD3/pHvAgnHl6bmAU3
+HTXU+c2HsKNzw6aemlrxsYYaGzmkp2P9uKzyhXLXZ7C+2JL/qqXOlAsGjma3Bqwo
+WUPT4HVLuGlIcR8iI55t8tyRRBCIzPfOdJvQMgam0K8tQDOuwb8DJBq4Kwl2VpgW
+3xZm63j8AE5+aOBQ9vVASn2CMRZcDbqwrqRuO0dxdPndZKCLIE82l8hPFmi2I7LC
+lm68C4hmsy88oGCOYnr+wnzLfTi7OA3tnapD8ms64CiMrOMGVmAqwjjT/DXGCpNz
+YP6yxPqr6m39qN+huLYbAJToTD2d9Ipz7LJkedh2pRBq5mHIXWPP4IbevAoyzC3N
+dcR5Ebj/vlYz3MDRO5H47dF3eBil47k8t4/OOQIobmxaBjT0kNC8aeHfL1PoYQiF
+0R4t2VHNFZEZVl/BmWxhO5lI1rNkU8X6Kd9Z99LoAqoqPgeiK2XwlE6j4/MPl1e1
+WARTC9RBymDdnJrypmfUPVK8+p4ujv/Kg1r4betKh2jErPJei6++mtlNttk5xqaa
+dRAmlalRDFRiKj1f/Uau3lc0unh19CvAoOBHbWoOYEP9+0U79vUcBsW8A1geZAmm
+nQOyHuJxi5CWQbK5+X7V
+=FKmu
 -----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.15.3-r1.ebuild b/net-im/gajim/gajim-0.15.3-r1.ebuild
deleted file mode 100644
index a8804adb399d..000000000000
--- a/net-im/gajim/gajim-0.15.3-r1.ebuild
+++ /dev/null
@@ -1,122 +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/gajim/gajim-0.15.3-r1.ebuild,v 1.11 2014/05/08 11:49:43 johu Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/gnome-keyring-python
-		dev-python/egg-python
-		)
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils )"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-roster.patch
-	"${FILESDIR}"/${P}-starttls.patch
-	)
-
-src_prepare() {
-	echo "src/command_system/mapping.py" >> po/POTFILES.in
-	echo '#!/bin/sh' > config/py-compile
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize "${ED}"/$(python_get_sitedir)
-	}
-	python_foreach_impl installation
-
-	rm "${D}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.16_beta1.ebuild b/net-im/gajim/gajim-0.16_beta1.ebuild
deleted file mode 100644
index 23296e19c431..000000000000
--- a/net-im/gajim/gajim-0.16_beta1.ebuild
+++ /dev/null
@@ -1,122 +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/gajim/gajim-0.16_beta1.ebuild,v 1.6 2014/05/08 11:49:43 johu Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/python-nbxmpp[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/egg-python
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize "${ED}"/$(python_get_sitedir)
-	}
-	python_foreach_impl installation
-
-	rm "${D}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.16_beta2-r1.ebuild b/net-im/gajim/gajim-0.16_beta2-r1.ebuild
deleted file mode 100644
index 269c4493d6d6..000000000000
--- a/net-im/gajim/gajim-0.16_beta2-r1.ebuild
+++ /dev/null
@@ -1,127 +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/gajim/gajim-0.16_beta2-r1.ebuild,v 1.4 2014/05/08 11:49:43 johu Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.3[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/egg-python
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pyopenssl-backport-1.patch
-	"${FILESDIR}"/${P}-pyopenssl-backport-2.patch
-)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}
diff --git a/net-im/gajim/gajim-0.16_beta2.ebuild b/net-im/gajim/gajim-0.16_beta2.ebuild
deleted file mode 100644
index 3d7ce54df19e..000000000000
--- a/net-im/gajim/gajim-0.16_beta2.ebuild
+++ /dev/null
@@ -1,122 +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/gajim/gajim-0.16_beta2.ebuild,v 1.6 2014/05/08 11:49:43 johu Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="sqlite,xml"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils python-r1 versionator
-
-MY_PV=${PV/_/-}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jabber client written in PyGTK"
-HOMEPAGE="http://www.gajim.org/"
-SRC_URI="
-	http://www.gajim.org/downloads/$(get_version_component_range 1-2)/${MY_P}.tar.bz2"
-#	test? ( http://dev.gentoo.org/~jlec/distfiles/${PN}-tests-${PV}.tar.xz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.1
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17-r1"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/python-nbxmpp-0.3[${PYTHON_USEDEP}]
-	crypt? (
-		app-crypt/gnupg
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		)
-	dbus? (
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-libs/dbus-glib
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
-		)
-	gnome? (
-		dev-python/libgnome-python
-		dev-python/egg-python
-		)
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	idle? ( x11-libs/libXScrnSaver )
-	jingle? ( net-libs/farstream:0.1[python] )
-	kde? ( kde-base/kwalletmanager )
-	networkmanager? (
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
-		)
-	spell? ( app-text/gtkspell:2 )
-	srv? (
-		|| (
-			dev-python/libasyncns-python[${PYTHON_USEDEP}]
-			net-dns/bind-tools )
-		)
-	xhtml? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	autotools-utils_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myeconfargs=(
-			$(use_enable nls)
-			$(use_with X x)
-			--docdir="/usr/share/doc/${PF}"
-			--libdir="$(python_get_sitedir)"
-			--enable-site-packages
-		)
-		run_in_build_dir autotools-utils_src_configure
-	}
-	python_foreach_impl configuration
-}
-
-src_compile() {
-	compilation() {
-		run_in_build_dir autotools-utils_src_compile
-	}
-	python_foreach_impl compilation
-}
-
-src_test() {
-	testing() {
-		run_in_build_dir ${PYTHON} test/runtests.py --verbose 3 || die
-	}
-	python_foreach_impl testing
-}
-
-src_install() {
-	installation() {
-		run_in_build_dir autotools-utils_src_install
-		python_optimize
-	}
-	python_foreach_impl installation
-
-	rm "${ED}/usr/share/doc/${PF}/README.html" || die
-	dohtml README.html
-}