gentoo resync : 25.04.2020

4 files changed, 2 insertions, 154 deletions

diff --git a/net-p2p/bittornado/Manifest b/net-p2p/bittornado/Manifest
index 92cccc19bb01..f1876f75cf0f 100644
--- a/net-p2p/bittornado/Manifest
+++ b/net-p2p/bittornado/Manifest
@@ -1,8 +1,5 @@
-AUX bittornado-0.3.18-wxversion.patch 2808 BLAKE2B 3ae6ae4b7ef5707ff84bf288a62dbbf8f8f8b2c0fc0b96c5d71f03d8cb7cbb2ef77cf970031154c23e726367c86863847e0af233d1edc4bc192168d0e23f5313 SHA512 df826f65f23be2b0c288666a57f755ad99e202f621143225ef232131bb821697b5e0bf8f3c9c7ee18644ca637c5172a0de3f88090a0bb413a99e23b6f9e36635
 AUX bttrack.conf 613 BLAKE2B ad791caf43fc5cf0e22f8fd01acab3d2f93feb827d64e07a1d61f24415e77acdbbea01104e32a13596bdd29dc1493b6f518ffbf1b695f24b46354b5c321edb3c SHA512 62d63735f3329cca879aff33d64b2ab5bd12ea99ca94fe581980382dbf8a12a25ef39c8adcbdd45295ea9055fbe2e156473e072081618cb6175a77434ad0f8a4
 AUX bttrack.rc 519 BLAKE2B 829b1a4cdb29bae41e25e832d7383ea4fda3ec2473d6d9bebc2738f126c9c95a937cbce0473bf5cf3a049b75e00a0301c3d8b1179c8c46db5f327e467977d9bc SHA512 74255a6dae0d5b1b5809dd6b7b792bb1f681d9c002dd64c0b633e4c903af8748922abe4521d0e52f23ad2d1f12066bf6a2eec1ad8112251e081f07002609eae0
-DIST BitTornado-0.3.18.tar.gz 189227 BLAKE2B 96a273c6f1072a19a0853cb0f0c16165432670927588f3422e680580e7d31a76b1b06b8e8a806676eb2f0cdfe0d4c785c389f07cb7a4690feb57cbac9c45c28f SHA512 61a55726d93ddb245e18e47f41dea982b8faa7d3296c3a7221d00e0fe71db772613c3ee113bb7df18390807dda8c77859ed7159a03535446ca417a1344e3c0d6
 DIST BitTornado-0.4.1_p20160925.tar.gz 164352 BLAKE2B 34cebe27ab0cb18a960ef830311ffa47f2064c83768a9a011dcd9e45e9460b60438e159824eaf9cf844d7c5604a9de832e6a85cea3335d9e6223c31e7b349014 SHA512 09971cc5705c421c4440cd51b9aa37da9f8ce992a882d342c0547fe1771199fa61c4924f6d6cd321776f9dcefafd3e244b9cbfce047c4cdd4502dd0a1a1fdaaa
-EBUILD bittornado-0.3.18-r4.ebuild 1447 BLAKE2B fa9a63bdfd2cf87a1759b9bdcd4021a5d72d6cf194620896cd8ddb1ff7b868fa3bc0a82b07caeba314da2070d89fc4821d15c4e919a9ab1fa433414a16c05d50 SHA512 4f2892e4eceef2be666aeea28152be6a8bd1fcec18f54021ebbea699991b5bef44fa6cfc92dd0867dce7c0ae79dc05db325fc4f907d21d72eddb08d75ebdd070
-EBUILD bittornado-0.4.1_p20160925-r1.ebuild 1391 BLAKE2B b11f762b1fb9c397825a5fb4c69cd97c167eba0fa4460bf8fb5d97e4c8fbbeb1fb26f3bafe06c9e90fb85b69324b22bca9aeb642497f61b40cbf001bfd2365bd SHA512 5e810fffd06e8ea93a1e91b4378129107c50036cfa9e23cf7f2beb93c2e7645e5dc7a2637105857b19177697e9850ddb4ac5849b51cc2143392118765f1bb8b3
+EBUILD bittornado-0.4.1_p20160925-r2.ebuild 1341 BLAKE2B 9169415d46bf1d47b731def8ef03d112a4aa2baa4f6696670a1c8bf539ce0306c413892fbcfef1c42c8ad82a0e87c4205d373b97c8e7f098f834cabeb666cd74 SHA512 d9ff1e7c9008ccb8c5038ca07248e3d6b836685a93e73a1b9b237474550e47a4bbc859e4dda3def1277750eea1d1de9ce4d81c8e64af5540d60009666ec45b4b
 MISC metadata.xml 302 BLAKE2B dee7f2a91d0302a9476d974057446af53bcd7cc74269dde75af61e5d6f824c697b0feadd4014c262ac4350511f797a60db656f45981d037125f0926f6bac569e SHA512 a2ed81559aad97406f1099fba266a7a2fa9d97013f267cfc9df5139ebde26495f103f1118fc0b2af825e281b026c434d11300e545aef9eed07b65eb504b47e67
