Fixes #56120

7 files changed, 44 insertions, 28 deletions

diff --git a/net-p2p/bittornado/ChangeLog b/net-p2p/bittornado/ChangeLog
index 8e70f730150e..747a6d5a4b61 100644
--- a/net-p2p/bittornado/ChangeLog
+++ b/net-p2p/bittornado/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for net-p2p/bittornado
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.17 2004/07/04 00:14:24 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/ChangeLog,v 1.18 2004/07/06 09:57:00 kang Exp $
 
 *bittornado-0.3.4 (04 Jul 2004)
 
+  06 Jul 2004; Guillaume Destuynder <kang@gentoo.org>
+  +files/bittornado-wxpython-pre2.5-fix.patch
+  Fixed #56120. Fixed repoman issues in all ebuilds (not listed.)
+
   04 Jul 2004; Martin Holzer <mholzer@gentoo.org> +bittornado-0.3.4.ebuild:
   Version bumped.
 
diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 27e2a9755bf6..67b2731638eb 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,10 +1,11 @@
-MD5 85522a8ddab9e7980f570451536aac45 bittornado-0.3.4.ebuild 1724
-MD5 1a3bb1e67c35af7744803b6a52d62d03 bittornado-0.3.3.ebuild 1723
-MD5 8fc8e79c527e575c6671c9ec0fc71319 bittornado-0.3.1.ebuild 1722
-MD5 3ababb841a6645eb34c98b68afce6251 bittornado-0.3.2.ebuild 1723
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 671172125c5adf534fbe71242fe2065c ChangeLog 2673
-MD5 29cd3bfcbae60e683be63fcf925d1aad files/digest-bittornado-0.3.3 68
-MD5 ab4c8a45e77ce1f1c9c2210eafe64627 files/digest-bittornado-0.3.4 68
+MD5 104fcf451aae66f22605be0bf6df25dc bittornado-0.3.1.ebuild 1733
+MD5 001278b5ef02787cea9456284858f63f ChangeLog 2837
+MD5 2572f2be36a78c93347241358cf9db93 bittornado-0.3.4.ebuild 1858
+MD5 d17973e04ef37bc8809e94f36694bd33 bittornado-0.3.3.ebuild 1734
+MD5 6f2fb3d4b4ad50d756847aa1eb886518 bittornado-0.3.2.ebuild 1734
 MD5 1254611280cd18cac6f13a32910f6223 files/digest-bittornado-0.3.1 68
 MD5 42424b1ceb30e798c909cd377fbe78f8 files/digest-bittornado-0.3.2 68
+MD5 29cd3bfcbae60e683be63fcf925d1aad files/digest-bittornado-0.3.3 68
+MD5 ab4c8a45e77ce1f1c9c2210eafe64627 files/digest-bittornado-0.3.4 68
+MD5 c7977a11c1bf8a5d7afb8772202af87d files/bittornado-wxpython-pre2.5-fix.patch 297
diff --git a/net-p2p/bittornado/bittornado-0.3.1.ebuild b/net-p2p/bittornado/bittornado-0.3.1.ebuild
index d1f7d542689d..ce85d005d911 100644
--- a/net-p2p/bittornado/bittornado-0.3.1.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.1.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/bittornado/bittornado-0.3.1.ebuild,v 1.6 2004/07/03 12:19:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.1.ebuild,v 1.7 2004/07/06 09:57:00 kang Exp $
 
 inherit distutils eutils
 
@@ -17,14 +17,14 @@ KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxpython-2.2 )
-	 >=dev-lang/python-2.0
-	 !virtual/bittorrent"
-
+	>=dev-lang/python-2.1
+	!virtual/bittorrent"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=sys-apps/sed-4.0.5"
-
 PROVIDE="virtual/bittorrent"
 
+
 S="${WORKDIR}/${MY_PN}-CVS"
 PIXMAPLOC="/usr/share/pixmaps/bittornado"
 
