[gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/files/

[David Seifert]

commit:     0a1f6ff79993dc1ce9e53ec74aada1885f981ed3
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 12 15:23:11 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 22:40:27 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1f6ff7

net-misc/electrum: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6840

 net-misc/electrum/files/2.7.15-no-user-root.patch | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/net-misc/electrum/files/2.7.15-no-user-root.patch b/net-misc/electrum/files/2.7.15-no-user-root.patch
deleted file mode 100644
index e98cf30da42..00000000000
--- a/net-misc/electrum/files/2.7.15-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']),
-     ]

[gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/files/

[Aaron Bauman]

commit:     2282e0a754928f130079deebcd8e711a262db600
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jan 28 13:59:01 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 19:55:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2282e0a7

net-misc/electrum: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10925
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 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 ----------------------
 4 files changed, 71 deletions(-)

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 2ca5363effe..00000000000
--- 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 d8d8a1355f2..00000000000
--- 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 2c271dd60d8..00000000000
--- 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 0f54f477adc..00000000000
--- 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',