diff --git a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild b/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
deleted file mode 100644
index fe11296fb4d2..000000000000
--- a/net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# note: wxGTK interface has been removed wrt #391685. this ebuild is only for
-# cmdline tools as is.
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=BitTornado
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="TheShad0w's experimental BitTorrent client"
-HOMEPAGE="http://www.bittornado.com/"
-SRC_URI="http://download2.bittornado.com/download/${MY_P}.tar.gz"
-# GPL-2 is just for the init script from FILESDIR.
-LICENSE="MIT GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-apps/sed-4.0.5"
-
-S=${WORKDIR}/${MY_PN}-CVS
-PIXMAPLOC=/usr/share/pixmaps/bittornado
-
-python_prepare_all() {
-	# fixes wrong icons path
-	sed -i "s:os.path.abspath(os.path.dirname(os.path.realpath(sys.argv\[0\]))):\"${PIXMAPLOC}/\":" btdownloadgui.py
-	# Needs wxpython-2.6 only, bug #201247
-	eapply "${FILESDIR}"/${P}-wxversion.patch
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# get rid of any reference to the not-installed gui version
-	rm "${ED%/}"/usr/bin/*gui.py || die
-	rm "${D}/$(python_get_scriptdir)"/*gui.py || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}"/bttrack.conf bttrack
-	newinitd "${FILESDIR}"/bttrack.rc bttrack
-}
diff --git a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r2.ebuild
index 7bb9680339b4..06c3058b021a 100644
--- a/net-p2p/bittornado/bittornado-0.4.1_p20160925-r1.ebuild
+++ b/net-p2p/bittornado/bittornado-0.4.1_p20160925-r2.ebuild
@@ -23,10 +23,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)"
+	dev-python/pycryptodome[${PYTHON_USEDEP}]"
 # Block dev-python/pytest-testmon for bug #693508.
 DEPEND="test? (
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/net-p2p/bittornado/files/bittornado-0.3.18-wxversion.patch b/net-p2p/bittornado/files/bittornado-0.3.18-wxversion.patch
deleted file mode 100644
index 357396303484..000000000000
--- a/net-p2p/bittornado/files/bittornado-0.3.18-wxversion.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -Naur BitTornado-CVS-orig/btcompletedirgui.py BitTornado-CVS/btcompletedirgui.py
---- BitTornado-CVS-orig/btcompletedirgui.py	2006-12-23 12:20:52.000000000 -0600
-+++ BitTornado-CVS/btcompletedirgui.py	2007-12-04 11:09:36.000000000 -0600
-@@ -19,12 +19,16 @@
- import sys
- from os import getcwd
- from os.path import join
-+
- try:
--    from wxPython.wx import *
--except:
--    print 'wxPython is either not installed or has not been installed properly.'
-+    import wxversion
-+    wxversion.select("2.6")
-+except Exception, e:
-+    print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
-     sys.exit(1)
- 
-+from wxPython.wx import *
-+
- try:
-     True
- except:
-diff -Naur BitTornado-CVS-orig/btdownloadgui.py BitTornado-CVS/btdownloadgui.py
---- BitTornado-CVS-orig/btdownloadgui.py	2007-12-04 11:06:58.000000000 -0600
-+++ BitTornado-CVS/btdownloadgui.py	2007-12-04 11:10:36.000000000 -0600
-@@ -18,10 +18,13 @@
- assert version >= '2', "Install Python 2.0 or greater"
- 
- try:
--    from wxPython.wx import *
--except:
--    print 'wxPython is either not installed or has not been installed properly.'
--    exit(1)
-+    import wxversion
-+    wxversion.select("2.6")
-+except Exception, e:
-+    print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
-+    sys.exit(1)
-+
-+from wxPython.wx import *
- from BitTornado.download_bt1 import BT1Download, defaults, parse_params, get_usage, get_response
- from BitTornado.RawServer import RawServer, UPnP_ERROR
- from random import seed
-diff -Naur BitTornado-CVS-orig/btmaketorrentgui.py BitTornado-CVS/btmaketorrentgui.py
---- BitTornado-CVS-orig/btmaketorrentgui.py	2006-12-23 12:20:56.000000000 -0600
-+++ BitTornado-CVS/btmaketorrentgui.py	2007-12-04 11:11:30.000000000 -0600
-@@ -21,12 +21,16 @@
- import sys
- from os import getcwd
- from os.path import join, isdir
-+
- try:
--    from wxPython.wx import *
--except:
--    print 'wxPython is either not installed or has not been installed properly.'
-+    import wxversion
-+    wxversion.select("2.6")
-+except Exception, e:
-+    print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
-     sys.exit(1)
- 
-+from wxPython.wx import *
-+
- try:
-     True
- except:
-diff -Naur BitTornado-CVS-orig/bt-t-make.py BitTornado-CVS/bt-t-make.py
---- BitTornado-CVS-orig/bt-t-make.py	2006-12-23 12:20:52.000000000 -0600
-+++ BitTornado-CVS/bt-t-make.py	2007-12-04 11:14:35.000000000 -0600
-@@ -22,12 +22,16 @@
- from os import getcwd, listdir
- from os.path import join, isdir
- from traceback import print_exc
-+
- try:
--    from wxPython.wx import *
--except:
--    print 'wxPython is either not installed or has not been installed properly.'
-+    import wxversion
-+    wxversion.select("2.6")
-+except Exception, e:
-+    print >> sys.stderr, "%s: wxPython 2.6 not installed." %e
-     sys.exit(1)
- 
-+from wxPython.wx import *
-+
- try:
-     True
- except: