gentoo resync : 02.04.2018

3 files changed, 51 insertions, 0 deletions

diff --git a/net-misc/electrum/files/3.1.2-desktop.patch b/net-misc/electrum/files/3.1.2-desktop.patch
new file mode 100644
index 000000000000..2c271dd60d88
--- /dev/null
+++ b/net-misc/electrum/files/3.1.2-desktop.patch
@@ -0,0 +1,21 @@
+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.1.2-no-user-root.patch b/net-misc/electrum/files/3.1.2-no-user-root.patch
new file mode 100644
index 000000000000..0d4781717714
--- /dev/null
+++ b/net-misc/electrum/files/3.1.2-no-user-root.patch
@@ -0,0 +1,17 @@
+diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
+--- Electrum-3.1.2.orig/setup.py	2018-03-28 04:51:11.000000000 -0400
++++ Electrum-3.1.2/setup.py	2018-03-31 15:05:45.540757981 -0400
+@@ -28,13 +28,6 @@
+     opts, _ = parser.parse_known_args(sys.argv[1:])
+     usr_share = os.path.join(sys.prefix, "share")
+     icons_dirname = 'pixmaps'
+-    if not os.access(opts.root_path + usr_share, os.W_OK) and \
+-       not os.access(opts.root_path, os.W_OK):
+-        icons_dirname = 'icons'
+-        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']),
+         (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
diff --git a/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
new file mode 100644
index 000000000000..f5e0015a7dff
--- /dev/null
+++ b/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
@@ -0,0 +1,13 @@
+diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
+--- Electrum-3.1.2.orig/setup.py	2018-03-31 15:08:48.919694817 -0400
++++ Electrum-3.1.2/setup.py	2018-03-31 15:09:28.738594744 -0400
+@@ -37,9 +37,6 @@
+     name="Electrum",
+     version=version.ELECTRUM_VERSION,
+     install_requires=requirements,
+-    extras_require={
+-        'full': requirements_hw + ['pycryptodomex'],
+-    },
+     packages=[
+         'electrum',
+         'electrum_gui',