diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
commit | e3872864be25f7421015bef2732fa57c0c9fb726 (patch) | |
tree | 9cb29a544215119b5c5538e37211b994ce1c87ae /games-puzzle/brainworkshop | |
parent | 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff) |
gentoo resync : 04.08.2018
Diffstat (limited to 'games-puzzle/brainworkshop')
6 files changed, 95 insertions, 78 deletions
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest index 02da8edfd58c..f44cb6d493ff 100644 --- a/games-puzzle/brainworkshop/Manifest +++ b/games-puzzle/brainworkshop/Manifest @@ -1,4 +1,4 @@ -AUX brainworkshop-4.8.4-fix-paths.patch 473 BLAKE2B 703ef1f87fe646b361fb9cb4e783cb33ebe1338a88c5c3cd464675a3a39cda954f7ac7396a3e6844bbce78d93d7d83f7f87a66e971ddee8feee0176e8660a5fb SHA512 858e837e001db04efd9a3c420860821e02ca9b7ef7197a8fe69221d0135f11a05cb6f2f9b4c19cd9eeec84c84ec5842c7e8126f08dc94f9ff79569f580f9d515 -DIST brainworkshop-4.8.4.zip 9373980 BLAKE2B 85af1f17755f0007f01c1684f4d746de6bab6580ed29c717e9462f8dd57115ce8ed7d2d61a411523e2d92191abe5a49d29b2598e937b014e68b3e1cb9ac3e059 SHA512 d3819036fef98fab9a89637ba01b2d844146babc7cb34b6ec6f4a589c18a7532fd23cf083c867ea1c917df9d7a6507ab51a5942e745d3ab9d01d938812486936 -EBUILD brainworkshop-4.8.4.ebuild 1238 BLAKE2B 2eb5ac9efd7a04445b1893ba33e3e7efc29777079c048a93f8827238964576b46724acb6f5edc09a7ec5c9dabf2cc4f9a372fac5fd785ec59eb9f6da71656974 SHA512 2a0b06c445c5da235da3da51672b2377c0a94b58ff1d7b2299f7763d8ed3f498a6593747b2203f8757319e27ad5230fd56670b11c0070fe013c68074e4ec1d05 -MISC metadata.xml 336 BLAKE2B 23696671d75d4a994a40ad18a57fdf4551932540ab62d153cfa0d41dafb59bec11466e0d8c14b3ff25ca1ed085e71f86d74aea672b56d9c53fa01d8d35243b7e SHA512 75e98aaef9436c2e488b304a19cfcaa1659748c97209ad217708046516aa4a76d9ac18c3c4762db08c496efe21a7ed5006bd4b2100989adb2b7fa0b9a8372b12 +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 +MISC metadata.xml 395 BLAKE2B a3f578a832b020cd1cb4f4dba3ce03e62081a44fa5402d66e907da7ec73462c6bc14932ca13222ea69ae3c38ef6c84790b793e0c992a617896a7f7dcbb348881 SHA512 b80e67f4bc7b85a5eeddc36d5a17b440a65f71422d42428ca95af5533243aa71bc5bda20e49404d03f7bb02d75752ec432fa80508f1bc0a59d295d146cf2b629 diff --git a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild deleted file mode 100644 index e454d7dd3448..000000000000 --- a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils gnome2-utils python-r1 games - -DESCRIPTION="Short-term-memory training N-Back game" -HOMEPAGE="http://brainworkshop.sourceforge.net/" -SRC_URI="mirror://sourceforge/brainworkshop/${P}.zip" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/pyopenal - || ( >=dev-python/pyglet-1.1.4[openal] - >=dev-python/pyglet-1.1.4[alsa] )" -DEPEND="app-arch/unzip" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${P}-fix-paths.patch - edos2unix ${PN}.pyw - - sed -i \ - -e 's#@GENTOO_DATADIR@#'${GAMES_DATADIR}'#' \ - ${PN}.pyw || die -} - -src_install() { - newgamesbin ${PN}.pyw ${PN} - python_replicate_script "${D}${GAMES_BINDIR}"/${PN} - insinto "${GAMES_DATADIR}"/${PN} - doins -r res/* - dodoc Readme.txt data/Readme-stats.txt - newicon -s 48 res/misc/brain/brain.png ${PN}.png - make_desktop_entry ${PN} "Brain Workshop" - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild b/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild new file mode 100644 index 000000000000..2783a034d990 --- /dev/null +++ b/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_6 ) +inherit eutils gnome2-utils python-r1 + +COMMIT="c5343cb3d828e8181ffff8249f683fce2fcca6db" +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" +LICENSE="GPL-3" +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] )" + +S="${WORKDIR}/${PN}-${COMMIT}" + +PATCHES=( + "${FILESDIR}"/${PN}-${PV%_*}-fix-paths.patch +) + +src_prepare() { + edos2unix ${PN}.pyw + default + + sed -i \ + "s#@GENTOO_DATADIR@#${EPREFIX}/usr/share/${PN}#g" \ + ${PN}.pyw || die +} + +src_install() { + newbin ${PN}.pyw ${PN} + python_replicate_script "${ED}"usr/bin/${PN} + + insinto /usr/share/${PN} + doins -r res/* + + dodoc Readme.md Readme-{instructions,resources}.txt data/Readme-stats.txt + + 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-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) diff --git a/games-puzzle/brainworkshop/metadata.xml b/games-puzzle/brainworkshop/metadata.xml index c0fd59a21391..91d27f3c24f6 100644 --- a/games-puzzle/brainworkshop/metadata.xml +++ b/games-puzzle/brainworkshop/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Games Project</name> </maintainer> <upstream> + <remote-id type="github">samcv/brainworkshop</remote-id> <remote-id type="sourceforge">brainworkshop</remote-id> </upstream> </pkgmetadata> |