From eecbc0f47a51b7a14b4e1cf92aadf6048c2942cd Mon Sep 17 00:00:00 2001 From: Jon Hood Date: Tue, 23 Nov 2004 18:43:53 +0000 Subject: [PATCH] fix wxpython depend; mark -r2 stable on x86, #71075 --- net-p2p/bittorrent/ChangeLog | 8 +++++++- net-p2p/bittorrent/bittorrent-3.4.1a.ebuild | 4 ++-- net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild | 4 ++-- net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild | 6 +++--- net-p2p/bittorrent/bittorrent-3.4.2.ebuild | 4 ++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/net-p2p/bittorrent/ChangeLog b/net-p2p/bittorrent/ChangeLog index 3212a93f7678..f67cd460910e 100644 --- a/net-p2p/bittorrent/ChangeLog +++ b/net-p2p/bittorrent/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/bittorrent # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.36 2004/10/11 21:16:26 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/ChangeLog,v 1.37 2004/11/23 18:43:53 squinky86 Exp $ + + 23 Nov 2004; Jon Hood bittorrent-3.4.1a.ebuild, + bittorrent-3.4.2-r1.ebuild, bittorrent-3.4.2-r2.ebuild, + bittorrent-3.4.2.ebuild: + Fix wxpython dependency; thanks pythonhead, #71075, mark 3.4.2-r2 stable + on x86. *bittorrent-3.4.2-r2 (11 Oct 2004) diff --git a/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild b/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild index eac5f7d39305..c17d60a01104 100644 --- a/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild +++ b/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild,v 1.4 2004/07/03 12:04:30 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.1a.ebuild,v 1.5 2004/11/23 18:43:53 squinky86 Exp $ inherit distutils @@ -18,7 +18,7 @@ KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64" IUSE="X" -RDEPEND="X? ( >=dev-python/wxpython-2.2 ) +RDEPEND="X? ( =dev-lang/python-2.1 !virtual/bittorrent" DEPEND="${RDEPEND} diff --git a/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild index d124e516e58f..7aed5d502383 100644 --- a/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild +++ b/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild,v 1.3 2004/08/19 11:45:39 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r1.ebuild,v 1.4 2004/11/23 18:43:53 squinky86 Exp $ inherit distutils @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="x86 ~ppc sparc ~alpha ~arm ~amd64" IUSE="X" -RDEPEND="X? ( >=dev-python/wxpython-2.2 ) +RDEPEND="X? ( =dev-lang/python-2.1 !virtual/bittorrent" DEPEND="${RDEPEND} diff --git a/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild index 27902776dfde..e20fe79f0252 100644 --- a/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild +++ b/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild,v 1.1 2004/10/11 21:16:26 squinky86 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2-r2.ebuild,v 1.2 2004/11/23 18:43:53 squinky86 Exp $ inherit distutils @@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" LICENSE="MIT" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64" +KEYWORDS="x86 ~ppc ~sparc ~alpha ~arm ~amd64" IUSE="X" -RDEPEND="X? ( >=dev-python/wxpython-2.2 ) +RDEPEND="X? ( =dev-lang/python-2.1 !virtual/bittorrent" DEPEND="${RDEPEND} diff --git a/net-p2p/bittorrent/bittorrent-3.4.2.ebuild b/net-p2p/bittorrent/bittorrent-3.4.2.ebuild index 02965f0c079b..afce0b72e95a 100644 --- a/net-p2p/bittorrent/bittorrent-3.4.2.ebuild +++ b/net-p2p/bittorrent/bittorrent-3.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2.ebuild,v 1.6 2004/07/23 01:24:31 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittorrent/bittorrent-3.4.2.ebuild,v 1.7 2004/11/23 18:43:53 squinky86 Exp $ inherit distutils @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="x86 ~ppc sparc ~alpha arm ~amd64" IUSE="X" -RDEPEND="X? ( >=dev-python/wxpython-2.2 ) +RDEPEND="X? ( =dev-lang/python-2.1 !virtual/bittorrent" DEPEND="${RDEPEND} -- 2.26.2