1 |
commit: 2282e0a754928f130079deebcd8e711a262db600 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jan 28 13:59:01 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 9 19:55:00 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2282e0a7 |
7 |
|
8 |
net-misc/electrum: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/10925 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
net-misc/electrum/files/2.8.0-no-user-root.patch | 15 -------------- |
15 |
.../electrum/files/3.1.1-pip-optional-pkgs.patch | 12 ----------- |
16 |
net-misc/electrum/files/3.1.2-desktop.patch | 21 -------------------- |
17 |
.../electrum/files/3.2.2-pip-optional-pkgs.patch | 23 ---------------------- |
18 |
4 files changed, 71 deletions(-) |
19 |
|
20 |
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 |
21 |
deleted file mode 100644 |
22 |
index 2ca5363effe..00000000000 |
23 |
--- a/net-misc/electrum/files/2.8.0-no-user-root.patch |
24 |
+++ /dev/null |
25 |
@@ -1,15 +0,0 @@ |
26 |
---- ./setup.py.orig 2017-01-06 19:17:44.294137848 +0000 |
27 |
-+++ ./setup.py 2017-01-06 19:17:50.093161327 +0000 |
28 |
-@@ -21,12 +21,6 @@ |
29 |
- parser.add_argument('--root=', dest='root_path', metavar='dir', default='/') |
30 |
- opts, _ = parser.parse_known_args(sys.argv[1:]) |
31 |
- usr_share = os.path.join(sys.prefix, "share") |
32 |
-- if not os.access(opts.root_path + usr_share, os.W_OK) and \ |
33 |
-- not os.access(opts.root_path, os.W_OK): |
34 |
-- if 'XDG_DATA_HOME' in os.environ.keys(): |
35 |
-- usr_share = os.environ['XDG_DATA_HOME'] |
36 |
-- else: |
37 |
-- usr_share = os.path.expanduser('~/.local/share') |
38 |
- data_files += [ |
39 |
- (os.path.join(usr_share, 'applications/'), ['electrum.desktop']), |
40 |
- ] |
41 |
|
42 |
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 |
43 |
deleted file mode 100644 |
44 |
index d8d8a1355f2..00000000000 |
45 |
--- a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch |
46 |
+++ /dev/null |
47 |
@@ -1,12 +0,0 @@ |
48 |
-diff -Naur Electrum-3.1.1.orig/setup.py Electrum-3.1.1/setup.py |
49 |
---- Electrum-3.1.1.orig/setup.py 2018-03-12 13:25:11.000000000 -0400 |
50 |
-+++ Electrum-3.1.1/setup.py 2018-03-17 17:49:54.481961514 -0400 |
51 |
-@@ -86,8 +86,3 @@ |
52 |
- url="https://electrum.org", |
53 |
- long_description="""Lightweight Bitcoin Wallet""" |
54 |
- ) |
55 |
-- |
56 |
--# Optional modules (not required to run Electrum) |
57 |
--import pip |
58 |
--opt_modules = requirements_hw + ['pycryptodomex'] |
59 |
--[ pip.main(['install', m]) for m in opt_modules ] |
60 |
|
61 |
diff --git a/net-misc/electrum/files/3.1.2-desktop.patch b/net-misc/electrum/files/3.1.2-desktop.patch |
62 |
deleted file mode 100644 |
63 |
index 2c271dd60d8..00000000000 |
64 |
--- a/net-misc/electrum/files/3.1.2-desktop.patch |
65 |
+++ /dev/null |
66 |
@@ -1,21 +0,0 @@ |
67 |
-diff -Naur Electrum-3.1.2.orig/electrum.desktop Electrum-3.1.2/electrum.desktop |
68 |
---- Electrum-3.1.2.orig/electrum.desktop 2018-03-24 06:42:16.000000000 -0400 |
69 |
-+++ Electrum-3.1.2/electrum.desktop 2018-04-01 08:37:43.362027638 -0400 |
70 |
-@@ -3,7 +3,7 @@ |
71 |
- |
72 |
- [Desktop Entry] |
73 |
- Comment=Lightweight Bitcoin Client |
74 |
--Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum %u' |
75 |
-+Exec=electrum %u |
76 |
- GenericName[en_US]=Bitcoin Wallet |
77 |
- GenericName=Bitcoin Wallet |
78 |
- Icon=electrum |
79 |
-@@ -14,8 +14,4 @@ |
80 |
- Terminal=false |
81 |
- Type=Application |
82 |
- MimeType=x-scheme-handler/bitcoin; |
83 |
--Actions=Testnet; |
84 |
- |
85 |
--[Desktop Action Testnet] |
86 |
--Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum --testnet %u' |
87 |
--Name=Testnet mode |
88 |
|
89 |
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 |
90 |
deleted file mode 100644 |
91 |
index 0f54f477adc..00000000000 |
92 |
--- a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch |
93 |
+++ /dev/null |
94 |
@@ -1,23 +0,0 @@ |
95 |
-diff -Naur Electrum-3.2.2.orig/setup.py Electrum-3.2.2/setup.py |
96 |
---- Electrum-3.2.2.orig/setup.py 2018-07-01 08:00:11.000000000 -0400 |
97 |
-+++ Electrum-3.2.2/setup.py 2018-07-16 14:09:10.790238994 -0400 |
98 |
-@@ -40,19 +40,10 @@ |
99 |
- (os.path.join(usr_share, icons_dirname), ['icons/electrum.png']) |
100 |
- ] |
101 |
- |
102 |
--extras_require = { |
103 |
-- 'hardware': requirements_hw, |
104 |
-- 'fast': ['pycryptodomex'], |
105 |
-- ':python_version < "3.5"': ['typing>=3.0.0'], |
106 |
--} |
107 |
--extras_require['full'] = extras_require['hardware'] + extras_require['fast'] |
108 |
-- |
109 |
-- |
110 |
- setup( |
111 |
- name="Electrum", |
112 |
- version=version.ELECTRUM_VERSION, |
113 |
- install_requires=requirements, |
114 |
-- extras_require=extras_require, |
115 |
- packages=[ |
116 |
- 'electrum', |
117 |
- 'electrum_gui', |