diff --git a/net-p2p/bittornado/bittornado-0.3.2.ebuild b/net-p2p/bittornado/bittornado-0.3.2.ebuild
index b478ae8a04a5..bf86147f69d3 100644
--- a/net-p2p/bittornado/bittornado-0.3.2.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.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/bittornado/bittornado-0.3.2.ebuild,v 1.4 2004/07/03 12:19:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.2.ebuild,v 1.5 2004/07/06 09:57:00 kang Exp $
 
 inherit distutils eutils
 
@@ -17,14 +17,14 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxpython-2.2 )
-	 >=dev-lang/python-2.0
-	 !virtual/bittorrent"
-
+	>=dev-lang/python-2.1
+	!virtual/bittorrent"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=sys-apps/sed-4.0.5"
-
 PROVIDE="virtual/bittorrent"
 
+
 S="${WORKDIR}/${MY_PN}-CVS"
 PIXMAPLOC="/usr/share/pixmaps/bittornado"
 
diff --git a/net-p2p/bittornado/bittornado-0.3.3.ebuild b/net-p2p/bittornado/bittornado-0.3.3.ebuild
index 4e0b9576ae59..790f16342ff3 100644
--- a/net-p2p/bittornado/bittornado-0.3.3.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.3.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/bittornado/bittornado-0.3.3.ebuild,v 1.2 2004/07/03 12:19:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.3.ebuild,v 1.3 2004/07/06 09:57:00 kang Exp $
 
 inherit distutils eutils
 
@@ -17,14 +17,14 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxpython-2.2 )
-	 >=dev-lang/python-2.0
-	 !virtual/bittorrent"
-
+	>=dev-lang/python-2.1
+	!virtual/bittorrent"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=sys-apps/sed-4.0.5"
-
 PROVIDE="virtual/bittorrent"
 
+
 S="${WORKDIR}/${MY_PN}-CVS"
 PIXMAPLOC="/usr/share/pixmaps/bittornado"
 
diff --git a/net-p2p/bittornado/bittornado-0.3.4.ebuild b/net-p2p/bittornado/bittornado-0.3.4.ebuild
index dbd1e2f6ed3d..78230f1c9f42 100644
--- a/net-p2p/bittornado/bittornado-0.3.4.ebuild
+++ b/net-p2p/bittornado/bittornado-0.3.4.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/bittornado/bittornado-0.3.4.ebuild,v 1.1 2004/07/04 00:14:24 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bittornado/bittornado-0.3.4.ebuild,v 1.2 2004/07/06 09:57:00 kang Exp $
 
 inherit distutils eutils
 
@@ -17,12 +17,11 @@ KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="X"
 
 RDEPEND="X? ( >=dev-python/wxpython-2.2 )
-	 >=dev-lang/python-2.0
-	 !virtual/bittorrent"
-
+	>=dev-lang/python-2.1
+	!virtual/bittorrent"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=sys-apps/sed-4.0.5"
-
 PROVIDE="virtual/bittorrent"
 
 S="${WORKDIR}/${MY_PN}-CVS"
@@ -34,6 +33,8 @@ src_unpack() {
 
 	# fixes wrong icons path
 	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" btdownloadgui.py
+	# fixes a bug with < wxpython-2.5 which is not yet available in portage
+	epatch ${FILESDIR}/${PN}-wxpython-pre2.5-fix.patch
 }
 
 src_install() {
diff --git a/net-p2p/bittornado/files/bittornado-wxpython-pre2.5-fix.patch b/net-p2p/bittornado/files/bittornado-wxpython-pre2.5-fix.patch
new file mode 100644
index 000000000000..0bde2f1c3ad9
--- /dev/null
+++ b/net-p2p/bittornado/files/bittornado-wxpython-pre2.5-fix.patch
@@ -0,0 +1,10 @@
+--- btdownloadgui.py	2004-07-06 01:28:16.384832080 +0200
++++ btdownloadgui.py	2004-07-06 01:27:43.043900672 +0200
+@@ -4,6 +4,7 @@
+ # Modifications by various people
+ # see LICENSE.txt for license information
+ 
++wxFULL_REPAINT_ON_RESIZE = 0
+ from BitTornado import PSYCO
+ if PSYCO.psyco:
+     try: