Remove blocker on net-p2p/bittornado, they don't collide

Package-Manager: portage-2.1.3.19

4 files changed, 21 insertions, 19 deletions

diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog
index be96d6fe64e1..8afdc22ecc69 100644
--- a/net-p2p/bittorrent/ChangeLog
+++ b/net-p2p/bittorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/bittorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.127 2008/01/16 15:32:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.128 2008/01/17 14:15:30 armin76 Exp $
+
+  17 Jan 2008; Raúl Porcel <armin76@gentoo.org> bittorrent-4.4.0-r1.ebuild,
+  bittorrent-5.0.9-r1.ebuild:
+  Remove blocker on net-p2p/bittornado, they don't collide
 
 *bittorrent-5.0.9-r1 (16 Jan 2008)
 *bittorrent-4.4.0-r1 (16 Jan 2008)
diff --git a/net-p2p/bittorrent/Manifest b/net-p2p/bittorrent/Manifest
index c70ee412e292..4f448990be22 100644
--- a/net-p2p/bittorrent/Manifest
+++ b/net-p2p/bittorrent/Manifest
@@ -8,18 +8,18 @@ RMD160 4546d4d647969f91f623d98bc80ef53dc86a2117 files/bittorrent-tracker.initd 6
 SHA256 5f70c794dcc5d821df1224168ac449fd94983a7f9eeb3e498d31fc369b3b2ff3 files/bittorrent-tracker.initd 653
 DIST BitTorrent-4.4.0.tar.gz 1255281 RMD160 9e743b3178142855d289743d4430598353fb4d3f SHA1 8ca3e52c8049ff29a6785da410d6aa80c6726882 SHA256 1c9338ed384240258b5733a814670e2dee8ca2fb65babf3f0ca07978707301e0
 DIST BitTorrent-5.0.9.tar.gz 2497550 RMD160 631d88c31ebd2f656477791db18e6a868349a2d5 SHA1 b610c811590aad6ec25fc7b30acb9e0264443121 SHA256 4459f694609328e55f829fe2e1143518e35f471aed7814da7689fee5d422f705
