gentoo resync : 04.08.2018

2 files changed, 38 insertions, 15 deletions

diff --git a/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch b/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
deleted file mode 100644
index 061187b7cfe0..000000000000
--- a/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/brainworkshop.pyw	2010-10-15 19:06:16.529006906 +0200
-+++ b/brainworkshop.pyw	2010-10-15 19:08:17.095632136 +0200
-@@ -35,8 +35,10 @@
- NOVBO = True

- VSYNC = False

- DEBUG = False

--FOLDER_RES = 'res'

--FOLDER_DATA = 'data'

-+FOLDER_RES = '@GENTOO_DATADIR@/brainworkshop'

-+FOLDER_DATA = os.path.expanduser('~/.brainworkshop')

-+if not os.path.isdir(FOLDER_DATA):

-+	os.mkdir(FOLDER_DATA)

- CONFIGFILE = 'config.ini'

- STATS_BINARY = 'logfile.dat'

- USER = 'default'

diff --git a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
new file mode 100644
index 000000000000..0ecf099ff6b9
--- /dev/null
+++ b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
@@ -0,0 +1,38 @@
+diff -Naur a/brainworkshop.pyw b/brainworkshop.pyw
+--- a/brainworkshop.pyw	2018-07-14 19:11:17.536581902 +0100
++++ b/brainworkshop.pyw	2018-07-14 19:12:07.582695292 +0100
+@@ -41,7 +41,7 @@
+             error_msg("Expected an argument following %s" % arg)
+             exit(1)
+ 
+-import random, os, sys, imp, socket, webbrowser, time, math, traceback, datetime
++import random, os, sys, imp, socket, webbrowser, time, math, traceback, datetime, errno
+ if sys.version_info >= (3,0):
+     import urllib.request, configparser as ConfigParser
+     from io import StringIO
+@@ -173,7 +173,7 @@
+     if rtrn:
+         return rtrn
+     else:
+-        return os.path.join(get_main_dir(), FOLDER_RES)
++        return '@GENTOO_DATADIR@'
+ def edit_config_ini():
+     if sys.platform == 'win32':
+         cmd = 'notepad'
+@@ -823,7 +823,15 @@
+         f = open(os.path.join(get_data_dir(), STATS_BINARY), 'w')
+         f.close()
+ 
+-check_and_move_user_data()
++try:
++    path = get_data_dir()
++    os.makedirs(path)
++except OSError as exc:
++    if exc.errno == errno.EEXIST and os.path.isdir(path):
++        pass
++    else:
++        raise
++
+ load_last_user('defaults.ini')
+ 
+ cfg = parse_config(CONFIGFILE)