From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- net-misc/electrum/Manifest | 4 ---- net-misc/electrum/files/2.8.0-no-user-root.patch | 15 -------------- .../electrum/files/3.1.1-pip-optional-pkgs.patch | 12 ----------- net-misc/electrum/files/3.1.2-desktop.patch | 21 -------------------- .../electrum/files/3.2.2-pip-optional-pkgs.patch | 23 ---------------------- 5 files changed, 75 deletions(-) delete mode 100644 net-misc/electrum/files/2.8.0-no-user-root.patch delete mode 100644 net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch delete mode 100644 net-misc/electrum/files/3.1.2-desktop.patch delete mode 100644 net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch (limited to 'net-misc/electrum') diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index b5c084b3ab20..f116153e5e70 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,10 +1,6 @@ -AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd -AUX 3.1.1-pip-optional-pkgs.patch 473 BLAKE2B 35784d786735b277b9efd906c35f6dc843971c948590fd00f875591208076429860f7cc1c4dacfd54a78cc64daa13c071857f6745b9da3154fd72f8abcfa5b12 SHA512 6c90bd44f440a18a8b70c0f398d5e132164e1738524771b4e35bd5c80a0ec03b311f11afcb717a1bda6103fbabc6268f5fbeb987beeb9c3bd6a313745cb429c5 -AUX 3.1.2-desktop.patch 671 BLAKE2B 1be7fddfb50dccb1c4dbca8827e2a1198c926abba507c9bf593f43308e6976dddb390a5fdd74ebb9fe6df34cd806a4de7be698ad431d6abee9840ae82635b0ad SHA512 1b9040e8468279381ecd6331e98ad040f52297a7cef32586655c8ec30358e0590cdcbf6f5353b5b66e4a022ed00515a34dae45b42a80222ce0b977cb9dbdfbf7 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173 AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d1423d940a1dcc8b6700d2fc67c221250a55f14fc5df99e2d6dede27c47223755e19e48ed776eb34432c8fd173a28a4 SHA512 ffe18ebfb67f6de8456e38228cbf864afce94a686ebc11ef866f4d9f0c324b3d96b8f3a315c13bd0efba0c62f6ee2af6f093005115be3cfb4d8a284d3a236b3f AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90 -AUX 3.2.2-pip-optional-pkgs.patch 725 BLAKE2B e0e5c3de68bc838665d818db491113c700e9512b6556ed2e24744f32c24f015ea4c28e93af16c25c04121b46e1c1275552100d4e65ae0491074870e46280326a SHA512 b85e11ada7e3a5849644262acf6a771f11d457ffdf46eaaf1f61183203bf8c7f7b07da54a57849198d2ea78d2fd43962970397d93af7a125bd9d381b0894267d AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439 diff --git a/net-misc/electrum/files/2.8.0-no-user-root.patch b/net-misc/electrum/files/2.8.0-no-user-root.patch deleted file mode 100644 index 2ca5363effe7..000000000000 --- a/net-misc/electrum/files/2.8.0-no-user-root.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./setup.py.orig 2017-01-06 19:17:44.294137848 +0000 -+++ ./setup.py 2017-01-06 19:17:50.093161327 +0000 -@@ -21,12 +21,6 @@ - parser.add_argument('--root=', dest='root_path', metavar='dir', default='/') - opts, _ = parser.parse_known_args(sys.argv[1:]) - usr_share = os.path.join(sys.prefix, "share") -- if not os.access(opts.root_path + usr_share, os.W_OK) and \ -- not os.access(opts.root_path, os.W_OK): -- if 'XDG_DATA_HOME' in os.environ.keys(): -- usr_share = os.environ['XDG_DATA_HOME'] -- else: -- usr_share = os.path.expanduser('~/.local/share') - data_files += [ - (os.path.join(usr_share, 'applications/'), ['electrum.desktop']), - ] diff --git a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch deleted file mode 100644 index d8d8a1355f25..000000000000 --- a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Electrum-3.1.1.orig/setup.py Electrum-3.1.1/setup.py ---- Electrum-3.1.1.orig/setup.py 2018-03-12 13:25:11.000000000 -0400 -+++ Electrum-3.1.1/setup.py 2018-03-17 17:49:54.481961514 -0400 -@@ -86,8 +86,3 @@ - url="https://electrum.org", - long_description="""Lightweight Bitcoin Wallet""" - ) -- --# Optional modules (not required to run Electrum) --import pip --opt_modules = requirements_hw + ['pycryptodomex'] --[ pip.main(['install', m]) for m in opt_modules ] diff --git a/net-misc/electrum/files/3.1.2-desktop.patch b/net-misc/electrum/files/3.1.2-desktop.patch deleted file mode 100644 index 2c271dd60d88..000000000000 --- a/net-misc/electrum/files/3.1.2-desktop.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur Electrum-3.1.2.orig/electrum.desktop Electrum-3.1.2/electrum.desktop ---- Electrum-3.1.2.orig/electrum.desktop 2018-03-24 06:42:16.000000000 -0400 -+++ Electrum-3.1.2/electrum.desktop 2018-04-01 08:37:43.362027638 -0400 -@@ -3,7 +3,7 @@ - - [Desktop Entry] - Comment=Lightweight Bitcoin Client --Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum %u' -+Exec=electrum %u - GenericName[en_US]=Bitcoin Wallet - GenericName=Bitcoin Wallet - Icon=electrum -@@ -14,8 +14,4 @@ - Terminal=false - Type=Application - MimeType=x-scheme-handler/bitcoin; --Actions=Testnet; - --[Desktop Action Testnet] --Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum --testnet %u' --Name=Testnet mode diff --git a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch deleted file mode 100644 index 0f54f477adc6..000000000000 --- a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur Electrum-3.2.2.orig/setup.py Electrum-3.2.2/setup.py ---- Electrum-3.2.2.orig/setup.py 2018-07-01 08:00:11.000000000 -0400 -+++ Electrum-3.2.2/setup.py 2018-07-16 14:09:10.790238994 -0400 -@@ -40,19 +40,10 @@ - (os.path.join(usr_share, icons_dirname), ['icons/electrum.png']) - ] - --extras_require = { -- 'hardware': requirements_hw, -- 'fast': ['pycryptodomex'], -- ':python_version < "3.5"': ['typing>=3.0.0'], --} --extras_require['full'] = extras_require['hardware'] + extras_require['fast'] -- -- - setup( - name="Electrum", - version=version.ELECTRUM_VERSION, - install_requires=requirements, -- extras_require=extras_require, - packages=[ - 'electrum', - 'electrum_gui', -- cgit v1.2.3