gentoo resync : 14.07.2018

46 files changed, 1088 insertions, 119 deletions

diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 2296607cf337..26ca77a3e1a7 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/childsplay-0.90.2-r1 b/games-kids/childsplay-0.90.2-r1
deleted file mode 100644
index 2dd8b9a1c8c6..000000000000
--- a/games-kids/childsplay-0.90.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg
-DESCRIPTION=A suite of educational games for young children
-EAPI=5
-HOMEPAGE=http://childsplay.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg games-misc/games-envd
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/childsplay/childsplay-0.90.2.tgz mirror://sourceforge/childsplay/childsplay_plugins-0.90.tgz mirror://sourceforge/childsplay/childsplay_plugins_lfc-0.90.tgz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fca0498da10bbfefe527dc59f71ac51b
diff --git a/games-kids/childsplay/Manifest b/games-kids/childsplay/Manifest
new file mode 100644
index 000000000000..86962f605752
--- /dev/null
+++ b/games-kids/childsplay/Manifest
@@ -0,0 +1,7 @@
+AUX childsplay 99 BLAKE2B 3b936c64c19529eadd49f1117477bc70bfa3c478b2dc548f6bb60e7caeaf1f8dbdf50c3dd896db14799069eac24175001514fa7e37607f45846a66ec4ed656f8 SHA512 7bdd05a0e957ce09a00443d84332bbeb62016b1df4cc88e693f0714ce9ceae4b5acd4447745c98e75063d5010b27dfb8bbf1f93bf5c3c729ced5edbd4afdfef0
+AUX childsplay-0.90.2-gentoo.patch 895 BLAKE2B dd8ea9ee59ddd57cf0172197247491f91f7b8ad7e7ca0c066ac9b40599aaf8dbad2a692e507fc0c436b9ff2993ed4d6003f3fe9078a616ce02b62b2fde2e9cff SHA512 77fe4151574e0b84218fa973b5f72631b378fb24892ff35902ebc88c9f7bd54129813cb2453551034f58b96bddd79c55c00a074184acf267962c2a737f4392cf
+DIST childsplay-0.90.2.tgz 2330022 BLAKE2B 83370489c52bd62ae46aee6f2d01d5ff42c17887105c5e4b1ba2c9f95c8869b8e315447fe60f6f325d6d6479c7ebf2c82832ffadf4414419976ed1507ed0a889 SHA512 0cc59f893f43f47fec18a6ba04e3d5b4c4b41e6c387fcd64859a65a0660b4d1c8803cd092932fc9d24a4d4b9784d6cc62cc2efc4e841ca62a205f17aec8dec68
+DIST childsplay_plugins-0.90.tgz 4528735 BLAKE2B 1aacd311138c97a868cacca723941ec582ef049831ce1ddb10f2e524f1109ceb81cf4bd34d16f2c857c4ce42ac49f7f5cb9d785e229e11f540476544093e6cb1 SHA512 f1c47c544da364bde6023cf8450d96423d214749f800d783661b6fb16f73c8bbc899ee7f997f36e11b43aff7655332c29445f865ff22dd475ad4ce4a0557e763
+DIST childsplay_plugins_lfc-0.90.tgz 6159653 BLAKE2B eb117a526f6c2caf43578dc0027d8d3b2849529d132ffc55b92d59efbfc12681f31961c265b3f6ab592a17db1a05987458b265bdf68054cef16386b71d2e28a1 SHA512 4fa8f59aae64520de03fd6527dbe7339f320ef377deca19fe91cf5591b364d853cfb9d73b8469417178fcf4bc074d6ed39a1704a20cb5a82657722862c749313
+EBUILD childsplay-0.90.2-r1.ebuild 3914 BLAKE2B 1deb5b73b35c56ed2d07719db6f1aff61760aa2a8660629c68ecbf0ae23e99fc0137c427c1ffb059e669ab3919a8c9bb124759c6c01bb5bc228cb15d73b164d8 SHA512 35e0bde061f8103da30fd1112ad3132fb07f9022a35cc015c9f1f970b1dbd47c5c4186441aece5e5f1e9045af6136b3ca26f93415c134884350018c876a99543
+MISC metadata.xml 516 BLAKE2B 785e9855bda1d0268ce6328d5e01cee50332941fc73203bcb7e85678225df29ad48bc1db13c5ccddb1e6fa1bdf25418a5dc2e840eb220c6b1995cd31ddb73c2d SHA512 145c6baf1c8115b4fbf694360c48e53ab31c32ec2cc2d3b2f9bb159377f4629b827014833155f17468cb5fccc98a8bef1ef8bc6fd64dab39d1d8fdf2b16e9275
diff --git a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild b/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
new file mode 100644
index 000000000000..3c535ad41d94
--- /dev/null
+++ b/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 games
+
+DESCRIPTION="A suite of educational games for young children"
+HOMEPAGE="http://childsplay.sourceforge.net/"
+PLUGINS_VERSION="0.90"
+PLUGINS_LFC_VERSION="0.90"
+SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
+	mirror://sourceforge/childsplay/${PN}_plugins-${PLUGINS_VERSION}.tgz
+	mirror://sourceforge/childsplay/${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+	media-libs/sdl-image[gif,jpeg,png]
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+	media-libs/libogg"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	local DIR
+
+	# Copy the plugins into the main package.
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
+	mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
+	for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
+		mv ../${DIR}/Data/*.icon.png Data/icons || die
+		cp -r ../${DIR}/lib/* lib || die
+		mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
+		rm -rf ../${DIR}
+	done
+	gunzip man/childsplay.6.gz
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	python_fix_shebang .
+}
+
+src_install() {
+	local fn
+
+	# The following variables are based on Childsplay's INSTALL.sh
+	_LOCALEDIR=/usr/share/locale
+	_ASSETMLDIR=/usr/share/assetml
+	_SCOREDIR=${GAMES_STATEDIR}
+	_SCOREFILE=${_SCOREDIR}/childsplay.score
+	_CPDIR=$(games_get_libdir)/childsplay
+	_SHAREDIR=${GAMES_DATADIR}/childsplay
+	_LIBDIR=${_CPDIR}/lib
+	_MODULESDIR=${_LIBDIR}
+	_SHARELIBDATADIR=${_SHAREDIR}/lib
+	_SHAREDATADIR=${_SHAREDIR}/Data
+	_RCDIR=${_SHARELIBDATADIR}/ConfigData
+	_HOME_DIR_NAME=.childsplay
+	_CHILDSPLAYRC=childsplayrc
+
+	dodir \
+		"${_CPDIR}" \
+		"${_LIBDIR}" \
+		"${_SHAREDIR}" \
+		"${_SHARELIBDATADIR}" \
+		"${_SCOREDIR}" \
+		"${_LOCALEDIR}" \
+		"${_ASSETMLDIR}"
+
+	# create BASEPATH.py
+	cat >BASEPATH.py <<EOF
+## Automated file--please do not edit
+LOCALEDIR="${_LOCALEDIR}"
+ASSETMLDIR="${_ASSETMLDIR}"
+SCOREDIR="${_SCOREDIR}"
+SCOREFILE="${_SCOREFILE}"
+CPDIR="${_CPDIR}"
+SHAREDIR="${_SHAREDIR}"
+LIBDIR="${_LIBDIR}"
+MODULESDIR="${_MODULESDIR}"
+SHARELIBDATADIR="${_SHARELIBDATADIR}"
+SHAREDATADIR="${_SHAREDATADIR}"
+RCDIR="${_RCDIR}"
+HOME_DIR_NAME="${_HOME_DIR_NAME}"
+CHILDSPLAYRC="${_CHILDSPLAYRC}"
+EOF
+
+	# copy software and data
+	cp -r *.py "${D}/${_CPDIR}" || die "cp failed"
+	cp -r Data "${D}/${_SHAREDIR}" || die "cp failed"
+	rm "${D}/${_SHAREDIR}/Data/childsplay.score"  # this copy won't be used
+
+	for fn in $(ls lib); do
+		if [[ -d lib/${fn} ]] ; then
+			cp -r lib/${fn} "${D}/${_SHARELIBDATADIR}" || die
+		else
+			cp lib/${fn} "${D}/${_LIBDIR}" || die
+		fi
+	done
+
+	if [[ ${LINGUAS+set} ]]; then
+		for lang in $LINGUAS; do
+			[[ -d locale/$lang ]] && cp -r locale/$lang "${D}/${_LOCALEDIR}"
+		done
+	else
+		cp -r locale/* "${D}/${_LOCALEDIR}" || die
+	fi
+	cp -r assetml/* "${D}/${_ASSETMLDIR}" || die
+
+	# initialize the score file
+	cp Data/childsplay.score "${D}/${_SCOREFILE}" || die
+	SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard"
+	${PYTHON} add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
+
+	# translate for the letters game
+	${PYTHON} letters-trans.py "${D}/${_ASSETMLDIR}" << EOF
+Q
+EOF
+
+	doman man/childsplay.6
+	dodoc doc/README* doc/Changelog doc/copyright
+
+	# Make a launcher.
+	dogamesbin "${FILESDIR}"/childsplay
+	sed -i \
+		-e "s:GENTOO_DIR:${_CPDIR}:" \
+		-e "s:python:${PYTHON}:" \
+		"${D}${GAMES_BINDIR}"/childsplay \
+		|| die "sed failed"
+
+	python_optimize "${D}${_CPDIR}"
+
+	newicon assetml/childsplay/childsplay-images/chpl-icon-48.png ${PN}.png
+	make_desktop_entry childsplay Childsplay
+
+	prepgamesdirs
+	fperms g+w "${_SCOREFILE}"
+}
diff --git a/games-kids/childsplay/files/childsplay b/games-kids/childsplay/files/childsplay
new file mode 100644
index 000000000000..eccf016836d0
--- /dev/null
+++ b/games-kids/childsplay/files/childsplay
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -z "${LANGUAGE}" ] && LANGUAGE=en
+export LANGUAGE
+python GENTOO_DIR/childsplay.py "$@"
diff --git a/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch b/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch
new file mode 100644
index 000000000000..742e3e02ee3c
--- /dev/null
+++ b/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch
@@ -0,0 +1,21 @@
+--- letters-trans.py.old	2010-04-26 12:13:12.000000000 +0200
++++ letters-trans.py	2010-04-26 12:13:49.000000000 +0200
+@@ -39,7 +39,7 @@
+ import os,fnmatch,operator,sys,locale
+ from CPConstants import ASSETMLROOT
+ 
+-if os.environ['USER'] != 'root':
++if os.environ['LOGNAME'] != 'root':
+     print "\nOnly root can use this script, sorry.\n"
+     sys.exit(1)
+ 
+@@ -69,7 +69,8 @@
+     sys.exit(0)
+         
+ # get description names from memory assetml, these are the words used by letters.py
+-parser = pyassetml.AssetmlParser('childsplay/memory-136x136/memory-136x136.assetml')
++assetmlfile = os.path.join(cwd,'memory-136x136.assetml')
++parser = pyassetml.AssetmlParser(assetmlfile)
+ loc = parser.get_locale()# get current locale setting, only the first two chars !!
+ wlist_org = parser.find_names((('file','.'),('description',"en")))
+ wlist = parser.find_names((('file','.'),('description',loc)))
diff --git a/games-kids/childsplay/metadata.xml b/games-kids/childsplay/metadata.xml
new file mode 100644
index 000000000000..56a899baf102
--- /dev/null
+++ b/games-kids/childsplay/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+	<longdescription lang="en">
+Childsplay is a suite of educational games for young children, like gcompris,
+but without the overkill of c/c++ and the gnome environ.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">childsplay</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-kids/gcompris-15.10-r1 b/games-kids/gcompris-15.10-r1
deleted file mode 100644
index 2b69300de42c..000000000000
--- a/games-kids/gcompris-15.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk(+)] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl:0 ) dev-db/sqlite:3 dev-libs/libxml2 dev-libs/popt dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/libintl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/texi2html dev-perl/XML-Parser gnome-base/gnome-common sys-apps/texinfo sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=full featured educational application for children from 2 to 10
-EAPI=6
-HOMEPAGE=http://gcompris.net/
-IUSE=gstreamer python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk(+)] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl:0 ) dev-db/sqlite:3 dev-libs/libxml2 dev-libs/popt dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/libintl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/tuxpaint sci-electronics/gnucap
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://gcompris.net/download/gcompris-15.10.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9fa68d659683d60fc44dd84bcdb3772e
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
new file mode 100644
index 000000000000..c8a06f4e783d
--- /dev/null
+++ b/games-kids/gcompris/Manifest
@@ -0,0 +1,4 @@
+AUX gcompris-15.10-build.patch 2824 BLAKE2B e0d0974e06f344f7d53f37cd88b2e9200e963ede7cf128b6194527358883808a58d80478c2d9a878a7eed0ec594fa2fd87c72f0c3025d275aa5bb445c7d11457 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d
+DIST gcompris-15.10.tar.bz2 279959562 BLAKE2B f8c9287a881a98bacf9b057e518597552a2f84f8bb9143684c1f7ba8f7803589c44b383c17af5b21715f4c71c78456540c5334cea4247380d28abd161b5ae756 SHA512 1915a6934f3111e871be2777ed88c8d15a3ddb85f0c16d92333b6ebcba0cbbe526e51e84ecc576021cd807a5d69bb9570dba481ddc925da9d4dd35a0075380fc
+EBUILD gcompris-15.10-r1.ebuild 1991 BLAKE2B e026f977e1dc8d1fdfff89b0921c7581606216ccfd38157985fae43bfd82a5cee6d4429cf01a8254cbae39a51aabb78109cd5953c6b9cc787a3680504c9492ff SHA512 23980183bd8d221af17d61de9ab4471abbd1a64d5f157cb21aef94357d880919c7534f3a97a8565897a9a1019f880ff34d598a3a5398d0ca9c01119cdce49a69
+MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
diff --git a/games-kids/gcompris/files/gcompris-15.10-build.patch b/games-kids/gcompris/files/gcompris-15.10-build.patch
new file mode 100644
index 000000000000..077d1f6baf1a
--- /dev/null
+++ b/games-kids/gcompris/files/gcompris-15.10-build.patch
@@ -0,0 +1,81 @@
+--- gcompris-13.11.orig/Makefile.am
++++ gcompris-13.11/Makefile.am
+@@ -7,7 +7,7 @@
+ # endif
+ 
+ 
+-icondir=$(datadir)/pixmaps
++icondir=/usr/share/pixmaps
+ icon_DATA = gcompris.png gcompris-edit.png
+ 
+ if BUILD_MINGW32
+@@ -15,7 +15,7 @@
+ Applications_in_files =
+ Applications_DATA =
+ else
+-Applicationsdir = $(datadir)/applications/
++Applicationsdir = /usr/share/applications/
+ Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
+ Applications_DATA = gcompris.desktop gcompris-edit.desktop
+ endif
+--- gcompris-13.11.orig/configure.ac
++++ gcompris-13.11/configure.ac
+@@ -57,7 +57,8 @@
+   gtk+-2.0 >= $GTK_REQUIRED \
+   librsvg-2.0 >= $LIBRSVG_REQUIRED \
+   libxml-2.0 >= $LIBXML_REQUIRED \
+-  gthread-2.0 )
++  gthread-2.0 \
++  gmodule-2.0 )
+ 
+ AC_SUBST(GCOMPRIS_CFLAGS)
+ AC_SUBST(GCOMPRIS_LIBS)
+@@ -204,10 +205,8 @@
+           USE_DEBUG="$enableval", USE_DEBUG="no")
+ if test "x$USE_DEBUG" == "xyes" ; then
+     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
+-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -g"
+-else
+-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
+ fi
++CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
+ 
+ dnl disable activation code
+ AC_ARG_ENABLE(disable-activation-code,
+@@ -336,21 +335,21 @@
+   fi
+ else
+   dnl Set PACKAGE_LOCALE_DIR in config.h.
+-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
++  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
+ 
+   dnl Set PACKAGE_DATA_DIR
+   PACKAGE_DATA_DIR="boards"
+   AC_SUBST(PACKAGE_DATA_DIR)
+-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
++  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
+ 
+   dnl Plugin Directory
+   my_libdir=`eval echo "${libdir}"`
+-  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
++  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
+   plugindir=$libdir/gcompris
+   AC_SUBST(plugindir)
+ 
+   dnl Python plugin Directory
+-  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
++  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
+   AC_SUBST(PYTHON_PLUGIN_DIR)
+ 
+   dnl System GCompris config directory
+--- gcompris-13.11.orig/src/gcompris/gcompris.c
++++ gcompris-13.11/src/gcompris/gcompris.c
+@@ -1322,7 +1322,7 @@
+     properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
+     properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
+ 							NULL);
+-    properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
++    properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
+     properties->menu_dir = g_strdup(properties->package_data_dir);
+     g_free(pkg_data_dir);
+     g_free(pkg_clib_dir);
diff --git a/games-kids/gcompris/gcompris-15.10-r1.ebuild b/games-kids/gcompris/gcompris-15.10-r1.ebuild
new file mode 100644
index 000000000000..6d417a86f543
--- /dev/null
+++ b/games-kids/gcompris/gcompris-15.10-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="full featured educational application for children from 2 to 10"
+HOMEPAGE="http://gcompris.net/"
+SRC_URI="http://gcompris.net/download/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/librsvg[gtk(+)]
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-good:0.10
+		media-plugins/gst-plugins-alsa:0.10
+		media-plugins/gst-plugins-ogg:0.10
+		media-plugins/gst-plugins-vorbis:0.10 )
+	!gstreamer? (
+		media-libs/sdl-mixer
+		media-libs/libsdl:0 )
+	dev-db/sqlite:3
+	dev-libs/libxml2
+	dev-libs/popt
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	virtual/libintl
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/texi2html
+	dev-perl/XML-Parser
+	gnome-base/gnome-common
+	sys-apps/texinfo
+	sys-devel/gettext
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	media-gfx/tuxpaint
+	sci-electronics/gnucap"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Drop DEPRECATED flags, bug #387817
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		src/gcompris/Makefile.am || die
+
+	cp /usr/share/gettext/config.rpath .
+	eautoreconf
+
+	sed -i \
+		-e 's#^itlocaledir =.*$#itlocaledir = @localedir@#' \
+		po/Makefile.in.in || die
+
+	# Fix desktop files
+	sed -i \
+		-e '/Encoding/d' \
+		gcompris.desktop.in \
+		gcompris-edit.desktop.in || die
+}
+
+src_configure() {
+	GNUCHESS="/usr/bin/gcompris-gnuchess" \
+	econf \
+		--datarootdir="/usr/share" \
+		--datadir="/usr/share" \
+		--localedir=/usr/share/locale \
+		--infodir=/usr/share/info \
+		--with-python="${PYTHON}" \
+		$(use_enable !gstreamer sdlmixer) \
+		--enable-sqlite \
+		--enable-py-build-only
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/games-kids/gcompris/metadata.xml b/games-kids/gcompris/metadata.xml
new file mode 100644
index 000000000000..c040f7c7d3e0
--- /dev/null
+++ b/games-kids/gcompris/metadata.xml
@@ -0,0 +1,8 @@
+<?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-kids/gmult-8.0-r1 b/games-kids/gmult-8.0-r1
deleted file mode 100644
index d02bf11fe860..000000000000
--- a/games-kids/gmult-8.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Multiplication Puzzle emulates the multiplication game found in Emacs
-EAPI=6
-HOMEPAGE=http://www.mterry.name/gmult/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl
-SLOT=0
-SRC_URI=https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=70ea4d905aa8415919fa727c0dae44b9
diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest
new file mode 100644
index 000000000000..12596d91aac2
--- /dev/null
+++ b/games-kids/gmult/Manifest
@@ -0,0 +1,3 @@
+DIST gmult-8.0.tar.bz2 222981 BLAKE2B 0b70c05844f0b0db7fec77e334406dab557898240b05d2990b10e2ef398a26a2d4ad65086c635798abb66a8daefe591e908d7374840ff0886a16908e98f21564 SHA512 40c29a998d50491de8c14f7e71ad298fb69e0dc6f1f04b1f9bf35f9f72010eb085a9bc7a9efa1f3c339ea44fdeb9eec4d4f82017442c57ebc28f992bc703252f
+EBUILD gmult-8.0-r1.ebuild 741 BLAKE2B 67904c4b2287b22bb38d4f5591d7e84ba88039efc16f9b66c622b403064077b529992b41b98c28aca9f00609ebcc41aa63acfb42b26782eb8f34faabb2918157 SHA512 16ddb76af4c569196b98e6fa4e072ed0b3476b36cf986a3d408c8394c1dc4ebbebd0c58a4e7ad700ba831c85dc4c0b99b1c25b5634f0ae41bf4bcc28aa38703b
+MISC metadata.xml 326 BLAKE2B f9162abedf00b10abf4c94c73c47af36166cfcad2758e142e7bb8c12f42b59c9cc2b1565585fe59bab2c608c5f42e9d21548c1f1e4006946a9dbf287ed11e57c SHA512 f1271501c503fe7d64e69cd7729804fa3b4c0817e2cedd3b3696b919c5c67ae57917a66a326dc7501c5ced7d2e8e8c3cf40eec1a2545cb00a9226bca9ea3a5e8
diff --git a/games-kids/gmult/gmult-8.0-r1.ebuild b/games-kids/gmult/gmult-8.0-r1.ebuild
new file mode 100644
index 000000000000..b72258066123
--- /dev/null
+++ b/games-kids/gmult/gmult-8.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils flag-o-matic
+
+DESCRIPTION="Multiplication Puzzle emulates the multiplication game found in Emacs"
+HOMEPAGE="http://www.mterry.name/gmult/"
+SRC_URI="https://launchpad.net/gmult/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:3
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	append-libs -lm
+	econf # \
+		#--bindir="${GAMES_BINDIR}"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-kids/gmult/metadata.xml b/games-kids/gmult/metadata.xml
new file mode 100644
index 000000000000..f00ab510568e
--- /dev/null
+++ b/games-kids/gmult/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="launchpad">gmult</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-kids/lletters-0.1.95-r3 b/games-kids/lletters-0.1.95-r3
deleted file mode 100644
index 8f3d58cc2f79..000000000000
--- a/games-kids/lletters-0.1.95-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Game that helps young kids learn their letters and numbers
-EAPI=6
-HOMEPAGE=http://lln.sourceforge.net
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/l/lletters/lletters_0.1.95+gtk2.orig.tar.gz mirror://debian/pool/main/l/lletters/lletters_0.1.95+gtk2-3.diff.gz mirror://sourceforge/lln/lletters-media-0.1.9a.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=316b47361b5eb0afb68436012ee37d53
diff --git a/games-kids/lletters/Manifest b/games-kids/lletters/Manifest
new file mode 100644
index 000000000000..6c0b4ccbaa79
--- /dev/null
+++ b/games-kids/lletters/Manifest
@@ -0,0 +1,8 @@
+AUX lletters-0.1.95-build-2.patch 2433 BLAKE2B a69d1d3b60dbb13028241544e7b8a7c59ddf30c3910803d0c595cf97cd09b7a46091849151b436a80419fab486dcd2bfa79056e8b5f4f95cb77b1f78af4cdea4 SHA512 1eb775c132b936f205fa7606b7a3d0e05df873aab573c09e17a2c0aee922ee5fbaf46a619674509735f259bc22295ac761919ae3537d9551ab7ac1b1eb5bcf26
+AUX lletters-0.1.95-make-382.patch 798 BLAKE2B 59a265776338d806bd7f72c647254a598b50b5d5ee78cf45481c69b5afc5f86bddc41538c4e3b71e10becbf3aa725c35a4d6a1717a681936bf597473e75eae38 SHA512 f4bc71bb6b2ad619851c7bc8ff44ca1404f14c0b98ae1bc1ab8e5c0bcb286a49409f927f8d0355de7fd189223906e7243155ae1be6cab160381fc143ee843b33
+AUX lletters-0.1.95-underlink.patch 475 BLAKE2B e48275417517f6a7ce0a3a0e0b9455bbec2440e2cef46ac922ec584658ce006e8ca25bd5a269350fe62fbd98f7e7edd52f9717aa62377daf521f0fe4d710b7f2 SHA512 ecaf18f8e7d897bbeeb1dff48bf4e9174d9f87af1186f122196e1109ed09e577492be7cbc5e74edc41dbae82123a485052151f2046a607a1be068b206fc7b0fd
+DIST lletters-media-0.1.9a.tar.gz 1966275 BLAKE2B 2bf4fb788c26ca6219d60aad208a0b5eae0829d7357765beeafd055545aa336c74c8f5edb4e9caed327ec7969d9780e2bd231c56099ae87f5b396119a163c1ed SHA512 0eb7f12c0ddeae4f9634c4c6a81ae496bc9a93e3863e1f993790e4a3589efb7163387ba28a43c18427a03362f7ddd8a5e0bca6eabcc904015c1711b95186dca0
+DIST lletters_0.1.95+gtk2-3.diff.gz 457812 BLAKE2B f155b63773c57595f660afa88b4f92bf5c270b66c12cc5bc173384941eeab2112f433b37add06a1a0e18e5e7dc78f13d92b42bfd2edf64ad8832e5a085e6a1c9 SHA512 d4daf92741e4fd8a249de9fe0b22ad6108687c00c194ccbee103c51de70392707319ecef00a7e55dd6878789a23fb5d9a365c468bf55c1326e899f4224b11e77
+DIST lletters_0.1.95+gtk2.orig.tar.gz 180896 BLAKE2B f3709f061f5f199d85f23767af015b5e1f94f8684d683f60e53a22b039fb307b0cdec12e4b76888eaef9bc763d85d991d253333a1b3e0c269cc7ca8ed2ba3533 SHA512 40720f44511895fd780e4147b923ccc49a4068c10219c17bee2a54595721b87ba0ec99062e45e9b6477bd38bc3eccf0dbe830784776c37213d6c3b06f1105845
+EBUILD lletters-0.1.95-r3.ebuild 1082 BLAKE2B f36429fdf2b62bc5cc6e8be057112aab3ab73ca582139fcbb03ff7706b4fb9cc60ba1fe87846c4cb12f82719d07a85012cd036123dac68a4ff778eb5348f237e SHA512 a64079f14ab5e2f3a50f51495ee61c4f347f3c7130f07dd314c71d6154450bfcf6bf818ef804781f4c5e8b6c83ec51af4e5be416ba32b6bda261279b1933cb90
+MISC metadata.xml 326 BLAKE2B e77269c1fa3495bebb1528cb544a93198a3cbc38b566de760c0935220cffdad805507010d69bde1fa62747ed4f61a0a352e6686814a207cd2e1f74335131651c SHA512 c235545ff08cbf0d011c27006f03f919f4bb3a3e1dabb136f87278ef55cf55d1b31cb9050a3712394cf5a925c21f7c2884b30e8cf0cf595621d674cb2ac42094
diff --git a/games-kids/lletters/files/lletters-0.1.95-build-2.patch b/games-kids/lletters/files/lletters-0.1.95-build-2.patch
new file mode 100644
index 000000000000..41e10517faf9
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-build-2.patch
@@ -0,0 +1,60 @@
+diff -ur lletters-0.1.95.orig/libqdwav/Makefile.in lletters-0.1.95/libqdwav/Makefile.in
+--- lletters-0.1.95.orig/libqdwav/Makefile.in	2008-04-09 19:23:13.000000000 +0300
++++ lletters-0.1.95/libqdwav/Makefile.in	2008-04-09 19:48:08.000000000 +0300
+@@ -225,7 +225,6 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ noinst_LIBRARIES = libqdwav.a
+-AM_CFLAGS = -O2
+ libqdwav_a_SOURCES = wav_read.c wav_write.c
+ noinst_HEADERS = wav_lib.h
+ all: all-am
+diff -ur lletters-0.1.95.orig/libqdwav/wav_read.c lletters-0.1.95/libqdwav/wav_read.c
+--- lletters-0.1.95.orig/libqdwav/wav_read.c	2000-02-21 09:53:08.000000000 +0200
++++ lletters-0.1.95/libqdwav/wav_read.c	2008-04-09 19:51:23.000000000 +0300
+@@ -1,5 +1,6 @@
+ /* operations for verifying and reading wav files. */
+ 
++#include <string.h> /* for strs */
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+diff -ur lletters-0.1.95.orig/libqdwav/wav_write.c lletters-0.1.95/libqdwav/wav_write.c
+--- lletters-0.1.95.orig/libqdwav/wav_write.c	2008-04-09 19:23:13.000000000 +0300
++++ lletters-0.1.95/libqdwav/wav_write.c	2008-04-09 19:51:28.000000000 +0300
+@@ -1,3 +1,4 @@
++#include <string.h> /* for strs */
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <signal.h>
+diff -ur lletters-0.1.95.orig/list.c lletters-0.1.95/list.c
+--- lletters-0.1.95.orig/list.c	2000-02-23 06:54:57.000000000 +0200
++++ lletters-0.1.95/list.c	2008-04-09 19:51:35.000000000 +0300
+@@ -1,3 +1,4 @@
++#include <string.h> /* for strs */
+ #include "lletters.h"
+ 
+ /* prototype std lib functions */
+diff -ur lletters-0.1.95.orig/po/Makefile.in.in lletters-0.1.95/po/Makefile.in.in
+--- lletters-0.1.95.orig/po/Makefile.in.in	2008-04-09 19:23:13.000000000 +0300
++++ lletters-0.1.95/po/Makefile.in.in	2008-04-09 19:48:08.000000000 +0300
+@@ -111,9 +111,9 @@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+@@ -122,6 +122,7 @@
+ 	    *.gmo) destdir=$(gnulocaledir);; \
+ 	    *)     destdir=$(localedir);; \
+ 	  esac; \
++	  destdir="$(DESTDIR)$$destdir"; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
+ 	  if test -r "$(MKINSTALLDIRS)"; then \
diff --git a/games-kids/lletters/files/lletters-0.1.95-make-382.patch b/games-kids/lletters/files/lletters-0.1.95-make-382.patch
new file mode 100644
index 000000000000..103c26a1a342
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-make-382.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/340599
+
+--- a/intl/Makefile.in
++++ b/intl/Makefile.in
+@@ -202,12 +202,12 @@
+ # The dependency for intlh.inst is different in gettext and all other
+ # packages.  Because we cannot you GNU make features we have to solve
+ # the problem while rewriting Makefile.in.
+-@GT_YES@intlh.inst: intlh.inst.in ../config.status
+-@GT_YES@	cd .. \
+-@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+-@GT_YES@	  $(SHELL) ./config.status
+-@GT_NO@.PHONY: intlh.inst
+-@GT_NO@intlh.inst:
++intlh.inst: intlh.inst.in ../config.status
++	cd .. \
++	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
++	  $(SHELL) ./config.status
++.PHONY: intlh.inst
++intlh.inst:
+ 
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games-kids/lletters/files/lletters-0.1.95-underlink.patch b/games-kids/lletters/files/lletters-0.1.95-underlink.patch
new file mode 100644
index 000000000000..1d6401379c5d
--- /dev/null
+++ b/games-kids/lletters/files/lletters-0.1.95-underlink.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2011-05-24 10:47:30.276355207 +0200
++++ b/Makefile.in	2011-05-24 10:47:53.316795932 +0200
+@@ -265,7 +265,7 @@
+ 
+ @SOUND_FALSE@lletters_SOURCES = $(lln_CORE)
+ @SOUND_TRUE@lletters_SOURCES = $(lln_CORE) wav_play.c $(sound_CORE) 
+-@SOUND_TRUE@lletters_LDADD = libqdwav/libqdwav.a -lgdk_pixbuf-2.0 -lglib-2.0 -lgtk-x11-2.0
++@SOUND_TRUE@lletters_LDADD = libqdwav/libqdwav.a @GTK_LIBS@
+ 
+ #lletters_LDADD = #@GTK_LIBS@
+ @SOUND_FALSE@SUBDIRS = intl	po images lang
diff --git a/games-kids/lletters/lletters-0.1.95-r3.ebuild b/games-kids/lletters/lletters-0.1.95-r3.ebuild
new file mode 100644
index 000000000000..e411ba9f847a
--- /dev/null
+++ b/games-kids/lletters/lletters-0.1.95-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+PATCH_LEVEL=3
+
+DESCRIPTION="Game that helps young kids learn their letters and numbers"
+HOMEPAGE="http://lln.sourceforge.net"
+SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2.orig.tar.gz
+	mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff.gz
+	mirror://sourceforge/lln/${PN}-media-0.1.9a.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff
+	"${FILESDIR}"/${P}-build-2.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-make-382.patch
+)
+
+src_prepare() {
+	default
+
+	cp -r "${WORKDIR}"/{images,sounds} . || die
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install () {
+	default
+	newdoc debian/changelog ChangeLog.debian
+	doicon debian/${PN}.xpm
+	make_desktop_entry ${PN} "Linux Letters and Numbers" ${PN}
+}
diff --git a/games-kids/lletters/metadata.xml b/games-kids/lletters/metadata.xml
new file mode 100644
index 000000000000..8496a3e8f1cc
--- /dev/null
+++ b/games-kids/lletters/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="sourceforge">lln</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-kids/memonix-1.6-r1 b/games-kids/memonix-1.6-r1
deleted file mode 100644
index ca2ea608f4dc..000000000000
--- a/games-kids/memonix-1.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis] sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Brain teasers, puzzle and memory games for kid's in one pack
-EAPI=6
-HOMEPAGE=http://www.viewizard.com/memonix/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis]
-SLOT=0
-SRC_URI=http://www.viewizard.com/download/memonix_1.6_src.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c853ed4be13daa5ea431f53519dfe1e
diff --git a/games-kids/memonix/Manifest b/games-kids/memonix/Manifest
new file mode 100644
index 000000000000..cdb6b91a8a35
--- /dev/null
+++ b/games-kids/memonix/Manifest
@@ -0,0 +1,3 @@
+DIST memonix_1.6_src.tar.bz2 6949315 BLAKE2B 7af09f7a83acbfe76b1e78c431056d99cc64abff52cae7092dcabf6fa561b367c8ee99d89c17981675c1e933d3ad892c0fb7f055f820489e64a197fd1aac352e SHA512 212def9c30cd878103d4ac8b7f57c5fcaeffa74ee7ece18a993c69304de94a2ce9eea24a70af394477532ac9a0887b595e220e106239cac5e6aec5a75d1a8ff1
+EBUILD memonix-1.6-r1.ebuild 832 BLAKE2B e44e7fa837659eae1a98363acd757f7b1c3c8751645019712a0b2af3e4f43a475ec8faa0cde5f50ad3dad1bec7ca95a4d114030e7a0ac604d8d36bbe1a09d8d1 SHA512 e18d5c876a278f1de8c0b5c46dd21a4605640886c42f5a43dd98a25a243b3394fd04995394afa41f46f4dcea2c0473076f5c5a7a7c0f493656a8333b583fa422
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-kids/memonix/memonix-1.6-r1.ebuild b/games-kids/memonix/memonix-1.6-r1.ebuild
new file mode 100644
index 000000000000..72187823716e
--- /dev/null
+++ b/games-kids/memonix/memonix-1.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils
+
+DESCRIPTION="Brain teasers, puzzle and memory games for kid's in one pack"
+HOMEPAGE="http://www.viewizard.com/memonix/"
+SRC_URI="http://www.viewizard.com/download/${PN}_${PV}_src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl:0[sound,opengl,video,X]
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[vorbis]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/MemonixSourceCode"
+
+src_install() {
+	exeinto /usr/"$(get_libdir)"
+	doexe ../${P}_build/Memonix
+
+	insinto "/usr/share/${PN}"
+	doins ../gamedata.vfs
+
+	make_wrapper ${PN} /usr/"$(get_libdir)"/Memonix /usr/share/${PN}
+
+	newicon ../icon48.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	dodoc ReadMe.txt
+}
diff --git a/games-kids/memonix/metadata.xml b/games-kids/memonix/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-kids/memonix/metadata.xml
@@ -0,0 +1,8 @@
+<?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-kids/metadata.xml b/games-kids/metadata.xml
new file mode 100644
index 000000000000..8836465ca306
--- /dev/null
+++ b/games-kids/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The games-kids category contains games designed for children.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-kids enthält Spiele für Kinder.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-kids contiene juegos diseñados para niños.
+	</longdescription>
+	<longdescription lang="ja">
+		games-kidsカテゴリーには子供向けのゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-kids categorie bevat spellen die gemaakt zijn voor kinderen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-kids chứa các trò chơi thiết kế cho thiếu nhi.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória games-kids obsahuje hry navrhnuté pre menšie deti.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-kids contiene giochi per bambini.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria games-kids contém jogos para crianças.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria games-kids zawiera gry dla dzieci.
+	</longdescription>
+</catmetadata>
+
diff --git a/games-kids/pytraffic-2.5.4-r2 b/games-kids/pytraffic-2.5.4-r2
deleted file mode 100644
index 37877ffa2e87..000000000000
--- a/games-kids/pytraffic-2.5.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer >=sys-apps/sed-4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python version of the board game Rush Hour
-EAPI=6
-HOMEPAGE=http://freecode.com/projects/pytraffic
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer dev-python/pygtk python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/pytraffic-2.5.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=47fe76fc3e6d29bc6e0561491e43db09
diff --git a/games-kids/pytraffic/Manifest b/games-kids/pytraffic/Manifest
new file mode 100644
index 000000000000..5021b399935b
--- /dev/null
+++ b/games-kids/pytraffic/Manifest
@@ -0,0 +1,4 @@
+AUX pytraffic 84 BLAKE2B 5e89b42368a312b59271dd2d97cb26c90507f29d5f447656a8a049d5616a4dd493c93af3ab0bd88b1482f53dbbe27ca0ac6cdcd48c433a4c1871834649f23bfd SHA512 af94d6fc6402e57b78461e65e8eca0ebdd789540a1b8113ed844bfd8bcc4aeff18683c5b254f20b05427d172ac50be06be9d6f8459cf51396a8b8fdd7cb332d9
+DIST pytraffic-2.5.4.tar.gz 2474006 BLAKE2B 4a2570d52aeac340812c7d1f251b6185fc8039ec06e4178d21a5f490b10bc82961fea0423dd3a3a4ec41271037f9a343fcf770d92fe071c4e929159bbbb2373b SHA512 c34a9b783e7de998b8ebc39c2ed2bf1b9a40b090c498773297da455b182aaa5f2047fb541bb11a91e11abdeffee9f02b04a37861135c5fa946fccabfc21b44c1
+EBUILD pytraffic-2.5.4-r2.ebuild 1714 BLAKE2B 1609d09a298a4c5098ab5c43b96d8ac6451b8b1816d58f922e5c8a56794fc543d47244d36728e96afc06fe4b49274b9d876654d24d86f856083c161c6ec9cb78 SHA512 da9a301719b8f9c41acbe4cc8e5a69123330a164a8c2d1ec7d51e948d0152969af8450950ef4954c3d4039785254d6c9026e0c2c7271f22315ead96a75e01ae9
+MISC metadata.xml 329 BLAKE2B 1a6d27d8cbd0cb64761f22fdfec0dde92a2309d8af353b6ee74c6e2c41273ae0a033674ea34019a76d3deb7938908236624520d6c1caaedeefe978d36f679e4c SHA512 9dc7087d6e8f9238e014a01f75ac366608fb881eb8d905412a590c7fe52d931d624a2c07164c861511e27152ca1a7b9e095db30b64cc7733cfd2e7e20abc6c60
diff --git a/games-kids/pytraffic/files/pytraffic b/games-kids/pytraffic/files/pytraffic
new file mode 100644
index 000000000000..30ab25196ce7
--- /dev/null
+++ b/games-kids/pytraffic/files/pytraffic
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import os
+os.chdir("@GAMES_DATADIR@")
+import pytraffic.Main
+
diff --git a/games-kids/pytraffic/metadata.xml b/games-kids/pytraffic/metadata.xml
new file mode 100644
index 000000000000..9814659ba9cc
--- /dev/null
+++ b/games-kids/pytraffic/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="freecode">pytraffic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-kids/pytraffic/pytraffic-2.5.4-r2.ebuild b/games-kids/pytraffic/pytraffic-2.5.4-r2.ebuild
new file mode 100644
index 000000000000..c3d2b8f0a0c8
--- /dev/null
+++ b/games-kids/pytraffic/pytraffic-2.5.4-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils python-utils-r1 python-r1 distutils-r1
+
+DESCRIPTION="Python version of the board game Rush Hour"
+HOMEPAGE="http://freecode.com/projects/pytraffic"
+SRC_URI="http://alpha.uhasselt.be/Research/Algebra/Members/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl:0[sound]
+	media-libs/sdl-mixer"
+RDEPEND="${DEPEND}
+	dev-python/pygtk"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# FHS compliance
+	sed -i \
+		-e 's#return os.path.join(exec_dir,path)#return os.path.join(os.getcwd(),path)#' \
+		Misc.py || die
+
+	sed \
+		-e "s#@GAMES_DATADIR@#/usr/share/${PN}#" \
+		"${FILESDIR}"/${PN} > "${T}"/${PN} || die
+}
+
+python_install() {
+	# install modules manually, build system broken
+	python_moduleinto ${PN}
+	python_domodule "${BUILD_DIR}"/lib/.
+
+	# allow to import the stuff as module
+	touch "${D}$(python_get_sitedir)"/${PN}/__init__.py || die
+
+	# install python wrapper script to handle multiple ABI properly
+	python_scriptinto /usr/bin
+	python_doscript "${T}"/${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/${PN}
+	doins -r doc config.db extra_themes icons libglade music sound_test themes ttraffic.levels
+
+	doicon -s 64 icons/64x64/${PN}.png
+	make_desktop_entry ${PN} PyTraffic
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-kids/tuxmath-2.0.3-r1 b/games-kids/tuxmath-2.0.3-r1
deleted file mode 100644
index 49990bcd943a..000000000000
--- a/games-kids/tuxmath-2.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-games/t4k-common[svg?] dev-libs/libxml2:2 media-libs/libsdl:0[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] media-libs/sdl-net media-libs/sdl-pango nls? ( virtual/libintl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
-DESCRIPTION=Educational arcade game where you have to solve maths problems
-EAPI=6
-HOMEPAGE=http://tux4kids.alioth.debian.org/tuxmath/
-IUSE=nls svg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 OFL-1.1
-RDEPEND=dev-games/t4k-common[svg?] dev-libs/libxml2:2 media-libs/libsdl:0[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] media-libs/sdl-net media-libs/sdl-pango nls? ( virtual/libintl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo )
-SLOT=0
-SRC_URI=mirror://debian/pool/main/t/tuxmath/tuxmath_2.0.3.orig.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13d7d159efd4e202f151cc3b1a27560c
diff --git a/games-kids/tuxmath/Manifest b/games-kids/tuxmath/Manifest
new file mode 100644
index 000000000000..b6aade9e1937
--- /dev/null
+++ b/games-kids/tuxmath/Manifest
@@ -0,0 +1,3 @@
+DIST tuxmath_2.0.3.orig.tar.gz 10396696 BLAKE2B bd060178e1acf62a36da380b9212e72549fde8f6e680d6ca3a4bbee3a0db163ae96a2df2a26d03bad96bf9fc297a6de5c6b0135b4be98ebacc325e1aff5ffbdf SHA512 dd7af90f3b1bd637f2f1639a3877d1a9950c95e60b1a71633998e2b0a654bb8015c4bf83540a9af092fe054d468035d0de5f3ddc7d54b17c3235f794a6108fbe
+EBUILD tuxmath-2.0.3-r1.ebuild 1267 BLAKE2B f3019ba58a18dc8b719a671e41049b1248bcb95d829ef5c223515429675a6b8993f99a496d491c230541bceb17657c461a4f791111865c19bdb40a7ec225242a SHA512 e3da9218c8faf5659eb31c4d5886e8bf9d82e677d8d1977a51fa11b058dd67a8b7bab7c01ee361be5975f1c61d2a92a3e9e7f6f6327cdb649c3f410cdde197e7
+MISC metadata.xml 330 BLAKE2B 9bce1114f26de1cdca452e5fe280ecda8bd5ed968cf7cfd15338252d748c91ecbf7cde6270e84ff9bee4e7904bd3ab6aa874fcc40d3e748828936eae5a162376 SHA512 6119196d06b8bdee2062eda1fcca6735e17325bbc19991a1c021c864f6d962e44eda75fc016b2995056c452431659b7d1e158723d115ae58e699bbeb50e5fa1b
diff --git a/games-kids/tuxmath/metadata.xml b/games-kids/tuxmath/metadata.xml
new file mode 100644
index 000000000000..b916dfd60180
--- /dev/null
+++ b/games-kids/tuxmath/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="sourceforge">tuxmath</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild b/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..56c09b87901e
--- /dev/null
+++ b/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils
+
+MY_PN="${PN}_w_fonts"
+DESCRIPTION="Educational arcade game where you have to solve maths problems"
+HOMEPAGE="http://tux4kids.alioth.debian.org/tuxmath/"
+SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls svg"
+
+RDEPEND="dev-games/t4k-common[svg?]
+	dev-libs/libxml2:2
+	media-libs/libsdl:0[video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	media-libs/sdl-net
+	media-libs/sdl-pango
+	nls? ( virtual/libintl )
+	svg? (
+		gnome-base/librsvg:2
+		x11-libs/cairo
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	default
+
+	sed -i -e '/\bdoc\b/d' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--localedir=/usr/share/locale \
+		$(use_enable nls) \
+		$(usex svg "" "--without-rsvg")
+}
+
+src_install() {
+	default
+	doicon -s scalable data/images/icons/${PN}.svg
+	make_desktop_entry ${PN} "TuxMath"
+	dodoc doc/{README,TODO,changelog}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-kids/tuxmathscrabble-0.8.1-r1 b/games-kids/tuxmathscrabble-0.8.1-r1
deleted file mode 100644
index 12f29186daab..000000000000
--- a/games-kids/tuxmathscrabble-0.8.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip
-DESCRIPTION=math-version of the popular board game for children 4-10
-EAPI=6
-HOMEPAGE=http://www.asymptopia.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/asymptopia/tuxmathscrabble/archive/0.8.1.tar.gz -> tuxmathscrabble-0.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2760645928d64bd3b0ff0c05e062dfa2
diff --git a/games-kids/tuxmathscrabble/Manifest b/games-kids/tuxmathscrabble/Manifest
new file mode 100644
index 000000000000..7eb47af153d7
--- /dev/null
+++ b/games-kids/tuxmathscrabble/Manifest
@@ -0,0 +1,4 @@
+AUX tuxmathscrabble-0.8.1-gentoo.patch 2770 BLAKE2B 8d5134f7cb2285728545352bc79d240c1a5e5dcbc268fd72a3b9c7ef798997756f70387f34144ff82feed2f82f089b7035c68eb7e70fc99f0886241ac7e79be8 SHA512 11633dbaae261d007638fc7f6dd2e934654fa699d5f08d6fd01552c62de2b7e52e95ecd737920b62cbf3d289f5b8da0eeef2416a0f45d1d54a9aca4432684c4d
+DIST tuxmathscrabble-0.8.1.tar.gz 9376820 BLAKE2B 40746d4e9b9ee81b09e563a522f6d1ae839a4729b7b38c9a96758553766b2597360c7391d42f09c8de494871ce086883f47186a17e9ee4b61c8a0afdc0f07b11 SHA512 70a48b078af170c4008beca495576afc6e0dd72239b2b57543a98642ee9e8d13a2ae48aa5afab77015c8c56cd9a2d80865645504a620b2e2b798ed40f653533c
+EBUILD tuxmathscrabble-0.8.1-r1.ebuild 1314 BLAKE2B c890aacaf3678c71f18d1c189222486eb5c1b0ffc5436bc911f3fc2823c5003dc6d4ca6cfbdeb9ebd08f4a80a3347798f39e6f82de73779969353700cbf9464d SHA512 82134dc3fc4cafccbf9812871016971a518b1ee5f002ff3faa67fde4d7dfea596121f2a2555dc3adfbb76818b6bc1e0aba484a5a2b62b485cc1c49e59af10171
+MISC metadata.xml 344 BLAKE2B 0a845bf521bec0b1539b3397218a41a64e7d5bbd91796bfbde2cba1fcb22f2d4e50831f52a1f0ccd8b4fcf39f358668b95eee64d635c685efe69635ae2e18453 SHA512 28b2c2b0b4de1a63524eeda1048d8bf7149bfb7eec23a39e22503143c9d68f449d7e40ec60f5529ce882670875961197ccdb5d8cf49d5c099f3392877a77d64d
diff --git a/games-kids/tuxmathscrabble/files/tuxmathscrabble-0.8.1-gentoo.patch b/games-kids/tuxmathscrabble/files/tuxmathscrabble-0.8.1-gentoo.patch
new file mode 100644
index 000000000000..0e104f2f586f
--- /dev/null
+++ b/games-kids/tuxmathscrabble/files/tuxmathscrabble-0.8.1-gentoo.patch
@@ -0,0 +1,92 @@
+--- a/TuxMathScrabble/tms.py	2015-02-02 22:19:30.894373011 +0100
++++ b/TuxMathScrabble/tms.py	2015-02-02 22:20:19.530320947 +0100
+@@ -1258,7 +1258,7 @@
+ 		if not os.path.exists(infname):
+ 			
+ 			master_fname=os.path.join(self.env.fontdir,'.tms_config_master')
+-			candidate=os.path.join('/','usr','share','games','tuxmathscrabble','.tms_config_master')
++			candidate=os.path.join('@GENTOO_DATADIR@','.tms_config_master')
+ 			if os.path.exists(candidate):
+ 				master_fname=candidate
+ 			
+--- a/.tms_config_master	2015-02-02 22:21:59.655216399 +0100
++++ b/.tms_config_master	2015-02-02 22:25:33.754003432 +0100
+@@ -380,66 +380,66 @@
+ 		'wtype':'wx.SpinCtrl',
+ 	},
+ 	'FONT_APPNAME':{
+-		'default_path':'./Font',
++		'default_path':'@GENTOO_DATADIR@/Font',
+ 		'default_value':'mickey.ttf',
+ 		'descr':'',
+ 		'dtype':'wx.String',
+-		'path':'./Font',
++		'path':'@GENTOO_DATADIR@/Font',
+ 		'showme':-1,
+ 		'tooltip':'Font to be used for application name overlay.',
+ 		'value':'mickey.ttf',
+ 		'wtype':'wx.FileDialog',
+ 	},
+ 	'FONT_BFONT':{
+-		'default_path':'./Font',
++		'default_path':'@GENTOO_DATADIR@/Font',
+ 		'default_value':'Bluehigh.ttf',
+ 		'descr':'',
+ 		'dtype':'wx.String',
+-		'path':'./Font',
++		'path':'@GENTOO_DATADIR@/Font',
+ 		'showme':0,
+ 		'tooltip':'Button Font',
+ 		'value':'Bluehigh.ttf',
+ 		'wtype':'wx.FileDialog',
+ 	},
+ 	'FONT_CFONT':{
+-		'default_path':'./Font',
++		'default_path':'@GENTOO_DATADIR@/Font',
+ 		'default_value':'arialbd.ttf',
+ 		'descr':'',
+ 		'dtype':'wx.String',
+-		'path':'./Font',
++		'path':'@GENTOO_DATADIR@/Font',
+ 		'showme':0,
+ 		'tooltip':'Character font used for tile characters',
+ 		'value':'arialbd.ttf',
+ 		'wtype':'wx.FileDialog',
+ 	},
+ 	'FONT_HUD':{
+-		'default_path':'./Font',
++		'default_path':'@GENTOO_DATADIR@/Font',
+ 		'default_value':'aqua_pfont.ttf',
+ 		'descr':'',
+ 		'dtype':'wx.String',
+-		'path':'./Font',
++		'path':'@GENTOO_DATADIR@/Font',
+ 		'showme':0,
+ 		'tooltip':'The default font to be used for other overlay information (credits, etc).',
+ 		'value':'aqua_pfont.ttf',
+ 		'wtype':'wx.FileDialog',
+ 	},
+ 	'FONT_OVERLAY':{
+-		'default_path':'./Font',
++		'default_path':'@GENTOO_DATADIR@/Font',
+ 		'default_value':'arial.ttf',
+ 		'descr':'',
+ 		'dtype':'wx.String',
+-		'path':'./Font',
++		'path':'@GENTOO_DATADIR@/Font',
+ 		'showme':0,
+ 		'tooltip':'The default font to be used for other overlay information (credits, etc).',
+ 		'value':'arial.ttf',
+ 		'wtype':'wx.FileDialog',
+ 	},
+ 	'FONT_PFONT':{
+-		'default_path':'./Font',
++		'default_path':'@GENTOO_DATADIR@/Font',
+ 		'default_value':'Bluehigh.ttf',
+ 		'descr':'',
+ 		'dtype':'wx.String',
+-		'path':'./Font',
++		'path':'@GENTOO_DATADIR@/Font',
+ 		'showme':0,
+ 		'tooltip':'Point value font (ie lower right corner of tiles)',
+ 		'value':'Bluehigh.ttf',
diff --git a/games-kids/tuxmathscrabble/metadata.xml b/games-kids/tuxmathscrabble/metadata.xml
new file mode 100644
index 000000000000..bc7656e3fc1e
--- /dev/null
+++ b/games-kids/tuxmathscrabble/metadata.xml
@@ -0,0 +1,11 @@
+<?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>
+	<upstream>
+		<remote-id type="github">asymptopia/tuxmathscrabble</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..53a209e1052b
--- /dev/null
+++ b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 multilib
+
+MY_PN=TuxMathScrabble
+DESCRIPTION="math-version of the popular board game for children 4-10"
+HOMEPAGE="http://www.asymptopia.org/"
+SRC_URI="https://github.com/asymptopia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="${PYTHON_DEPS}
+	dev-python/wxpython[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	app-arch/unzip"
+RDEPEND="${CDEPEND}
+	dev-python/pygame[${PYTHON_USEDEP}]"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	rm -f $(find . -name '*.pyc')
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:/usr/share/${MY_PN}:" \
+		${MY_PN}/tms.py \
+		.tms_config_master \
+		|| die "sed failed"
+	sed -i \
+		-e "s:python2.7-32:python:g" \
+		${PN}.py || die "2nd sed failed"
+	python_fix_shebang .
+}
+
+src_install() {
+	newbin ${PN}.py ${PN}
+
+	insinto $(python_get_sitedir)
+	doins -r ${MY_PN}
+
+	insinto /usr/share/${MY_PN}
+	doins -r .tms_config_master Font
+
+	python_optimize
+
+	newicon tms.ico ${PN}.ico
+	make_desktop_entry ${PN} ${PN} /usr/share/pixmaps/${PN}.ico
+
+	dodoc CHANGES README
+}
diff --git a/games-kids/tuxtype-1.8.1-r1 b/games-kids/tuxtype-1.8.1-r1
deleted file mode 100644
index 5e34c7184386..000000000000
--- a/games-kids/tuxtype-1.8.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install setup
-DEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf svg? ( gnome-base/librsvg )
-DESCRIPTION=Typing tutorial with lots of eye-candy
-EAPI=6
-HOMEPAGE=https://alioth.debian.org/projects/tux4kids
-IUSE=svg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 OFL-1.1
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf svg? ( gnome-base/librsvg )
-SLOT=0
-SRC_URI=https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-1.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22012bb6c393eaed1fed533de32defb7
diff --git a/games-kids/tuxtype/Manifest b/games-kids/tuxtype/Manifest
new file mode 100644
index 000000000000..ef8524e2ece4
--- /dev/null
+++ b/games-kids/tuxtype/Manifest
@@ -0,0 +1,3 @@
+DIST tuxtype_w_fonts-1.8.1.tar.gz 11528002 BLAKE2B 45cf547f94665913746c6f3fbcd25554cd4adeda1b6cbcc7cbffc1afec3c161f590ad9d21fa53c8e141978916a2d943cfa626cf412f805aeaf7d327284b11615 SHA512 2c360807295f8d9f3d18f36b64c49e39fac78d81570c7a554244a01ee76627c90579e580b609ea7994378f5bbff916142e293ad94306b7b38d132fdc1c53734f
+EBUILD tuxtype-1.8.1-r1.ebuild 1059 BLAKE2B 5ae170cdbcad66fa1a2e2710555a0ab453b3de73058658700c3722041e7fc469de8498ed2bf78c9762308efca637279c626c527a0a3d07202bdd022d5b18f85c SHA512 0022ad58f51ed9eb84968c6b690c73b4cce22e61a72ef9a458fc79fe9c31474f6987af156957722d7f7fc37d9df0f277100cd4511bc91ef0278452b890a875e8
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-kids/tuxtype/metadata.xml
@@ -0,0 +1,8 @@
+<?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-kids/tuxtype/tuxtype-1.8.1-r1.ebuild b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..ecb8f47f7717
--- /dev/null
+++ b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user
+
+DESCRIPTION="Typing tutorial with lots of eye-candy"
+HOMEPAGE="https://alioth.debian.org/projects/tux4kids"
+SRC_URI="https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.tar.gz"
+
+LICENSE="GPL-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="svg"
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-pango
+	media-libs/sdl-ttf
+	svg? ( gnome-base/librsvg )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/tuxtype_w_fonts-${PV}
+
+pkg_setup(){
+	enewgroup gamestat 36
+}
+
+src_configure() {
+	econf \
+		--localedir=/usr/share/locale \
+		$(use_with svg rsvg)
+}
+
+src_install() {
+	default
+	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL,ABOUT-NLS}*
+	doicon ${PN}.ico
+	make_desktop_entry ${PN} TuxTyping /usr/share/pixmaps/${PN}.ico
+	keepdir /etc/${PN} /var/games/${PN}/words
+
+	fowners root:gamestat /var/games/${PN} /usr/bin/${PN}
+	fperms 660 /var/games/${PN}
+	fperms 2755 /usr/bin/${PN}
+}