gentoo resync : 04.08.2018

20 files changed, 209 insertions, 228 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index fc7e2ae8167f..ba8f268b31e0 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
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>
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
deleted file mode 100644
index 105aa905cf91..000000000000
--- a/games-puzzle/ensemblist/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ensemblist-040126-build.patch 1610 BLAKE2B 42492746d138019727da45c6f6ee89d155e73e45a1c1fd3a06a10cfd1b0639261901d52d32099f05e2633444e1cf9e445e9602c093d897ae98e89a855f4e31ef SHA512 19e9e9625786d43053a72ba633aaa08d18b7a91fe5995cb583b6830605f0ec2b37b8c002d7853db520fc7ccfc4bbe8699184d2ac69f62be51d4801b438ea6ce5
-DIST ensemblist-040126.tar.gz 1312095 BLAKE2B 715aba1d5d62b3b4f7889b87ed70f1a33441d8ce7fe878c17dbdd342b45906c9242eb34b9eca8d34f41e9146d1eceac771e28e49b209b85dac31fce8e16b21eb SHA512 59202fe3c6168cfd60a7204f64dba5ab9fec2aa80e32be2f649862cf60dd27df0a51f4359161f8ca1ab3cf541fb1ea127f4f83b2213c4cb40bf6a574c14c8052
-EBUILD ensemblist-040126.ebuild 859 BLAKE2B 7e9fd9a8d6873b8cd51a4fce1dcfb9810f88475891a195a19585feabfc7ca875cd78b92ecfc8d39f9d8f7a010854f8f5674ad9c666a16e5cabc78b730b402e21 SHA512 18e85ad3e9adb8b8793b83c30dfb791cc3a5c2e135bafb0183e9205195a662c62f81f28f991ecd36d66f55a15ad6770306be931163739279470e9def0886440d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
deleted file mode 100644
index 559fa92b6034..000000000000
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Put together several primitives to build a given shape. (C.S.G. Game)"
-HOMEPAGE="http://www.nongnu.org/ensemblist/index_en.html"
-SRC_URI="https://savannah.nongnu.org/download/ensemblist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="media-libs/freeglut
-	media-libs/libmikmod:0
-	media-libs/libpng:0
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake DATADIR="\"${GAMES_DATADIR}\"/${PN}/datas" \
-		CFLAGSLD="${LDFLAGS}"
-}
-
-src_install() {
-	dogamesbin ensemblist
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r datas
-	dodoc Changelog README
-	make_desktop_entry ${PN} Ensemblist
-	prepgamesdirs
-}
diff --git a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch b/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
deleted file mode 100644
index 42cc04070eef..000000000000
--- a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru ensemblist-040126.orig/Makefile ensemblist-040126/Makefile
---- ensemblist-040126.orig/Makefile	2004-01-26 10:37:05.000000000 -0500
-+++ ensemblist-040126/Makefile	2009-01-23 03:24:05.000000000 -0500
-@@ -1,17 +1,8 @@
- NAME=ensemblist
--CC=gcc
--ifdef DEBUG
--DATADIR=/home/rixed/src/ensemblist/datas
--COMPILE_FLAGS=-Wall -fno-builtin -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wredundant-decls -O0 -g `libmikmod-config --cflags` -DDATADIR=$(DATADIR)
--LINK_FLAGS=-g -lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lefence -lpthread
--else
- DATADIR=$(DESTDIR)/usr/share/$(NAME)
--COMPILE_FLAGS=-Wall -O3 -fomit-frame-pointer `libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR)
--LINK_FLAGS=-lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread
--endif
-+COMPILE_FLAGS=`libmikmod-config --cflags` -DDATADIR=$(DATADIR)
-+LINK_FLAGS=-L/usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread -lm
- APPLE_FRAMEWORKS=-framework GLUT -framework Cocoa -framework OpenGL
--#uncomment the following if you want to compile on MacOS/X
--#LINK_FLAGS=$(LINK_FLAGS) $(APPLE_FRAMEWORKS)
- CFILES=$(wildcard *.c)
- OFILES=$(patsubst %.c,%.o,$(CFILES))
- 
-@@ -22,15 +13,10 @@
- all: $(NAME)
- 
- $(NAME): $(OFILES)
--	@echo '$(COL)$@$(NORM)'
--	$(CC) $(COMPILE_FLAGS) $(LINK_FLAGS) $^ -o $@
--ifndef DEBUG
--	strip $(NAME)
--endif
-+	$(CC) $(CFLAGSLD) $(COMPILE_FLAGS) $^ -o $@ $(LINK_FLAGS) 
- 
- .c.o:
--	@echo '$(COL)$@$(NORM)'
--	$(CC) $(COMPILE_FLAGS) -c $<
-+	$(CC) $(CFLAGS) $(COMPILE_FLAGS) -c $<
- 
- clean:
- 	@echo '$(COL)$@$(NORM)'
diff --git a/games-puzzle/ensemblist/metadata.xml b/games-puzzle/ensemblist/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/ensemblist/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index e7ce3ce75c74..f3f27b1b7766 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-sudoku-3.24.0.tar.xz 2890256 BLAKE2B 81e8c2cf8df3a441979dfcd6d5726439231d9c4175be1fc765f02aef5bd13bee3675708cd33694f1c2a3a0097e35a83023b6add3bfe7930c4289be576fbfbf2f SHA512 3e00726be6ceebe6107f0e7c1100e1072f815dcaf0f4d5f2ce5cf75ae0393457aead001fe8b43420d20ef6e09bc8a7d6fd79d8aaa72a87c21e7c9f8d18ee0809
+DIST gnome-sudoku-3.26.0.tar.xz 2821288 BLAKE2B bb0c3269a1557d22686414dc3dd4eee4141af60e1342e498f30c0f902e8d6471dab588eeb4b302000fd5f302867edb80e966fb89f40587aa5f797c6525b0949b SHA512 d40ca96556af2d1537845554a8ee9bf4c63aa4eefd38a000d6dcffd649cdd14ee0d1fb85d128e59605714da19e6a7a02b8ca3e8d70fe9eb897b18028457f7928
 EBUILD gnome-sudoku-3.24.0.ebuild 772 BLAKE2B 7716caf3d721948cba678ee7e260aacb2defb1839c990a81d1686fcd211d48b3ff89f989e702938325a3967f8fc888af543a27fb4fe40538b2101fb2e7eed072 SHA512 b940bda715837ad7814a04e13ac1526cdd42a0c4673524783519d15e7eb91a29d0a45f5e76ec49e4b82227972f6200b1ecbf1172588fcec24bef3f9b3a58d8d5
+EBUILD gnome-sudoku-3.26.0.ebuild 774 BLAKE2B 7a4ef8c6973cae899a2f4ada9ddb261c55c7c80ebf16345defce71bfdc0832fdc7c5629df7af7d2d19a5eac2f53361533f7dd20ed214e6a3a8ad0ae2f0509305 SHA512 e00c9c95c3653464b42eabf4bd0a9893b4091d1870dd1e1deef819f32728663e28d3b6ba0743df9fe9510b6a519e8c9a63cae8c4a73e905c118b7344e34bc616
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.26.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.26.0.ebuild
new file mode 100644
index 000000000000..1b9809f4996a
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.26.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.36"
+
+inherit gnome2 vala
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libgee:0.8=[introspection]
+	dev-libs/json-glib
+	>=dev-libs/qqwing-1.3.4
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.19.0:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index c41e64f74a43..608825e04e73 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-taquin-3.22.0.tar.xz 5030156 BLAKE2B e2757fe196a985c19de5b902d866fb1e9c6f97234dc25af59db10b3c066d1095a7280a5a0054b0c15c913fa93c541f4c0626f481257ab3bfefe5db9fdf308493 SHA512 9fbfa651b2546af16ca215ce0edb4466dd3663c90bf1c130c983422a0c5860f6146db97f7d9095b727d99ee98496e3bdb02afe46c9ced66672435638ba49788a
+DIST gnome-taquin-3.28.0.tar.xz 4550056 BLAKE2B f5fd5a984bf9ae47c5cea19cc9708e00256023b16cc05dcf2d38d70dc8ae975e0386e8d9d2ff9c4f03f36f0176d67f2d275444eeb2df1b7c3e8dcafbcd97fe70 SHA512 66939b13f2e22980702dfcde9e7c93ffaf3a3d9278d9b87ded295eb9fcc7702d9e325b3a70313a8a34e12834fbe887e4e65a6b429938ad332c5958935a6b80dc
 EBUILD gnome-taquin-3.22.0.ebuild 681 BLAKE2B 548d984c52259163ab17e583ca5779f094511661e9e221e29dff65e38ffcbcf33b18747fd76283d758961abe396f2815478031ed9a4227f031ddc55a3b9bf97c SHA512 0ae6e60c94c1973c9cbe4fb842349925e15e279ddddb17f6d8fb1d9eff6da09ef501d7ed5d2e997ecd9760af0a368f25ae21738bd9b072ef59bd976dec9eb18e
+EBUILD gnome-taquin-3.28.0.ebuild 783 BLAKE2B c2acdd5f1445521dead769815f79d7c90a13ea08f3505ae3499070468dba7dcc1da38cccb44be6b7a4f6558c1023ee4ccacc578938ececa6e33f77db6d57ccd0 SHA512 e7cb35fee941bcd93f2da4414738d5b81da0176ada7cb0d69859a65ebbf72802e5b2b64de1b9acfdfdf26c75b0483ebb7a08344733f3877594b4f7bb433c8b7b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.28.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.28.0.ebuild
new file mode 100644
index 000000000000..527566355020
--- /dev/null
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.28.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 vala
+
+DESCRIPTION="Move tiles so that they reach their places"
+HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32:2
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/gtk+-3.15:3
+"
+# libxml2+gdk-pixbuf required for glib-compile-resources
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/gdk-pixbuf:2
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/hoh-bin/Manifest b/games-puzzle/hoh-bin/Manifest
deleted file mode 100644
index e966c632f3c3..000000000000
--- a/games-puzzle/hoh-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hohlin-101.tar.bz2 14808528 BLAKE2B bfa0563f900f5bf7fdb05011baddd0fcc4c1f16eb30215f9db8b539e7c1b6f11e2c978a978c989732d832e309b3f61f0ee1ac4270c45c8c7d0e82f155d987004 SHA512 38f5815d9b2356c5d566d8b5b4730e1ed24192dfb5c3fcae9096b4a2c6110de60245b13da6bffc359032165d7fc0681a6adfa3503005c9281807c4734d519c0b
-EBUILD hoh-bin-1.01.ebuild 1083 BLAKE2B 45b2b531522742a77413a42fa305052660b3d400b53d5a05a8237141d00a554fcbadc02bf17eab83e4f114dd27dffbae3bdf1741efb65c2d73c82bfb7b2654a0 SHA512 a4bcd813fdfb8b9322e359389b7b1958c889881df7be9e4736e0f556ddb21ef7db664800bc9fbfc17cb7e37a1394eeac99d48f121b95f9e4397dafd0bc4f4e5b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
deleted file mode 100644
index ad681b47a18e..000000000000
--- a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="PC remake of the spectrum game, Head Over Heels"
-HOMEPAGE="http://retrospec.sgn.net/games/hoh/"
-SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-${PV/./}.tar.bz2"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-
-S=${WORKDIR}/hoh-install-${PV}
-
-# bug #448420
-QA_PREBUILT="
-/opt/HoH/data/runtime/libstdc++-libc6.2-2.so.3
-/opt/HoH/data/HoH
-"
-
-src_compile() {
-	cat > "${T}/hoh" <<-EOF
-		#!/bin/bash
-		export LD_LIBRARY_PATH="${GAMES_PREFIX_OPT}/HoH/data/runtime"
-		cd "${GAMES_PREFIX_OPT}/HoH/data"
-		exec ./HoH \$@
-EOF
-}
-
-src_install() {
-	local DATADIR="${GAMES_PREFIX_OPT}/HoH/data"
-	local DOCDIR="${GAMES_PREFIX_OPT}/HoH/docs"
-
-	dogamesbin "${T}/hoh"
-	dodir "${DATADIR}" "${DOCDIR}"
-	cp -pPRf data/* "${D}/${DATADIR}/" || die
-	cp -pPRf docs/* "${D}/${DOCDIR}/"  || die
-	make_desktop_entry hoh "Head Over Heels"
-	prepgamesdirs
-}
diff --git a/games-puzzle/hoh-bin/metadata.xml b/games-puzzle/hoh-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/hoh-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index a41bb5a51b16..c21fe0245630 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,3 +1,5 @@
 DIST swell-foop-3.24.0.tar.xz 2313656 BLAKE2B 2a52751eb1390a7bff7956ed21058fef913e5b125f04f6415ccb9aef28cd5517d1c4683318379dafa820c8124d7798ed2142c4ed1277234d70c1b9dfe8403b86 SHA512 470bcf9715e280b9cc7bba79d1d50e924416b6d29058ba0105aee48d30ee58971262e2304610334f92f2f6a9fc6983898047d3ad05443a2cb062e15564388ab0
+DIST swell-foop-3.26.0.tar.xz 2295368 BLAKE2B 6e85f2f3a931ddb3351d8cea25dc9f03252be8bb793385a3d2dc011528590b20aa9d2261d4810b2425ce995d82df49b6e07fb471b052e79c00cd16af31f375f2 SHA512 586e41c775b7fae55c9688b4e6152efebbd02efe71c7264baa1a914b343b2779d31229a3f97cff22e1d57fe223d401e3ac3b8ae72dc1f975959fef609ac6645c
 EBUILD swell-foop-3.24.0.ebuild 666 BLAKE2B 6813c366536c6a35d6b47417d8474922ac41371d1646989393ce5ab9eb335092f79ba0c6e27cf0b4e46b1af0d41f8d3f3982c607dd9bbd33191a1add264a2a8b SHA512 195d833ba4322ebcc2c6f8a1f1bfd2e871961b8f533eebf280a14730d1eb303b6c72a1545ead8356187322d40cf55ed2447c3dc9b56267c647ad2ec5ad53b174
+EBUILD swell-foop-3.26.0.ebuild 668 BLAKE2B 1ff6a9ed8d3ea1503eeb8fc68478469b0a19ed840a9837a644c78888a79409f6af8ad94103a27b6ab94221eca44c1f560cc1fd5255bd6d4b95cae8106dd7740c SHA512 a83a1c54c93165216ec7ca4db846c3f860ffc7169e8a4e572350e1c5bf9fa9242f0a16aa75a93155ab56690c393cff8c3e25fafd920268ff84d7b7d80b819205
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/swell-foop-3.26.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.26.0.ebuild
new file mode 100644
index 000000000000..a56bce3d0246
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-3.26.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 vala
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=media-libs/clutter-1.14:1.0
+	>=media-libs/clutter-gtk-1.5:1.0
+	>=x11-libs/gtk+-3.12:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	vala_src_prepare
+}