-EBUILD bittorrent-4.4.0-r1.ebuild 1815 RMD160 ff5bfe91bea73c62fdf5b9b3dcdc16271da115a4 SHA1 3d674a81b092e55f30b61d6de5c10919459c0524 SHA256 60121cfb7bdcf714312fe852e0a2dc757ebb165d31618c98935631f2eb8bccf5
-MD5 07be87451c5f19e1d924f4eda9b246e0 bittorrent-4.4.0-r1.ebuild 1815
-RMD160 ff5bfe91bea73c62fdf5b9b3dcdc16271da115a4 bittorrent-4.4.0-r1.ebuild 1815
-SHA256 60121cfb7bdcf714312fe852e0a2dc757ebb165d31618c98935631f2eb8bccf5 bittorrent-4.4.0-r1.ebuild 1815
-EBUILD bittorrent-5.0.9-r1.ebuild 2388 RMD160 850f06ec8d031f568407e729443ca112d07ce1aa SHA1 e0927ecef9872ff9ca5e53de2e18718b2e5760bf SHA256 33a335b5ecd67c13615afbe0d187d29a748f7e48ba7d52e757e887808f152cc1
-MD5 1b0613d5036cc7ffb7882165363c4423 bittorrent-5.0.9-r1.ebuild 2388
-RMD160 850f06ec8d031f568407e729443ca112d07ce1aa bittorrent-5.0.9-r1.ebuild 2388
-SHA256 33a335b5ecd67c13615afbe0d187d29a748f7e48ba7d52e757e887808f152cc1 bittorrent-5.0.9-r1.ebuild 2388
-MISC ChangeLog 18367 RMD160 6abfef351d58a67778375c3f3a1c08fe4709fe5e SHA1 93ccc7100f5b1ce590e078019582aadcdf1c7414 SHA256 f09bcde6d873b60a14fc00ce7a935427ba1f478a1ac75a42c00363f4638c810b
-MD5 686818eb481ae24fa6c903b085e82d36 ChangeLog 18367
-RMD160 6abfef351d58a67778375c3f3a1c08fe4709fe5e ChangeLog 18367
-SHA256 f09bcde6d873b60a14fc00ce7a935427ba1f478a1ac75a42c00363f4638c810b ChangeLog 18367
+EBUILD bittorrent-4.4.0-r1.ebuild 1794 RMD160 a008195d8d01d73c775f218a6d4ed15cc421a488 SHA1 27888e2e414748ae4db2e3d417ac5dec10ee4552 SHA256 0b914405288e2b4815ac0ff68ccf5edd4fd96184a03d8e0bb870fadc23aa9d0d
+MD5 2bfe3143f3ea0cc56d8031ea816571e4 bittorrent-4.4.0-r1.ebuild 1794
+RMD160 a008195d8d01d73c775f218a6d4ed15cc421a488 bittorrent-4.4.0-r1.ebuild 1794
+SHA256 0b914405288e2b4815ac0ff68ccf5edd4fd96184a03d8e0bb870fadc23aa9d0d bittorrent-4.4.0-r1.ebuild 1794
+EBUILD bittorrent-5.0.9-r1.ebuild 2367 RMD160 9baff43817b6c72d5a843728887149023b6aa6d5 SHA1 c01bdc1bc9a40af8eecfa72a534355932337f171 SHA256 5382cc2db66bb38ee08aa52984afd64c828c589bd6f91945b7a19b18fe2607e2
+MD5 4a189cb0d1eee28328ea22f9becbaad0 bittorrent-5.0.9-r1.ebuild 2367
+RMD160 9baff43817b6c72d5a843728887149023b6aa6d5 bittorrent-5.0.9-r1.ebuild 2367
+SHA256 5382cc2db66bb38ee08aa52984afd64c828c589bd6f91945b7a19b18fe2607e2 bittorrent-5.0.9-r1.ebuild 2367
+MISC ChangeLog 18534 RMD160 b0fc5768b2631108b5b0fa88fb11e9e46310749c SHA1 525296dbc74f761de9181bd69ef48da83215fb92 SHA256 2971260b1f4bcdb14f3c9524330d7fde31117ba1b443a4453fbea7b30929658f
+MD5 156a8c485295c68f15b2459e677ef81e ChangeLog 18534
+RMD160 b0fc5768b2631108b5b0fa88fb11e9e46310749c ChangeLog 18534
+SHA256 2971260b1f4bcdb14f3c9524330d7fde31117ba1b443a4453fbea7b30929658f ChangeLog 18534
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
diff --git a/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild b/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild
index 6cb1a948405a..69b00c5e67e2 100644
--- a/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild
+++ b/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild,v 1.1 2008/01/16 15:32:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild,v 1.2 2008/01/17 14:15:30 armin76 Exp $
 
 inherit distutils fdo-mime eutils
 
@@ -22,8 +22,7 @@ RDEPEND=">=dev-lang/python-2.3
 		>=x11-libs/gtk+-2.6
 		>=dev-python/pygtk-2.6
 	)
-	>=dev-python/pycrypto-2.0
-	!net-p2p/bittornado"
+	>=dev-python/pycrypto-2.0"
 DEPEND="${RDEPEND}
 	app-arch/gzip
 	>=sys-apps/sed-4.0.5
diff --git a/net-p2p/bittorrent/bittorrent-5.0.9-r1.ebuild b/net-p2p/bittorrent/bittorrent-5.0.9-r1.ebuild
index d8c59856bfb7..c9203fde6621 100644
--- a/net-p2p/bittorrent/bittorrent-5.0.9-r1.ebuild
+++ b/net-p2p/bittorrent/bittorrent-5.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-5.0.9-r1.ebuild,v 1.1 2008/01/16 15:32:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-5.0.9-r1.ebuild,v 1.2 2008/01/17 14:15:30 armin76 Exp $
 
 WX_GTK_VER="2.6"
 inherit distutils fdo-mime eutils wxwidgets
@@ -23,8 +23,7 @@ RDEPEND=">=dev-lang/python-2.3
 	>=dev-python/pycrypto-2.0
 	>=dev-python/twisted-2
 	dev-python/twisted-web
-	net-zope/zopeinterface
-	!net-p2p/bittornado"
+	net-zope/zopeinterface"
 DEPEND="${RDEPEND}
 	app-arch/gzip
 	>=sys-apps/sed-4.0.5