diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-01-17 14:15:30 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-01-17 14:15:30 +0000 |
| commit | 12facffe004ded67b4781811486380cf348eb9a2 (patch) | |
| tree | 01d6d33227bfcacde0af8d1b9287d95d224c785c /net-p2p/bittorrent | |
| parent | set the PYTHON_VERSION environment variable so we pick the right version, fro... (diff) | |
| download | gentoo-2-12facffe004ded67b4781811486380cf348eb9a2.tar.gz gentoo-2-12facffe004ded67b4781811486380cf348eb9a2.tar.bz2 gentoo-2-12facffe004ded67b4781811486380cf348eb9a2.zip | |
Remove blocker on net-p2p/bittornado, they don't collide
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-p2p/bittorrent')
| -rw-r--r-- | net-p2p/bittorrent/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/bittorrent/bittorrent-4.4.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-p2p/bittorrent/bittorrent-5.0.9-r1.ebuild | 5 |
3 files changed, 9 insertions, 7 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/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 |