gentoo resync : 25.04.2020

3 files changed, 20 insertions, 43 deletions

diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
index f44cb6d493ff..ac390c845133 100644
--- a/games-puzzle/brainworkshop/Manifest
+++ b/games-puzzle/brainworkshop/Manifest
@@ -1,4 +1,4 @@
-AUX brainworkshop-5-fix-paths.patch 1190 BLAKE2B c340b1c218cfffd19e6c2845ef2f1a65600ecd5ab64570265f2749ac3beb4c9652bc7063aeba97cc4349cf8c45d21c7a5f284325ece7a52b39df1af5460d7ac4 SHA512 90cacbec87c731e539773f7c4dd4d4c5200259a41db7eba45d0e2f60f87d09868ee31c04ae693049e82286543f27494d33d28ea1701e39f27ce742eebc6d5183
-DIST brainworkshop-5_beta20180712.tar.gz 8001699 BLAKE2B 0bf6114d89ab39a79e7659f6fb76d1e1cb21624a014381fc73bf6ca56f2bd721c192bc89e42b147666dd6fb7d0f6df12c60230dc3bf17b75d68f3fba1ea58b99 SHA512 5733daefd79f77c0eadcf7cec03d1cd3658ca8f79b23705f763ba5b15cf44d2f67861852287a3998c101072a7dfae20304508bf68cd728f27e2051271a16464f
-EBUILD brainworkshop-5_beta20180712.ebuild 1295 BLAKE2B da3ddb6fa303ff4cec953303d30e913094b31d0ed333c76a5dff6589e414d5ab7f5dc5a749cf98b818e901333b282e1c5f49501e837a2c9beab0edffffc4e0b4 SHA512 7299aa61c91eb414c00f140bba38e76487f19f7bc3b0499d36575fc36c095b53f2708a328b1b41b31a1f08a7e6d8aa8f0c894cef7bf7fc55ea4ffe39196519fe
+AUX brainworkshop-5-fix-paths.patch 411 BLAKE2B e0243d2d6485ac0363505f604277adff228956591818333942b7a2c4e42f7392e49245fad58ff4f063fd25e2da9a6cfefe178e31566e737f18a1c79ab4a81a25 SHA512 2562fc3b436066c16cf3157ee4adc4ab390981eb5c3db8751848f4d30e1f780b74be78366ac578b5d44c553d488e51752ded6e5308503c7e5095a653881361f0
+DIST brainworkshop-5_beta20200310.tar.gz 8001718 BLAKE2B ec3ef92d169956cb9334230e60b5e2c370154c11640daa3201b56654cd402ecba37d3bd1e3ff95339b351bd8984fb84a6bab72bf9f752175d0fb3ae1d989ba10 SHA512 f061ef005ac5f1c8b3fe1f23d847852730a9402bfa6be83946b2cd1f3a352a7a6eb67b73c81506f082fe2ae590598435736a36c87513a11b87f3e8237a296669
+EBUILD brainworkshop-5_beta20200310.ebuild 1138 BLAKE2B 4aee5be97a1b54e103d67f2b1c8849b5847af7c0f4965408b30906ff60f87d04be1528e3a828c84fcff77c0f6553f6c0f80dbba4ce6f6789391ccd2167cc5326 SHA512 2719c00f51ad7f0abf6cd051b7416c96bcd041f88e1dcce6a998fb4804f711524b86915c9dc7682eae3e0a8f5f9d11009de8457af0f4e6231b5063b1a5820e03
 MISC metadata.xml 395 BLAKE2B a3f578a832b020cd1cb4f4dba3ce03e62081a44fa5402d66e907da7ec73462c6bc14932ca13222ea69ae3c38ef6c84790b793e0c992a617896a7f7dcbb348881 SHA512 b80e67f4bc7b85a5eeddc36d5a17b440a65f71422d42428ca95af5533243aa71bc5bda20e49404d03f7bb02d75752ec432fa80508f1bc0a59d295d146cf2b629
diff --git a/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
index 2783a034d990..145e5021f07f 100644
--- a/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-inherit eutils gnome2-utils python-r1
+PYTHON_COMPAT=( python3_{7,8} )
 
-COMMIT="c5343cb3d828e8181ffff8249f683fce2fcca6db"
+inherit desktop eutils python-single-r1 xdg
+
+COMMIT="ea817f7e163c4fb07a60b2066c694cba92d23818"
 DESCRIPTION="Short-term-memory training N-Back game"
 HOMEPAGE="https://github.com/samcv/brainworkshop"
 SRC_URI="https://github.com/samcv/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -15,9 +16,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	|| ( >=dev-python/pyglet-1.1.4[${PYTHON_USEDEP},openal]
-		 >=dev-python/pyglet-1.1.4[${PYTHON_USEDEP},alsa] )"
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pyglet-1.5[${PYTHON_USEDEP},sound]
+	')
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
@@ -35,8 +43,7 @@ src_prepare() {
 }
 
 src_install() {
-	newbin ${PN}.pyw ${PN}
-	python_replicate_script "${ED}"usr/bin/${PN}
+	python_newscript ${PN}.pyw ${PN}
 
 	insinto /usr/share/${PN}
 	doins -r res/*
@@ -46,7 +53,3 @@ src_install() {
 	newicon -s 48 res/misc/brain/brain.png ${PN}.png
 	make_desktop_entry ${PN} "Brain Workshop"
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
index 0ecf099ff6b9..5e720d5cf8ba 100644
--- a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
+++ b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
@@ -1,15 +1,6 @@
 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
@@ -19,20 +10,3 @@ diff -Naur a/brainworkshop.pyw b/brainworkshop.pyw
  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)