proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

469 files changed, 11290 insertions, 0 deletions

diff --git a/games-puzzle/4stattack/4stattack-2.1.4.ebuild b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
new file mode 100644
index 000000000000..885ac94d922b
--- /dev/null
+++ b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Connect-4 game, single or network multiplayer"
+HOMEPAGE="http://forcedattack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/pygame"
+
+S=${WORKDIR}/4stAttack-${PV}
+
+src_prepare() {
+	# move the doc files aside so it's easier to install the game files
+	mv README.txt credits.txt changelog.txt ..
+	rm -f GPL version~
+
+	# This patch makes the game save settings in $HOME
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+}
+
+src_install() {
+	games_make_wrapper ${PN} "python ${PN}.py" "${GAMES_DATADIR}"/${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r *
+	newicon kde/icons/48x48/forcedattack2.png ${PN}.png
+	make_desktop_entry ${PN} "4st Attack 2"
+	dodoc ../{README.txt,credits.txt,changelog.txt}
+	prepgamesdirs
+}
diff --git a/games-puzzle/4stattack/Manifest b/games-puzzle/4stattack/Manifest
new file mode 100644
index 000000000000..6db450e8ec01
--- /dev/null
+++ b/games-puzzle/4stattack/Manifest
@@ -0,0 +1 @@
+DIST 4stAttack-2.1.4.tar.gz 1828247 SHA256 196c553fd3dbda8b2c2a07a9b0cbacf4f067712498f909d2823161e7d0b289e6 SHA512 4819c0915bfe47bb965ea39d49fa007fb18cfa965b15e5e72a4b0ac3be8a03c616d9438c8dedd960ee257e44b48f98f75ced6bed5bfc77f3366328c797b30f3c WHIRLPOOL 439d05b5208821d18b6976f055de32521283ee737832bf80c4eeea1f62bb334cc72b43b360b09f9cb0da42e8310e54e078ff097432e24ebd3c5ae74ddad1ac99
diff --git a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
new file mode 100644
index 000000000000..be7d32ed3ff2
--- /dev/null
+++ b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
@@ -0,0 +1,21 @@
+--- 4stattack.py
++++ 4stattack.py
+@@ -28,6 +28,9 @@
+ images	= None
+ screen	= None
+ 
++f = os.path.expanduser('~/.4stattackrc')
++if not os.path.exists(f):
++    os.system('cp settings.ini %s' % f)
+ 
+ def playMusic(datadir):
+ 	if pygame.mixer.get_init():
+@@ -78,7 +81,7 @@
+ 	if options.has_key('-ini'):
+ 		ini_settings = IniSettings(options['-ini'])
+ 	else:
+-		ini_settings = IniSettings('settings.ini')
++		ini_settings = IniSettings(os.path.expanduser('~/.4stattackrc'))
+ 	
+ 	settings = ini_settings.settings
+ 	
diff --git a/games-puzzle/4stattack/metadata.xml b/games-puzzle/4stattack/metadata.xml
new file mode 100644
index 000000000000..8a762d2d0fc2
--- /dev/null
+++ b/games-puzzle/4stattack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">forcedattack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
new file mode 100644
index 000000000000..557b6360db74
--- /dev/null
+++ b/games-puzzle/amoebax/Manifest
@@ -0,0 +1 @@
+DIST amoebax-0.2.1.tar.bz2 10645579 SHA256 709c7e657b328a6f7d331298c6264f172528489d28cab107c40c483c392340b2 SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181 WHIRLPOOL eafcdf27b852b226db86f162b14665d5d6f5bc5e539b1c5cefe698380fbf6fe378cdf86de2e023f51cda5e3846a134b21b509180ac257d85b446bfb33d4f6104
diff --git a/games-puzzle/amoebax/amoebax-0.2.1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
new file mode 100644
index 000000000000..6c7ada024569
--- /dev/null
+++ b/games-puzzle/amoebax/amoebax-0.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+DESCRIPTION="a cute and addictive action-puzzle game, similar to tetris"
+HOMEPAGE="http://www.emma-soft.com/games/amoebax/"
+SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
+
+LICENSE="FreeArt GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-aclocal.patch \
+		"${FILESDIR}"/${P}-compile.patch
+
+	sed -i \
+		-e "/^SUBDIRS/s:doc ::" \
+		Makefile.am || die
+	sed -i \
+		-e "/^iconsdir/s:=.*:=/usr/share/pixmaps:" \
+		-e "/^desktopdir/s:=.*:=/usr/share/applications:" \
+		data/Makefile.am || die
+	sed -i \
+		-e '/Encoding/d' \
+		-e '/Icon/s/.svg//' \
+		data/amoebax.desktop || die
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
new file mode 100644
index 000000000000..4cafc8d44de8
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
@@ -0,0 +1,41 @@
+--- m4/objc.m4.old
++++ m4/objc.m4
+@@ -448,32 +448,32 @@
+ 
+ # AC_LANG_SOURCE(Objective C)(BODY)
+ # ---------------------------------
+-m4_copy([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
++m4_copy_force([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
+ 
+ 
+ # AC_LANG_PROGRAM(Objective C)([PROLOGUE], [BODY])
+ # ------------------------------------------------
+-m4_copy([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
++m4_copy_force([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
+ 
+ 
+ # AC_LANG_CALL(Objective C)(PROLOGUE, FUNCTION)
+ # ---------------------------------------------
+-m4_copy([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
++m4_copy_force([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
+ 
+ 
+ # AC_LANG_FUNC_LINK_TRY(Objective C)(FUNCTION)
+ # --------------------------------------------
+-m4_copy([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
++m4_copy_force([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
+ 
+ 
+ # AC_LANG_BOOL_COMPILE_TRY(Objective C)(PROLOGUE, EXPRESSION)
+ # -----------------------------------------------------------
+-m4_copy([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
++m4_copy_force([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
+ 
+ 
+ # AC_LANG_INT_SAVE(Objective C)(PROLOGUE, EXPRESSION)
+ # ---------------------------------------------------
+-m4_copy([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
++m4_copy_force([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
+ 
+ 
+ 
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
new file mode 100644
index 000000000000..79c66a8c95b8
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
@@ -0,0 +1,12 @@
+--- src/binreloc.cxx
++++ src/binreloc.cxx
+@@ -739,7 +739,8 @@
+ char *
+ br_dirname (const char *path)
+ {
+-	char *end, *result;
++	const char *end;
++	char *result;
+ 
+ 	if (path == (const char *) NULL)
+ 		return (char *) NULL;
diff --git a/games-puzzle/amoebax/metadata.xml b/games-puzzle/amoebax/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/amoebax/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/anagramarama/Manifest b/games-puzzle/anagramarama/Manifest
new file mode 100644
index 000000000000..54aa75db9b03
--- /dev/null
+++ b/games-puzzle/anagramarama/Manifest
@@ -0,0 +1 @@
+DIST anagramarama-0.2.tar.gz 861484 SHA256 3ebb57468025e38c205d6f34f1f1647b593b371beda8032e69ba94aca516bccf SHA512 7cdafaf489100c184a71859f50b64fe8534210d953c4144d822727815ae2f7dd12302447b159039d95c9b3097711ab14931538789ac81c01233cc2c767291603 WHIRLPOOL 8e1f44ca5ff854c90dd5aec0341b11ef3395be87bfaef39b6a0e7fde1462c508056bdb3d47cd647445a5678a0755f4dc22514e79ab6dd6cd27b8671ab1cf6535
diff --git a/games-puzzle/anagramarama/anagramarama-0.2.ebuild b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
new file mode 100644
index 000000000000..5fb8f4b98ac9
--- /dev/null
+++ b/games-puzzle/anagramarama/anagramarama-0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Create as many words as you can before the time runs out"
+HOMEPAGE="http://www.coralquest.com/anagramarama/"
+SRC_URI="http://www.omega.clara.net/anagramarama/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.2
+	>=media-libs/sdl-mixer-1.2
+	>=media-libs/sdl-image-1.2"
+RDEPEND="${DEPEND}
+	sys-apps/miscfiles"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i \
+		-e "s:wordlist.txt:${GAMES_DATADIR}\/${PN}\/wordlist.txt:" \
+		-e "s:\"audio\/:\"${GAMES_DATADIR}\/${PN}\/audio\/:" \
+		-e "s:\"images\/:\"${GAMES_DATADIR}\/${PN}\/images\/:" \
+		src/{ag.c,dlb.c} \
+		|| die "sed failed"
+	ecvs_clean
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	newgamesbin ag ${PN}
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins wordlist.txt
+	doins -r images/ audio/
+	dodoc readme
+	prepgamesdirs
+}
diff --git a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
new file mode 100644
index 000000000000..85b194ea7928
--- /dev/null
+++ b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
@@ -0,0 +1,34 @@
+--- makefile.old	2009-02-08 18:24:33.000000000 +0100
++++ makefile	2009-02-08 18:29:12.000000000 +0100
+@@ -1,5 +1,4 @@
+-LFLAGS=-Wall -funroll-loops -fomit-frame-pointer -pipe -O9
+-CFLAGS=-Wall `sdl-config --cflags --libs` -funroll-loops -fomit-frame-pointer -pipe -O9 -lSDL_mixer
++LDLIBS=`sdl-config --cflags --libs` -lSDL_mixer
+ CC=gcc
+ 
+ C_FILES=src/dlb.c src/linked.c src/sprite.c src/ag.c
+@@ -9,19 +8,19 @@
+ all:ag
+ 
+ ag: $(OBJ_FILES)
+-	$(CC) $(CFLAGS) -o $(OUT_FILE) $(OBJ_FILES)
++	$(CC) $(LDFLAGS) -o $(OUT_FILE) $(OBJ_FILES) $(LDLIBS)
+ 
+ src/dlb.o: src/dlb.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ src/linked.o: src/linked.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 	
+ src/sprite.o: src/sprite.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ src/ag.o: src/ag.c
+-	$(CC) $(LFLAGS) -c -o $@ $^
++	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ clean:
+ 	rm -f src/*.o
diff --git a/games-puzzle/anagramarama/metadata.xml b/games-puzzle/anagramarama/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/anagramarama/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
new file mode 100644
index 000000000000..6ff47216a646
--- /dev/null
+++ b/games-puzzle/angrydd/Manifest
@@ -0,0 +1 @@
+DIST angrydd-1.0.1.tar.gz 5331883 SHA256 e4950cf9c059302632f88340aad23f389e335b21e266672b8ac5ae0f9fab30ee SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0 WHIRLPOOL 50014010a387098feb2a077e981313fc89d7742aad9bf17d11f07ddfef0b14cf749c1e1bdb30214a8d71f045513742251d54478dd18544e2ed70b1216d033cf1
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..57df8d25fe9a
--- /dev/null
+++ b/games-puzzle/angrydd/angrydd-1.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 games
+
+DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
+HOMEPAGE="http://www.sacredchao.net/~piman/angrydd/"
+SRC_URI="http://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+RDEPEND=${DEPEND}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${GAMES_DATADIR}" \
+		TO="${PN}" \
+		install
+	rm -rf "${D}${GAMES_DATADIR}/games" "${D}${GAMES_DATADIR}/share" || die
+
+	python_optimize "${D}${GAMES_DATADIR}/${PN}"
+
+	dodir "${GAMES_BINDIR}"
+	dosym "${GAMES_DATADIR}/${PN}/angrydd.py" "${GAMES_BINDIR}/${PN}"
+	doman angrydd.6
+	dodoc README TODO HACKING
+
+	doicon angrydd.png
+	make_desktop_entry angrydd "Angry, Drunken Dwarves"
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/angrydd/metadata.xml b/games-puzzle/angrydd/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/angrydd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/arrows/Manifest b/games-puzzle/arrows/Manifest
new file mode 100644
index 000000000000..85e6ab2cdbc5
--- /dev/null
+++ b/games-puzzle/arrows/Manifest
@@ -0,0 +1 @@
+DIST arrows-0.6.tar.gz 53374 SHA256 a8d18e1798d23c26e4d0330db745356d01cc4a3231b669643e08e426eb842d3f SHA512 f6c55d616283ad25d9d830440deaa11de81bccfc2d8eabe627104626ea111d986e522f73d61e5aed58476cc34a3e2b3fe2a20ab1538b7ecef04ecb941f34d83e WHIRLPOOL 0b4ed8bff7d64c4001e6a1f122ddb3ffeed47c4595fb7bd8604c0648b23fd687653862009b2f8439ec667aeeb7232f9f1de2211a7da3edc1de6ed34b059bf03f
diff --git a/games-puzzle/arrows/arrows-0.6.ebuild b/games-puzzle/arrows/arrows-0.6.ebuild
new file mode 100644
index 000000000000..f89271c52fa4
--- /dev/null
+++ b/games-puzzle/arrows/arrows-0.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="simple maze-like game where you navigate around and destroy arrows"
+HOMEPAGE="http://noreason.ca/?file=software"
+SRC_URI="http://noreason.ca/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Modify path to data
+	sed -i \
+		-e "s:arrfl:${GAMES_DATADIR}/${PN}/arrfl:" \
+		-e 's:nm\[9:nm[35:' \
+		-e 's:nm\[6:nm[30:' \
+		-e 's:nm\[7:nm[31:' \
+		game.c \
+		|| die 'sed failed'
+	sed -i \
+		-e '/^CC /d' \
+		-e '/CCLIBS/s:$: $(LDFLAGS):' \
+		Makefile \
+		|| die 'sed failed'
+}
+
+src_compile() {
+	make clean || die "make clean failed"
+	emake CCOPTS="${CFLAGS}"
+}
+
+src_install() {
+	dogamesbin arrows
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins arrfl*
+	dodoc README
+	prepgamesdirs
+}
diff --git a/games-puzzle/arrows/metadata.xml b/games-puzzle/arrows/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/arrows/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
new file mode 100644
index 000000000000..06ae1d519e59
--- /dev/null
+++ b/games-puzzle/atomix/Manifest
@@ -0,0 +1,2 @@
+DIST atomix-2.14.0.tar.bz2 284987 SHA256 5d4e073c29e7d23d49b1bfcce9edf1e8f0c04bdb91db368e05e854e2b2636bb8 SHA512 9fffd28e1bdda80911ad99da8dc1125d43440de459679763c8502b0b0a68594ab06800198537b067ddac3768d2d90c8772e2b7a6628fa6a5e71fdca77410e709 WHIRLPOOL d5c6b96e974d80826bf5495ace5aaec2278dbe9c2e30bb5402142944e9fde52e5ebb86321bd7c89fde696c18fd60438d0cfa2ad087f1a3923d6cfca9ac82b3b2
+DIST atomix-3.16.0.tar.xz 261464 SHA256 29b0dd200344d6ceb9e4e9ad6034a4d5d14bf06dead343a3b70331f81f66a630 SHA512 bc2c78af2a6b2791d611414cdef24537f2d9e93bd6dd1fdb06a4733d876f2f2eaf197fa75578260c3de810ebbb69c99d4b4344eda0e3a77d7f52b0901eadf1d5 WHIRLPOOL 731a4f6fcd3f83f105ca7b6e0d35fb5ac7210b7fb42538aef4d7c3bea27387b40355fd25766fcdbca3211f68656fd4619f2b1c6cf176cc6a39e284f4c3f018db
diff --git a/games-puzzle/atomix/atomix-2.14.0.ebuild b/games-puzzle/atomix/atomix-2.14.0.ebuild
new file mode 100644
index 000000000000..9554d563246f
--- /dev/null
+++ b/games-puzzle/atomix/atomix-2.14.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GNOME_TARBALL_SUFFIX=bz2
+inherit autotools gnome2
+
+DESCRIPTION="a game where you build full molecules, from simple inorganic to extremely complex organic ones"
+HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/pango-1.0.3
+	>=x11-libs/gtk+-2.6:2
+	>=dev-libs/glib-2.6:2
+	>=gnome-base/gconf-2.12
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libgnome-2.12
+	>=gnome-base/libgnomeui-2.12
+	>=gnome-base/libbonoboui-2.0.0
+	>=gnome-base/libgnomecanvas-2.0.0
+	>=dev-libs/libxml2-2.4.23
+	dev-perl/XML-Parser"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=dev-util/intltool-0.17"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed -i \
+		-e '/Icon/s/\.png//' \
+		-e '/Categories/s/PuzzleGame;//' \
+		atomix.desktop.in || die
+	epatch "${FILESDIR}"/${P}-underlink.patch
+	eautoreconf
+	gnome2_src_prepare
+}
diff --git a/games-puzzle/atomix/atomix-3.16.0.ebuild b/games-puzzle/atomix/atomix-3.16.0.ebuild
new file mode 100644
index 000000000000..e118e8578683
--- /dev/null
+++ b/games-puzzle/atomix/atomix-3.16.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit gnome-games
+
+DESCRIPTION="a game where you build full molecules, from simple inorganic to extremely complex organic ones"
+HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.4.23
+	>=x11-libs/gdk-pixbuf-2.0.5:2
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/atomix/files/atomix-2.14.0-underlink.patch b/games-puzzle/atomix/files/atomix-2.14.0-underlink.patch
new file mode 100644
index 000000000000..682180c048b2
--- /dev/null
+++ b/games-puzzle/atomix/files/atomix-2.14.0-underlink.patch
@@ -0,0 +1,12 @@
+--- src/Makefile.am.old	2013-12-07 22:25:30.513540434 +0100
++++ src/Makefile.am	2013-12-07 22:25:43.209654104 +0100
+@@ -26,7 +26,8 @@
+ 
+ atomix_LDADD = \
+ 	libatomix.a \
+-	$(ATOMIX_LIBS)
++	$(ATOMIX_LIBS) \
++	-lm
+ 
+ noinst_LIBRARIES = libatomix.a
+ 
diff --git a/games-puzzle/atomix/metadata.xml b/games-puzzle/atomix/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/atomix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/bastet/Manifest b/games-puzzle/bastet/Manifest
new file mode 100644
index 000000000000..12d21f45a4c8
--- /dev/null
+++ b/games-puzzle/bastet/Manifest
@@ -0,0 +1 @@
+DIST bastet-0.43.tgz 29115 SHA256 e208c68684cc9b818a08b0d3f5f1e7ef381b1e4d8bc801a90b5ff6a8f00d8168 SHA512 a3683c2cea4df592d9cef2be1b0006acc2b6eddbe6b64aba1c21e81ba39df9bcff6494e0949b67a84f3d1a0fa6837f0d1b7cebb2eb8a551b54392e4a45f2e172 WHIRLPOOL 80e2039599598da1b97af9502f6230e043b5a13c8daad1d48adad69b0ce81c8a8283ea678b0ebffd134cea0d4821dcaf3735a36b0d251d955452855928020147
diff --git a/games-puzzle/bastet/bastet-0.43.ebuild b/games-puzzle/bastet/bastet-0.43.ebuild
new file mode 100644
index 000000000000..7c2ca2ac16ca
--- /dev/null
+++ b/games-puzzle/bastet/bastet-0.43.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="a simple, evil, ncurses-based Tetris(R) clone"
+HOMEPAGE="http://fph.altervista.org/prog/bastet.shtml"
+SRC_URI="http://fph.altervista.org/prog/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses
+	dev-libs/boost"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_install() {
+	dogamesbin bastet
+	doman bastet.6
+	dodoc AUTHORS NEWS README
+	dodir "${GAMES_STATEDIR}"
+	touch "${D}${GAMES_STATEDIR}/bastet.scores" || die "touch failed"
+	fperms 664 "${GAMES_STATEDIR}/bastet.scores"
+	prepgamesdirs
+}
diff --git a/games-puzzle/bastet/files/bastet-0.43-gentoo.patch b/games-puzzle/bastet/files/bastet-0.43-gentoo.patch
new file mode 100644
index 000000000000..db7671592224
--- /dev/null
+++ b/games-puzzle/bastet/files/bastet-0.43-gentoo.patch
@@ -0,0 +1,15 @@
+--- Makefile.old	2010-12-02 15:43:29.000000000 +0100
++++ Makefile	2010-12-02 15:47:18.000000000 +0100
+@@ -11,10 +11,10 @@
+ depend: *.hpp $(SOURCES)
+ 	$(CXX) -MM $(SOURCES) > depend
+ 
+-include depend
++-include depend
+ 
+ $(PROGNAME): $(SOURCES:.cpp=.o)
+-	$(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options
++	$(CXX) ${CXXFLAGS} -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options
+ 
+ clean:
+ 	rm -f $(SOURCES:.cpp=.o) $(PROGNAME)
diff --git a/games-puzzle/bastet/metadata.xml b/games-puzzle/bastet/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/bastet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/biniax2/Manifest b/games-puzzle/biniax2/Manifest
new file mode 100644
index 000000000000..d3f25012ae08
--- /dev/null
+++ b/games-puzzle/biniax2/Manifest
@@ -0,0 +1 @@
+DIST biniax2-1.30-fullsrc.tar.gz 3072220 SHA256 2c09f6f0a5fe453a409d990d72a964636ee91ca91daac99f0db861b8f42531bf SHA512 180564b24051b629c29bc6245664a36b7ff9881ac5003b03b91eeebff86c89b9507c028c1155387c42debaa51482d8f1e2b08e9e9236b77da1c3f286b78be8b5 WHIRLPOOL 7016364f493791f11a28b30a870bf3b60e6271018564e057ef41b8706e3a60ffb1396f48b337c7ccb0fa3777cf3702ad4a400fffca466c7dc590ca9ab5f180bf
diff --git a/games-puzzle/biniax2/biniax2-1.30.ebuild b/games-puzzle/biniax2/biniax2-1.30.ebuild
new file mode 100644
index 000000000000..c5bf7dcf47fb
--- /dev/null
+++ b/games-puzzle/biniax2/biniax2-1.30.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Logic game with arcade and tactics modes"
+HOMEPAGE="http://biniax.com/"
+SRC_URI="http://mordred.dir.bg/biniax/${P}-fullsrc.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+S=${WORKDIR}
+
+src_prepare() {
+	rm -f data/Thumbs.db
+	sed -i \
+		-e "s:data/:${GAMES_DATADIR}/${PN}/:" \
+		desktop/{gfx,snd}.c \
+		|| die
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-dotfiles.patch
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data/*
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry ${PN} Biniax-2
+	prepgamesdirs
+}
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-build.patch b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
new file mode 100644
index 000000000000..26c053c2e98e
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
@@ -0,0 +1,18 @@
+--- makefile
++++ makefile
+@@ -4,7 +4,7 @@
+ # To execute the game you need the runtimes of SDL, SDL_mixer and SDL_image.
+ 
+ FLAGS=-W -WALL
+-CC=gcc
++CC?=gcc
+ FILES=biniax.c hof.c desktop/cfg.c desktop/gfx.c desktop/snd.c desktop/inp.c desktop/sys.c
+ INCLUDES=-I . -I desktop
+ LINKTO=-lSDL -lSDL_mixer -lSDL_image
+@@ -12,4 +12,4 @@
+ TARGET=biniax2
+ 
+ biniax:
+-	$(CC) $(AUTO) $(FILES) $(INCLUDES) -o $(TARGET) $(LINKTO)
+\ No newline at end of file
++	$(CC) $(CFLAGS) $(LDFLAGS) $(AUTO) $(FILES) $(INCLUDES) -o $(TARGET) $(LINKTO)
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
new file mode 100644
index 000000000000..2cd212d6857c
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
@@ -0,0 +1,60 @@
+--- biniax.c
++++ biniax.c
+@@ -47,6 +47,8 @@
+ INCLUDES

+ ******************************************************************************/

+ 

++#include <unistd.h>

++

+ #include "game.h"

+ #include "lev.h"

+ #include "inc.h"

+@@ -97,6 +99,8 @@
+ 	UNREF( argc );

+ 	UNREF( argv );

+ 

++	chdir( getenv( "HOME" ) );

++

+ 	cfgInit();

+ 	hofInit();

+ 	if ( gfxInit() == BNX_FALSE )

+--- desktop/cfg.c
++++ desktop/cfg.c
+@@ -36,7 +36,7 @@
+ ******************************************************************************/

+ 

+ #define _Cfg_Buffer 255

+-#define csConfigName "config.bnx2"

++#define csConfigName ".config.bnx2"

+ 

+ struct BNX_SETUP

+ {

+--- game.h
++++ game.h
+@@ -37,7 +37,7 @@
+ DEFINITIONS

+ ******************************************************************************/

+ 

+-#define csSaveGameName		"autosave.bnx2"

++#define csSaveGameName		".autosave.bnx2"

+ 

+ /******************************************************************************

+ CONSTANTS

+--- hof.c
++++ hof.c
+@@ -34,7 +34,7 @@
+ #define chCursor		'_'			/* Cursor ON */

+ #define chSpace			' '			/* Cursor OFF*/

+ 

+-#define csHOFName		"hof.bnx2"	/* File name */

++#define csHOFName		".hof.bnx2"	/* File name */

+ #define cHOFFileSize	504			/* File size */

+ 

+ BNX_HALL	Hof;

+@@ -292,4 +292,4 @@
+ BNX_HALL *hofGet()

+ {

+ 	return (BNX_HALL *) &Hof;

+-}
+\ No newline at end of file
++}

diff --git a/games-puzzle/biniax2/files/biniax2.xpm b/games-puzzle/biniax2/files/biniax2.xpm
new file mode 100644
index 000000000000..da3c5ddd7d1d
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * icon_xpm[] = {
+"32 32 6 1",
+" 	c None",
+".	c #800000",
+"+	c #FF8204",
+"@	c #FC4E04",
+"#	c #FCA204",
+"$	c #FEC489",
+"                                ",
+"                                ",
+"                                ",
+"               .                ",
+"  ++++++++++  .@.               ",
+"  +########$ .@@@$              ",
+"  +#$$$$$$$$  $@$               ",
+"  +#$          $                ",
+"  +#$                           ",
+"  +#$                           ",
+"  +#$   ++++         +++   +++  ",
+"  +#$   +####        +#$   +#$  ",
+"  +#$   +####+       +#$   +#$  ",
+"  +#$   +#$####      +#$   +#$  ",
+"  +#$   +#$ $##+     +#$   +#$  ",
+"  +#$   +#$  ####    +#$   +#$  ",
+"  +#$   +#$   $##+   +#$   +#$  ",
+"  +#$   +#$    ####  +#$   +#$  ",
+"  +#$   +#$     $##+ +#$   +#$  ",
+"  +#$   +#$      ######$   +#$  ",
+"  +#$   +#$       $####$   +#$  ",
+"  +#$   +#$        ####$   +#$  ",
+"  $$$   $$$         $$$$   +#$  ",
+"                           +#$  ",
+"                           +#$  ",
+"                .          +#$  ",
+"               .@.  ++++++++#$  ",
+"              .@@@$ +########$  ",
+"               $@$  $$$$$$$$$$  ",
+"                $               ",
+"                                ",
+"                                "};
diff --git a/games-puzzle/biniax2/metadata.xml b/games-puzzle/biniax2/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/biniax2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
new file mode 100644
index 000000000000..0d14ddd62c1b
--- /dev/null
+++ b/games-puzzle/braincurses/Manifest
@@ -0,0 +1 @@
+DIST braincurses-0.5b.tar.gz 18487 SHA256 c9adc662a30fdc51b36467e536ff5222b769ec73b35c7bddbd0ed4772c05f332 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e WHIRLPOOL 97829b1602e353714ec085a9ea635557c01911c935e0b6a13728d633026958ee9dd2e3903ca801cb2e24297c4702a325ace1d32908873cec985882a61edcb332
diff --git a/games-puzzle/braincurses/braincurses-0.5b.ebuild b/games-puzzle/braincurses/braincurses-0.5b.ebuild
new file mode 100644
index 000000000000..20227d193457
--- /dev/null
+++ b/games-puzzle/braincurses/braincurses-0.5b.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="An ncurses-based mastermind clone"
+HOMEPAGE="http://freshmeat.net/projects/braincurses/"
+SRC_URI="mirror://sourceforge/braincurses/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
+	# fix buffer overflow (bug #301033)
+	sed -i \
+		-e 's/guessLabel\[2/guessLabel[3/' \
+		curses/windows.cpp \
+		|| die 'sed failed'
+}
+
+src_install() {
+	dogamesbin braincurses
+	dodoc README THANKS Changelog
+	prepgamesdirs
+}
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch b/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
new file mode 100644
index 000000000000..d1f36152403f
--- /dev/null
+++ b/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
@@ -0,0 +1,27 @@
+--- Makefile.old	2009-02-09 16:04:47.000000000 +0100
++++ Makefile	2009-02-09 16:14:41.000000000 +0100
+@@ -1,22 +1,9 @@
+ # Makefile for braincurses game
+ # written by Brian Derr
+ 
+-CC=g++
+-CFLAGS=-Wall
+-CURSES_LIBS=-lncurses
++LDLIBS=-lncurses
+ 
+-ncurses: curses/windows.o braincurses.o 
+-	${CC} ${CURSES_LIBS} ${CFLAGS} -o braincurses curses/windows.o \
+-	braincurses.o
+-
+-windows.o: windows.cpp
+-	${CC} ${CFLAGS} -c curses/windows.cpp
+-
+-braincurses.o: braincurses.cpp
+-	${CC} ${CFLAGS} -c braincurses.cpp
+-
+-#top_scores.o: top_scores.cpp
+-#	${CC} ${CFLAGS} -c top_scores.cpp
++braincurses: curses/windows.cpp braincurses.cpp 
+ 
+ install:
+ 	install -o root -g root braincurses /usr/local/bin/
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch b/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
new file mode 100644
index 000000000000..eafa39e4b9b8
--- /dev/null
+++ b/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
@@ -0,0 +1,10 @@
+--- braincurses.h
++++ braincurses.h
+@@ -12,6 +12,7 @@
+ #include <cstddef>
+ #include <cstdlib>
+ #include <ctime>
++#include <cstring>
+ #include <iostream>
+ #include <map>
+ #include <string>
diff --git a/games-puzzle/braincurses/metadata.xml b/games-puzzle/braincurses/metadata.xml
new file mode 100644
index 000000000000..f8159f79ec81
--- /dev/null
+++ b/games-puzzle/braincurses/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">braincurses</remote-id>
+		<remote-id type="freshmeat">braincurses</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/brainparty/Manifest b/games-puzzle/brainparty/Manifest
new file mode 100644
index 000000000000..c8e952484359
--- /dev/null
+++ b/games-puzzle/brainparty/Manifest
@@ -0,0 +1 @@
+DIST brainparty0.61.tar.gz 40676905 SHA256 6930b563b45f935451b28fa3ed5d33619e766885f82656a3eb48c6d30671a625 SHA512 bc8578a551ce4b7f40e212d9ab9910b2435b88d8b7b7e90a1c088e37d5f26b5c6126fcb9ffee7e39981eff34c13144c8f3204e020532b5abf1c4815cc8074eb9 WHIRLPOOL b8c9065af334a7f404faab934922841adf860fbc36734ae44ba582e7c30f218236c2f266347f1de596e0036f5139e16c5e4702899b83025e5f60fcc1fc36d258
diff --git a/games-puzzle/brainparty/brainparty-0.61.ebuild b/games-puzzle/brainparty/brainparty-0.61.ebuild
new file mode 100644
index 000000000000..3b5c5abb1f65
--- /dev/null
+++ b/games-puzzle/brainparty/brainparty-0.61.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
+HOMEPAGE="http://www.tuxradar.com/brainparty"
+SRC_URI="http://launchpad.net/brainparty/trunk/${PV}/+download/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,opengl,video]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	media-libs/sdl-image[png]
+	media-libs/sdl-gfx"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i \
+		-e 's/$(LIBS) $(OSXCOMPAT) $(OBJFILES)/$(OSXCOMPAT) $(OBJFILES) $(LIBS)/' \
+		-e 's/CXXFLAGS = .*/CXXFLAGS+=-c/' \
+		-e '/^CXX =/d' \
+		-e '/-o brainparty/s/INCLUDES) /&$(LDFLAGS) /' \
+		Makefile || die
+	sed -i \
+		"/^int main(/ a\\\\tchdir(\"${GAMES_DATADIR}/${PN}\");\n" \
+		main.cpp || die
+	epatch \
+		"${FILESDIR}"/${P}-savegame.patch \
+		"${FILESDIR}"/${P}-gcc49.patch
+
+}
+
+src_install() {
+	dogamesbin brainparty
+	insinto "${GAMES_DATADIR}/${PN}/Content"
+	doins Content/*
+	newicon Content/icon.bmp ${PN}.bmp
+	make_desktop_entry brainparty "Brain Party" /usr/share/pixmaps/${PN}.bmp
+	prepgamesdirs
+}
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch b/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch
new file mode 100644
index 000000000000..7147cd460be6
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch
@@ -0,0 +1,20 @@
+--- a/BPList.h
++++ a/BPList.h
+@@ -138,7 +138,7 @@
+ 	~BPPList();
+ 	void Add(T item);
+ 	bool Contains(T item);
+-	void Clear(bool safe_delete);
++	void Clear(bool safe_delete = true);
+ 	int IndexOf(T item);
+ 	void Insert(int pos, T item);
+ 	void Remove(T item);
+@@ -171,7 +171,7 @@
+ }
+ 
+ template <class T>
+-void BPPList<T>::Clear(bool safe_delete = true) {
++void BPPList<T>::Clear(bool safe_delete) {
+ 	if (safe_delete) {
+ 		for (int i = data.size() - 1; i >= 0; --i) {
+ 			T item = data[i];
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch b/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch
new file mode 100644
index 000000000000..08526d345100
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch
@@ -0,0 +1,27 @@
+--- a/BPGame.cpp
++++ b/BPGame.cpp
+@@ -1294,8 +1294,10 @@ void BPGame::LoadSettings() {
+ 	Secret1 = Secret2 = Secret3 = Secret4 = false;
+ 	NumUnlockedGames = 0;
+ 
++	string file = string("/.brainparty");
++	file.insert(0, getenv("HOME"));
+ 	ifstream ifs;
+-	ifs.open(".brainparty");
++	ifs.open(file.c_str());
+ 	
+ 	FirstRun = false;
+ 	
+@@ -1425,8 +1428,11 @@ void BPGame::LoadSettings() {
+ }
+ 
+ void BPGame::SaveSettings() {
++	string file = string("/.brainparty");
++	file.insert(0, getenv("HOME"));
++	
+  	ofstream savefile;
+- 	savefile.open(".brainparty");
++ 	savefile.open(file.c_str());
+ 	savefile << EnableSound << endl;
+ 	savefile << EnableMusic << endl;
+ 	savefile << endl;
diff --git a/games-puzzle/brainparty/metadata.xml b/games-puzzle/brainparty/metadata.xml
new file mode 100644
index 000000000000..edd52d2870d2
--- /dev/null
+++ b/games-puzzle/brainparty/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="launchpad">brainparty</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
new file mode 100644
index 000000000000..becf83b71079
--- /dev/null
+++ b/games-puzzle/brainworkshop/Manifest
@@ -0,0 +1 @@
+DIST brainworkshop-4.8.4.zip 9373980 SHA256 bb1f259eda90e945a803524eedbc0087283e3fb9ae2ab4c16ded88c8c4e95b15 SHA512 d3819036fef98fab9a89637ba01b2d844146babc7cb34b6ec6f4a589c18a7532fd23cf083c867ea1c917df9d7a6507ab51a5942e745d3ab9d01d938812486936 WHIRLPOOL 4faf02832dc3af0f7c5fd0103996a884921433d2f3ff37d77d6c2510d7f6f3ab274dbe08c89f26e360725cb0ea3c52312cd23a813b680d330274579135fee2ef
diff --git a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
new file mode 100644
index 000000000000..d8e3e7e18743
--- /dev/null
+++ b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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=""
+
+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/files/brainworkshop-4.8.4-fix-paths.patch b/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
new file mode 100644
index 000000000000..061187b7cfe0
--- /dev/null
+++ b/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
@@ -0,0 +1,15 @@
+--- 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/metadata.xml b/games-puzzle/brainworkshop/metadata.xml
new file mode 100644
index 000000000000..6c54b4173f44
--- /dev/null
+++ b/games-puzzle/brainworkshop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">brainworkshop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/bubble-chains/Manifest b/games-puzzle/bubble-chains/Manifest
new file mode 100644
index 000000000000..656fef7cb128
--- /dev/null
+++ b/games-puzzle/bubble-chains/Manifest
@@ -0,0 +1 @@
+DIST chains-0.1.1-src.7z 3282431 SHA256 c1c487c51e8cba1640a49497debe5962f692e17df1272994c5dfaee9d6eb304f SHA512 2557974ccfa474329924684d859abae8555bdf7fc8e3264883ed0802255bd29ae486b8150b5ffd2d1b4176d0b8d98aec35f7717da4a6606a6c21026a41f1297c WHIRLPOOL bed7a7d1a64447715d47da432ee495fa5ae4d17ed99376182188398f6c846fa38c5666eac722fd60e7003d77660708809763f5f3466abefccee0b739e74bd69d
diff --git a/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
new file mode 100644
index 000000000000..310d6506b5d2
--- /dev/null
+++ b/games-puzzle/bubble-chains/bubble-chains-0.1.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic qt4-r2 games
+
+MY_P=${P/bubble-}-src
+
+DESCRIPTION="Arcade-puzzle game"
+HOMEPAGE="http://bubble-chains.sintegrial.com/"
+SRC_URI="http://${PN}.sintegrial.com/files/${MY_P}.7z"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXrandr
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-arch/p7zip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	append-cxxflags $(pkg-config sdl --cflags)
+	sed -i \
+		-e "s:/usr/local/bin:${GAMES_BINDIR}:g" \
+		-e "s:/usr/local/games:${GAMES_DATADIR}:g" \
+		-e "s:LIBS += -lSDLmain:LIBS += -lSDL -lX11:" \
+		Game.pro main.cpp || die
+}
+
+src_configure() {
+	eqmake4 Game.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README
+	newicon images/img64_base.png ${PN}.png
+	make_desktop_entry chains "Bubble Chains"
+	prepgamesdirs
+}
diff --git a/games-puzzle/bubble-chains/metadata.xml b/games-puzzle/bubble-chains/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/bubble-chains/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/color-lines/Manifest b/games-puzzle/color-lines/Manifest
new file mode 100644
index 000000000000..6b9e2c2581ab
--- /dev/null
+++ b/games-puzzle/color-lines/Manifest
@@ -0,0 +1 @@
+DIST lines_0.6.tar.gz 862137 SHA256 e20c87dfcc8f940c8af7784dad12e66fa1cd10d0d97766979fef00eb17c0b0b3 SHA512 fe9e96b598fb6cf0980d0970facbc070715b33491a8f0ad979c57332a22e97ab801e85dd17b5d0b2a1b8aba69b48b6c42dc115b01a36654ad05a5e9a06c5405a WHIRLPOOL aa4e0663433a8a967f7595fcbdac5d11d2ff89c25dd0beeca9541f46a94a005ab1b108240fb5fa511f27c407cdd3511d8cdbc57d287d033221a655fa807e2387
diff --git a/games-puzzle/color-lines/color-lines-0.6.ebuild b/games-puzzle/color-lines/color-lines-0.6.ebuild
new file mode 100644
index 000000000000..7212f1e7de96
--- /dev/null
+++ b/games-puzzle/color-lines/color-lines-0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="Color lines game written with SDL with bonus features"
+HOMEPAGE="http://color-lines.googlecode.com/"
+SRC_URI="http://color-lines.googlecode.com/files/lines_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND="media-libs/libsdl[X,sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[wav,mod]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/lines-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Version/d' \
+		-e '/^Icon/s/.png//' \
+		color-lines.desktop.in || die 'sed on color-lines.desktop.in failed'
+
+	epatch_user
+}
+
+src_compile() {
+	emake BINDIR="${EPREFIX}${GAMES_BINDIR}/" GAMEDATADIR="${EPREFIX}${GAMES_DATADIR}/${PN}/"
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r gfx sounds
+
+	domenu ${PN}.desktop
+	doicon icon/${PN}.png
+	dodoc ChangeLog
+	dogamesbin ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
new file mode 100644
index 000000000000..9f552d712713
--- /dev/null
+++ b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
@@ -0,0 +1,35 @@
+--- Makefile.unix.orig	2013-04-12 13:56:42.131113000 +0400
++++ Makefile.unix	2013-04-12 13:57:26.595946027 +0400
+@@ -2,18 +2,18 @@
+ VERTITLE := lines-$(VERSION)
+ ARCHIVE := lines_$(VERSION).tar.gz
+ 
+-CFLAGS:=-Wall -O2 $(shell sdl-config --cflags) 
++CFLAGS += $(shell sdl-config --cflags) 
+ #-DMAEMO
+ 
+-LDFLAGS:=$(shell sdl-config --libs) -lSDL_image -lSDL_mixer
++LIBS   := -lm $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
+ 
+ SRC     := board.c graphics.c main.c sound.c
+ OBJ     := $(patsubst %.c, %.o, $(SRC))
+ 
+ all: color-lines
+-PREFIX:=/usr/local
++PREFIX:=/usr
+ 
+-BINDIR:=$(DESTDIR)/$(PREFIX)/games/
++BINDIR:=$(DESTDIR)$(PREFIX)/games/bin
+ GAMEDATADIR:=$(DESTDIR)/$(PREFIX)/share/games/color-lines/
+ 
+ svnclean:
+@@ -29,8 +29,7 @@
+ 
+ color-lines:  $(OBJ)
+ 	cat color-lines.desktop.in | sed -e "s|@BINDIR|$(BINDIR)|g" > color-lines.desktop
+-	$(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@) 
+-	strip color-lines
++	$(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o color-lines
diff --git a/games-puzzle/color-lines/metadata.xml b/games-puzzle/color-lines/metadata.xml
new file mode 100644
index 000000000000..d2caaa081e19
--- /dev/null
+++ b/games-puzzle/color-lines/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>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">color-lines</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/colorcode/Manifest b/games-puzzle/colorcode/Manifest
new file mode 100644
index 000000000000..007ba5ce75e1
--- /dev/null
+++ b/games-puzzle/colorcode/Manifest
@@ -0,0 +1 @@
+DIST ColorCode-0.7.2.tar.gz 236580 SHA256 d1c5bf4d65c81de16c4159c2c69c096fc7ff47cca587d7233985e078d63c79aa SHA512 e45eedc2bb5f9f3d110c5c6b0531c5180d5f68532b9b50fe7767073ce068faef52d718337f93eef43d3325bd741a67660a3e53b6ee0ffc6d9371806a8bf324ce WHIRLPOOL ee82b0f78f461f000f3459f5a621045170c56986131907efaa1d4b5cbabcc72b2b47a8de31b2ca09adf21234aa24c1cb9c5a0ac12907c8b860d6ad0ddd192c7c
diff --git a/games-puzzle/colorcode/colorcode-0.7.2.ebuild b/games-puzzle/colorcode/colorcode-0.7.2.ebuild
new file mode 100644
index 000000000000..d1b45241cfe9
--- /dev/null
+++ b/games-puzzle/colorcode/colorcode-0.7.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-r2 games
+
+MY_PN=ColorCode
+DESCRIPTION="A free advanced MasterMind clone"
+HOMEPAGE="http://colorcode.laebisch.com/"
+SRC_URI="http://${PN}.laebisch.com/download/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+	sed -i -e '/FLAGS/d' ${PN}.pro || die
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	qt4-r2_src_configure
+}
+
+src_install() {
+	dogamesbin ${PN}
+	newicon img/cc64.png ${PN}.png
+	make_desktop_entry ${PN} ${MY_PN}
+	prepgamesdirs
+}
diff --git a/games-puzzle/colorcode/metadata.xml b/games-puzzle/colorcode/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/colorcode/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/concentration/Manifest b/games-puzzle/concentration/Manifest
new file mode 100644
index 000000000000..ac0bc78dddc5
--- /dev/null
+++ b/games-puzzle/concentration/Manifest
@@ -0,0 +1 @@
+DIST concentration-1.2.tar.gz 1044563 SHA256 f247fa694c03bc0a2be91bf85fed8c0f44447d0e7216b2d22259713453596ce8 SHA512 afa9007cfaaa9a1cedcbfc490cb63d93d8ed1e91230ee714cece481ed3a39b73c82ec4cda65b29a27e9e71a7d2215be7f476e3217b487af54716eb4d692ca005 WHIRLPOOL 469e38d5b485ddd2938acc66f57a4b259828d2e5baf13827b45b1c11dbfaaa36cc4a2f1b5e8e7d17088246469cfffa461296b650730e6e3b71d55195b808e1bf
diff --git a/games-puzzle/concentration/concentration-1.2-r1.ebuild b/games-puzzle/concentration/concentration-1.2-r1.ebuild
new file mode 100644
index 000000000000..902176460f0c
--- /dev/null
+++ b/games-puzzle/concentration/concentration-1.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="The classic memory game with some new life"
+HOMEPAGE="https://packages.gentoo.org/package/games-puzzle/concentration"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-ttf"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	default
+	newicon pics/set1/19.png ${PN}.png
+	make_desktop_entry ${PN} Concentration
+	prepgamesdirs
+}
diff --git a/games-puzzle/concentration/files/concentration-1.2-gentoo.patch b/games-puzzle/concentration/files/concentration-1.2-gentoo.patch
new file mode 100644
index 000000000000..759d068b5bae
--- /dev/null
+++ b/games-puzzle/concentration/files/concentration-1.2-gentoo.patch
@@ -0,0 +1,155 @@
+diff -ru concentration-1.2.orig/src/ShiftyEngine.c concentration-1.2/src/ShiftyEngine.c
+--- concentration-1.2.orig/src/ShiftyEngine.c	2004-09-20 21:08:59.000000000 -0400
++++ concentration-1.2/src/ShiftyEngine.c	2010-05-18 13:39:22.717713130 -0400
+@@ -61,13 +61,13 @@
+ 	int len = strlen(name);
+ 	assert(name);
+ 
+-	gameName = (char *)malloc((sizeof(char) * len) + 1);
++	gameName = malloc(len + 1);
+ 	if(!gameName) {
+ 		fprintf(stderr, "Out Of Memory.");
+ 		exit(1);
+ 	}
+ 
+-	strncpy(gameName, name, len);
++	snprintf(gameName, len + 1, "%s", name);
+ }
+ 
+ /*****************************************************
+@@ -87,13 +87,13 @@
+ 	int len = strlen(name);
+ 	assert(name);
+ 
+-	backgroundName = (char *)malloc((sizeof(char) * len) + 1);
++	backgroundName = malloc(len + 1);
+ 	if(!backgroundName) {
+ 		fprintf(stderr, "Out Of Memory.");
+ 		exit(1);
+ 	}
+ 
+-	strncpy(backgroundName, name, len);
++	snprintf(backgroundName, len + 1, "%s", name);
+ }
+ 
+ /*****************************************************
+@@ -175,7 +175,7 @@
+ 		exit(1);
+ 	}
+ 
+-	strncpy(t->name, name, 16);
++	snprintf(t->name, 16, "%s", name);
+ 	t->x = x;
+ 	t->y = y;
+ 	t->w = w;
+diff -ru concentration-1.2.orig/src/concentration.c concentration-1.2/src/concentration.c
+--- concentration-1.2.orig/src/concentration.c	2005-11-09 11:05:02.000000000 -0500
++++ concentration-1.2/src/concentration.c	2010-05-18 13:42:19.688474410 -0400
+@@ -202,7 +202,7 @@
+ 
+ /*****************************************************
+  ****************************************************/
+-inline void drawText(char * str, SDL_Color color, int x, int y, TTF_Font * font)
++void drawText(char * str, SDL_Color color, int x, int y, TTF_Font * font)
+ {
+ 	static SDL_Rect dest;
+ 	
+@@ -814,7 +814,7 @@
+ 				SE_Error("A blit failed.");
+ 			SDL_FreeSurface(text);
+ 			
+-			sprintf(str, "%d seconds", myclock);
++			snprintf(str, sizeof(str), "%d seconds", myclock);
+ 			text   = TTF_RenderText_Blended(smallFont, str, black);
+ 			if(!text)
+ 				SE_Error("A render failed.");
+@@ -831,7 +831,7 @@
+ 				SE_Error("A blit failed.");
+ 			SDL_FreeSurface(text);
+ 			
+-			sprintf(str, "%d trys", hits + misses);
++			snprintf(str, sizeof(str), "%d trys", hits + misses);
+ 			text   = TTF_RenderText_Blended(smallFont, str, black);
+ 			if(!text)
+ 				SE_Error("A render failed.");
+@@ -840,7 +840,7 @@
+ 				SE_Error("A blit failed.");
+ 			SDL_FreeSurface(text);
+ 			
+-			sprintf(str, "Total pairs: %d", (size == 2) ? 2 : (size == 4) ? 8 : 36);
++			snprintf(str, sizeof(str), "Total pairs: %d", (size == 2) ? 2 : (size == 4) ? 8 : 36);
+ 			text   = TTF_RenderText_Blended(smallFont, str, black);
+ 			if(!text)
+ 				SE_Error("A render failed.");
+@@ -1327,7 +1327,7 @@
+ {
+ 	int x, makeFullScreen = 0;
+ 
+-	char name[16];
++	char name[64];
+ 	
+ 	SE_SetName("Concentration 1.2");
+ 	SE_SetBackground("pics/background.png");
+@@ -1395,13 +1395,13 @@
+ 
+ 	/* load icon set 1 */
+ 	for(x = 1; x <= 30; x++) {
+-		sprintf(name, "pics/set1/%d.png", x);
++		snprintf(name, sizeof(name), "pics/set1/%d.png", x);
+ 		icons[x] = loadPNG(name);
+ 
+-		sprintf(name, "pics/set2/%d.png", x);
++		snprintf(name, sizeof(name), "pics/set2/%d.png", x);
+ 		icons2[x] = loadPNG(name);
+ 
+-		sprintf(name, "pics/set3/%d.png", x);
++		snprintf(name, sizeof(name), "pics/set3/%d.png", x);
+ 		icons3[x] = loadPNG(name);
+ 	}
+ 
+diff -ru concentration-1.2.orig/src/gfx.c concentration-1.2/src/gfx.c
+--- concentration-1.2.orig/src/gfx.c	2004-09-20 21:08:59.000000000 -0400
++++ concentration-1.2/src/gfx.c	2010-05-18 13:39:22.718722669 -0400
+@@ -39,8 +39,7 @@
+ 		exit(1);
+ 	}
+ 
+-	strcpy(newname, sg_data_path);
+-	strcat(newname, name);
++	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
+ 
+ 	temp = IMG_Load(newname);
+ 	if (temp == NULL) {
+@@ -67,8 +66,7 @@
+ 		exit(1);
+ 	}
+ 
+-	strcpy(newname, sg_data_path);
+-	strcat(newname, name);
++	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
+ 
+ 	temp = IMG_Load(newname);
+ 	if (temp == NULL) {
+@@ -99,8 +97,7 @@
+ 		exit(1);
+ 	}
+ 
+-	strcpy(newname, sg_data_path);
+-	strcat(newname, name);
++	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
+ 
+ 	temp = TTF_OpenFont(newname, size);
+ 	if (temp == NULL) {
+diff -ru concentration-1.2.orig/src/sound.c concentration-1.2/src/sound.c
+--- concentration-1.2.orig/src/sound.c	2004-09-20 21:08:59.000000000 -0400
++++ concentration-1.2/src/sound.c	2010-05-18 13:39:22.718722669 -0400
+@@ -57,8 +57,7 @@
+ 		fprintf(stderr, "Out of memory!\n");
+ 		exit(1);
+ 	}
+-	strcpy(newname, sg_data_path);
+-	strcat(newname, name);
++	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
+ 
+ 	temp = Mix_LoadWAV(newname);
+ 	if(!temp)
diff --git a/games-puzzle/concentration/metadata.xml b/games-puzzle/concentration/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/concentration/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
new file mode 100644
index 000000000000..c2837d62767f
--- /dev/null
+++ b/games-puzzle/connectagram/Manifest
@@ -0,0 +1,2 @@
+DIST connectagram-1.0.1-src.tar.bz2 263808 SHA256 6d3696b69f09eda26cdd2a42fe4d91de3effc4757c68f5109b19c1d4d6510e37 SHA512 747a34c7f42a7ac4b09178bc10d17124429d06d257b9e6f25cf800ecb2c06037611871c45bc67c17eda690ea77bba7c59661d1730a3bd01fb0aa0ccd82244aeb WHIRLPOOL 70b126c2b7e0a8d96f6b447348196549163bc90a47049bde2801bbe06feddfdc3ecd43ae688b333719a8292984ca0a10813fe7d94aa19ccfdc03530e97550a58
+DIST connectagram-1.2.1-src.tar.bz2 1632426 SHA256 0a559243a8d970bb79c6791214be879269fc073b5eaec6aa55fb60be82f140bb SHA512 0266af5680e7f76d517f60934afc6115c1118832fef237803b1b3d8c0fb785e5c312d585b099f24f4c476f124ca9722868a159dc4d1a9a8a695e9cdfa4f9c1c6 WHIRLPOOL 3862fee2f4a87c6d7a78bbbaa64713b640df2c0020dfb542eb5655b77c687ca105380ac96c29dc18a324ad90f8942d503044b25971d64c7862925290eccafdca
diff --git a/games-puzzle/connectagram/connectagram-1.0.1-r1.ebuild b/games-puzzle/connectagram/connectagram-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..c527deeefef2
--- /dev/null
+++ b/games-puzzle/connectagram/connectagram-1.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils qt4-r2 games
+
+DESCRIPTION="A word unscrambling game"
+HOMEPAGE="http://gottcode.org/connectagram/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	sed -i \
+		-e "/PREFIX/s:/usr/local:/usr:" \
+		-e "/target.path/s:\$\$PREFIX/bin:${GAMES_BINDIR}:" \
+		-e "/definitions.path/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
+		${PN}.pro || die
+}
+
+src_configure() {
+	qt4-r2_src_configure
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc ChangeLog
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/connectagram/connectagram-1.2.1.ebuild b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
new file mode 100644
index 000000000000..e1443bca3274
--- /dev/null
+++ b/games-puzzle/connectagram/connectagram-1.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils qmake-utils games
+
+DESCRIPTION="A word unscrambling game"
+HOMEPAGE="http://gottcode.org/connectagram/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-qt/qtcore-5.2:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	>=dev-qt/qtgui-5.2:5"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed -i \
+		-e "s#@GAMES_BINDIR@#${GAMES_BINDIR}#" \
+		-e "s#@GAMES_DATADIR@#${GAMES_DATADIR}#" \
+		${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
+}
+
+src_configure() {
+	eqmake5 connectagram.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc CREDITS ChangeLog NEWS README
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch
new file mode 100644
index 000000000000..b02dfef46792
--- /dev/null
+++ b/games-puzzle/connectagram/files/connectagram-1.2.1-gentoo.patch
@@ -0,0 +1,76 @@
+--- connectagram-1.2.1.orig/connectagram.pro
++++ connectagram-1.2.1/connectagram.pro
+@@ -74,16 +74,16 @@
+ 	RESOURCES += icons/icon.qrc
+ 
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+-		BINDIR = bin
++		BINDIR = @GAMES_BINDIR@
+ 	}
+ 
+-	target.path = $$PREFIX/$$BINDIR/
++	target.path = $$BINDIR/
+ 
+ 	data.files = data
+-	data.path = $$PREFIX/share/connectagram/
++	data.path = @GAMES_DATADIR@/connectagram/
+ 
+ 	pixmap.files = icons/connectagram.xpm
+ 	pixmap.path = $$PREFIX/share/pixmaps/
+@@ -98,7 +98,7 @@
+ 	appdata.path = $$PREFIX/share/appdata/
+ 
+ 	qm.files = translations/*.qm
+-	qm.path = $$PREFIX/share/connectagram/translations
++	qm.path = @GAMES_DATADIR@/connectagram/translations
+ 
+ 	man.files = doc/connectagram.6
+ 	man.path = $$PREFIX/share/man/man6
+--- connectagram-1.2.1.orig/src/locale_dialog.cpp
++++ connectagram-1.2.1/src/locale_dialog.cpp
+@@ -88,6 +88,7 @@
+ 		paths.append(appdir);
+ 		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
+ 		paths.append(appdir + "/../Resources");
++		paths.append("@GAMES_DATADIR@/connectagram");
+ 	}
+ 	for (const QString& path : paths) {
+ 		if (QFile::exists(path + "/translations/")) {
+--- connectagram-1.2.1.orig/src/new_game_dialog.cpp
++++ connectagram-1.2.1/src/new_game_dialog.cpp
+@@ -48,7 +48,7 @@
+ 	m_wordlist = new WordList(this);
+ 	m_wordlist->setLanguage(WordList::defaultLanguage());
+ 	m_languages_box = new QComboBox(this);
+-	QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
++	QStringList languages = QDir("@GAMES_DATADIR@/connectagram/data").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+ 	for (const QString& language : languages) {
+ 		m_languages_box->addItem(LocaleDialog::languageName(language), language);
+ 	}
+--- connectagram-1.2.1.orig/src/wordlist.cpp
++++ connectagram-1.2.1/src/wordlist.cpp
+@@ -91,9 +91,9 @@
+ 
+ QString WordList::defaultLanguage() {
+ 	QString language = QLocale().name();
+-	if (!QFile::exists("connectagram:" + language)) {
++	if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
+ 		language = language.left(2);
+-		if (!QFile::exists("connectagram:" + language)) {
++		if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
+ 			language = "en";
+ 		}
+ 	}
+@@ -112,7 +112,7 @@
+ 	m_maximum_length(0)
+ {
+ 	// Read words from disk
+-	QFile file("connectagram:" + language + "/words");
++	QFile file("@GAMES_DATADIR@/connectagram/data/" + language + "/words");
+ 	if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
+ 		return;
+ 	}
diff --git a/games-puzzle/connectagram/metadata.xml b/games-puzzle/connectagram/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/connectagram/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
new file mode 100644
index 000000000000..899aae692714
--- /dev/null
+++ b/games-puzzle/construo/Manifest
@@ -0,0 +1 @@
+DIST construo-0.2.2.tar.gz 442626 SHA256 93b1dc5c26aab42d886f102e501189982c28d390f8b573f8f4a42bad640ec630
diff --git a/games-puzzle/construo/construo-0.2.2.ebuild b/games-puzzle/construo/construo-0.2.2.ebuild
new file mode 100644
index 000000000000..07653eb74bbf
--- /dev/null
+++ b/games-puzzle/construo/construo-0.2.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools games
+
+DESCRIPTION="2d construction toy with objects that react on physical forces"
+HOMEPAGE="http://www.nongnu.org/construo/"
+SRC_URI="http://freesoftware.fsf.org/download/construo/construo.pkg/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/freeglut
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-lGLU.patch
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf --datadir="${GAMES_DATADIR_BASE}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		bindir="${GAMES_BINDIR}" install
+	dodoc AUTHORS NEWS README TODO
+	prepgamesdirs
+}
diff --git a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
new file mode 100644
index 000000000000..cc946b043bae
--- /dev/null
+++ b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
@@ -0,0 +1,82 @@
+--- command_line.cxx
++++ command_line.cxx
+@@ -19,7 +19,9 @@
+ 
+ #include <config.h>
+ #include <iostream>
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include "settings.hxx"
+ #include "command_line.hxx"
+ 
+--- config.hxx
++++ config.hxx
+@@ -21,6 +21,7 @@
+ #define CONFIG_HH
+ 
+ #include <string>
++#include <cstdlib>
+ 
+ class Config
+ {
+--- lisp_reader.cxx
++++ lisp_reader.cxx
+@@ -17,6 +17,7 @@
+ //  along with this program; if not, write to the Free Software
+ //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
++#include <cstring>
+ #include "construo_error.hxx"
+ #include "lisp_reader.hxx"
+ 
+--- unix_system.cxx
++++ unix_system.cxx
+@@ -17,8 +17,9 @@
+ //  along with this program; if not, write to the Free Software
+ //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+-#include <stdio.h>
+-#include <assert.h>
++#include <cstdio>
++#include <cassert>
++#include <cstring>
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <time.h>
+--- vector.cxx
++++ vector.cxx
+@@ -16,8 +16,8 @@
+ 	totally replaced old CL_Vector with this code
+ */
+ 
+-#include <assert.h>
+-#include <math.h>
++#include <cassert>
++#include <cmath>
+ #include "vector.hxx"
+ 
+ CL_Vector::CL_Vector(float x, float y, float z, float w)
+--- world.cxx
++++ world.cxx
+@@ -17,7 +17,8 @@
+ //  along with this program; if not, write to the Free Software
+ //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+-#include <assert.h>
++#include <cassert>
++#include <cstring>
+ #include <algorithm>
+ #include "config.h"
+ 
+--- x11_display.cxx
++++ x11_display.cxx
+@@ -19,6 +19,7 @@
+ 
+ #include <config.h>
+ #include <iostream>
++#include <cstring>
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <X11/keysym.h>
diff --git a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
new file mode 100644
index 000000000000..4c0b018cfdc1
--- /dev/null
+++ b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
@@ -0,0 +1,18 @@
+--- configure.ac.old	2009-11-24 18:27:48.000000000 +0100
++++ configure.ac	2009-11-24 18:28:29.000000000 +0100
+@@ -114,7 +114,7 @@
+ AC_CHECK_LIB(glut, glutMainLoop,
+ [
+   ConstruoTargets="$ConstruoTargets construo.glut"
+-  AC_SUBST(glut_LIBS,"-lglut")
++  AC_SUBST(glut_LIBS,"-lglut -lGLU -lGL -lm")
+ ],
+ [])
+ 
+@@ -158,4 +158,4 @@
+ echo "  Ingo Ruhnke <grumbel@gmx.de>"
+ echo ""
+ 
+-# EOF #
+\ No newline at end of file
++# EOF #
diff --git a/games-puzzle/construo/metadata.xml b/games-puzzle/construo/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/construo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/cutemaze/Manifest b/games-puzzle/cutemaze/Manifest
new file mode 100644
index 000000000000..f188a11976df
--- /dev/null
+++ b/games-puzzle/cutemaze/Manifest
@@ -0,0 +1 @@
+DIST cutemaze-1.1.1-src.tar.bz2 370854 SHA256 3236d012af36a8390b86524e84d38baa40a12203a1e991c653203f3a23a7445d SHA512 5f61e640ffa26ff1fa3c983fc9b091294a7707eaabeb5b0c14fd4a1e5b271afdb3c5924c342319234e0f0b1dcdb122bbdf15fa1340d3b80ccc7550479aa70bde WHIRLPOOL 1c928473b951abe6801388b0451ffeda60f248063b3619761ef2501b6285026c484d771006ed1aa224f76ccc071d00b17557eac66854fcc1b3f195f4184985f9
diff --git a/games-puzzle/cutemaze/cutemaze-1.1.1.ebuild b/games-puzzle/cutemaze/cutemaze-1.1.1.ebuild
new file mode 100644
index 000000000000..13cbbdf40547
--- /dev/null
+++ b/games-puzzle/cutemaze/cutemaze-1.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-r2 games
+
+DESCRIPTION="A simple, top-down game in which mazes are randomly generated"
+HOMEPAGE="http://gottcode.org/cutemaze/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4"
+RDEPEND=${DEPEND}
+
+src_configure() {
+	qt4-r2_src_configure
+}
+
+src_install() {
+	dogamesbin cutemaze
+	dodoc ChangeLog README
+	doicon icons/${PN}.png
+	domenu icons/${PN}.desktop
+	prepgamesdirs
+}
diff --git a/games-puzzle/cutemaze/metadata.xml b/games-puzzle/cutemaze/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/cutemaze/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
new file mode 100644
index 000000000000..0c67f68f77f2
--- /dev/null
+++ b/games-puzzle/cuyo/Manifest
@@ -0,0 +1 @@
+DIST cuyo-2.~-1.1.tar.gz 3005426 SHA256 7157aa70ae731c17e765fba11736866f2020826ad6187d8df6c55039d4481de6 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787 WHIRLPOOL ef2817feecbe9c785e8d6438aca123247857c8f9845421a5aef89375b0f9c15a050d0e6f16791cab408f8e87a9640ef0cbc77c9cc89f03c5e788d3851b07af2d
diff --git a/games-puzzle/cuyo/cuyo-2.1.1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
new file mode 100644
index 000000000000..a4227a912241
--- /dev/null
+++ b/games-puzzle/cuyo/cuyo-2.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils versionator games
+
+MY_P=${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)
+DESCRIPTION="highly addictive and remotely related to tetris"
+HOMEPAGE="http://www.karimmi.de/cuyo/"
+SRC_URI="http://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+music"
+
+DEPEND="sys-libs/zlib
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer
+	music? ( media-libs/sdl-mixer[mod] )
+	media-libs/sdl-image"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	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/cuyo/files/cuyo-2.1.1-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
new file mode 100644
index 000000000000..9ad50b067fb5
--- /dev/null
+++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
@@ -0,0 +1,11 @@
+--- cuyo-2.~-1.1.orig/src/stringzeug.h
++++ cuyo-2.~-1.1/src/stringzeug.h
+@@ -20,7 +20,7 @@
+ 
+ #include <config.h>
+ #include <string>
+-
++#include <stdio.h>
+ 
+ 
+ 
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
new file mode 100644
index 000000000000..78bafe2ded47
--- /dev/null
+++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
@@ -0,0 +1,30 @@
+--- cuyo-2.~-1.1.orig/icons/Makefile.am
++++ cuyo-2.~-1.1/icons/Makefile.am
+@@ -1,4 +1,4 @@
+-desktopdir = $(datadir)/applications
++desktopdir = /usr/share/applications
+ desktop_DATA = cuyo.desktop
+ 
+ 
+@@ -25,7 +25,7 @@
+ # Das vorige war falsch: die png sollen alle cuyo.png heissen
+ # und nicht cuyo-xxxx.png. Deshalb nachfolgend neue Version:
+ 
+-iconsdir = $(datadir)/icons/hicolor
++iconsdir = /usr/share/icons/hicolor
+ icons_DATA = cuyo-32x32.png cuyo-64x64.png
+ 
+ install-iconsDATA:
+--- cuyo-2.~-1.1.orig/icons/cuyo.desktop
++++ cuyo-2.~-1.1/icons/cuyo.desktop
+@@ -3,9 +3,8 @@
+ Icon=cuyo
+ Type=Application
+ Terminal=false
+-MimeType=application/x-executable
++MimeType=application/x-executable;
+ Categories=Game;BlocksGame;
+-Encoding=UTF-8
+ Comment=A tetris like game with many levels
+ Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
+ Exec=cuyo
diff --git a/games-puzzle/cuyo/metadata.xml b/games-puzzle/cuyo/metadata.xml
new file mode 100644
index 000000000000..658a1ecd0c6d
--- /dev/null
+++ b/games-puzzle/cuyo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<use>
+	<flag name="music">Enable playing of background music</flag>
+</use>
+</pkgmetadata>
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
new file mode 100644
index 000000000000..21b3f3dd737b
--- /dev/null
+++ b/games-puzzle/einstein/Manifest
@@ -0,0 +1,2 @@
+DIST einstein-2.0-src.tar.gz 722301 SHA256 0f2d1c7d46d36f27a856b98cd4bbb95813970c8e803444772be7bd9bec45a548 SHA512 45599546f2f7fce32f7441cfdae88b72297f4a506d9eb98a64c3b24ec2e2fd86a63d59961a21e017df6a7a676d864ad12598d735f9049adf43cddd91d661f619 WHIRLPOOL aa0327d50a87a3e73e5812585cc6fd505eebda91eedbe43b83210a9e574c20be90c026a1d660d634a8a617b650c43a61e7df91c606780e5e5d7a6b2a1765ece1
+DIST einstein.png 932 SHA256 87416ad30823294a55be626adf3bbf3d32f98cf7c8d7e9e65470d78ed37a66a5 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283 WHIRLPOOL 6a83e7e0de616f843a67a828a2b9fdeb47bfb134f5759dc2b04605b4eb89bba18183a3be2f5e92075c88fedb875f80e948dcc906572ba8c3513ff0455501f098
diff --git a/games-puzzle/einstein/einstein-2.0.ebuild b/games-puzzle/einstein/einstein-2.0.ebuild
new file mode 100644
index 000000000000..6973c9b64319
--- /dev/null
+++ b/games-puzzle/einstein/einstein-2.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A puzzle game inspired by Albert Einstein"
+HOMEPAGE="https://freecode.com/projects/einsteinpuzzle"
+SRC_URI="mirror://gentoo/${P}-src.tar.gz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}*.patch
+	sed -i \
+		-e "/PREFIX/s:/usr/local:${GAMES_PREFIX}:" \
+		-e "s:\$(PREFIX)/share/einstein:${GAMES_DATADIR}/${PN}:" \
+		-e "s:\$(PREFIX)/bin:${GAMES_BINDIR}:" \
+		-e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \
+		|| die
+	sed -i \
+		-e "s:PREFIX L\"/share/einstein:L\"${GAMES_DATADIR}/${PN}:" main.cpp \
+		|| die
+}
+
+src_install() {
+	dogamesbin "${PN}"
+	insinto "${GAMES_DATADIR}/${PN}/res"
+	doins einstein.res
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} "Einstein Puzzle"
+	prepgamesdirs
+}
diff --git a/games-puzzle/einstein/files/einstein-2.0-64bit.patch b/games-puzzle/einstein/files/einstein-2.0-64bit.patch
new file mode 100644
index 000000000000..4d6656252898
--- /dev/null
+++ b/games-puzzle/einstein/files/einstein-2.0-64bit.patch
@@ -0,0 +1,31 @@
+--- einstein-2.0.orig/formatter.cpp
++++ einstein-2.0/formatter.cpp
+@@ -58,7 +58,7 @@
+             if ((c.type == INT_ARG) || (c.type == STRING_ARG) ||
+                     (c.type == FLOAT_ARG) || (c.type == DOUBLE_ARG))
+             {
+-                int no = (int)c.data;
++                long int no = (long int)c.data;
+                 args[no - 1] = c.type;
+             }
+         }
+@@ -123,7 +123,7 @@
+ std::wstring Formatter::format(std::vector<ArgValue*> &argValues) const
+ {
+     std::wstring s;
+-    int no;
++    long int no;
+ 
+     for (int i = 0; i < commandsCnt; i++) {
+         Command *cmd = &commands[i];
+@@ -135,8 +135,8 @@
+                 
+             case STRING_ARG:
+             case INT_ARG:
+-                no = (int)cmd->data - 1;
+-                if (no < (int)argValues.size())
++                no = (long int)cmd->data - 1;
++                if (no < (long int)argValues.size())
+                     s += argValues[no]->format(cmd);
+                 break;
+ 
diff --git a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
new file mode 100644
index 000000000000..fe870bf036e7
--- /dev/null
+++ b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
@@ -0,0 +1,11 @@
+--- Makefile.old        2009-02-09 16:37:58.000000000 +0100
++++ Makefile    2009-02-09 16:38:13.000000000 +0100
+@@ -49,7 +49,7 @@
+ 
+ 
+ $(TARGET): $(OBJECTS)
+-	$(CXX) $(LNFLAGS) $(OBJECTS) -o $(TARGET)
++	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(TARGET) $(LNFLAGS)
+ 
+ clean:
+ 	rm -f $(OBJECTS) core* *core $(TARGET) *~
diff --git a/games-puzzle/einstein/files/einstein-2.0-gcc43.patch b/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
new file mode 100644
index 000000000000..25e1815e5e41
--- /dev/null
+++ b/games-puzzle/einstein/files/einstein-2.0-gcc43.patch
@@ -0,0 +1,20 @@
+--- einstein-2.0.orig/convert.h
++++ einstein-2.0/convert.h
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <string>
++#include <typeinfo>
+ 
+ #include "exceptions.h"
+ #include "unicode.h"
+
+--- einstein-2.0.orig/unicode.cpp
++++ einstein-2.0/unicode.cpp
+@@ -1,5 +1,6 @@
+ #include <wchar.h>
+ #include <stdlib.h>
++#include <string.h>
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
diff --git a/games-puzzle/einstein/metadata.xml b/games-puzzle/einstein/metadata.xml
new file mode 100644
index 000000000000..f83be4edcc0b
--- /dev/null
+++ b/games-puzzle/einstein/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="freecode">einsteinpuzzle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
new file mode 100644
index 000000000000..328b133424d7
--- /dev/null
+++ b/games-puzzle/enigma/Manifest
@@ -0,0 +1 @@
+DIST enigma-1.21.tar.gz 56409951 SHA256 d872cf067d8eb560d3bb1cb17245814bc56ac3953ae1f12e2229c8eb6f82ce01 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0 WHIRLPOOL 9583eaacd75c7a3cf5af172d1209771b599e6f8b0fed2b7ea6b0a76ccc2743615d47ac3199f56dd1e39203afc09a43d9aa5d8d879e38502b47d4b77274217b87
diff --git a/games-puzzle/enigma/enigma-1.21-r1.ebuild b/games-puzzle/enigma/enigma-1.21-r1.ebuild
new file mode 100644
index 000000000000..3148edc53fff
--- /dev/null
+++ b/games-puzzle/enigma/enigma-1.21-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils games
+
+DESCRIPTION="puzzle game similar to Oxyd"
+HOMEPAGE="http://www.nongnu.org/enigma/"
+SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="nls"
+
+COMMON_DEPS="media-libs/sdl-ttf
+	media-libs/libsdl[video]
+	media-libs/sdl-mixer
+	media-libs/sdl-image[jpeg,png]
+	media-libs/libpng:0=
+	sys-libs/zlib
+	net-misc/curl
+	|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] )
+	net-libs/enet
+	nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPS}
+	sys-devel/gettext"
+RDEPEND="${COMMON_DEPS}
+	media-fonts/dejavu
+	x11-misc/xdg-utils"
+
+src_prepare() {
+	cp /usr/share/gettext/config.rpath .
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i \
+		-e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
+		src/main.cc || die
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--with-system-enet \
+		$(use_enable nls)
+}
+
+src_install() {
+	DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
+		default
+	dosym \
+		/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
+		"${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf
+	dosym \
+		/usr/share/fonts/dejavu/DejaVuSans.ttf \
+		"${GAMES_DATADIR}"/${PN}/fonts/vera_sans.ttf
+	dohtml -r doc/*
+	doman doc/enigma.6
+	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/enigma/enigma-1.21.ebuild b/games-puzzle/enigma/enigma-1.21.ebuild
new file mode 100644
index 000000000000..06ace23017a8
--- /dev/null
+++ b/games-puzzle/enigma/enigma-1.21.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome2-utils games
+
+DESCRIPTION="puzzle game similar to Oxyd"
+HOMEPAGE="http://www.nongnu.org/enigma/"
+SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="nls"
+
+COMMON_DEPS="media-libs/sdl-ttf
+	media-libs/libsdl[video]
+	media-libs/sdl-mixer
+	media-libs/sdl-image[jpeg,png]
+	media-libs/libpng:0=
+	sys-libs/zlib
+	net-misc/curl
+	|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] )
+	net-libs/enet
+	nls? ( virtual/libintl )"
+DEPEND="${COMMON_DEPS}
+	sys-devel/gettext"
+RDEPEND="${COMMON_DEPS}
+	media-fonts/dejavu
+	media-fonts/ttf-bitstream-vera
+	x11-misc/xdg-utils"
+
+src_prepare() {
+	cp /usr/share/gettext/config.rpath .
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i \
+		-e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
+		src/main.cc || die
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--with-system-enet \
+		$(use_enable nls)
+}
+
+src_install() {
+	DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
+		default
+	dosym \
+		/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
+		"${GAMES_DATADIR}"/${PN}/fonts/DejaVuSansCondensed.ttf
+	dosym \
+		/usr/share/fonts/ttf-bitstream-vera/Vera.ttf \
+		"${GAMES_DATADIR}"/${PN}/fonts/vera_sans.ttf
+	dohtml -r doc/*
+	doman doc/enigma.6
+	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/enigma/files/enigma-1.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch
new file mode 100644
index 000000000000..6d5e91ca76e4
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.21-build.patch
@@ -0,0 +1,110 @@
+diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am
+--- enigma-1.21.orig/Makefile.am	2014-12-19 16:26:06.000000000 -0500
++++ enigma-1.21/Makefile.am	2015-02-06 18:20:22.239518323 -0500
+@@ -3,12 +3,9 @@
+ #   tools -> lib-src/lua
+ #   src   -> tools, lib-src
+ #
+-SUBDIRS = m4 lib-src tools intl src data doc po etc
++SUBDIRS = m4 lib-src tools intl src data po etc
+ EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
+ 
+-docdir = @datadir@/doc/enigma
+-doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
+-
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ .PHONY: tolua
+diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac
+--- enigma-1.21.orig/configure.ac	2014-12-19 16:26:06.000000000 -0500
++++ enigma-1.21/configure.ac	2015-02-06 18:20:22.282516643 -0500
+@@ -342,7 +342,6 @@
+ 	CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer"
+ 	AC_MSG_RESULT(yes)
+ else
+-	CXXFLAGS="$CXXFLAGS -g"
+ 	AC_MSG_RESULT(no)
+ fi
+ 
+diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am
+--- enigma-1.21.orig/etc/Makefile.am	2014-12-19 16:26:05.000000000 -0500
++++ enigma-1.21/etc/Makefile.am	2015-02-06 18:25:44.131945494 -0500
+@@ -1,18 +1,18 @@
+ # if !MINGW32
+ # Comply with xdg icon theme specification
+-icondir = $(prefix)/share/icons/hicolor/48x48/apps
++icondir = /usr/share/icons/hicolor/48x48/apps
+ icon_DATA = enigma.png
+ 
+ # Backwards-compatible global search location for images
+-pixmapdir = $(prefix)/share/pixmaps
++pixmapdir = /usr/share/pixmaps
+ pixmap_DATA = enigma.png
+ 
+ # Install .desktop file in xdg standard location
+-desktopdir = $(prefix)/share/applications
++desktopdir = /usr/share/applications
+ desktop_DATA = enigma.desktop
+ 
+ # Install AppData file
+-appdatadir = $(prefix)/share/appdata
++appdatadir = /usr/share/appdata
+ dist_appdata_DATA = enigma.appdata.xml
+ # endif !MINGW32
+ 
+diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop
+--- enigma-1.21.orig/etc/enigma.desktop	2014-12-19 16:26:05.000000000 -0500
++++ enigma-1.21/etc/enigma.desktop	2015-02-06 18:20:22.282516643 -0500
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=1.21
++Version=1.0
+ Name=Enigma
+ Name[be]=Enigma
+ Name[cs]=Enigma
+@@ -44,5 +44,5 @@
+ StartupNotify=false
+ Icon=enigma
+ Type=Application
+-Categories=Application;Game;PuzzleGame;
++Categories=Game;X-PuzzleGame;
+ 
+diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in
+--- enigma-1.21.orig/po/Makefile.in.in	2014-12-19 16:26:06.000000000 -0500
++++ enigma-1.21/po/Makefile.in.in	2015-02-06 18:20:22.283516604 -0500
+@@ -25,12 +25,12 @@
+ exec_prefix = @exec_prefix@
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@ 
++MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
+ #install_sh@ -d
+ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+diff -ru enigma-1.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am
+--- enigma-1.21.orig/src/Makefile.am	2014-12-19 16:24:38.000000000 -0500
++++ enigma-1.21/src/Makefile.am	2015-02-06 18:20:22.283516604 -0500
+@@ -12,7 +12,7 @@
+ CXXFLAGS = @CXXFLAGS@\
+ 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
+ 	-DDOCDIR=\"$(docdir)\" \
+-	-DLOCALEDIR=\"$(localedir_enigma)\" \
++	-DLOCALEDIR=\"/usr/share/locale\" \
+ 	-I$(top_srcdir)/lib-src/zipios++  \
+ 	-I$(top_builddir)/lib-src/zipios++ \
+ 	-I$(top_srcdir)/lib-src/lua \
+@@ -440,7 +440,7 @@
+ 
+ else # not MINGW32
+ 
+-  localedir_enigma := $(datadir)/locale
++  localedir_enigma := /usr/share/locale
+   mingw_ldadd =
+ 
+ endif
diff --git a/games-puzzle/enigma/metadata.xml b/games-puzzle/enigma/metadata.xml
new file mode 100644
index 000000000000..88fbd37387dd
--- /dev/null
+++ b/games-puzzle/enigma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">enigma-game</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
new file mode 100644
index 000000000000..0ee7df4f98ee
--- /dev/null
+++ b/games-puzzle/ensemblist/Manifest
@@ -0,0 +1 @@
+DIST ensemblist-040126.tar.gz 1312095 SHA256 6cfd48b3f62a0853a08609a85841bea400a9fe0eb9d3b8bdf0f62dd5a8aa36be
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
new file mode 100644
index 000000000000..f54f3356f58f
--- /dev/null
+++ b/games-puzzle/ensemblist/ensemblist-040126.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://savannah.nongnu.org/download/ensemblist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+DEPEND="media-libs/freeglut
+	media-libs/libmikmod:0
+	media-libs/libpng:0
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXmu"
+
+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
new file mode 100644
index 000000000000..42cc04070eef
--- /dev/null
+++ b/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/ensemblist/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
new file mode 100644
index 000000000000..f8bfb943ae61
--- /dev/null
+++ b/games-puzzle/fbg/Manifest
@@ -0,0 +1 @@
+DIST fbg-0.9.tar.gz 1127384 SHA256 189b86f00345fb6cbfdf0c8d55c495960d373b653972fad5fad2f47ba46274e5 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353 WHIRLPOOL 4df0aa39485f5533407f8b2388cce42081acb5b75f00b6b4e5fc49a0e84ff35abcec705d566cf99ac5c083f6453f65d5dee2e1f1b05680cc00acc0b068628b99
diff --git a/games-puzzle/fbg/fbg-0.9-r1.ebuild b/games-puzzle/fbg/fbg-0.9-r1.ebuild
new file mode 100644
index 000000000000..d409745878c4
--- /dev/null
+++ b/games-puzzle/fbg/fbg-0.9-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A Tetris clone written in OpenGL"
+HOMEPAGE="http://fbg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	virtual/glu
+	dev-games/physfs
+	media-libs/libsdl
+	media-libs/libmikmod
+	x11-libs/libXt"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e "/FBGDATADIR=/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
+		-e '/^datadir=/d' \
+		configure \
+		|| die "sed failed"
+}
+
+src_configure() {
+	egamesconf --disable-fbglaunch
+}
+
+src_install() {
+	default
+	newicon startfbg/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Falling Block Game" ${PN}
+	rm -rf "${D}/${GAMES_PREFIX}"/doc
+	prepgamesdirs
+}
diff --git a/games-puzzle/fbg/metadata.xml b/games-puzzle/fbg/metadata.xml
new file mode 100644
index 000000000000..24cdc6eef843
--- /dev/null
+++ b/games-puzzle/fbg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">fbg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
new file mode 100644
index 000000000000..8bd34503da06
--- /dev/null
+++ b/games-puzzle/fish-fillets/Manifest
@@ -0,0 +1,2 @@
+DIST fillets-ng-1.0.1.tar.gz 380290 SHA256 329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da SHA512 fe4a5186f94e953cbc85fe8b0ce804c881c96feda385cfc36e1840e448cf094c3d815fdbe32976a6697a855038951f97a384c277a1c52a048520e8da71136718 WHIRLPOOL ca70ee8e420ebb85f87ba4033eaf0738d9c29f87b347def51f5b53898b05eabdff0593f181e0a6cb7fc5e95159d8d69d040272d2c66c0be2ee1b5cab470a32a1
+DIST fillets-ng-data-1.0.0.tar.gz 146418413 SHA256 ad475a60cc96e8f5f55a7b264c390264898f1891b6ff096cc617e24d75dffd45 SHA512 61c7fe3980510a7dbd85f4c246e7e42a0f79d8e2aacd96a0c7a14189c5dee92292efb030ac92299474162995039073288283fee0f352cf08be6975a2c86703e7 WHIRLPOOL d80bbb54a465f40fb045930d767ac61e4cc5100fcd15b2fa3a4bd358b181c587bdc740851064bbd95140a4dd4f222ab9f1b4964ef089a41a523d9da1de5b25fd
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
new file mode 100644
index 000000000000..9130c13c94f3
--- /dev/null
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+DATA_PV="1.0.0"
+DESCRIPTION="Underwater puzzle game - find a safe way out"
+HOMEPAGE="http://fillets.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
+	mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsdl-1.2[sound,video]
+	>=media-libs/sdl-mixer-1.2.5[vorbis]
+	>=media-libs/sdl-image-1.2.2[png]
+	media-libs/smpeg
+	x11-libs/libX11
+	media-libs/sdl-ttf
+	dev-libs/fribidi
+	>=dev-lang/lua-5"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/fillets-ng-${PV}
+
+src_prepare() {
+	#.mod was renamed to .fmod in lua 5.1.3 - bug #223271
+	sed -i \
+		-e 's/\.mod(/.fmod(/' \
+		$(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
+		|| die "sed failed"
+	rm -f missing
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf \
+		--datadir="${GAMES_DATADIR}/${PN}"
+}
+
+src_install() {
+	default
+	insinto "${GAMES_DATADIR}/${PN}"
+	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
+	rm -f COPYING
+	doins -r *
+	newicon images/icon.png ${PN}.png
+	make_desktop_entry fillets "Fish Fillets NG"
+	prepgamesdirs
+}
diff --git a/games-puzzle/fish-fillets/metadata.xml b/games-puzzle/fish-fillets/metadata.xml
new file mode 100644
index 000000000000..bb9d8fdaf249
--- /dev/null
+++ b/games-puzzle/fish-fillets/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">fillets</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
new file mode 100644
index 000000000000..6cf4286431ba
--- /dev/null
+++ b/games-puzzle/five-or-more/Manifest
@@ -0,0 +1,2 @@
+DIST five-or-more-3.14.1.tar.xz 3214516 SHA256 bc9c248709aecbc6c1736f377bdcf7abfc78691e5d920fd1b83eb1bf7b3a1d70 SHA512 d2f0c1572635c20eb7022ff8bbfee7b740b34226a3ea7f3fd3e32e3138989f8409aaf12033a4f39967728d9813f57b5535a4da7d222783b2c17be9a158e47766 WHIRLPOOL 93c6585ae7d916296e86c68361938b46f88f13178cd2979b7e70c9431928c570ef18e1877b70e2450338eb6743de1791ea2aa3e9a9a6038fa40143a47339e977
+DIST five-or-more-3.16.1.tar.xz 3186212 SHA256 e38999be3c385958875bce86d2cdb4cab8345ecf4ecda0fb96d1012cf8100705 SHA512 6f160b3dedba0e3b4a9e52a49bbf3105339f57b73b13acfdce1f851cf6f9ebeb3a7d632f9bed71e111a8aaa277c2ae1d0289b6ca69b3005481045d8bfd4773ff WHIRLPOOL e4b26505a8d40521a962d15099aafabb05a8049a5d1f32ad26fa857b65196e7774ac0e1540c3cacaf86bcf796a38bd0b962e94b3dfddc705d0317215598e3be6
diff --git a/games-puzzle/five-or-more/five-or-more-3.14.1.ebuild b/games-puzzle/five-or-more/five-or-more-3.14.1.ebuild
new file mode 100644
index 000000000000..fea27c27e944
--- /dev/null
+++ b/games-puzzle/five-or-more/five-or-more-3.14.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Five or More Game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.12:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/appdata-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/five-or-more/five-or-more-3.16.1.ebuild b/games-puzzle/five-or-more/five-or-more-3.16.1.ebuild
new file mode 100644
index 000000000000..bdfb686236d8
--- /dev/null
+++ b/games-puzzle/five-or-more/five-or-more-3.16.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Five or More Game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.12:3
+"
+RDEPEND="${COMMON_DEPEND}
+	!<x11-themes/gnome-themes-standard-3.14
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/five-or-more/metadata.xml b/games-puzzle/five-or-more/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/five-or-more/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
new file mode 100644
index 000000000000..9b139c62c6e4
--- /dev/null
+++ b/games-puzzle/flobopuyo/Manifest
@@ -0,0 +1,2 @@
+DIST flobopuyo-0.20.tgz 2949750 SHA256 be4c32e7fbeaae44278a920b7482fd8805dc142abd4384ee0c080c11d12fad31 SHA512 8ec7e690e53cfc171959663ef07912f2b23ae1842b72faa0125de8d6d2ad93672b9b4d68593b1f49f97c53a13409aca7bc5a598858fc7cff4698a4064ec95276 WHIRLPOOL 073c2a72ad2a8ad91d1be75431d8cb0d374fc31cc22ecc2a310e63a71218244be74c39b9eb9d1a4f997062080757e79ab17cc0b59a087306d28245a83592edce
+DIST flobopuyo.png 25038 SHA256 d0ed25d8396e58be484d68e00c4c3828aa26f01566089c8a3b53772dff00f2b3 SHA512 6eca6fd1559d8ecb62b19be9fcaef2af1edb727154dd4e10f9f0f9ef9863d99c9445689bd64724cb5da0b251384efc491acfa40bf5105fa9bdcecad3f809ceb6 WHIRLPOOL 8e81689a9890b1a44c106e1f137ae880c65c709e02f26e6503bf9dff8c2b87a1fca328b80842b9b6bbce1d08d7bc1ddf361e8523ed7265c93468bfede4982316
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
new file mode 100644
index 000000000000..6c5d39445a4c
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
@@ -0,0 +1,25 @@
+Index: flobopuyo-0.20/IosVector.cpp
+===================================================================
+--- flobopuyo-0.20.orig/IosVector.cpp
++++ flobopuyo-0.20/IosVector.cpp
+@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()

+ void IosVector::dumpVector() const {

+ 	fprintf(stderr, "Size: %d\n", getSize());

+ 	for (int i = 0, j = getSize() ; i < j ; i++)

+-		fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));

++		fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));

+ 	fprintf(stderr, "\n");

+ }

+Index: flobopuyo-0.20/PuyoGame.cpp
+===================================================================
+--- flobopuyo-0.20.orig/PuyoGame.cpp
++++ flobopuyo-0.20/PuyoGame.cpp
+@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe
+ 		return (PuyoState)newItem;

+ 	}

+ 	else

+-		return (PuyoState)(int)(sequenceItems.getElementAt(sequence));

++		return (PuyoState)(long)(sequenceItems.getElementAt(sequence));

+ }

+ 

+ PuyoPuyo::PuyoPuyo(PuyoState state)

diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
new file mode 100644
index 000000000000..6b3f54ef5630
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
@@ -0,0 +1,13 @@
+Index: flobopuyo-0.20/PuyoGame.h
+===================================================================
+--- flobopuyo-0.20.orig/PuyoGame.h
++++ flobopuyo-0.20/PuyoGame.h
+@@ -46,7 +46,7 @@ public:

+     virtual ~PuyoPuyo() {};

+     PuyoState getPuyoState();

+     void setPuyoState(PuyoState state);

+-    bool PuyoPuyo::isFalling();

++    bool isFalling();

+     int getPuyoX() const;

+     int getPuyoY() const;

+     void setPuyoXY(int X, int Y);

diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
new file mode 100644
index 000000000000..64cd0335ce9c
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
@@ -0,0 +1,136 @@
+--- Makefile.orig	2004-10-08 18:41:12.000000000 -0400
++++ Makefile	2008-08-06 19:48:47.000000000 -0400
+@@ -41,15 +41,13 @@
+ ##############
+ 
+ SDL_CONFIG=sdl-config
+-CC=g++
+-CXX=g++
+ 
+-CFLAGS= -DDATADIR=\"${DATADIR}\"
+-LDFLAGS=
++CXXFLAGS+= -DDATADIR=\"${DATADIR}\"
+ 
+ ifneq ($(PLATFORM), $(CYGWIN_VERSION))
+-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
+-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
++CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
++LDFLAGS:=$(LDFLAGS)
++LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
+ endif
+ 
+ HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
+@@ -71,46 +69,46 @@
+ ################
+ # Mac OS X
+ ifeq ($(PLATFORM), Darwin)
+-CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR
++CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR
+ endif
+ 
+ ################
+ # Win32
+ ifeq ($(PLATFORM), $(CYGWIN_VERSION))
+-CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
+-LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
++CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
++LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
++LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
+ endif
+ 
+ ifeq ($(ENABLE_AUDIO), true)
+-CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1
++CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1
+ OBJFILES:=$(OBJFILES)
+ endif
+ 
+ ifeq ($(ENABLE_OPENGL), true)
+-CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
++CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1
+ OBJFILES:=$(OBJFILES) glSDL.o
+ ifeq ($(PLATFORM), Linux)
+-LDFLAGS:=$(LDFLAGS) -lGL
++LDFLAGS:=$(LDFLAGS)
++LIBS:=$(LIBS) -lGL
+ endif
+ endif
+ 
+ ifeq ($(ENABLE_DGA), true)
+ ifeq ($(PLATFORM), Linux)
+-CFLAGS:=$(CFLAGS) -DUSE_DGA=1
++CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1
+ endif
+ endif
+ 
+ ifeq ($(DEBUG), true)
+-CFLAGS:=$(CFLAGS) -DDEBUG=1 -g
++CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g
+ LDFLAGS:=$(LDFLAGS) -g
+ endif
+ 
+-CXXFLAGS=${CFLAGS}
+-
+ all: prelude flobopuyo
+ 
+ flobopuyo: ${OBJFILES}
+-	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
++	@echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image
+ 	@echo "--------------------------------------"
+ 	@echo " Compilation finished"
+ 	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
+@@ -121,14 +119,14 @@
+ prelude:
+ 	@rm -f WARNINGS
+ 	@touch WARNINGS
+-	@echo "Compiling with CFLAGS=$(CFLAGS)"
++	@echo "Compiling with CXXFLAGS=$(CXXFLAGS)"
+ 	@echo "Compiling with LDFLAGS=$(LDFLAGS)"
+ 
+ %.o:%.c
+-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
++	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+ 
+ %.o:%.cpp
+-	@echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
++	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+ 
+ PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES}
+ HiScores.o:HiScores.cpp HiScores.h preferences.h
+@@ -155,10 +153,10 @@
+ IosException.o:IosException.cpp
+ IosVector.o:IosVector.cpp
+ glSDL.o:glSDL.c
+-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
++	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+ 	@rm -f EXT_WARNINGS
+ SDL_prim.o:SDL_prim.c
+-	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
++	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
+ 	@rm -f EXT_WARNINGS
+ corona.o:corona.cpp
+ corona32.o:corona32.cpp
+@@ -178,7 +176,6 @@
+ 	rm -f  .DS_Store */.DS_Store */*/.DS_Store .gdb_history
+ 
+ install: flobopuyo
+-	strip flobopuyo
+ 	mkdir -p ${INSTALL_BINDIR}
+ 	mkdir -p ${INSTALL_DATADIR}
+ 	cp -r data/* ${INSTALL_DATADIR}
+@@ -191,7 +188,7 @@
+ 	chmod a+rx ${INSTALL_BINDIR}/flobopuyo
+ 
+ flobopuyo-static: prelude  ${OBJFILES}
+-	@echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
++	@echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static ${OBJFILES}\
+         /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a /sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs`
+ 	@echo "--------------------------------------"
+ 	@echo " Compilation finished"
+@@ -207,7 +204,6 @@
+ 	rm -rf $(bundle_name)/Contents/Resources/data/CVS $(bundle_name)/Contents/Resources/data/*/CVS
+ 	rm -rf $(bundle_name)/Contents/Resources/data/.xvpics $(bundle_name)/Contents/Resources/data/*/.xvpics
+ 	rm -f $(bundle_name)/Contents/Resources/data/.DS_Store $(bundle_name)/Contents/Resources/data/*/.DS_Store
+-	strip $(bundle_name)/Contents/MacOS/flobopuyo
+ 
+ mac-package: bundle
+ 	mkdir -p $(macimage_name)
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
new file mode 100644
index 000000000000..01db8b5d68d7
--- /dev/null
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs eutils games
+
+DESCRIPTION="Clone of the famous PuyoPuyo game"
+HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29"
+SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="opengl"
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	opengl? ( virtual/opengl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-libs.patch
+
+	find . -type f -name ".*" -exec rm -f \{\} \;
+	sed -i \
+		-e "s:^DATADIR=.*:DATADIR=\"${GAMES_DATADIR}/${PN}\":" \
+		-e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:${GAMES_BINDIR}:" \
+		Makefile \
+		|| die
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" \
+		ENABLE_OPENGL="$(use opengl && echo true || echo false)"
+}
+
+src_install() {
+	default
+	doman man/flobopuyo.6
+	doicon "${DISTDIR}/${PN}.png"
+	make_desktop_entry flobopuyo FloboPuyo
+	prepgamesdirs
+}
diff --git a/games-puzzle/flobopuyo/metadata.xml b/games-puzzle/flobopuyo/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/flobopuyo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
new file mode 100644
index 000000000000..f0cb0bef2cd6
--- /dev/null
+++ b/games-puzzle/freesweep/Manifest
@@ -0,0 +1 @@
+DIST freesweep-0.92.tar.gz 87353 SHA256 519c7405c131bd62db7534855fbb92b9cfcf511ded2bf4d2b94f1abaf86aa698 SHA512 9f7f33ba5fab62d1ea3a6a57b9a60323281c91255218afb51251c4e20500c123769f003ae1a3622205be34fa7cfe11b691e58ad8787782da4d0a7045d4f41122 WHIRLPOOL 7056a37755cb94b168e2e879925bcf436ea9431bed8580f4d0ed54a909329ff88c824fdcb01e5799f1a5d253b4ae42cc9e537adb8355a38e668ad1b72e8160fb
diff --git a/games-puzzle/freesweep/freesweep-0.92.ebuild b/games-puzzle/freesweep/freesweep-0.92.ebuild
new file mode 100644
index 000000000000..5ce298a7bf14
--- /dev/null
+++ b/games-puzzle/freesweep/freesweep-0.92.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs games
+
+DESCRIPTION="Console Minesweeper"
+HOMEPAGE="http://freshmeat.net/projects/freesweep"
+SRC_URI="http://www.upl.cs.wisc.edu/~hartmann/sweep/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~ppc-macos"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+	dogamesbin freesweep
+	dodoc README
+	doman freesweep.6
+	prepgamesdirs
+}
diff --git a/games-puzzle/freesweep/metadata.xml b/games-puzzle/freesweep/metadata.xml
new file mode 100644
index 000000000000..3b43868cdaab
--- /dev/null
+++ b/games-puzzle/freesweep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="freshmeat">freesweep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
new file mode 100644
index 000000000000..1b540df1bb83
--- /dev/null
+++ b/games-puzzle/galaxis/Manifest
@@ -0,0 +1 @@
+DIST galaxis-1.8.tar.gz 8962 SHA256 bc36c7e5b1e1d96e5a8c6cdb117b3891833a99e99df709c5531c7d44009a8adc SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f WHIRLPOOL 719323349e747473501fb4bd737cb7db8b719dd22e5dfc3d0f7acb9402618064206311101a466fa37037381781094b8c90348171e6b8d2f04b04539e96af72b0
diff --git a/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch b/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch
new file mode 100644
index 000000000000..3153291d3f4f
--- /dev/null
+++ b/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch
@@ -0,0 +1,83 @@
+diff -ru galaxis-1.7.orig/Makefile galaxis-1.7/Makefile
+--- galaxis-1.7.orig/Makefile	2003-12-29 04:09:53.000000000 -0500
++++ galaxis-1.7/Makefile	2010-10-18 13:08:43.929375025 -0400
+@@ -3,9 +3,8 @@
+ VERS=$(shell sed <galaxis.spec -n -e '/Version: \(.*\)/s//\1/p')
+ 
+ # Flags for use with the Linux ncurses package (recommended)
+-CFLAGS = -g -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
++CFLAGS += -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
+ TERMLIB = -lncurses
+-CC = gcc
+ 
+ # Flags for use with stock curses
+ #CFLAGS = -DNDEBUG
+@@ -13,7 +12,7 @@
+ #CC = gcc
+ 
+ galaxis: galaxis.c
+-	$(CC) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
+ 
+ galaxis.6: galaxis.xml
+ 	xmlto man galaxis.xml
+diff -ru galaxis-1.7.orig/galaxis.c galaxis-1.7/galaxis.c
+--- galaxis-1.7.orig/galaxis.c	2003-12-26 23:19:20.000000000 -0500
++++ galaxis-1.7/galaxis.c	2010-10-18 13:10:03.575307583 -0400
+@@ -8,6 +8,10 @@
+ #define _POSIX_SOURCE
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <time.h>
++#include <string.h>
+ #include <termios.h>
+ #include <curses.h>
+ #include <signal.h>
+@@ -29,7 +33,6 @@
+ extern long lrand48();
+ extern void srand48();
+ #define bzero(s, n)	(void)memset((char *)(s), '\0', n)
+-extern char *memset();
+ /*
+  * Try this if ungetch() fails to resolve.
+  *
+@@ -167,16 +170,17 @@
+ }		    
+ 
+ /* VARARGS1 */
+-static void prompt(f, s)
++static void prompt(s)
+ /* print a message at the prompt line */
+-char *f, *s;
++char *s;
+ {
+     (void) move(PROMPTLINE, 0);
+     (void) clrtoeol();
+-    (void) printw(f, s);
++    (void) printw("%s", s);
+     (void) refresh();
+ }
+ 
++#if 0
+ static void error(s)
+ char *s;
+ {
+@@ -188,6 +192,7 @@
+ 	(void) beep();
+     }
+ }
++#endif
+ 
+ static int rnd(n)
+ int n;
+@@ -647,7 +652,7 @@
+     }
+ }
+ 
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char *argv[];
+ {
diff --git a/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch b/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
new file mode 100644
index 000000000000..abee05096288
--- /dev/null
+++ b/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
@@ -0,0 +1,60 @@
+diff -ru galaxis-1.8.orig/Makefile galaxis-1.8/Makefile
+--- galaxis-1.8.orig/Makefile	2010-10-19 09:48:58.000000000 -0400
++++ galaxis-1.8/Makefile	2010-10-20 04:04:49.246650551 -0400
+@@ -3,9 +3,8 @@
+ VERS=$(shell sed <galaxis.spec -n -e '/Version: \(.*\)/s//\1/p')
+ 
+ # Flags for use with the Linux ncurses package (recommended)
+-CFLAGS = -g -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
++CFLAGS += -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
+ TERMLIB = -lncurses
+-CC = gcc
+ 
+ # Flags for use with stock curses
+ #CFLAGS = -DNDEBUG
+@@ -13,7 +12,7 @@
+ #CC = gcc
+ 
+ galaxis: galaxis.c
+-	$(CC) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
+ 
+ galaxis.6: galaxis.xml
+ 	xmlto man galaxis.xml
+diff -ru galaxis-1.8.orig/galaxis.c galaxis-1.8/galaxis.c
+--- galaxis-1.8.orig/galaxis.c	2010-10-13 06:13:31.000000000 -0400
++++ galaxis-1.8/galaxis.c	2010-10-20 04:05:30.036888771 -0400
+@@ -8,6 +8,8 @@
+ #define _POSIX_SOURCE
+ 
+ #include <stdio.h>
++#include <unistd.h>
++#include <time.h>
+ #include <termios.h>
+ #include <curses.h>
+ #include <signal.h>
+@@ -176,6 +177,7 @@
+     (void) refresh();
+ }
+ 
++#if 0
+ static void error(char *s)
+ {
+     (void) move(PROMPTLINE + 2, 0);
+@@ -186,6 +188,7 @@
+ 	(void) beep();
+     }
+ }
++#endif
+ 
+ static int rnd(int n)
+ {
+@@ -644,7 +647,7 @@
+     }
+ }
+ 
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char *argv[];
+ {
diff --git a/games-puzzle/galaxis/galaxis-1.8.ebuild b/games-puzzle/galaxis/galaxis-1.8.ebuild
new file mode 100644
index 000000000000..9aeb8cdb89c8
--- /dev/null
+++ b/games-puzzle/galaxis/galaxis-1.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="A UNIX-hosted, curses-based clone of the nifty little Macintosh freeware game Galaxis"
+HOMEPAGE="http://www.catb.org/~esr/galaxis/"
+SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.3"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_install() {
+	dogamesbin galaxis
+	doman galaxis.6
+	dodoc README
+	prepgamesdirs
+}
diff --git a/games-puzzle/galaxis/metadata.xml b/games-puzzle/galaxis/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/galaxis/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gemdropx/Manifest b/games-puzzle/gemdropx/Manifest
new file mode 100644
index 000000000000..dd5beb99ef6f
--- /dev/null
+++ b/games-puzzle/gemdropx/Manifest
@@ -0,0 +1 @@
+DIST gemdropx-0.9.tar.gz 903036 SHA256 e50495d292a1d456c28044efbf07c16d8865f8d95e1caba86f4c5b2e3fb1d28f SHA512 f99292f44575cb86c50e29f220d5fd358b3e6dd379148dcd764eac5bca5edcc49f88e119f9bebddb14017403985378f1bc07633c987556a9264f36ce20cc6fb2 WHIRLPOOL 05d0ce2cecbcbdac76dd4f60637ef875f647ec6387f0cac19ad4c099d396e019dda269ce344185ed1963f69eb08a3555050a287c01abe180d8b9b5386a0e86c7
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
new file mode 100644
index 000000000000..5758c2d3e6aa
--- /dev/null
+++ b/games-puzzle/gemdropx/gemdropx-0.9-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="A puzzle game where it's your job to clear the screen of gems"
+HOMEPAGE="http://www.newbreedsoftware.com/gemdropx/"
+SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.2.3-r1[joystick,video]
+	>=media-libs/sdl-mixer-1.2.1[mod]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC/d' \
+		-e '/^CXX/d' \
+		-e 's/CXX/CC/' \
+		-e 's/-o/$(LDFLAGS) -o/' \
+		Makefile || die
+
+	find data/ -type d -name .xvpics -exec rm -rf \{\} +
+}
+
+src_compile() {
+	emake \
+		DATA_PREFIX="${GAMES_DATADIR}/${PN}" \
+		XTRA_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dogamesbin gemdropx
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r data/* "${D}/${GAMES_DATADIR}/${PN}/" || die
+	dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
+	prepgamesdirs
+}
diff --git a/games-puzzle/gemdropx/metadata.xml b/games-puzzle/gemdropx/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/gemdropx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
new file mode 100644
index 000000000000..6fa1c5653afa
--- /dev/null
+++ b/games-puzzle/gfifteen/Manifest
@@ -0,0 +1 @@
+DIST gfifteen-1.0.3.tar.gz 525454 SHA256 049eec9eec2f857823f185a72c831d9bd8a1368a9965bd04796e1fe0553f5e6f SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4 WHIRLPOOL 9dadd31972efd3bbf474c582aea4129dfe7105d10f5df2f93614df1b5e552a6754aea2cedfb3f8c2e05e2c0c97c75a78ce24b262f800da884d4bcdce0cc3eeb2
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
new file mode 100644
index 000000000000..d1bb5dc05516
--- /dev/null
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="graphical implementation of the sliding puzzle game fifteen"
+HOMEPAGE="https://frigidcode.com/code/gfifteen/"
+SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	# make it compile against newer gtk+:3 (bug #536994)
+	sed -i \
+		-e 's/-DGTK_DISABLE_DEPRECATED=1 //' \
+		Makefile.in || die
+}
+
+src_configure() {
+	egamesconf --disable-assembly
+}
+
+src_install() {
+	default
+	doicon -s scalable ${PN}.svg
+	domenu gfifteen.desktop
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/gfifteen/metadata.xml b/games-puzzle/gfifteen/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/gfifteen/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/glightoff/Manifest b/games-puzzle/glightoff/Manifest
new file mode 100644
index 000000000000..eb6e3204012f
--- /dev/null
+++ b/games-puzzle/glightoff/Manifest
@@ -0,0 +1 @@
+DIST glightoff-1.0.0.tar.gz 349274 SHA256 14dd3174e75c175b437cd5a6c8a9eddc29865b62c588463892031cd0a355938a SHA512 b3be7f65bfbb6b3affbddd20a12321ee401defb2bc0b64e58b5aed05d319e6ac51100cfa8dfb4beddb3c919deb9ee6931235dbc4183c12d3e501da5eb748ae94 WHIRLPOOL ce5506248de6f0174eb3b9bc3549a762ab48a6973a4068752d59056c1ff48329551a81fd8460a8eb263401b3e8fd6b3986d8ba2a4d1f12ffb167aa4a0152f1b8
diff --git a/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch b/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
new file mode 100644
index 000000000000..0d087d78df9f
--- /dev/null
+++ b/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
@@ -0,0 +1,15 @@
+--- glightoff.desktop.in.old	2014-11-22 17:57:47.019838007 +0100
++++ glightoff.desktop.in	2014-11-22 17:58:15.484321664 +0100
+@@ -1,10 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=GLightOff
+ _Comment=Simple Light Off game
+ Exec=glightoff
+ Terminal=false
+ Type=Application
+-Icon=glightoff.png
+-Categories=GNOME;Application;Game;PuzzleGame;
++Icon=glightoff
++Categories=GNOME;Game;
+ StartupNotify=true
diff --git a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..f523e25a3039
--- /dev/null
+++ b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="A simple (but not so easy to solve!) puzzle game"
+HOMEPAGE="http://glightoff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="
+	gnome-base/librsvg
+	media-libs/libpng:0=
+	>=x11-libs/gtk+-2.6:2
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.29
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Fix broken png files
+	pngfix -q --out=out.png glightoff.png
+	mv -f out.png glightoff.png || die
+
+	epatch "${FILESDIR}/${PN}-1.0.0-desktop.patch"
+
+	gnome2_src_prepare
+}
diff --git a/games-puzzle/glightoff/metadata.xml b/games-puzzle/glightoff/metadata.xml
new file mode 100644
index 000000000000..81f551222572
--- /dev/null
+++ b/games-puzzle/glightoff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">glightoff</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
new file mode 100644
index 000000000000..36d8f5d9bea4
--- /dev/null
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-klotski-3.14.2.tar.xz 1818908 SHA256 e11ebe420536abda02ab69e451a60eb1c69a1c5afb1735398eaf80480aa72697 SHA512 bd995bb7429a579efe5cb8dc0e1ec06622a5cb9ba630b77511cb0f73f7570e4bf59b910bd8c8affd3a324c5f70965ba4695ff2d7127c69fdf5cf6c8e7e9a4d62 WHIRLPOOL b6422df45d2bf0476ccce611d67d698aa9cedbbe8630560087348092ea0ad3c607a0146a994a4bd0603662dba55943d4ea4c44dd2694dd54d29d7a73ad9da4dd
+DIST gnome-klotski-3.16.1.tar.xz 1413744 SHA256 5ddd6778d88883bd293bce7998ff9155d1d1e94f3809a7a00ce5dec3ca48c428 SHA512 9e3f03df1453634ab8e847921bba94f240c940f30f48824dac214bf106df7a2186912537186c5ba6af14456540578fd2d82da47161ecc49991bbe630425f2462 WHIRLPOOL 8d19b2be1f3b152f446f2761c59e1050751ba337f30f34d41c6197f94a6941b4989017b94cefea56caee0a7b51766e7a64538e897de1dcdd667c5812e5309671
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.14.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.14.2.ebuild
new file mode 100644
index 000000000000..0cfac834bb49
--- /dev/null
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.14.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Slide blocks to solve the puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.32.0
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-util/appdata-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome-games_src_configure APPDATA_VALIDATE=$(type -P true)
+}
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.16.1.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.16.1.ebuild
new file mode 100644
index 000000000000..59a0b5b46285
--- /dev/null
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.16.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Slide blocks to solve the puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=gnome-base/librsvg-2.32.0
+	>=x11-libs/gtk+-3.15: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() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/gnome-klotski/metadata.xml b/games-puzzle/gnome-klotski/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/gnome-klotski/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
new file mode 100644
index 000000000000..68a5a1f1830f
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-sudoku-3.14.2.tar.xz 3071084 SHA256 4364662b624d76e174f1930811061de5358c917e4f546c8e5ca234e120689301 SHA512 031e200d90d85c4ac1ffcda78e26cfa79f81cca442ea4d73b46e6f56e639e0885590b2156bb0c1781051712e4f095df69a352224f9acecc514eb8471211e4304 WHIRLPOOL c492e97fbd8318bcd2b92371e17d1eb868a3571b1db830e33bd398a62c5f1bab07704caae959b503baf6e30baa50dd5ee285623a5a71e307d2d516d1b5a21e35
+DIST gnome-sudoku-3.16.0.tar.xz 3063340 SHA256 bbeb4c410ac690df967fe494da92a40ded473ed28b2565c5e2f34af91be53dad SHA512 26567f0eeaa03dedaa22a86ed74404d70fb6954087222d3c5f0dc1f1aa3ad89307aec9c136c829dc4b0c39d028214c146d7c0c4b0080043f2f89405534da6914 WHIRLPOOL 8373e59f9763381888d162d62584e3ddaa45697261d29951849b99331cac712d155ff5671d73bec593b9e0736fb19132280bf13153b75d022f58af6747adf88f
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.14.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.14.2.ebuild
new file mode 100644
index 000000000000..4c666923324f
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.14.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+
+inherit gnome-games vala
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libgee:0.8[introspection]
+	dev-libs/json-glib
+	>=dev-libs/qqwing-1.2
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.14.3:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/appdata-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome-games_src_prepare
+}
+
+src_configure() {
+	# Workaround until we know how to fix bug #475318
+	gnome-games_src_configure \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${GAMES_BINDIR}"
+}
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.16.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.16.0.ebuild
new file mode 100644
index 000000000000..9e2f5c1c059b
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.16.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# fixed vala & gtk+ from gnome-3.16 branch
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	dev-libs/libgee:0.8[introspection]
+	dev-libs/json-glib
+	>=dev-libs/qqwing-1.2
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.15:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome-games_src_prepare
+}
+
+src_configure() {
+	# Workaround until we know how to fix bug #475318
+	gnome-games_src_configure \
+		--prefix="${EPREFIX}/usr" \
+		--bindir="${GAMES_BINDIR}"
+}
diff --git a/games-puzzle/gnome-sudoku/metadata.xml b/games-puzzle/gnome-sudoku/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
new file mode 100644
index 000000000000..c3fb3cbde42a
--- /dev/null
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -0,0 +1 @@
+DIST gnome-taquin-3.16.1.tar.xz 5514336 SHA256 f1a25ea1d26e10fcb74f1025a08f7f9b2065bbd197ee12a1af94c5f06c0c8a08 SHA512 4d6b3d5b2ae765cd3dd12b766f381aa3d800e5ba9da31acd487440b4ea2607ee2b99f17c1daa9926084cde370afa82a911591e448dd80167835b335b1d20440e WHIRLPOOL b8d6074c633ede2dce2d85277a57c8cdbab1081b1354519f3e7383b3959b411b4f5a41217a54db0be9b8353f3d8c8ab9c3049d5069e008b726fe62537302d9bc
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.16.1.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.16.1.ebuild
new file mode 100644
index 000000000000..f3a7d62124c4
--- /dev/null
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.16.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Move tiles so that they reach their places"
+HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32
+	>=media-libs/libcanberra-0.26
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome-games_src_prepare
+}
diff --git a/games-puzzle/gnome-taquin/metadata.xml b/games-puzzle/gnome-taquin/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/gnome-taquin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
new file mode 100644
index 000000000000..5d647977bfaa
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-tetravex-3.14.0.tar.xz 2226536 SHA256 022fee0fecd0b3330c9bbc45c748f8426242de8d247aeebcb94faa97f41befd5 SHA512 e09f0761f389ef2d5e0aed02ff2dd5950bae4fbffd2600ac86b16ab0a7ea1f0dd1f6418522df5bdcee9c343a5f097f6c02bf934751d0203b7f4280fbe4e1ec91 WHIRLPOOL b8a8d2d99e0b76a74501e4a777f751c12d2bd22ad79f0eae96044ea5e6c6c96f009132a63f8beed77f8c6a81f01e708ab76ad635763cb4407ee79e454985ded5
+DIST gnome-tetravex-3.16.0.tar.xz 2229476 SHA256 e9d37bf923db8f446d94ef0d1b40e712c92d547e2421814cdd48bad27265951d SHA512 656be65f75514e407c7acc0357b418dc77fd158a4b36cf985295fd14697e6bcf8019d137bdaa029870af266ba0b107d038562ec6656a0d7f672429fdcbe1e147 WHIRLPOOL 36c8ac9c5d4e625f76551c8870e5de5434b6af91ac7e89a6a151177cd4133067d07633457ef00581a975793a2763e6ba72a615c256ac80cb25b89e996a5a51b2
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.14.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.14.0.ebuild
new file mode 100644
index 000000000000..8258f50a2a3f
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.14.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome-games vala
+
+DESCRIPTION="Complete the puzzle by matching numbered tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.13.2:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.16.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.16.0.ebuild
new file mode 100644
index 000000000000..1a8a1270852a
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.16.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome-games vala
+
+DESCRIPTION="Complete the puzzle by matching numbered tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.40:2
+	>=gnome-base/librsvg-2.32
+	>=x11-libs/gtk+-3.13.4: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() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/gnome-tetravex/metadata.xml b/games-puzzle/gnome-tetravex/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gnudoku/Manifest b/games-puzzle/gnudoku/Manifest
new file mode 100644
index 000000000000..b4a1da09576f
--- /dev/null
+++ b/games-puzzle/gnudoku/Manifest
@@ -0,0 +1 @@
+DIST GNUDoku-0.93.tar.gz 26212 SHA256 409b18d525c37660a117d786fe537672c7f58b7f01e2c37dbc1cdf339661075d SHA512 124bde796149136320758de5088f7d177ec8a4ffe03190f22bd8b228c00d1adb790450c760110e14d1cc9bf70f7dd54477405582c313c91e8da97d39c8fc55a6 WHIRLPOOL 828632a90600ed64bed9fc8972b0826f3effda4975758c16023907b3cb47ccc4e55b848643675bd3528808b753e5442385bcd6421c21579bcc32ca254055e55f
diff --git a/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
new file mode 100644
index 000000000000..69dd08c3e8b0
--- /dev/null
+++ b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
@@ -0,0 +1,20 @@
+--- GNUDoku.C
++++ GNUDoku.C
+@@ -25,6 +25,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <ctime>
++#include <cstring>
+ 
+ #include <vector>
+ #include <cassert>
+--- sudoku.C
++++ sudoku.C
+@@ -10,6 +10,7 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <ctime>
++#include <cstring>
+ 
+ #include <map>
+ namespace sudoku
diff --git a/games-puzzle/gnudoku/gnudoku-0.93.ebuild b/games-puzzle/gnudoku/gnudoku-0.93.ebuild
new file mode 100644
index 000000000000..406f777ae1f9
--- /dev/null
+++ b/games-puzzle/gnudoku/gnudoku-0.93.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+MY_PN="GNUDoku"
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="A program for creating and solving Su Doku puzzles"
+HOMEPAGE="http://www.icculus.org/~jcspray/GNUDoku"
+SRC_URI="http://www.icculus.org/~jcspray/GNUDoku/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/gtkmm-2.6:2.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	sed -i \
+		-e "s:\$(CXX):\$(CXX) ${CXXFLAGS} ${LDFLAGS}:" \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_install() {
+	dogamesbin GNUDoku
+	newicon GNUDoku.png ${PN}.png
+	make_desktop_entry ${MY_PN} ${MY_PN}
+	dodoc ALGORITHM Changelog README TODO
+	prepgamesdirs
+}
diff --git a/games-puzzle/gnudoku/metadata.xml b/games-puzzle/gnudoku/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/gnudoku/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
new file mode 100644
index 000000000000..e6c9ef4598e4
--- /dev/null
+++ b/games-puzzle/gnurobbo/Manifest
@@ -0,0 +1 @@
+DIST gnurobbo-0.66-source.tar.gz 1765034 SHA256 54d2418f49e52b8f49631eb93af7789074b628d308a6d26b00cc795ad0b04d89 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c WHIRLPOOL f51fd6d27b73dea701d7f3e1b520012f7dafbb40003550c67e34e6c6c46ecf7e910bfb1648b86c9d471d908168a97dded4b042f76f046484eb0d685a651c4e28
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
new file mode 100644
index 000000000000..9034a6fac0e2
--- /dev/null
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
@@ -0,0 +1,18 @@
+--- Makefile.old	2011-06-20 21:19:49.578922392 +0200
++++ Makefile	2011-06-20 21:20:28.535421648 +0200
+@@ -39,14 +39,13 @@
+ CFLAGS?=-O3 -pipe
+ CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
+ 	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
+-LDFLAGS=
+ # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers)
+ #CFLAGS?=-O0 -pipe -g -pg
+ #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
+ #	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
+ #LDFLAGS=-pg
+ LINK=$(CC)
+-LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
++LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) -lm
+ 
+ # You won't need to alter anything below
+ all: $(SOURCES) $(TARGET)
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
new file mode 100644
index 000000000000..d7b890ed9c1f
--- /dev/null
+++ b/games-puzzle/gnurobbo/gnurobbo-0.66.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux"
+HOMEPAGE="http://gnurobbo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnurobbo/${P}-source.tar.gz"
+
+LICENSE="GPL-2 BitstreamVera"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video,joystick]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+
+src_compile() {
+	emake \
+		PACKAGE_DATA_DIR="${GAMES_DATADIR}/${PN}" \
+		BINDIR="${GAMES_BINDIR}" \
+		DOCDIR="/usr/share/doc/${PF}"
+}
+
+src_install() {
+	dogamesbin gnurobbo
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data/{levels,skins,locales,rob,sounds}
+	dodoc AUTHORS Bugs ChangeLog README TODO
+	newicon icon32.png ${PN}.png
+	make_desktop_entry ${PN} Gnurobbo
+	prepgamesdirs
+}
diff --git a/games-puzzle/gnurobbo/metadata.xml b/games-puzzle/gnurobbo/metadata.xml
new file mode 100644
index 000000000000..979d97db6292
--- /dev/null
+++ b/games-puzzle/gnurobbo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">gnurobbo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/gottet/Manifest b/games-puzzle/gottet/Manifest
new file mode 100644
index 000000000000..6afb7395e1e1
--- /dev/null
+++ b/games-puzzle/gottet/Manifest
@@ -0,0 +1 @@
+DIST gottet-1.0.6-src.tar.bz2 268854 SHA256 66338509e04927b76804cb0a3ebb31989a4c6f2500e8b99bec6d1db1121cd561 SHA512 20755d1bdd62259226dbe389a322bb8abf8608e0b08ee337e4a4b59e881ea176ccb5579fd4047ea994024b8db8bdb645b002ece00d7858dd235406c0505dee8e WHIRLPOOL f6c6ea0e49f50a05d46ef0c03da89563324ae4b68c4b6cebbdb5f4d9b2a24c4813e9f058135e6a33568fb95117f8765c507a4b01dff626a0b176bbbf8bfc3062
diff --git a/games-puzzle/gottet/files/gottet-1.0.6-gentoo.patch b/games-puzzle/gottet/files/gottet-1.0.6-gentoo.patch
new file mode 100644
index 000000000000..3b34dae0e261
--- /dev/null
+++ b/games-puzzle/gottet/files/gottet-1.0.6-gentoo.patch
@@ -0,0 +1,11 @@
+--- src/locale_dialog.cpp.old	2014-05-18 18:11:33.546814928 +0200
++++ src/locale_dialog.cpp	2014-05-18 18:40:56.033720946 +0200
+@@ -85,7 +85,7 @@
+ 	if (paths.isEmpty()) {
+ 		QString appdir = QCoreApplication::applicationDirPath();
+ 		paths.append(appdir);
+-		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
++		paths.append("@GENTOO_DATADIR@/" + QCoreApplication::applicationName().toLower());
+ 		paths.append(appdir + "/../Resources");
+ 	}
+ 	foreach (const QString& path, paths) {
diff --git a/games-puzzle/gottet/gottet-1.0.6.ebuild b/games-puzzle/gottet/gottet-1.0.6.ebuild
new file mode 100644
index 000000000000..fcce03800750
--- /dev/null
+++ b/games-puzzle/gottet/gottet-1.0.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+LANGS="ca de en es fr he ko ms pl ro ru tr vi"
+inherit eutils qt4-r2 games
+
+DESCRIPTION="A tetris clone based on Qt4"
+HOMEPAGE="http://gottcode.org/gottet/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
+		src/locale_dialog.cpp \
+		|| die "sed failed"
+}
+
+src_configure() {
+	qt4-r2_src_configure
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}/translations/
+	for lang in ${LINGUAS};do
+		for x in ${LANGS};do
+			if [[ ${lang} == ${x} ]];then
+				doins translations/${PN}_${x}.qm
+			fi
+		done
+	done
+	insinto /usr/share/icons
+	doins -r icons/hicolor
+	dodoc CREDITS ChangeLog NEWS README
+	doicon icons/${PN}.xpm
+	domenu icons/${PN}.desktop
+	prepgamesdirs
+}
diff --git a/games-puzzle/gottet/metadata.xml b/games-puzzle/gottet/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/gottet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/greedy/Manifest b/games-puzzle/greedy/Manifest
new file mode 100644
index 000000000000..52c11c6848ae
--- /dev/null
+++ b/games-puzzle/greedy/Manifest
@@ -0,0 +1 @@
+DIST greedy-0.2.0.tar.gz 13152 SHA256 31929c41e6871698fbe2d259419fe2f31e8d4530568ccbc45a03783de970f321 SHA512 07376d003193244d336909f6336d68c4ce0f1e15388f28cc8e50121856b1f341f46f2aeba6e09118063b27d572916b4f596b75354543df3a72930a44b6b6f8ac WHIRLPOOL 68cf565dd509f37ba3a8f07c00e03813a8f3fa575a88f70a6e6d97777acfcae8cd4f7cdc6d965bfc35d9871e3d8893d519afdc0203f8914518552c467362ef3f
diff --git a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..3b4a9f1652c3
--- /dev/null
+++ b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs games
+
+DESCRIPTION="fun little ncurses puzzle game"
+HOMEPAGE="http://www.kotinet.com/juhamattin/linux/index.html"
+SRC_URI="http://www.kotinet.com/juhamattin/linux/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -f Makefile
+	# It wants a scores file.  We need to touch one and install it.
+	touch greedy.scores
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" ${PN}
+}
+
+src_install() {
+	insinto "${GAMES_STATEDIR}"
+	doins greedy.scores
+
+	dogamesbin greedy
+	dodoc CHANGES README TODO
+
+	prepgamesdirs
+	# We need to set the permissions correctly
+	fperms 664 "${GAMES_STATEDIR}/greedy.scores"
+}
diff --git a/games-puzzle/greedy/metadata.xml b/games-puzzle/greedy/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/greedy/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/groundhog/Manifest b/games-puzzle/groundhog/Manifest
new file mode 100644
index 000000000000..c8451ed684a8
--- /dev/null
+++ b/games-puzzle/groundhog/Manifest
@@ -0,0 +1,2 @@
+DIST groundhog-1.4.tar.gz 221871 SHA256 75567245a041a70f1ecb29503a424889136fcde81123234aedf5fb3ef9fad549 SHA512 9d1cf9073658cd325c4dceb6009825f50d8d4c55d0cca1b762cfdd066663257958d92e0e67ad49593add5821ce202e19c1106793ae8c77e4776c3b2e1fdc093c WHIRLPOOL 819caecd374d8e813e513f6d51e1cb170c480fee2f28203b0b239e2c0ba76c213cdb583fef1bd431cc28d8e3693a4ec79f748ab860f6e131383f8319b05c177f
+DIST groundhog_1.4-9.diff.gz 8613 SHA256 0303ee125dac6118a7bc76d9eba9eb18ac9996549bd8f427ab634f594aa88154 SHA512 ddbb7c8b51fe63a1d318e080133737a851276ab55324875e5d68650d2399ac141667c62ab79ee41ababd2b5426e7bee5f158e7aa4edfe8ee82c6c3b6fb8179b8 WHIRLPOOL 01b46cc9a98725e76c59cbec46c8a451cacd5bf0facaaceb85c09ae5ab33414c2db810646a3c73a62aac28bf319a5304eb8e9c9ceca2f823d07f7bce04e6cf91
diff --git a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
new file mode 100644
index 000000000000..48275a8c39b1
--- /dev/null
+++ b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
@@ -0,0 +1,32 @@
+respect flags
+
+applied on top of debian patches
+
+--- configure.in
++++ configure.in
+@@ -46,8 +46,6 @@
+ dnl Checks for libraries.
+ dnl AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(Groundhog needs GTK 2.0))
+ 
+-CXXFLAGS="-O2 -Wall"
+-
+ dnl Checks for header files.
+ AC_CHECK_HEADERS(unistd.h)
+ 
+@@ -57,16 +55,6 @@
+ 
+ dnl Checks for library functions.
+ 
+-dnl Use -Wall if we have gcc.
+-changequote(,)dnl
+-if test "x$GCC" = "xyes"; then
+-  case " $CFLAGS " in
+-  *[\ \	]-Wall[\ \	]*) ;;
+-  *) CFLAGS="$CFLAGS -Wall" ;;
+-  esac
+-fi
+-changequote([,])dnl
+-
+ AC_OUTPUT([ m4/Makefile  intl/Makefile
+ Makefile 
+ src/Makefile 
diff --git a/games-puzzle/groundhog/groundhog-1.4.ebuild b/games-puzzle/groundhog/groundhog-1.4.ebuild
new file mode 100644
index 000000000000..139678eb2698
--- /dev/null
+++ b/games-puzzle/groundhog/groundhog-1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools games
+
+DEB_VER="9"
+DESCRIPTION="Put the balls in the pockets of the same color by manipulating a maze of tubes"
+HOMEPAGE="http://home-2.consunet.nl/~cb007736/groundhog.html"
+SRC_URI="http://home-2.consunet.nl/~cb007736/${P}.tar.gz
+	mirror://debian/pool/main/g/groundhog/groundhog_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	cd "${WORKDIR}"
+	epatch groundhog_${PV}-${DEB_VER}.diff
+	cd "${S}"
+	sed -e "s:groundhog-1.4/::" -i \
+		debian/patches/sv.po.patch || die
+	epatch \
+		$(sed -e 's:^:debian/patches/:' debian/patches/series) \
+		"${FILESDIR}"/${P}-flags.patch
+	mv configure.in configure.ac || die
+	AT_M4DIR="m4" eautoreconf
+	sed -i 's:$(localedir):/usr/share/locale:' \
+		$(find . -name 'Makefile.in*') || die
+}
+
+src_configure() {
+	egamesconf $(use_enable nls)
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-puzzle/groundhog/metadata.xml b/games-puzzle/groundhog/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/groundhog/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
new file mode 100644
index 000000000000..9ed1ce7caae9
--- /dev/null
+++ b/games-puzzle/gtetrinet/Manifest
@@ -0,0 +1,2 @@
+DIST gtetrinet-0.7.11.tar.bz2 416744 SHA256 cea27a5f65cc4384e9130cf345421ef677418be4ebdab14d82b9049dd162ddc0 SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130 WHIRLPOOL bb05ae48330a6a17209e13857d63f7f8711683df1ded9959b27bfcd3393859d4276f458462ac4b4e1663ac3a19f9e8299a53f0100b44909e5757881bd6ca1e02
+DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 SHA256 33037370a0cab1ac395716f8b33ead7f2360cac0bd25b869cff3ab5d28b6a323 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d WHIRLPOOL 9f1a0c0e4e7ea394209638e05640460be14533eb9d6db6962f9c10f2776af5c01d1b5486ac51792f0fc70e2b21bace691c6f1cf83d9b22c2117c1148e3218e8d
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch
new file mode 100644
index 000000000000..9bf7c2e506db
--- /dev/null
+++ b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch
@@ -0,0 +1,28 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Nov 30 20:02:03 UTC 2012
+Subject: desktop file
+
+	fix desktop file according to fd.o spec
+
+--- gtetrinet.desktop
++++ gtetrinet.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=GTetrinet
+ Name[am]=GTetrinet
+ Name[bg]=GTetrinet
+@@ -99,11 +98,11 @@
+ Comment[zh_HK]=Tetrinet 的 GNOME 客戶端程式
+ Comment[zh_TW]=Tetrinet 的 GNOME 客戶端程式
+ Exec=gtetrinet
+-Icon=gtetrinet.png
++Icon=gtetrinet
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Game;BlocksGame;
++Categories=GNOME;Game;BlocksGame;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gtetrinet
+ X-GNOME-Bugzilla-Component=general
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
new file mode 100644
index 000000000000..59389a18f7c5
--- /dev/null
+++ b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
@@ -0,0 +1,16 @@
+Author: Jordi Mallach <jordi@debian.org>
+Description: Fix build when using -Werror=format-security, now default
+ on Debian.
+Status: committed-upstream
+
+--- gtetrinet-0.7.11.orig/src/tetrinet.c
++++ gtetrinet-0.7.11/src/tetrinet.c
+@@ -232,7 +232,7 @@
+             dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+                                              GTK_MESSAGE_ERROR,
+                                              GTK_BUTTONS_OK,
+-                                             buf);
++                                             "%s", buf);
+             gtk_dialog_run (GTK_DIALOG(dialog));
+             gtk_widget_destroy (dialog);
+             g_free (data_utf8);
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
new file mode 100644
index 000000000000..b49758401298
--- /dev/null
+++ b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
@@ -0,0 +1,130 @@
+--- gtetrinet-0.7.11/configure.in~	2006-11-15 17:02:36.000000000 +0000
++++ gtetrinet-0.7.11/configure.in	2011-03-06 15:39:10.000000000 +0000
+@@ -30,7 +30,6 @@
+ LIBGTK_REQUIRED=2.6.0
+ LIBGNOME_REQUIRED=2.0.0
+ LIBGNOMEUI_REQUIRED=2.0.0
+-LIBESD_REQUIRED=0.2.36
+ 
+ dnl *****************************************
+ dnl libgnome, libgnomeui needed for all utils
+@@ -40,21 +39,21 @@
+ AC_SUBST(GTET_CFLAGS)
+ AC_SUBST(GTET_LIBS)
+ 
+-dnl Check for libesd
+-if pkg-config --exists esound ; then
+-	have_esound=yes
++dnl Check for libcanberra
++if pkg-config --exists libcanberra ; then
++	have_libcanberra=yes
+ else 
+-	have_esound=no
++	have_libcanberra=no
+ fi
+ 
+-if test "x$have_esound" = "xyes"; then
+-AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.])
+-PKG_CHECK_MODULES(ESOUND, esound >= $LIBESD_REQUIRED)
+-AC_SUBST(ESOUND_CFLAGS)
+-AC_SUBST(ESOUND_LIBS)
++if test "x$have_libcanberra" = "xyes"; then
++AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define this to enable libcanberra support.])
++PKG_CHECK_MODULES(LIBCANBERRA, libcanberra)
++AC_SUBST(LIBCANBERRA_CFLAGS)
++AC_SUBST(LIBCANBERRA_LIBS)
+ fi
+ 
+-AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes")
++AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes")
+ 
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+--- gtetrinet-0.7.11/config.h.in~	2006-11-15 17:03:53.000000000 +0000
++++ gtetrinet-0.7.11/config.h.in	2011-03-06 15:39:31.000000000 +0000
+@@ -15,8 +15,8 @@
+ /* Define to 1 if you have the `dcgettext' function. */
+ #undef HAVE_DCGETTEXT
+ 
+-/* Define this to enable EsounD support. */
+-#undef HAVE_ESD
++/* Define this to enable libcanberra support. */
++#undef HAVE_LIBCANBERRA
+ 
+ /* Define if the GNU gettext() function is already present or preinstalled. */
+ #undef HAVE_GETTEXT
+--- gtetrinet-0.7.11/src/dialogs.c~	2006-11-03 12:49:49.000000000 +0000
++++ gtetrinet-0.7.11/src/dialogs.c	2011-03-06 15:40:45.000000000 +0000
+@@ -1054,7 +1054,7 @@
+     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(soundcheck), soundenable);
+     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(midicheck), midienable);
+ 
+-#ifdef HAVE_ESD
++#ifdef HAVE_LIBCANBERRA
+     if (midienable) prefdialog_midion ();
+     else prefdialog_midioff ();
+     if (soundenable) prefdialog_soundon ();
+--- gtetrinet-0.7.11/src/sound.c~	2005-03-18 21:19:18.000000000 +0000
++++ gtetrinet-0.7.11/src/sound.c	2011-03-06 15:47:24.000000000 +0000
+@@ -36,33 +36,36 @@
+ char midifile[1024];
+ char midicmd[1024];
+ 
+-#ifdef HAVE_ESD
++#ifdef HAVE_LIBCANBERRA
+ 
+-#include <esd.h>
+-#include <libgnome/gnome-sound.h>
++#include <canberra.h>
+ 
+-static int soundsamples[S_NUM];
+ static int midipid = 0;
++static ca_context *ctx = 0;
+ 
+ void sound_cache (void)
+ {
+     int i;
+     if (!soundenable) return;
++    if (!ctx)
++        ca_context_create(&ctx);
++    if (ctx) {
+     for (i = 0; i < S_NUM; i ++) {
+-        if (soundsamples[i])
+-            esd_sample_free (gnome_sound_connection_get (), soundsamples[i]);
+         if (soundfiles[i][0])
+-            soundsamples[i] = gnome_sound_sample_load (soundfiles[i], soundfiles[i]);
+-        else
+-            soundsamples[i] = 0;
++                ca_context_cache(ctx,
++                    CA_PROP_MEDIA_FILENAME, soundfiles[i],
++                    NULL);
++        }
+     }
+ }
+ 
+ void sound_playsound (int id)
+ {
+-    if (!soundenable) return;
+-    if (soundsamples[id] > 0)
+-      esd_sample_play (gnome_sound_connection_get (), soundsamples[id]);
++    if (!soundenable || !ctx) return;
++    if (soundfiles[id][0])
++        ca_context_play(ctx, 0,
++            CA_PROP_MEDIA_FILENAME, soundfiles[id],
++            NULL);
+ }
+ 
+ void sound_playmidi (char *file)
+--- gtetrinet-0.7.11/src/Makefile.am~	2006-11-03 16:20:08.000000000 +0000
++++ gtetrinet-0.7.11/src/Makefile.am	2011-03-06 15:57:32.000000000 +0000
+@@ -7,8 +7,8 @@
+ 	   -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \
+ 	   $(GTET_CFLAGS)
+ 
+-if HAVE_ESOUND
+-LDADD = $(GTET_LIBS) $(ESOUND_LIBS)
++if HAVE_LIBCANBERRA
++LDADD = $(GTET_LIBS) $(LIBCANBERRA_LIBS)
+ else
+ LDADD = $(GTET_LIBS)
+ endif
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
new file mode 100644
index 000000000000..3569f77524e2
--- /dev/null
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Tetrinet Clone for GNOME"
+HOMEPAGE="http://gtetrinet.sourceforge.net/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls ipv6"
+
+RDEPEND="
+	dev-libs/libxml2
+	media-libs/libcanberra
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-noesd.patch
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
+	epatch "${FILESDIR}"/${P}-format-security.patch
+	sed -i \
+		-e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
+		src/Makefile.in themes/*/Makefile.in || die
+	sed -i \
+		-e '/^gamesdir/s:=.*:=@bindir@:' \
+		src/Makefile.am || die
+
+	rm -rf "${WORKDIR}"/gentoo/.xvpics || die # Remove cruft
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	gnome2_src_install
+	mv "${WORKDIR}"/gentoo "${ED}/usr/share/${PN}/themes/" || die
+}
diff --git a/games-puzzle/gtetrinet/metadata.xml b/games-puzzle/gtetrinet/metadata.xml
new file mode 100644
index 000000000000..a455b5ead3db
--- /dev/null
+++ b/games-puzzle/gtetrinet/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<herd>gnome</herd>
+<longdescription>
+GTetrinet is a client program for the popular Tetrinet game, a 
+multiplayer tetris game that is played over the internet.
+
+Gee, Tetris?  Whats that?  Yeah, yeah, so it's been
+done 2 billion times before (give or take a few bil),
+but this is different!  Yes, all you tetris addicts
+out there be prepared for even MORE excitement..
+internet tetris!  Now you can play your five best
+buddies in one of the most well known games in
+existence!
+</longdescription>
+</pkgmetadata>
diff --git a/games-puzzle/gtkballs/Manifest b/games-puzzle/gtkballs/Manifest
new file mode 100644
index 000000000000..9063903b6754
--- /dev/null
+++ b/games-puzzle/gtkballs/Manifest
@@ -0,0 +1 @@
+DIST gtkballs-3.1.5.tar.gz 1176977 SHA256 75fa007b39668b7f454a6cbab62d55a8e63d234480d3503f87f965ff564de2c8 SHA512 a22352a19368c3b957e6fbd21aea0b4636efd3042f4e6b1c44a40f946643eb89873b182fe35a8888111ca42277e69fccfe2e2b683e804358ad36f4feca235e8a WHIRLPOOL 21bac73591f2dbeca1c7f6aa1fb2c0637c9e6a7158ee580759484fbca7e30bb3bb9213b6b44ee3a2e8a90dfe38533f5e51011ef430ed6185775825dff892df61
diff --git a/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..fade6e04911c
--- /dev/null
+++ b/games-puzzle/gtkballs/gtkballs-3.1.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="An entertaining game based on the old DOS game lines"
+HOMEPAGE="http://gtkballs.antex.ru/"
+SRC_URI="http://gtkballs.antex.ru/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.10.38 )"
+
+src_prepare() {
+	sed -i \
+		-e '/^nlsdir=/s:=.*:=/usr/share/locale:' \
+		-e '/^localedir/s:=.*:=/usr/share/locale:' \
+		configure po/Makefile.in.in || die "sed locale failed"
+}
+
+src_configure() {
+	egamesconf $(use_enable nls)
+}
+
+src_install() {
+	default
+	newicon gnome-gtkballs.png ${PN}.png
+	make_desktop_entry gtkballs "GTK Balls"
+	prepgamesdirs
+}
diff --git a/games-puzzle/gtkballs/metadata.xml b/games-puzzle/gtkballs/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/gtkballs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/gweled/Manifest b/games-puzzle/gweled/Manifest
new file mode 100644
index 000000000000..9e2dab59414e
--- /dev/null
+++ b/games-puzzle/gweled/Manifest
@@ -0,0 +1 @@
+DIST gweled-0.9.1.tar.gz 403252 SHA256 f6064989040949659f5a970cf3a9dd280615df7ad67c014ac37e1466ce91055d SHA512 12ac6f0033e9af037febca3ecc86f7531491498a38cdc36d7baf113fecece75da4a5b83f6c6e8f4fc6beebb24d479eac10087baa9effec4966cfcfb6c42df75a WHIRLPOOL 26f42dcea3527b56e67da3092997fba39cb0e18d6c987d7948d97540b8e360782b91785215fa730ce616f39612c8ae76441202f973b0c684267f1d484a9b2ce0
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
new file mode 100644
index 000000000000..81a8cece8870
--- /dev/null
+++ b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
@@ -0,0 +1,11 @@
+--- configure.in.old	2014-06-03 09:21:52.868225743 +0200
++++ configure.in	2014-06-03 09:22:06.604614448 +0200
+@@ -66,7 +66,7 @@
+     *) AC_MSG_ERROR([bad value ${enableval} for --disable-setgid]) ;;
+    esac],[setgid=true;enable_setgid=yes])
+ 
+-scoredir='${localstatedir}/games'
++scoredir='${localstatedir}/gweled'
+ scores_group=games
+ scores_user=games
+ 
diff --git a/games-puzzle/gweled/gweled-0.9.1-r1.ebuild b/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..d94bb58c7618
--- /dev/null
+++ b/games-puzzle/gweled/gweled-0.9.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic autotools games
+
+DESCRIPTION="Bejeweled clone game"
+HOMEPAGE="http://www.gweled.org/"
+SRC_URI="http://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	media-libs/libmikmod
+	gnome-base/librsvg:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -fomit-frame-pointer
+	append-ldflags -Wl,--export-dynamic
+	egamesconf \
+		--disable-setgid
+}
+
+src_install() {
+	default
+	gamesowners -R "${D}/var/games/gweled"
+	prepgamesdirs
+}
diff --git a/games-puzzle/gweled/metadata.xml b/games-puzzle/gweled/metadata.xml
new file mode 100644
index 000000000000..ca4a9ecfd3d7
--- /dev/null
+++ b/games-puzzle/gweled/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="launchpad">gweled</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
new file mode 100644
index 000000000000..7b25c31cf922
--- /dev/null
+++ b/games-puzzle/hangman/Manifest
@@ -0,0 +1 @@
+DIST hangman-0.9.2.tar.gz 1023712 SHA256 5fa60699112895848b390b98f84ebb3dc4abaca431fd5c0cb25bf4d09824da2d SHA512 cbf940310b4821cf4de27a99a5228bccf42093a65ca83b0a2582556865ee5cea5a4ee2ebe08d2e02ac93f0cfc8d190b1f5427adbd74e7ddb57b90cee84f85d65 WHIRLPOOL 4e32b02a85fc0d93dc514818e6832ec4a6101a45e18b10875d97ab477ee5dd166d8d143c555e890266bde95dee53d0dd067a35a1fc577014aa52be0b1ae86670
diff --git a/games-puzzle/hangman/hangman-0.9.2.ebuild b/games-puzzle/hangman/hangman-0.9.2.ebuild
new file mode 100644
index 000000000000..0405fea9fe70
--- /dev/null
+++ b/games-puzzle/hangman/hangman-0.9.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="The classic word guessing game"
+HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html"
+SRC_URI="http://www.shiftygames.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+DEPEND="!games-misc/bsd-games
+	media-libs/libsdl
+	media-libs/sdl-mixer
+	media-libs/sdl-image
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}
+	sys-apps/miscfiles"
+
+src_prepare() {
+	sed -i \
+		-e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
+		src/hangman.c \
+		|| die "sed failed"
+}
+
+src_install() {
+	default
+	newicon pics/noose.png ${PN}.png
+	make_desktop_entry ${PN} Hangman
+	prepgamesdirs
+}
diff --git a/games-puzzle/hangman/metadata.xml b/games-puzzle/hangman/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/hangman/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/hexalate/Manifest b/games-puzzle/hexalate/Manifest
new file mode 100644
index 000000000000..aa93bbb05897
--- /dev/null
+++ b/games-puzzle/hexalate/Manifest
@@ -0,0 +1 @@
+DIST hexalate-1.0.3-src.tar.bz2 336589 SHA256 a391ba44aa0f5bd618385dbe17e059947b829b85315aecb19edd1c863b3ebe3c SHA512 582e41ef298788e73e4f39976dbf334fdb514518e53556b77bd2a7f49d82f66617e21ab5ff24a298313e529aa147e80703fe9eb40318d9b74673dd6fcf32d909 WHIRLPOOL 4ce78bf4cb37346b4722f647e4dbda4fe3c88138264b8ad758302152cc199d7374f0cfadb8497ad767aae678345910701bc30f12ef7eb1b0e691a1df73fc40bf
diff --git a/games-puzzle/hexalate/files/hexalate-1.0.3-gentoo.patch b/games-puzzle/hexalate/files/hexalate-1.0.3-gentoo.patch
new file mode 100644
index 000000000000..49f5b1c82ee5
--- /dev/null
+++ b/games-puzzle/hexalate/files/hexalate-1.0.3-gentoo.patch
@@ -0,0 +1,11 @@
+--- src/locale_dialog.cpp.old	2014-05-20 22:30:07.399795787 +0200
++++ src/locale_dialog.cpp	2014-05-20 22:31:12.079600999 +0200
+@@ -85,7 +85,7 @@
+ 	if (paths.isEmpty()) {
+ 		QString appdir = QCoreApplication::applicationDirPath();
+ 		paths.append(appdir);
+-		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
++		paths.append("@GENTOO_DATADIR@");
+ 		paths.append(appdir + "/../Resources");
+ 	}
+ 	foreach (const QString& path, paths) {
diff --git a/games-puzzle/hexalate/hexalate-1.0.3.ebuild b/games-puzzle/hexalate/hexalate-1.0.3.ebuild
new file mode 100644
index 000000000000..65c9d3f838ee
--- /dev/null
+++ b/games-puzzle/hexalate/hexalate-1.0.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+LANGS="ca cs de el en es et fr hu ms nl pl ro ru tr"
+LANGSLONG="pt_BR"
+inherit eutils qt4-r2 games
+
+DESCRIPTION="A color matching game"
+HOMEPAGE="http://gottcode.org/hexalate/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i -e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		src/locale_dialog.cpp \
+		|| die "sed failed"
+}
+
+src_configure() {
+	qt4-r2_src_configure
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}/translations/
+	for lang in ${LINGUAS};do
+		for x in ${LANGS};do
+			if [[ ${lang} == ${x} ]];then
+				doins translations/${PN}_${x}.qm
+			fi
+		done
+	done
+	insinto /usr/share/icons
+	doins -r icons/hicolor
+	dodoc CREDITS ChangeLog NEWS README
+	doicon icons/${PN}.xpm
+	domenu icons/${PN}.desktop
+	prepgamesdirs
+}
diff --git a/games-puzzle/hexalate/metadata.xml b/games-puzzle/hexalate/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/hexalate/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/hexamine/Manifest b/games-puzzle/hexamine/Manifest
new file mode 100644
index 000000000000..e1786a79097d
--- /dev/null
+++ b/games-puzzle/hexamine/Manifest
@@ -0,0 +1 @@
+DIST hexamine-0.2.1.tar.gz 130603 SHA256 8d8b1dfe32474def6ee9840f19a1b6aecfe23f3ad802e4658350d8cf00926405 SHA512 eaf7c110f1c2434c2ea7bc01cc13266ed8e91cbbf0fff4ee8d8a78c549f9fd3f8d877210f574ba1cefad5a6ea230f376aab7d9ced6a4e2f477b6be776332a640 WHIRLPOOL 3b79aba9bce6213d479d62ac0e2a7527c14ec198298c1c830be9d9e5906183c87216ea55d21d503dc51ae456b2728e0a603f5b0d49b2727103b821848d6b591f
diff --git a/games-puzzle/hexamine/hexamine-0.2.1.ebuild b/games-puzzle/hexamine/hexamine-0.2.1.ebuild
new file mode 100644
index 000000000000..f232bc50a84a
--- /dev/null
+++ b/games-puzzle/hexamine/hexamine-0.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 games
+
+DESCRIPTION="Hexagonal Minesweeper"
+HOMEPAGE="http://sourceforge.net/projects/hexamine"
+SRC_URI="mirror://sourceforge/hexamine/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-python/pygame
+	${PYTHON_DEPS}"
+DEPEND="${PYTHON_DEPS}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	# Modify game data directory
+	sed -i \
+		-e "s:\`dirname \$0\`:${GAMES_DATADIR}/${PN}:" \
+		-e "s:\./hexamine:exec ${EPYTHON} &:" \
+		hexamine || die
+}
+
+src_install() {
+	dogamesbin hexamine
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r hexamine.* skins
+	dodoc ABOUT README
+	prepgamesdirs
+}
diff --git a/games-puzzle/hexamine/metadata.xml b/games-puzzle/hexamine/metadata.xml
new file mode 100644
index 000000000000..be0be9e8dd1a
--- /dev/null
+++ b/games-puzzle/hexamine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">hexamine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
new file mode 100644
index 000000000000..b5bf866191c3
--- /dev/null
+++ b/games-puzzle/hitori/Manifest
@@ -0,0 +1,2 @@
+DIST hitori-3.14.3.tar.xz 491360 SHA256 37af62cf8ec529edab13c7c44d2b5317c71dc572b1f40fc1244c622c6da9ee59 SHA512 250c96de33b80a5bb76ec2ce393003c474d770fb50ea36e37ce478fc4631ca49ef901c6e200e4d5905ff670d9cc4894064aadc603f8a318172a31513c756140d WHIRLPOOL f93a7a1419bf1b854525081e776e949d59885ddf6679e30f6853713b67a0f3e94f8e3c6c779f504feb8ad19f6d6b5d209ce2839aba659f433f69e4507a9182ea
+DIST hitori-3.16.1.tar.xz 494796 SHA256 a169af5f74dcc7622dae2dfd69c5dcaeb653ae1232cc504247ebc902681ff51e SHA512 c051662eeccd1b453501ed6d461de72c049f432af14359dedbe13f7e8ebbfd659f1788d7795dd936db191e492f1ea06954d8bfe84232a70d80bdb3a147835742 WHIRLPOOL cab783f003d511841160024d8087a86fc729169e357dcffe0a98ec60d3da52e6ded58ed2ff38ef877c3f6b6fc54943e39f505b61529d5c2c06f9489fce7ed63c
diff --git a/games-puzzle/hitori/hitori-3.14.3.ebuild b/games-puzzle/hitori/hitori-3.14.3.ebuild
new file mode 100644
index 000000000000..a00e0cd49b0f
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.14.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/cairo-1.4
+	>=x11-libs/gtk+-3.13.2:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50.2
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/hitori/hitori-3.16.1.ebuild b/games-puzzle/hitori/hitori-3.16.1.ebuild
new file mode 100644
index 000000000000..585280676c3d
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.16.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/cairo-1.4
+	>=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50.2
+	gnome-base/gnome-common
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/games-puzzle/hitori/metadata.xml b/games-puzzle/hitori/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/hitori/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/hoh-bin/Manifest b/games-puzzle/hoh-bin/Manifest
new file mode 100644
index 000000000000..cce1a25c0230
--- /dev/null
+++ b/games-puzzle/hoh-bin/Manifest
@@ -0,0 +1 @@
+DIST hohlin-101.tar.bz2 14808528 SHA256 72e0e14f28a1245b34455d6c9c1b4715d297e165f6cdf3aa8fc525429b9839ee SHA512 38f5815d9b2356c5d566d8b5b4730e1ed24192dfb5c3fcae9096b4a2c6110de60245b13da6bffc359032165d7fc0681a6adfa3503005c9281807c4734d519c0b WHIRLPOOL 32e0d466c214d9f0d3b97fb1ec8a66bc0d6b499b143743009d7280e1384492539d14e3f7f7d8e1c029bbdd7cb5e515d63368d2c1ad0b3fe79d9e727a2160c32a
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
new file mode 100644
index 000000000000..63232abb54f1
--- /dev/null
+++ b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/hoh-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
new file mode 100644
index 000000000000..25437d2bd6bd
--- /dev/null
+++ b/games-puzzle/icebreaker/Manifest
@@ -0,0 +1 @@
+DIST icebreaker-1.9.6.tgz 137333 SHA256 e80f3a0c918beeff528ec7e61c04a17019c2afff85f018a04f715f2b401931dc SHA512 c3b085dc42d33757011d6d526016477312c5e1cbab4c5584c1e271a1e43b40d61ad1e7f0c96c8f41348550b2e198b3ee7bca65fbef90125dbfa32544cbdf357b WHIRLPOOL 3616e2cd757c6efc7831dfcbd36cbd1a0ec7b5b1f32022ad7c721e39adde41985c40b7a6529acc60de9b5d8f92d802fe579f5a395d9b1402f6c653929be65698
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
new file mode 100644
index 000000000000..d6e16a6c39a6
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
@@ -0,0 +1,247 @@
+--- dialog.c
++++ dialog.c
+@@ -279,10 +279,10 @@ PopupReturnType popuphighscores()
+ 
+ 	for (i=0;i<HISCORENUM;i++)
+ 	{
+-		snprintf(buf,4,"%d.",i+1);
++		snprintf(buf,sizeof(buf),"%d.",i+1);
+ 		puttext(scorelistrect.x+BLOCKWIDTH,scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,buf);		
+ 		puttext(scorelistrect.x+BLOCKWIDTH*4,scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,hiscorename[i]);		
+-		snprintf(buf,30,"%ld",hiscoreval[i]);		
++		snprintf(buf,sizeof(buf),"%ld",hiscoreval[i]);		
+ 		puttext(scorelistrect.x+scorelistrect.w-(BLOCKWIDTH*5),scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,buf);
+ 	}
+ 	
+@@ -364,7 +364,7 @@ PopupReturnType popuphelp()
+ 	{
+ 		puttext(helprect.x+BLOCKWIDTH/2,helprect.y+BLOCKHEIGHT/2+i*(CHARHEIGHT*2+4),2,color.normaltext,helptext[i]);		
+ 	}
+-	snprintf(buf,80,"v%d.%d.%d   %s",VERMAJOR,VERMINOR,VERSUB,"Copyright (c) 2000-2002 Matthew Miller. Released under the GPL.");
++	snprintf(buf,sizeof(buf),"v%d.%d.%d   %s",VERMAJOR,VERMINOR,VERSUB,"Copyright (c) 2000-2002 Matthew Miller. Released under the GPL.");
+ 	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*3,1,color.copyrighttext,buf);		
+ 	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*1-3,1,color.copyrighttext,"Thanks to my wonderful wife Karen for inspiration (and for patience)!");		
+ 	
+--- menu.c
++++ menu.c
+@@ -193,12 +193,12 @@ PopupReturnType popupoptionsmenu()
+ 
+ 	if (strlen(commandline.theme)>0)
+ 	{
+-		snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",commandline.theme);
++		snprintf(originaltheme,sizeof(originaltheme),"%s",commandline.theme);
+ 		originalthemecl=true;
+ 	}
+ 	else
+ 	{
+-		snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",options.theme);
++		snprintf(originaltheme,sizeof(originaltheme),"%s",options.theme);
+ 		originalthemecl=false;	
+ 	}
+ 				
+@@ -521,7 +521,7 @@ PopupReturnType menuitem_theme(char * va
+ 		if (((mbutton==1 || mbutton==4) && t==themecount-1) || ((mbutton!=1 && mbutton!=4) && t==0))
+ 		{ // "random", at the end/beginning of the list
+ 			
+-			strncpy(val,"random",MAXMENUVALUELENGTH);
++			strcpy(options.theme,"random");
+ 			snprintf(options.theme,MAXMENUVALUELENGTH,"random");
+ 			
+ 			settheme("linux"); // just for pretty
+@@ -538,7 +538,7 @@ PopupReturnType menuitem_theme(char * va
+ 			if (mbutton==1 || mbutton==4) // left click or scroll forwards
+ 			{
+ 				strncpy(val,themelist[(t+1)%themecount],MAXMENUVALUELENGTH);
+-				snprintf(options.theme,MAXMENUVALUELENGTH,themelist[(t+1)%themecount]);
++				snprintf(options.theme,sizeof(options.theme),"%s",themelist[(t+1)%themecount]);
+ 			}
+ 			else // right or middle or scroll back
+ 			{
+--- hiscore.c
++++ hiscore.c
+@@ -72,7 +72,7 @@
+ 	// make sure all entries are zeroed out to start.
+ 	for (i=0;i<HISCORENUM;i++)
+ 	{
+-		snprintf(temphiscorename[i],7,"Nobody");
++		strcpy(temphiscorename[i],"Nobody");
+ 		temphiscoreval[i]=100; //100 is better than 0. :)
+ 	}
+ 
+@@ -103,7 +103,7 @@
+ 	// ok, so now, we can copy things over in the proper sorted order
+ 	for (i=0;i<HISCORENUM;i++)
+ 	{
+-		snprintf(hiscorename[i],50,temphiscorename[arrayindex[i]]);
++		snprintf(hiscorename[i],50,"%s",temphiscorename[arrayindex[i]]);
+ 		hiscoreval[i]=temphiscoreval[arrayindex[i]];
+ 	}
+ 
+@@ -201,13 +201,13 @@
+ 	// make sure the temp array contains the right data
+ 	for (i=0;i<HISCORENUM;i++)
+ 	{
+-		snprintf(temphiscorename[i],50,hiname[i]);
++		snprintf(temphiscorename[i],50,"%s",hiname[i]);
+ 		temphiscoreval[i]=hival[i];
+ 	}
+ 	
+ 	// and toss in the new data 
+ 	//(this is why these arrays are size HISCORENUM+1)
+-	snprintf(temphiscorename[HISCORENUM],50,username);
++	snprintf(temphiscorename[HISCORENUM],50,"%s",username);
+ 	temphiscoreval[HISCORENUM]=score;
+ 
+ 	// fill the "helper" array. 
+@@ -221,7 +221,7 @@
+ 	// and take the top ones back.
+ 	for (i=0;i<HISCORENUM;i++)
+ 	{
+-		snprintf(hiname[i],50,temphiscorename[arrayindex[i]]); 
++		snprintf(hiname[i],50,"%s",temphiscorename[arrayindex[i]]); 
+ 		hival[i]=temphiscoreval[arrayindex[i]];
+ 	}
+ }
+--- line.c
++++ line.c
+@@ -30,8 +30,9 @@
+ 
+ Line createline(int linenum)
+ {
+-	Line l;
++	static Line l;
+ 
++	memset(&l, 0, sizeof(l));
+ 	switch (linenum)
+ 	{
+ 		case 1: 
+--- options.c
++++ options.c
+@@ -66,7 +66,7 @@
+ 	options.autopause=AUTOPAUSEOFF;	
+ 	options.difficulty=NORMAL;
+ 	options.fullscreen=FULLSCREENOFF;
+-	snprintf(options.theme,MAXTHEMENAMELENGTH+1,"linux");
++	strcpy(options.theme,"linux");
+ }
+ 
+ int readoptions(void)
+@@ -81,7 +81,7 @@
+ 
+ 	setdefaultoptions();
+ 	
+-	snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
++	snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
+ 	
+ 	optionfile=fopen(filename,"r");
+ 	if (optionfile==NULL)
+@@ -135,7 +135,7 @@
+ 			}
+ 			else if (!strcmp(optbuf,"theme"))
+ 			{
+-				snprintf(options.theme,MAXTHEMENAMELENGTH+1,"%s",valbuf);
++				snprintf(options.theme,sizeof(options.theme),"%s",valbuf);
+ 			}
+ 			// FIX: add username
+ 		}
+@@ -150,7 +150,7 @@
+ {
+ 	FILE * optionfile;
+ 	char filename[255];
+-	snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
++	snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
+ 	
+ 	optionfile=fopen(filename,"w");
+ 	if (optionfile==NULL)
+@@ -292,7 +292,7 @@
+ 			else
+ 			{
+ 				// fix -- we should probably search for malicious characters here.
+-				snprintf(commandline.theme,MAXTHEMENAMELENGTH+1,"%s",argv[i]+strlen(FLAGTHEME));
++				snprintf(commandline.theme,sizeof(commandline.theme),"%s",argv[i]+strlen(FLAGTHEME));
+ 			}	
+ 		}
+ 		else if (strncmp(argv[i],FLAGTHEMELONG "=" ,strlen(FLAGTHEMELONG "=")) == 0)
+@@ -312,7 +312,7 @@
+ 			else
+ 			{
+ 				// fix -- we should probably search for malicious characters here.
+-				snprintf(commandline.theme,MAXTHEMENAMELENGTH+1,"%s",argv[i]+strlen(FLAGTHEMELONG "="));
++				snprintf(commandline.theme,sizeof(commandline.theme),"%s",argv[i]+strlen(FLAGTHEMELONG "="));
+ 			}	
+ 		}
+ 		else if (strncmp(argv[i],FLAGTHEMELONG,strlen(FLAGTHEMELONG)) == 0)
+--- penguin.c
++++ penguin.c
+@@ -40,8 +40,9 @@
+ 
+ Penguin createpenguinxy(int x, int y)
+ {
+-	Penguin p;
++	static Penguin p;
+ 
++	memset(&p, 0, sizeof(p));
+ 	switch (random() % 4)
+ 	{
+ 		case 0:
+--- themes.c
++++ themes.c
+@@ -183,7 +183,7 @@
+ 
+ 	foundcolor.spritetransparent = 0;
+ 	
+-	snprintf(themefilename, 256,"%s/%s%s",DATAPREFIX,themename,THEMEFILEEXTENSION);
++	snprintf(themefilename, sizeof(themefilename),"%s/%s%s",DATAPREFIX,themename,THEMEFILEEXTENSION);
+ 	
+ 	themefile=fopen(themefilename,"r");
+ 	if (themefile==NULL)
+@@ -329,7 +329,7 @@
+ 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
+ 						               "(Filename is %s)\n",themename,valbuf);
+ 					}
+-					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
++					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
+ 					spriteimage=loadsprite(themename,loadfilebuf);
+ 				}
+ 				else if (!strcmp(optbuf,"spritemirrorbitmap"))
+@@ -340,7 +340,7 @@
+ 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
+ 						               "(Filename is %s)\n",themename,valbuf);
+ 					}
+-					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
++					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
+ 					spritemirrorimage=loadsprite(themename,loadfilebuf);
+ 				}
+ 				else if (!strcmp(optbuf,"soundouch"))
+@@ -351,7 +351,7 @@
+ 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
+ 						               "(Filename is %s)\n",themename,valbuf);
+ 					}
+-					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
++					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
+ 					loadsounds(themename,loadfilebuf,NULL);
+ 				}
+ 				else if (!strcmp(optbuf,"soundcrash"))
+@@ -362,7 +362,7 @@
+ 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
+ 						               "(Filename is %s)\n",themename,valbuf);
+ 					}
+-					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
++					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
+ 					loadsounds(themename,NULL,loadfilebuf);
+ 				}
+ 			}
+@@ -474,11 +474,11 @@
+ 	{
+ 		fprintf(stderr,"Hey! You can't have a theme named random! Please remove the random.ibt\n"
+ 		        "file from your themes directory.\n");
+-		snprintf(themename,MAXTHEMENAMELENGTH+1,"linux");
++		strcpy(themename,"linux");
+ 	}
+ 	else
+ 	{
+-		snprintf(themename,MAXTHEMENAMELENGTH+1,themelist[random() %themecount]);
++		snprintf(themename,sizeof(themename),"%s",themelist[random() %themecount]);
+ 	}
+ 	freethemenames(&themelist,themecount);
+ 	return settheme(themename);
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
new file mode 100644
index 000000000000..44ef9bdf8631
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
@@ -0,0 +1,28 @@
+--- Makefile.orig	2010-10-11 12:20:01.274684641 -0400
++++ Makefile	2010-10-11 12:22:02.256897083 -0400
+@@ -1,5 +1,3 @@
+-CC=gcc
+-
+ SDLCONFIG=sdl-config
+ 
+ ifndef prefix
+@@ -177,7 +175,7 @@
+ 	[ -d win32.build ] && rm -rf win32.build || true
+ 
+ icebreaker:	$(SRC:.c=.o)
+-	$(CC) $(CFLAGS) $^ -o icebreaker $(SDL_LIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) $^ -o icebreaker $(SDL_LIB)
+ 
+ man: icebreaker.6
+ 
+@@ -202,8 +200,8 @@
+ 	install -m 644 *.wav *.bmp $(datadir)/icebreaker
+ 
+ install-bin: icebreaker
+-	install -s -g games -m 2755 icebreaker $(bindir) || \
+-	  install -s -m 755 icebreaker $(bindir)
++	install -g games -m 2755 icebreaker $(bindir) || \
++	  install -m 755 icebreaker $(bindir)
+ 	@test -g $(bindir)/icebreaker || \
+ 	  echo -e '*** Note: icebreaker binary not installed set-group-ID "games" -- shared\n*** highscores may be impossible. (Try installing as root.)'
+ 
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
new file mode 100644
index 000000000000..5a59b04f79af
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
@@ -0,0 +1,20 @@
+--- menu.c.old	2013-06-24 22:09:11.606750080 +0200
++++ menu.c	2013-06-24 22:25:51.635735351 +0200
+@@ -522,7 +522,7 @@
+ 		{ // "random", at the end/beginning of the list
+ 			
+ 			strcpy(options.theme,"random");
+-			snprintf(options.theme,MAXMENUVALUELENGTH,"random");
++			snprintf(options.theme,MAXTHEMENAMELENGTH,"random");
+ 			
+ 			settheme("linux"); // just for pretty
+ 			
+@@ -544,7 +544,7 @@
+ 			{
+ 				if (t<0) t=themecount;
+ 				strncpy(val,themelist[(t-1)%themecount],MAXMENUVALUELENGTH);
+-				snprintf(options.theme,MAXMENUVALUELENGTH,themelist[(t-1)%themecount]);
++				snprintf(options.theme,MAXTHEMENAMELENGTH,themelist[(t-1)%themecount]);
+ 			}
+ 			
+ 			settheme(options.theme);
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
new file mode 100644
index 000000000000..de388d9b5758
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
@@ -0,0 +1,34 @@
+--- Makefile.old	2010-10-19 10:26:18.000000000 +0200
++++ Makefile	2010-10-19 10:38:28.000000000 +0200
+@@ -196,26 +196,30 @@
+ themes-install: install-themes
+ 
+ install-themes:
++	mkdir -p $(datadir)/icebreaker
+ 	install -m 644 *.ibt $(datadir)/icebreaker
+ 	install -m 644 *.wav *.bmp $(datadir)/icebreaker
+ 
+ install-bin: icebreaker
++	mkdir -p $(bindir)
+ 	install -g games -m 2755 icebreaker $(bindir) || \
+ 	  install -m 755 icebreaker $(bindir)
+ 	@test -g $(bindir)/icebreaker || \
+ 	  echo -e '*** Note: icebreaker binary not installed set-group-ID "games" -- shared\n*** highscores may be impossible. (Try installing as root.)'
+ 
+ install-man: icebreaker.6
++	mkdir -p $(mandir)/man6
+ 	install -m 644 icebreaker.6 $(mandir)/man6
+ 
+ install-scorefile:
++	mkdir -p $(highscoredir)
+ 	touch $(highscoredir)/icebreaker.scores
+ 	chown -f games:games $(highscoredir)/icebreaker.scores && \
+ 	chmod 664 $(highscoredir)/icebreaker.scores || \
+ 	chmod 644 $(highscoredir)/icebreaker.scores
+ 
+ 
+-install: all install-mkdirs install-themes install-bin install-man install-scorefile
++install: install-themes install-bin install-man install-scorefile
+ 
+ %.d: %.c
+ 	set -e; $(CC) -M $(CFLAGS) $< \
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
new file mode 100644
index 000000000000..3f049ee3e6b8
--- /dev/null
+++ b/games-puzzle/icebreaker/icebreaker-1.9.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Trap and capture penguins on Antarctica"
+HOMEPAGE="http://www.mattdm.org/icebreaker/"
+SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-parallell-install.patch \
+		"${FILESDIR}"/${P}-ovfl.patch
+}
+
+src_compile() {
+	emake \
+		OPTIMIZE="${CFLAGS}" \
+		prefix=/usr \
+		bindir="${GAMES_BINDIR}" \
+		datadir="${GAMES_DATADIR}" \
+		highscoredir="${GAMES_STATEDIR}"
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		bindir="${D}${GAMES_BINDIR}" \
+		datadir="${D}${GAMES_DATADIR}" \
+		highscoredir="${D}${GAMES_STATEDIR}" install
+	newicon ${PN}_48.bmp ${PN}.bmp
+	make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
+	dodoc ChangeLog README* TODO
+	prepgamesdirs
+}
diff --git a/games-puzzle/icebreaker/metadata.xml b/games-puzzle/icebreaker/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/icebreaker/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/jag/Manifest b/games-puzzle/jag/Manifest
new file mode 100644
index 000000000000..fa98e096ef4a
--- /dev/null
+++ b/games-puzzle/jag/Manifest
@@ -0,0 +1,2 @@
+DIST jag-0.3.2-data.zip 6237911 SHA256 d331b8b1ec20068de0f35d7747b3e4eb4567f505568c3d8621884d2ca46b6d22 SHA512 fd8d625d47c12779baf9158475d378a8a09d8c96e48ebf8f8b23e3967db8fe38fada33625ac155550ec72f96e259b229311652e09001bb146a326ee202f2e32f WHIRLPOOL d4dd8734a1ea61a1a59514208493c07ae8c7cb9a1d2242ff571221e9d547d8a7e8cbe451dc4f1a9b441a5e213e69e892c1d2fa84532759bc0e7c5736ba36087a
+DIST jag-0.3.2-src.zip 995053 SHA256 0b1fc46373d7b70bdd359ca93e553bc244a49721fa1a18d5225c5e887b54ca44 SHA512 96379500aabb282324c7308304359412faa503ca2a62a22951313b612f7d065378ba3fa880ff0b2cb42ebd92ddbce22f8e3c088fc6a5361462beaf8b21aed8dc WHIRLPOOL cbf45eacd3b97f2808cc74ca32479ef9c08e2662552ab21ad3dfa54538a7bd723e636ad3e6189da0278a18e4765142f0319ca94be40d3a7bbae3859e67b20385
diff --git a/games-puzzle/jag/jag-0.3.2.ebuild b/games-puzzle/jag/jag-0.3.2.ebuild
new file mode 100644
index 000000000000..e48f2cfd296e
--- /dev/null
+++ b/games-puzzle/jag/jag-0.3.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-r2 games
+
+DESCRIPTION="Arcade 2D Puzzle Game"
+HOMEPAGE="http://jag.xlabsoft.com/"
+SRC_URI="http://jag.xlabsoft.com/files/${P}-src.zip
+	http://jag.xlabsoft.com/files/${P}-data.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="editor"
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	x11-libs/libXrandr
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${P}-src
+
+src_prepare() {
+	mv "${WORKDIR}"/${P}-data/data "${WORKDIR}"/${P}-src/
+	sed -i \
+		-e "s:/usr/local/bin:${GAMES_BINDIR}:g" \
+		-e "s:/usr/local/games:${GAMES_DATADIR}:g" \
+		-e "s:LIBS += -lSDLmain:LIBS += -lSDL -lX11:" \
+		Game.pro main.cpp editor/editor.pro \
+		|| die "sed failed"
+}
+
+src_configure() {
+	qt4-r2_src_configure
+	if use editor; then
+		cd editor
+		eqmake4 editor.pro
+	fi
+}
+
+src_compile() {
+	qt4-r2_src_compile
+	if use editor; then
+		cd editor
+		qt4-r2_src_compile
+	fi
+}
+
+src_install() {
+	qt4-r2_src_install
+	newicon images/logo.png ${PN}.png
+	make_desktop_entry jag Jag
+
+	if use editor; then
+		cd editor
+		qt4-r2_src_install
+		make_desktop_entry jag-editor "Jag Level editor" ${PN}
+	fi
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/jag/metadata.xml b/games-puzzle/jag/metadata.xml
new file mode 100644
index 000000000000..87786f1c40dd
--- /dev/null
+++ b/games-puzzle/jag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+  <use>
+    <flag name="editor">Install level editor</flag>
+  </use>
+</pkgmetadata>
diff --git a/games-puzzle/jools/Manifest b/games-puzzle/jools/Manifest
new file mode 100644
index 000000000000..c2b3d5de84b2
--- /dev/null
+++ b/games-puzzle/jools/Manifest
@@ -0,0 +1,2 @@
+DIST jools-0.20.tar.gz 1710143 SHA256 50f5c23491e45b4658baecdb774ba071000f4c9a1164b77c95cbfe711f3e36c8 SHA512 11eadceb8208a72846a9e16a2dae0a1b1d7f8995d5ff2487ee03dd62811f3a232c0d08dc044c351f44c120e6e75eba11df1a727a9d5c6c57ce5e2ef8ee4d0986 WHIRLPOOL 7c84e67e4c1b1ced837f8295bd8333bf511f526494d0cf1d9f75f97bc675955aa91aa5f49ef452fc45e5f596fc22d904b90113409f66877c0f2140f730ff2fd1
+DIST jools-musicpack-1.0.tar.gz 4447501 SHA256 baf3bd24a65508868b13b6224a0661dc4b8616eb8d70fab04a9e732d32983c84 SHA512 1773beb8cd7df756cb4f7ba55729a6dfa995ca860f3381e2fed3884f42227d19955e13f8be9b2f6f64d4d86e452be9fe876963e24c85cd2c3cc42df62804b9c2 WHIRLPOOL 0b3cfc8c115919c375132150a5bb5fd861d592f8ae6de75e9fe00b835ebdbcd4988a8187499bc50049931b2a2651113f24de84ff240082961197a6dd9328cdae
diff --git a/games-puzzle/jools/jools-0.20-r2.ebuild b/games-puzzle/jools/jools-0.20-r2.ebuild
new file mode 100644
index 000000000000..ce1b2dab8512
--- /dev/null
+++ b/games-puzzle/jools/jools-0.20-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 games
+
+MUS_P=${PN}-musicpack-1.0
+DESCRIPTION="clone of Bejeweled, a popular pattern-matching game"
+HOMEPAGE="http://pessimization.com/software/jools/"
+SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz
+	 http://pessimization.com/software/jools/${MUS_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+RDEPEND=${DEPEND}
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${P}/jools
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/music
+	unpack ${MUS_P}.tar.gz
+}
+
+src_prepare() {
+	echo "MEDIAROOT = \"${GAMES_DATADIR}/${PN}\"" > config.py
+	python_fix_shebang .
+}
+
+src_install() {
+	games_make_wrapper ${PN} "${EPYTHON} ./__init__.py" "$(games_get_libdir)"/${PN}
+	insinto "$(games_get_libdir)"/${PN}
+	doins *.py
+	python_optimize "${D}$(games_get_libdir)/${PN}"
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r fonts images music sounds
+
+	newicon images/ruby/0001.png ${PN}.png
+	make_desktop_entry ${PN} Jools
+	dodoc ../{ChangeLog,doc/{POINTS,TODO}}
+	dohtml ../doc/manual.html
+	prepgamesdirs
+}
diff --git a/games-puzzle/jools/metadata.xml b/games-puzzle/jools/metadata.xml
new file mode 100644
index 000000000000..7b0afd175166
--- /dev/null
+++ b/games-puzzle/jools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<longdescription lang="en">
+Jools is a graphical puzzle game in the tradition of Tetris. It has begun as
+a clone of Bejeweled, which is currently available for Windows, Mac, and
+Palm/Pocket PC devices.  In a nutshell, the goal is to swap adjacent jools
+(jewels) within a grid, in order to create rows of three or more of a kind.
+These jools will then disappear, and more will fall to fill their places.
+</longdescription>
+</pkgmetadata>
diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest
new file mode 100644
index 000000000000..db1417db59b6
--- /dev/null
+++ b/games-puzzle/kiki/Manifest
@@ -0,0 +1 @@
+DIST kiki-1.0.2-src.tgz 3366523 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246 SHA512 9e5976fee8abcfc8226a158560ead409a68c0eb72d4b5138b10a4fe4ca1fb720972075c4c67f080856a2830fb039fc33151160736bda0b1121c23d9cf4e209c3 WHIRLPOOL 4c7454a43a1bdef285acffad1003f489c753d7afc2aab20b5363db75b906459c00918a9764c2bceb87587bc9b0c28893b166caa7f16e4d1738fe3958082f6d43
diff --git a/games-puzzle/kiki/files/kiki-1.0.2-build.patch b/games-puzzle/kiki/files/kiki-1.0.2-build.patch
new file mode 100644
index 000000000000..b3798678f81a
--- /dev/null
+++ b/games-puzzle/kiki/files/kiki-1.0.2-build.patch
@@ -0,0 +1,45 @@
+--- kodilib/linux/Makefile
++++ kodilib/linux/Makefile
+@@ -21,7 +21,7 @@
+ 

+ INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)

+ 

+-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)

++CXXFLAGS += $(INCLUDES) $(SDL_CFLAGS)

+ 

+ src =  \

+ 	$(KODISRCDIR)/handler/KEventHandler.cpp \

+--- linux/Makefile
++++ linux/Makefile
+@@ -14,11 +14,7 @@
+ 

+ GLLIBS = -lglut -lGLU -lGL

+ 

+-PYTHONHOME = /usr/lib/python$(PYTHON_VERSION)/

+-PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VERSION).a -lutil \

+-             $(PYTHONHOME)/lib-dynload/math.so \

+-	     $(PYTHONHOME)/lib-dynload/time.so \

+-	     $(PYTHONHOME)/lib-dynload/_random.so

++PYTHONLIBS = -lpython$(PYTHON_VERSION) -lutil

+ 

+ # change this, if the kodilib directory isn't parallel to the kiki directory

+ 

+@@ -46,7 +42,7 @@
+ 

+ INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)

+ 

+-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)

++CXXFLAGS += $(INCLUDES) $(SDLCFLAGS)

+ 

+ src =  \

+ 	$(KIKISRC)/base/KikiAction.cpp \

+@@ -105,8 +101,7 @@
+ obj = $(src:.cpp=.o)

+ 

+ kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)

+-	-(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)

+-	$(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)

++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)

+ 

+ obj-clean:

+ 	$(RM) -f $(obj)

diff --git a/games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch b/games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch
new file mode 100644
index 000000000000..aab70ba69b72
--- /dev/null
+++ b/games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch
@@ -0,0 +1,19 @@
+--- src/main/main.cpp.orig	2003-04-11 14:42:29.000000000 +0100
++++ src/main/main.cpp	2006-07-06 19:37:55.000000000 +0100
+@@ -9,6 +9,7 @@
+ #include <math.h>

+ 

+ #include <SDL.h>

++#include <GL/glut.h>

+ #include "KikiController.h"

+ 

+ // __________________________________________________________________________________________________

+@@ -19,6 +20,8 @@
+     int width, height;

+     SDL_Surface * screen;

+ 

++	glutInit(&argc, argv);

++

+     // initialize SDL

+     if ( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_VIDEO) < 0 ) // SDL_INIT_TIMER

+     {

diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch
new file mode 100644
index 000000000000..05bdd3707ec7
--- /dev/null
+++ b/games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch
@@ -0,0 +1,10 @@
+--- src/main/KikiPythonWidget.h.old	2006-05-07 23:14:09.000000000 +0200
++++ src/main/KikiPythonWidget.h	2006-05-07 23:17:20.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include "KikiPos.h"

+ #include <KTextField.h>

+ 

++class KikiPython;

+ class KikiPythonWidget : public KTextField

+ {

+     friend class	KikiPython;

diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch
new file mode 100644
index 000000000000..baa04f2ff98e
--- /dev/null
+++ b/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch
@@ -0,0 +1,56 @@
+--- kiki/kodilib/src/handler/KPickable.h.orig	2003-04-09 05:56:01.000000000 +0300
++++ kiki/kodilib/src/handler/KPickable.h	2008-10-18 17:23:42.000000000 +0300
+@@ -9,6 +9,8 @@
+ #include "KIntrospection.h"

+ #include <vector>

+ 

++#include <limits.h>

++

+ #define DEBUG_PICKING		false

+ 

+ class KPickable;

+--- kiki/kodilib/src/tools/KIntrospection.h.orig	2003-04-09 05:56:03.000000000 +0300
++++ kiki/kodilib/src/tools/KIntrospection.h	2008-10-18 17:22:03.000000000 +0300
+@@ -11,6 +11,7 @@
+ #endif

+ 

+ #include <string>

++#include <cstring>

+ 

+ // --------------------------------------------------------------------------------------------------------

+ class KClassInfo

+--- kiki/kodilib/src/tools/KStringTools.cpp.orig	2003-04-14 00:42:13.000000000 +0300
++++ kiki/kodilib/src/tools/KStringTools.cpp	2008-10-18 17:25:48.000000000 +0300
+@@ -6,9 +6,10 @@
+ #include "KStringTools.h"

+ #include "KVector.h"

+ 

+-#include <sys/types.h> 	// INT_MAX

+ #include <stdio.h>

+ 

++#include <limits.h> // INT_MAX

++

+ // --------------------------------------------------------------------------------------------------------

+ void kStringInsertStringBehindTags ( std::string & str, const std::string & insertString, 

+                                      const std::string & tag )

+--- kiki/kodilib/src/tools/KStringTools.h.orig	2003-04-09 05:56:04.000000000 +0300
++++ kiki/kodilib/src/tools/KStringTools.h	2008-10-18 17:22:49.000000000 +0300
+@@ -7,6 +7,7 @@
+ #define __KStringTools

+ 

+ #include <string>

++#include <cstring>

+ #include <vector>

+ #include <stdarg.h>

+ 

+--- kiki/kodilib/src/tools/KXMLTools.cpp.orig	2003-04-14 00:42:13.000000000 +0300
++++ kiki/kodilib/src/tools/KXMLTools.cpp	2008-10-18 17:26:42.000000000 +0300
+@@ -8,6 +8,8 @@
+ #include "KSeparatedMatrix.h"

+ #include <stdio.h>

+ 

++#include <cstdlib>

++

+ // --------------------------------------------------------------------------------------------------------

+ std::string kXMLTag ( const std::string & name, const std::string & attributes, int depth )

+ {

diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch
new file mode 100644
index 000000000000..457c6d68ae02
--- /dev/null
+++ b/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch
@@ -0,0 +1,22 @@
+--- SWIG/KikiPy_wrap.cpp.old	2011-04-20 14:48:38.000000000 +0200
++++ SWIG/KikiPy_wrap.cpp	2011-04-20 15:15:08.000000000 +0200
+@@ -12968,7 +12968,7 @@
+   void *argp1 = 0 ;
+   int res1 = 0 ;
+   PyObject * obj0 = 0 ;
+-  std::string *result = 0 ;
++  std::string result ;
+   
+   if (!PyArg_ParseTuple(args,(char *)"O:KikiText_getText",&obj0)) SWIG_fail;
+   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_KikiText, 0 |  0 );
+@@ -12976,8 +12976,8 @@
+     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "KikiText_getText" "', argument " "1"" of type '" "KikiText const *""'"); 
+   }
+   arg1 = reinterpret_cast< KikiText * >(argp1);
+-  result = (std::string *) &((KikiText const *)arg1)->getText();
+-  resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
++  result = ((KikiText const *)arg1)->getText();
++  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
+   return resultobj;
+ fail:
+   return NULL;
diff --git a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..ae20f2567671
--- /dev/null
+++ b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_DEPEND="2"
+inherit eutils python toolchain-funcs games
+
+DESCRIPTION="Fun 3D puzzle game using SDL/OpenGL"
+HOMEPAGE="http://kiki.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kiki/${P}-src.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[opengl]
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	virtual/opengl
+	virtual/glu
+	media-libs/freeglut"
+DEPEND="${RDEPEND}
+	dev-lang/swig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-freeglut.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-build.patch
+	ecvs_clean
+	rm -f py/runkiki
+
+	# Change the hard-coded data dir for sounds, etc...
+	sed -i \
+		-e "s:kiki_home += \"/\";:kiki_home = \"${GAMES_DATADIR}/${PN}/\";:g" \
+		-e "s:KConsole\:\:printf(\"WARNING \:\: environment variable KIKI_HOME not set ...\");::g" \
+		-e "s:KConsole\:\:printf(\"           ... assuming resources in current directory\");::g" \
+		src/main/KikiController.cpp || die
+
+	# Bug 139570
+	cd SWIG
+	swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i || die
+	cp -f kiki.py ../py
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+}
+
+src_compile() {
+	emake -C kodilib/linux AR="$(tc-getAR)"
+	emake -C linux PYTHON_VERSION="$(python_get_version)"
+}
+
+src_install() {
+	dogamesbin linux/kiki
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r py sound
+
+	dodoc Readme.txt Thanks.txt
+	prepgamesdirs
+}
+
+pkg_setup() {
+	python_pkg_setup
+	python_set_active_version 2
+	games_pkg_setup
+}
diff --git a/games-puzzle/kiki/metadata.xml b/games-puzzle/kiki/metadata.xml
new file mode 100644
index 000000000000..fc9f396abb37
--- /dev/null
+++ b/games-puzzle/kiki/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">kiki</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/krystaldrop/Manifest b/games-puzzle/krystaldrop/Manifest
new file mode 100644
index 000000000000..9f5697845002
--- /dev/null
+++ b/games-puzzle/krystaldrop/Manifest
@@ -0,0 +1,2 @@
+DIST krystaldrop-0.7.2-art.tgz 17079147 SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27 SHA512 f9cf76007a0c280c450e0fc5a83f0ce01de787382fe12754f4d490a93579db380a3babc1670630fe16f48a1dd6e73c60391ed7c76ce3f7b2fde550ea20c9811a WHIRLPOOL 0eb7f4bb5523c6842523da02f05836b5b212d5e0f3887cc8406b88f285b7e702e0c5d98b63016d67fcd78b02c51bb4f604f2aa9d079372a9c3abc8b0c0bef7aa
+DIST krystaldrop-0.7.2-src.tgz 162856 SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5 SHA512 680b311966ae5d766de0c2f173806e34f7d4b6ae8ca37ad90f1abf70256b2e3f909aca71cf1584d09ac0b53e084ebd668167da33431d2ec7d8e27406d48a39e6 WHIRLPOOL e69ab50d8cda6a740096aa8646dd10f592eeb30c430e37a89f548097331aa540b6d21bf53d6405f2ae87c99d4b1676faa033e8d5e78dbe466b82ba9bb9de536e
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch
new file mode 100644
index 000000000000..54eba0e97014
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch
@@ -0,0 +1,11 @@
+--- Sources/Makefile.old        2009-02-10 10:03:03.000000000 +0100
++++ Sources/Makefile    2009-02-10 10:04:21.000000000 +0100
+@@ -186,7 +186,7 @@
+ 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
+ 
+ kdrop: $(OBJ)
+-	$(LINK) $(LCFLAGS) $(LIBS) -o $@ $(OBJ)
++	$(LINK) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ $(OBJ): %.o: dep/%.d
+ $(OBJ): %.o: %.cpp
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch
new file mode 100644
index 000000000000..7fcb5aac603c
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch
@@ -0,0 +1,36 @@
+--- Sources/Makefile.old	2012-11-09 08:04:43.029680861 +0100
++++ Sources/Makefile	2012-11-09 08:16:02.650491943 +0100
+@@ -35,10 +35,6 @@
+ export
+ VERSION=0_7_2
+ 
+-CC=g++
+-LINK=g++
+-MAKE=make
+-
+ SRC= KrystalDrop/main.cpp                              \
+      KrystalDrop/Names.cpp                             \
+      KrystalDrop/Controller/BackgroundController.cpp   \
+@@ -159,7 +155,7 @@
+   CCFLAGS:=$(CCFLAGS) -ggdb -DDEBUG -DDEBUG_SANITY_CHECK
+ endif
+ ifeq ($(DEBUG_MODE),no)
+-  CCFLAGS:=$(CCFLAGS) -O2 -DNDEBUG
++  CCFLAGS:=$(CCFLAGS) -DNDEBUG
+ endif
+ ifeq ($(DISPLAY_FPS),yes)
+   CCFLAGS:=$(CCFLAGS) -DDISPLAY_FPS
+@@ -186,11 +182,11 @@
+ 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
+ 
+ kdrop: $(OBJ)
+-	$(LINK) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS)
++	$(CXX) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ $(OBJ): %.o: dep/%.d
+ $(OBJ): %.o: %.cpp
+-	$(CC) $(CCFLAGS) -o $@ -c $<
++	$(CXX) $(CCFLAGS) $(CXXFLAGS) -o $@ -c $<
+ 
+ clean:
+ 	find -name "*.o" -exec rm {} ";"
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-deps.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-deps.patch
new file mode 100644
index 000000000000..07e60a0b71f1
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-deps.patch
@@ -0,0 +1,26 @@
+Index: krystaldrop/Makefile.dep
+===================================================================
+--- krystaldrop.orig/Makefile.dep
++++ krystaldrop/Makefile.dep
+@@ -10,7 +10,6 @@ default:
+ $(DEP): dep/%.d: %.cpp
+ 	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
+ 	@$(SHELL) -ec '$(CC) $(CCFLAGS) $(DCFLAGS) $< \
+-	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
+-	dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
++	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
+ 	[ -s $@ ] || rm -f $@'
+ 
+Index: krystaldrop/Sources/Makefile.dep
+===================================================================
+--- krystaldrop.orig/Sources/Makefile.dep
++++ krystaldrop/Sources/Makefile.dep
+@@ -10,7 +10,6 @@ default:
+ $(DEP): dep/%.d: %.cpp
+ 	@test -d dep/$(dir $*) || mkdir -p dep/$(dir $*)
+ 	@$(SHELL) -ec '$(CC) $(CCFLAGS) $(DCFLAGS) $< \
+-	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o \
+-	dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
++	| sed '\''s/$(subst .,\.,$(notdir $*))\.o[ :]*/$(subst /,\/,$*).o dep\/$(subst /,\/,$*).d : /g'\'' > $@; \
+ 	[ -s $@ ] || rm -f $@'
+ 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch
new file mode 100644
index 000000000000..c962a2121596
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc41.patch
@@ -0,0 +1,78 @@
+Index: krystaldrop/Sources/KDpp/Tools/FilePath.h
+===================================================================
+--- krystaldrop.orig/Sources/KDpp/Tools/FilePath.h
++++ krystaldrop/Sources/KDpp/Tools/FilePath.h
+@@ -75,7 +75,7 @@ public:
+ 	/**
+ 		Adds a directory before the filePath....
+ 	*/
+-	void KD_FilePath::PrefixDirectory(const string &path);
++	void PrefixDirectory(const string &path);
+ 
+ 
+ 	/**
+Index: krystaldrop/Sources/KDpp/Video/Color.h
+===================================================================
+--- krystaldrop.orig/Sources/KDpp/Video/Color.h
++++ krystaldrop/Sources/KDpp/Video/Color.h
+@@ -38,7 +38,7 @@ public:
+ 	KD_Color operator*( float lambda );
+ 
+ 	// Multiply by another color
+-	KD_Color KD_Color::operator*( const KD_Color &other );
++	KD_Color operator*( const KD_Color &other );
+ 
+ 	// Sets all the components between 0 and 1
+ 	void normalize();
+Index: krystaldrop/Sources/KrystalDrop/Game/AnimRow.h
+===================================================================
+--- krystaldrop.orig/Sources/KrystalDrop/Game/AnimRow.h
++++ krystaldrop/Sources/KrystalDrop/Game/AnimRow.h
+@@ -22,7 +22,7 @@ class KD_AnimatedRow: public KD_Row
+    void UpdateBlocks (unsigned multiplier); /* multiplier is used to catch up when a lag has occured */
+   
+   public:
+-   KD_AnimatedRow::KD_AnimatedRow (short Height_In_Gems, short x_Offset, 
++   KD_AnimatedRow (short Height_In_Gems, short x_Offset, 
+                                    KD_Hand* Hand, KD_Parameters* Param, KD_Memo* Memo);
+   ~KD_AnimatedRow();
+   
+Index: krystaldrop/Sources/KrystalDrop/Game/Table.h
+===================================================================
+--- krystaldrop.orig/Sources/KrystalDrop/Game/Table.h
++++ krystaldrop/Sources/KrystalDrop/Game/Table.h
+@@ -329,7 +329,7 @@ public:
+ 	/**
+ 		Sets the sprites for the border of the field.
+ 	*/
+-	void KD_Table::setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]);
++	void setAllBorders(KD_Sprite *spr[KD_NB_SPRITE_FOR_BORDER]);
+ 	void setHorizontalBar(KD_Sprite *spr);
+ 	void setVerticalBar(KD_Sprite *spr);
+ 	void setUpperLeftBar(KD_Sprite *spr);
+Index: krystaldrop/Sources/Makefile
+===================================================================
+--- krystaldrop.orig/Sources/Makefile
++++ krystaldrop/Sources/Makefile
+@@ -35,7 +35,7 @@ ACC_ZLIB_SUPPORT=yes
+ export
+ VERSION=0_7_2
+ 
+-CC=g++ -Werror
++CC=g++
+ LINK=g++
+ MAKE=make
+ 
+Index: krystaldrop/Sources/Makefile.lib
+===================================================================
+--- krystaldrop.orig/Sources/Makefile.lib
++++ krystaldrop/Sources/Makefile.lib
+@@ -30,7 +30,7 @@ STATIC_LIBRARY=no
+ export
+ VERSION=0_7
+ 
+-CC=g++ -Werror
++CC=g++
+ LINK=g++
+ MAKE=make
+ 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch
new file mode 100644
index 000000000000..a4130ac31afd
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-gcc43.patch
@@ -0,0 +1,113 @@
+--- krystaldrop/Sources/KDpp/Resources/ArchiveReader.h.old	2008-07-30 22:05:18.000000000 -0500
++++ krystaldrop/Sources/KDpp/Resources/ArchiveReader.h	2008-07-30 22:27:20.000000000 -0500
+@@ -2,7 +2,26 @@
+ #define ArchiveReader_H
+ 
+ #include <map>
+-#include <string>
++#include <cstring>
++#include <locale>
++
++/* 
++ * structs needed for std::transform() 
++ * See: http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html#7 
++ */ 
++struct ToUpper { 
++	ToUpper(std::locale const& l) : loc(l) {;} 
++	char operator() (char c) const  { return std::toupper(c,loc); } 
++private: 
++	std::locale const& loc; 
++}; 
++	 
++struct ToLower { 
++	ToLower(std::locale const& l) : loc(l) {;} 
++	char operator() (char c) const  { return std::tolower(c,loc); } 
++private: 
++	std::locale const& loc; 
++}; 
+ 
+ /** \c KD_ArchiveReader is a generic abstract class which reads a specific kind of archive
+     (`.zip' for instance)
+--- krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp.old	2008-07-30 20:53:19.000000000 -0500
++++ krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp	2008-07-30 22:35:54.000000000 -0500
+@@ -1,10 +1,11 @@
+-#include <assert.h>
++#include <cassert>
++#include <algorithm>
+ 
+ #include "ArchiveManager.h"
+ #include "../Tools/Logfile.h"
+ 
+ #ifndef _WIN32
+-#include <ctype.h>
++#include <cctype>
+ #endif
+ 
+ std::map<std::string,KD_ArchiveReader*> KD_ArchiveManager::opened_archives;
+@@ -25,7 +26,6 @@
+   opened_archives.clear();
+ }
+ 
+-
+ void KD_ArchiveManager::RegisterArchiveFormat (std::string suffix, T_ArchiveReaderFactory reader_factory)
+ {
+   NormalizeSuffix (suffix);
+@@ -36,9 +36,10 @@
+ 
+ 
+ void KD_ArchiveManager::NormalizeSuffix (std::string& suffix)
+-{
++{  
++  ToLower __tolower(std::locale::classic());
+   // stores the suffix lower-case
+-  transform (suffix.begin(), suffix.end(), suffix.begin(), tolower);
++  transform (suffix.begin(), suffix.end(), suffix.begin(), __tolower);
+ 
+    // add the dot character `.' if it is missing
+   if (suffix[0]!= '.') suffix= '.'+ suffix;
+--- krystaldrop/Sources/KDpp/Tools/FilePath.cpp.old	2008-07-30 20:55:13.000000000 -0500
++++ krystaldrop/Sources/KDpp/Tools/FilePath.cpp	2008-07-30 22:37:05.000000000 -0500
+@@ -1,12 +1,12 @@
+ #include "FilePath.h"
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <algorithm>
+ 
+ #ifndef _WIN32
+-#include <ctype.h>
++#include <cctype>
+ #endif
+ 
+-
+ KD_FilePath::KD_FilePath() : fileName("") , filePath(""), archiveName(""), archiveSuffix("")
+ {
+ }
+@@ -165,8 +165,9 @@
+ 	// (*not* the first one found scanning from left to right)
+ 
+ 	// the search is case-insensitive -> lower-casificator in action
++	ToLower __tolower(std::locale::classic());
+ 	string copy_directory = directory;
+-	transform (copy_directory.begin(), copy_directory.end(), copy_directory.begin(), tolower);
++	transform (copy_directory.begin(), copy_directory.end(), copy_directory.begin(), __tolower);
+ 
+ 	map<string,T_ArchiveReaderFactory>::iterator suffix_iter=
+ 		KD_ArchiveManager::known_suffixes.begin();
+@@ -271,6 +272,7 @@
+ 
+ string KD_FilePath::GetFileExtension() const
+ {
++	ToLower __tolower(std::locale::classic());
+ 	size_t pos = fileName.rfind('.');
+ 	if (pos == fileName.npos)
+ 		return "";
+@@ -280,7 +282,7 @@
+ 	for (unsigned int i=0; i<ext.size(); i++)
+ 		ext[i] = tolower(ext[i]);
+ */
+-	transform (ext.begin(), ext.end(), ext.begin(), tolower);
++	transform (ext.begin(), ext.end(), ext.begin(), __tolower);
+ 	return ext;
+ }
+ 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch
new file mode 100644
index 000000000000..2e9ab8b76f66
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- Sources/KrystalDrop/Tools/direct.cpp
++++ Sources/KrystalDrop/Tools/direct.cpp
+@@ -77,7 +77,7 @@
+   assert (f);
+   assert (*f!= 0);
+ 
+-  p= strrchr (f, ACC_FNSPLITCHAR);
++  p= strrchr ((char *)f, ACC_FNSPLITCHAR);
+   if (p!= NULL)
+   { if (*p== 0)      return NULL; // this line should be useless, according to strrchr manpage
+     if (*(p+ 1)== 0) return NULL;
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-icu.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-icu.patch
new file mode 100644
index 000000000000..09bcaf613714
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-icu.patch
@@ -0,0 +1,14 @@
+--- Sources/KDpp/Tools/XMLConfig.h.old	2011-05-05 11:42:04.117278725 +0200
++++ Sources/KDpp/Tools/XMLConfig.h	2011-05-05 11:42:28.395026400 +0200
+@@ -3,11 +3,9 @@
+ 
+ #include "defines.h"
+ 
+-extern "C" {
+ #include <libxml/xmlmemory.h>
+ #include <libxml/parser.h>
+ //#include <libxml/parser.h>
+-}
+ 
+ #include "FilePath.h"
+ 
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-assert.patch b/games-puzzle/krystaldrop/files/krystaldrop-assert.patch
new file mode 100644
index 000000000000..5aff17ee7dd6
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-assert.patch
@@ -0,0 +1,9 @@
+diff -rNu krystaldrop.orig/Sources/KDpp/Resources/ArchiveManager.cpp krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp
+--- krystaldrop.orig/Sources/KDpp/Resources/ArchiveManager.cpp	2003-08-26 15:14:19.000000000 -0400
++++ krystaldrop/Sources/KDpp/Resources/ArchiveManager.cpp	2004-02-26 20:13:42.000000000 -0500
+@@ -1,3 +1,5 @@
++#include <assert.h>
++
+ #include "ArchiveManager.h"
+ #include "../Tools/Logfile.h"
+ 
diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
new file mode 100644
index 000000000000..9e173dde092c
--- /dev/null
+++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils games
+
+DESCRIPTION="Free clone of an excellent NeoGeo puzzle game, Magical Drop"
+HOMEPAGE="http://krystaldrop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/krystaldrop/art_${PV}.tgz -> ${P}-art.tgz
+	mirror://sourceforge/krystaldrop/src_${PV}.tgz -> ${P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf
+	dev-libs/libxml2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	mv ../art .
+	epatch \
+		"${FILESDIR}"/krystaldrop-assert.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-deps.patch \
+		"${FILESDIR}"/${P}-icu.patch \
+		"${FILESDIR}"/${P}-glibc2.10.patch \
+		"${FILESDIR}"/${P}-cxxflags.patch
+
+	sed -i \
+		-e "/^EXEDIR:=/ s|$|/bin|" \
+		-e "/^INSTALL_PREFIX:=/ s|$|${D}|" Makefile \
+		|| die "sed Makefile failed"
+
+	# fix the high score location
+	sed -i \
+		-e "s:BINDIR:\"${GAMES_STATEDIR}/${PN}\":" \
+		Sources/KrystalDrop/Controller/HighScoresController.cpp \
+		|| die "sed HighScoresController.cpp failed"
+}
+
+src_install() {
+	default
+	dodir "${GAMES_STATEDIR}/${PN}"
+	mv "${D}${GAMES_DATADIR}/${PN}/art/survival.sco" \
+		"${D}${GAMES_STATEDIR}/${PN}/" || die "mv failed"
+	fperms 664 "${GAMES_STATEDIR}/${PN}/survival.sco"
+	doman doc/kdrop.6
+	newicon art/drop.png ${PN}.png
+	make_desktop_entry kdrop "KrystalDrop" ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/krystaldrop/metadata.xml b/games-puzzle/krystaldrop/metadata.xml
new file mode 100644
index 000000000000..29a32c6a06d5
--- /dev/null
+++ b/games-puzzle/krystaldrop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">krystaldrop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
new file mode 100644
index 000000000000..d5785c0c6cef
--- /dev/null
+++ b/games-puzzle/ksokoban/Manifest
@@ -0,0 +1 @@
+DIST ksokoban-0.5.0_pre20120725.tar.xz 345344 SHA256 fb1c47e37b7d6297960f67377f9bac0deb9c4b132c251c02cdd75d1935bc2b5c SHA512 b7a962a5915bb6f10ecb85dfaae20b009a6c40ba0312e02d12b654e196bdef82159e7f0d6fca17b1befaa1cb17db1a9268822904cdf9bdc8bd1bacf2202b460c WHIRLPOOL 3026b04a4a50da8097a926949ab80e736d0f77f814f437aa87a39c6b5805ab0636cb6dde5a1ab74a76b56ce17b44176bf393c5ffe66e86314b30b77ae9921b4c
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild
new file mode 100644
index 000000000000..102fe69d4202
--- /dev/null
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20120725.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.code.sf.net/p/ksokoban/code"
+else
+	SRC_URI="http://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-utils
+DESCRIPTION="The japanese warehouse keeper game"
+HOMEPAGE="https://sourceforge.net/projects/ksokoban/"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="kde-base/kdelibs:4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+CMAKE_IN_SOURCE_BUILD="yes"
+
+src_prepare() {
+	sed -i 's/%m//' "data/${PN}.desktop" || die "sed for desktop file failed"
+}
+
+# source lacks install target
+src_install() {
+	dobin ksokoban
+	dodoc AUTHORS NEWS TODO
+	domenu "data/${PN}.desktop"
+	for i in 16 22 32 48 64 128; do
+		doicon -s "${i}" "data/hi${i}-app-${PN}.png"
+	done
+}
diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/ksokoban/ksokoban-9999.ebuild
new file mode 100644
index 000000000000..102fe69d4202
--- /dev/null
+++ b/games-puzzle/ksokoban/ksokoban-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+	inherit mercurial
+	EHG_REPO_URI="http://hg.code.sf.net/p/ksokoban/code"
+else
+	SRC_URI="http://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-utils
+DESCRIPTION="The japanese warehouse keeper game"
+HOMEPAGE="https://sourceforge.net/projects/ksokoban/"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="kde-base/kdelibs:4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+CMAKE_IN_SOURCE_BUILD="yes"
+
+src_prepare() {
+	sed -i 's/%m//' "data/${PN}.desktop" || die "sed for desktop file failed"
+}
+
+# source lacks install target
+src_install() {
+	dobin ksokoban
+	dodoc AUTHORS NEWS TODO
+	domenu "data/${PN}.desktop"
+	for i in 16 22 32 48 64 128; do
+		doicon -s "${i}" "data/hi${i}-app-${PN}.png"
+	done
+}
diff --git a/games-puzzle/ksokoban/metadata.xml b/games-puzzle/ksokoban/metadata.xml
new file mode 100644
index 000000000000..2b2f1635f4e7
--- /dev/null
+++ b/games-puzzle/ksokoban/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+	<email>bircoph@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/larry/Manifest b/games-puzzle/larry/Manifest
new file mode 100644
index 000000000000..7720dbc1f686
--- /dev/null
+++ b/games-puzzle/larry/Manifest
@@ -0,0 +1 @@
+DIST LarryReloadedLinux.tar.gz 767543995 SHA256 8fe697796e8a62f52105490da6768c35a3d5f76a5aafe02a9d10fb387186e703 SHA512 81ad52ba562eb890d2f001c3e4174222b183064103da3c4f2ddcb4cbf3ad432892b35aeb6b4e253ffc972431f6c673c149bb4a80d742a05c20bec803feaaa23a WHIRLPOOL 9d75e5b28091a12e064247ea71cc6d3ddb5132c974b65f7cd2ddcd167e3a24bbf30024b0d7777b4f7770c2199e28e5959cc033b7a052fbb14ea422c43cbfb142
diff --git a/games-puzzle/larry/files/larry-wrapper b/games-puzzle/larry/files/larry-wrapper
new file mode 100644
index 000000000000..717be43fbd10
--- /dev/null
+++ b/games-puzzle/larry/files/larry-wrapper
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# https://forums.replaygamesinc.com/viewtopic.php?f=28&t=1141
+export LC_ALL=C
+
+cd "@GAMES_DIR@"
+exec ./Larry-Linux "$@"
diff --git a/games-puzzle/larry/larry-1-r1.ebuild b/games-puzzle/larry/larry-1-r1.ebuild
new file mode 100644
index 000000000000..ba3b9c32ec45
--- /dev/null
+++ b/games-puzzle/larry/larry-1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils check-reqs gnome2-utils games
+
+DESCRIPTION="Leisure Suit Larry Reloaded"
+HOMEPAGE="https://www.replaygamesinc.com"
+SRC_URI="LarryReloadedLinux.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="bindist fetch splitdebug"
+
+QA_PREBUILT="${GAMES_PREFIX_OPT#/}/${PN}/Larry-Linux
+	${GAMES_PREFIX_OPT#/}/${PN}/Larry-Linux_Data/Mono/x86/libmono.so"
+CHECKREQS_DISK_VAR="4500M"
+CHECKREQS_DISK_USR="4500M"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_prepare() {
+	sed \
+		-e "s#@GAMES_DIR@#${GAMES_PREFIX_OPT}/${PN}#" \
+		"${FILESDIR}"/${PN}-wrapper > "${S}"/larry || die
+}
+
+src_install() {
+	newicon -s 128 Larry/Larry-Linux_Data/Resources/UnityPlayer.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	dogamesbin larry
+	# move it, over 4gb
+	dodir "${GAMES_PREFIX_OPT}"/${PN}
+	mv Larry/* "${ED%/}/${GAMES_PREFIX_OPT}"/${PN}/ || die
+
+	fperms +x "${GAMES_PREFIX_OPT}"/${PN}/Larry-Linux
+
+	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/larry/metadata.xml b/games-puzzle/larry/metadata.xml
new file mode 100644
index 000000000000..cad5a2aa1773
--- /dev/null
+++ b/games-puzzle/larry/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
new file mode 100644
index 000000000000..64e90fa1e3c8
--- /dev/null
+++ b/games-puzzle/lightsoff/Manifest
@@ -0,0 +1,3 @@
+DIST lightsoff-3.14.1.tar.xz 1982768 SHA256 5ca1bd65e4159caa4f8032a0cab3e545995496c12e172d5a6fa58a87ed312b61 SHA512 62c265f175e9b980343a30f55687f1405132e323048afd60bcd035b8a56dbc671a2cc43d35832064805a6d3cb8c62d58c71c74387876c93dd8e56e6a793294dc WHIRLPOOL e764e43766228c74a442894316287fc8b856263ac5a19e64164150284cd932ceb0d13f102556fad9ebdb086d87124aaf6bb3d298bd68e59557ebed0ba938ab40
+DIST lightsoff-3.16.1.1.tar.xz 1957368 SHA256 80113f0e2e16db30b62c699f984f5349907f35078a6f75e6cfdd99cccf964201 SHA512 708374c5fcb8627c009b24d3310d37e50c88f6eec8ba942753ce14c40de28135ba1656d628730246b7bb8549bcdafbe318f21dc1f8c89079aefe017e19f8542b WHIRLPOOL 53935dfaad2342f0f5b83a6ecad3581a81ff779eca4daf627a11eddc7983f88b59616dbdac8cbf6f61f6ffa531871ff96e6f72d2537d27f508e3b35661c550ee
+DIST lightsoff-3.16.1.tar.xz 1955664 SHA256 7ec154a85da601a366d11b6b434ae0f631c04753cabca4b6c2223a44d355e892 SHA512 ed35aabf9245a05d1f711b72bfeff57f7a2ed2427dfbfdce111b1cfe8913ea918e1e905c4fc630906032eea0dc447c54f292036392421728c95cdc784278d090 WHIRLPOOL eb2b9f15b7baf17ed08a046a05cdfdbac09b9e92b566915aa153b022b90e88cb680ad616e611366b0858a81001e89a7928a8f67a9d316a843bfc27edb3e76b76
diff --git a/games-puzzle/lightsoff/lightsoff-3.14.1.ebuild b/games-puzzle/lightsoff/lightsoff-3.14.1.ebuild
new file mode 100644
index 000000000000..1dbc077e478b
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-3.14.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Turn off all the lights"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32:2
+	>=media-libs/clutter-1.14:1.0
+	>=media-libs/clutter-gtk-1.5.5:1.0
+	>=x11-libs/gtk+-3.13.2:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/lightsoff/lightsoff-3.16.1.1.ebuild b/games-puzzle/lightsoff/lightsoff-3.16.1.1.ebuild
new file mode 100644
index 000000000000..ccda7c7158cb
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-3.16.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Turn off all the lights"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32:2
+	>=media-libs/clutter-1.14:1.0
+	>=media-libs/clutter-gtk-1.5.5:1.0
+	>=x11-libs/gtk+-3.13.2: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() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/lightsoff/lightsoff-3.16.1.ebuild b/games-puzzle/lightsoff/lightsoff-3.16.1.ebuild
new file mode 100644
index 000000000000..ccda7c7158cb
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-3.16.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Turn off all the lights"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32:2
+	>=media-libs/clutter-1.14:1.0
+	>=media-libs/clutter-gtk-1.5.5:1.0
+	>=x11-libs/gtk+-3.13.2: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() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/lightsoff/metadata.xml b/games-puzzle/lightsoff/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/lightsoff/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
new file mode 100644
index 000000000000..9cd325819b26
--- /dev/null
+++ b/games-puzzle/lmarbles/Manifest
@@ -0,0 +1 @@
+DIST lmarbles-1.0.8.tar.gz 914238 SHA256 0e5a16a0116d325589b28f3555ced6a0b486f0fd7632cd3d98bee5cddf213e83 SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a WHIRLPOOL 030942eb4d8dc0c4002fcf597832c27457f1debdd059b299bc9fc41a74896eea0a066d8062c4e344cf327637796be5e77e43363170a6e7a8d33a429cffdcaf1f
diff --git a/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch b/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
new file mode 100644
index 000000000000..160b6d0f79d5
--- /dev/null
+++ b/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
@@ -0,0 +1,15 @@
+diff -ru lmarbles-1.0.8.orig/Makefile.am lmarbles-1.0.8/Makefile.am
+--- lmarbles-1.0.8.orig/Makefile.am	2009-10-26 16:01:08.000000000 -0400
++++ lmarbles-1.0.8/Makefile.am	2009-11-07 13:23:55.994140203 -0500
+@@ -4,11 +4,6 @@
+ README-SDL.txt TODO LMarbles.prj lmarbles32.gif lmarbles48.gif \
+ lmarbles.desktop.in
+ 
+-desktopdir = $(datadir)/applications
+-desktop_DATA = lmarbles.desktop
+-icondir = $(datadir)/icons
+-icon_DATA = lmarbles48.gif
+-
+ AUTOMAKE_OPTIONS = foreign
+ 
+ WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt TODO marbles.spec
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
new file mode 100644
index 000000000000..35ad2a1feb4c
--- /dev/null
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LMarbles"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-mixer"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	mv configure.{in,ac}
+	rm *.m4
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	newicon lmarbles48.gif ${PN}.gif
+	make_desktop_entry lmarbles LMarbles /usr/share/pixmaps/${PN}.gif
+	dohtml src/manual/*
+	prepgamesdirs
+}
diff --git a/games-puzzle/lmarbles/metadata.xml b/games-puzzle/lmarbles/metadata.xml
new file mode 100644
index 000000000000..0f9429dd0de0
--- /dev/null
+++ b/games-puzzle/lmarbles/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">lgames</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/lpairs/Manifest b/games-puzzle/lpairs/Manifest
new file mode 100644
index 000000000000..f4b7424fc6c4
--- /dev/null
+++ b/games-puzzle/lpairs/Manifest
@@ -0,0 +1 @@
+DIST lpairs-1.0.4.tar.gz 536625 SHA256 350237a51a5de6b2a557af687b4f16678056a0e8d8d96d7e395f6629481462c5 SHA512 637f9782c1c1faee3fe0d02adeeb7ea70704f1b625922e1ba086cd03e9a6cf1d61a082eff4753a2ec8be5fc7041bd029f193adf847a39e773e4eedd9eafb2b97 WHIRLPOOL 36d57eb4100a03fdd73e770759330799a55973860b7213f8b4f1847d546e54197071dc064171c9f15c936d71c83b35aa9ae49c5b68ad019741d8964be1735a47
diff --git a/games-puzzle/lpairs/lpairs-1.0.4.ebuild b/games-puzzle/lpairs/lpairs-1.0.4.ebuild
new file mode 100644
index 000000000000..6d08273de8df
--- /dev/null
+++ b/games-puzzle/lpairs/lpairs-1.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A classical memory game"
+HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LPairs"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="media-libs/libsdl
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	sed -i \
+		-e 's:$localedir:/usr/share/locale:' \
+		-e 's:$(localedir):/usr/share/locale:' \
+		configure po/Makefile.in.in \
+		|| die "sed failed"
+}
+
+src_configure() {
+	egamesconf \
+		--datadir="${GAMES_DATADIR_BASE}" \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	doicon lpairs.png
+	make_desktop_entry lpairs LPairs
+	prepgamesdirs
+}
diff --git a/games-puzzle/lpairs/metadata.xml b/games-puzzle/lpairs/metadata.xml
new file mode 100644
index 000000000000..0f9429dd0de0
--- /dev/null
+++ b/games-puzzle/lpairs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">lgames</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/ltris/Manifest b/games-puzzle/ltris/Manifest
new file mode 100644
index 000000000000..25085605da8d
--- /dev/null
+++ b/games-puzzle/ltris/Manifest
@@ -0,0 +1 @@
+DIST ltris-1.0.19.tar.gz 883543 SHA256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 SHA512 ab43b3d8f04ab40016be5b5c414f8679bee4f5f344ef9cab52c3628d48017458b84b0fbc0bcaecdfab43853a1ef628ee1cabf3a1373ea108650d4e76015881c5 WHIRLPOOL 9f9b12b5374a686affdf0243cad0220332150655202835f4a254a6febfcd3aab76d8f2331f832e8e891d4616f55190bb0b77f713dfe7ec96cf4df6a56084c003
diff --git a/games-puzzle/ltris/files/ltris-1.0.19-gentoo.patch b/games-puzzle/ltris/files/ltris-1.0.19-gentoo.patch
new file mode 100644
index 000000000000..82acee7d33bc
--- /dev/null
+++ b/games-puzzle/ltris/files/ltris-1.0.19-gentoo.patch
@@ -0,0 +1,51 @@
+diff -ru ltris-1.0.15.orig/Makefile.am ltris-1.0.15/Makefile.am
+--- ltris-1.0.15.orig/Makefile.am	2010-09-20 13:26:05.000000000 -0400
++++ ltris-1.0.15/Makefile.am	2010-09-21 02:01:52.680858712 -0400
+@@ -1,21 +1,9 @@
+-SUBDIRS = intl m4 po src icons
++SUBDIRS = intl m4 po src
+ 
+ EXTRA_DIST = config.rpath  AUTHORS COPYING ChangeLog INSTALL \
+ README TODO touchall ABOUT-NLS po/tr.po_full po/pt.po_full \
+-po/nonascii.pl ltris32.gif ltris48.gif ltris.desktop.in
+-
+-desktopdir = $(datadir)/applications
+-desktop_DATA = ltris.desktop
+-icondir = $(datadir)/icons
+-icon_DATA = ltris48.gif
++po/nonascii.pl
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-# We can't use static desktop file because of icon location. Is this 
+-# the right way to handle it? At least it works... as long as $datadir
+-# does not contain plus signs. :-)
+-ltris.desktop:
+-	@sed -e "s+Icon=+Icon=$(datadir)/icons/ltris48.gif+" \
+-	< ltris.desktop.in > ltris.desktop
+-
+ ACLOCAL_AMFLAGS = -I m4
+diff -ru ltris-1.0.15.orig/configure.in ltris-1.0.15/configure.in
+--- ltris-1.0.15.orig/configure.in	2010-09-20 13:23:17.000000000 -0400
++++ ltris-1.0.15/configure.in	2010-09-21 02:02:22.418843746 -0400
+@@ -55,7 +55,7 @@
+ AC_SUBST(buf_flag)
+ 
+ dnl set localedir
+-localedir=$datadir/locale
++localedir=/usr/share/locale
+ locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
+ 
+ dnl installation path
+diff -ru ltris-1.0.15.orig/po/Makefile.in.in ltris-1.0.15/po/Makefile.in.in
+--- ltris-1.0.15.orig/po/Makefile.in.in	2005-10-04 14:41:03.000000000 -0400
++++ ltris-1.0.15/po/Makefile.in.in	2010-09-21 02:02:40.464207966 -0400
+@@ -23,7 +23,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
diff --git a/games-puzzle/ltris/ltris-1.0.19.ebuild b/games-puzzle/ltris/ltris-1.0.19.ebuild
new file mode 100644
index 000000000000..8cf203d4f4fa
--- /dev/null
+++ b/games-puzzle/ltris/ltris-1.0.19.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+DESCRIPTION="very polished Tetris clone"
+HOMEPAGE="http://lgames.sourceforge.net/index.php?project=LTris"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-mixer
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	mv configure.in configure.ac || die
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	egamesconf $(use_enable nls)
+}
+
+src_install() {
+	default
+	newicon icons/ltris48.xpm ${PN}.xpm
+	make_desktop_entry ltris LTris
+	prepgamesdirs
+}
diff --git a/games-puzzle/ltris/metadata.xml b/games-puzzle/ltris/metadata.xml
new file mode 100644
index 000000000000..0f9429dd0de0
--- /dev/null
+++ b/games-puzzle/ltris/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">lgames</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
new file mode 100644
index 000000000000..5959168118b5
--- /dev/null
+++ b/games-puzzle/magiccube4d/Manifest
@@ -0,0 +1 @@
+DIST mc4d-src-2_2.tgz 144645 SHA256 79c7b62bbe7a132a2eacf58f92f80113ea63171d3eea59755bc828a1aa9daa44 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6 WHIRLPOOL 9413fc099375eaf1c5bfdba15e9836125c37275cf0be47560b8d4b99c7a3008393787e2037d91b8b4f8075cf7c3c408a84c111f43d3378f2bd780e8ee35137dc
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
new file mode 100644
index 000000000000..7fbd52871887
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
@@ -0,0 +1,53 @@
+diff -Nru magiccube4d-src-2_2.orig/EventHandler.cpp magiccube4d-src-2_2/EventHandler.cpp
+--- magiccube4d-src-2_2.orig/EventHandler.cpp	2007-09-30 12:01:46.503967712 +0200
++++ magiccube4d-src-2_2/EventHandler.cpp	2007-09-30 12:03:23.489172011 +0200
+@@ -20,6 +20,7 @@
+ #include <iostream>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdint.h>
+ 
+ #include "MagicCube.h"
+ #include "Puzzlest.h"
+@@ -415,7 +416,7 @@
+ void
+ EventHandler::undo_cb(void* argp)
+ {
+-    int arg = (int) argp;
++    int arg = (intptr_t) argp;
+     struct stickerspec grip;
+     int         dir;
+     int         slicesmask;
+@@ -461,7 +462,7 @@
+ void
+ EventHandler::redo_cb(void* argp)
+ {
+-    int arg = (int) argp;
++    int arg = (intptr_t) argp;
+     struct stickerspec grip;
+     int         dir;
+     int         slicesmask;
+@@ -507,7 +508,7 @@
+ void
+ EventHandler::scramble_cb(void *arg = NULL)
+ {
+-    int n = (int)arg;
++    int n = (intptr_t)arg;
+     struct stickerspec grip;
+     int i, previous_face = -1;
+     int ngrips = NFACES * 3 * 3 * 3;
+@@ -855,12 +856,12 @@
+ void
+ EventHandler::newPuzzle_cb(void* arg)
+ {
+-    if ((int)arg == preferences.getLength())
++    if ((intptr_t)arg == preferences.getLength())
+     {
+         reset_cb(0);
+         return;
+     }
+-    preferences.setLength((int)arg);
++    preferences.setLength((intptr_t)arg);
+     int length = preferences.getLength();
+ 
+     polymgr->reset(length);
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
new file mode 100644
index 000000000000..adb4d2836a62
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
@@ -0,0 +1,22 @@
+--- EventHandler.h.old	2006-05-19 22:11:48.000000000 +0200
++++ EventHandler.h	2006-05-19 22:11:58.000000000 +0200
+@@ -165,7 +165,7 @@
+ 
+     int  number_of_reference_stickers_needed;
+     int  (*reference_stickers_needed)[4];
+-    void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg = NULL);
++    void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg);
+     void* cur_ui_data;
+ 
+     bool quick_mode;
+--- Machine.h.old	2006-05-19 22:12:17.000000000 +0200
++++ Machine.h	2006-05-19 22:12:29.000000000 +0200
+@@ -31,7 +31,7 @@
+ {
+ public:
+     typedef void (EventHandler::*event_handler)(EventHandler::Event*,
+-                                                void *arg = 0);
++                                                void *arg);
+     virtual ~Machine() {};
+ 
+     static Machine* createMachine(EventHandler*, int& argc, char *argv[],
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
new file mode 100644
index 000000000000..446eb0cc91ae
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
@@ -0,0 +1,15 @@
+--- Makefile.in.old	2010-10-15 10:38:48.000000000 +0200
++++ Makefile.in	2010-10-15 10:39:07.000000000 +0200
+@@ -72,10 +72,10 @@
+ 	$(CXX) -c $(CXXFLAGS) $<
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
+ 
+ $(TARGET).static: $(OBJS)
+-	$(CXX) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
++	$(CXX) $(LDFLAGS) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
+ 
+ Vec.h: vec_h.c
+ 	$(CC) -o vec_h vec_h.c
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
new file mode 100644
index 000000000000..7dae8981c4aa
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
@@ -0,0 +1,11 @@
+--- EventHandler.cpp.old	2004-11-04 22:58:13.735812448 +1100
++++ EventHandler.cpp	2004-11-04 22:57:03.176539088 +1100
+@@ -326,7 +326,7 @@
+         number_of_reference_stickers_needed--;
+         reference_stickers_needed++;
+         if (number_of_reference_stickers_needed == 0)
+-            (this->*what_to_do_after_got_reference_stickers)();
++            (this->*what_to_do_after_got_reference_stickers)(NULL);
+     }
+ }
+ 
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
new file mode 100644
index 000000000000..f42d5a1d3fe6
--- /dev/null
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+MY_PV=${PV/./_}
+DESCRIPTION="four-dimensional analog of Rubik's cube"
+HOMEPAGE="http://www.superliminal.com/cube/cube.htm"
+SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}-src-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-EventHandler.patch \
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-64bit-ptr.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-e "s:-Werror::" \
+		configure \
+		|| die "sed failed"
+}
+
+src_compile() {
+	emake DFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dogamesbin magiccube4d
+	dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt
+	prepgamesdirs
+}
diff --git a/games-puzzle/magiccube4d/metadata.xml b/games-puzzle/magiccube4d/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/magiccube4d/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
new file mode 100644
index 000000000000..8aeb3e5d65cf
--- /dev/null
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -0,0 +1 @@
+DIST meandmyshadow-0.4-src.tar.gz 16962805 SHA256 cd20a7637499f70ac9ed0ff16a506cd6a21557c4b3643b7891fa8a25863eebb6 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b WHIRLPOOL 5dbcaf0d3bfc9cd20b9c6d2f226035ac445b536bd4d0117966c53921d357c34816520bd80b3fefb4cb110861fab065554f9b49c689e25a8c0bb5d66a1af4968b
diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
new file mode 100644
index 000000000000..0bd66d5d284a
--- /dev/null
+++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
@@ -0,0 +1,17 @@
+--- meandmyshadow-0.4.orig/CMakeLists.txt
++++ meandmyshadow-0.4/CMakeLists.txt
+@@ -15,13 +15,12 @@
+ Find_Package(CURL REQUIRED)

+ Find_Package(LibArchive REQUIRED)

+ Find_Package(OpenSSL REQUIRED)

++Find_Package(X11 REQUIRED)

+ 

+ #Use openGL only when compiling with HARDWARE_ACCELERATION.

+ #Otherwise we try to find XLib.

+ if(HARDWARE_ACCELERATION)

+ 	Find_Package(OpenGL REQUIRED)

+-else(HARDWARE_ACCELERATION)

+-	INCLUDE(FindX11)

+ endif(HARDWARE_ACCELERATION)

+ 

+ #Add the include dirs of the libraries.

diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
new file mode 100644
index 000000000000..5c5e912d720a
--- /dev/null
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils gnome2-utils games
+
+DESCRIPTION="A puzzle/plateform game with a player and its shadow"
+HOMEPAGE="http://meandmyshadow.sourceforge.net/"
+SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
+
+LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="opengl"
+
+DEPEND="media-libs/libsdl[sound,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-ttf
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png]
+	dev-libs/openssl
+	net-misc/curl
+	app-arch/libarchive
+	x11-libs/libX11
+	opengl? ( virtual/opengl )"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_VERBOSE_MAKEFILE=TRUE
+		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
+		-DBINDIR="${GAMES_BINDIR}"
+		-DDATAROOTDIR="${GAMES_DATADIR}"
+		-DICONDIR=/usr/share/icons
+		-DDESKTOPDIR=/usr/share/applications
+		$(cmake-utils_use opengl HARDWARE_ACCELERATION)
+		)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt
+	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/meandmyshadow/metadata.xml b/games-puzzle/meandmyshadow/metadata.xml
new file mode 100644
index 000000000000..3238e8898df6
--- /dev/null
+++ b/games-puzzle/meandmyshadow/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">meandmyshadow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/metadata.xml b/games-puzzle/metadata.xml
new file mode 100644
index 000000000000..abb3008d8ab0
--- /dev/null
+++ b/games-puzzle/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The games-puzzle category contains puzzle games.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-puzzle enthält Knobelspiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-puzzle contiene juegos puzzle.
+	</longdescription>
+	<longdescription lang="ja">
+		games-puzzle カテゴリーにはパズル・ゲームが
+		含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-puzzle categorie bevat puzzelspellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-puzzle chứa các trò chơi dạng đánh đố (puzzle).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-puzzle contiene giochi tipo puzzle.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria games-puzzle contém jogos de puzzle.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria games-puzzle zawiera układanki.
+	</longdescription>
+</catmetadata>
+
diff --git a/games-puzzle/mindless/Manifest b/games-puzzle/mindless/Manifest
new file mode 100644
index 000000000000..557e571db9e5
--- /dev/null
+++ b/games-puzzle/mindless/Manifest
@@ -0,0 +1,2 @@
+DIST OracleAll_050523.txt 1280717 SHA256 8c0384da067477f216af77ade0ff2680e9315072406c340700c3993d3786e34c SHA512 d2d46e330a697974bc6c69b8616bdd08c959d1b20840468ccb20ca22a105d7cfac01dd0262113804fb84e790cb1f8ad439c1aa3c17927551617ec2f6de5b83e5 WHIRLPOOL edfb8bcaf6923953358b24be12afff981bdb2c2a72c9d86455bf8d121dcdc5c2180959eb2f09eb9e6c30227dc898adeacfb7421e6199bfd2cf22c3118b16726c
+DIST mindless-1.6.tar.gz 85620 SHA256 1f3c413f6ef96ce380392a39151b5761a8c2a67249402bf02fc582f3d7837eff SHA512 bcb47311aebc127e30e10931e489cbbdb80845c6d95008834abab7ecbb7565eb61a38f47e68d24db5ed9da2cb3467fdaccccd05c6eaaca403afaf41cc76a991f WHIRLPOOL efccab674ce10c885be0dfdfc2c2060c85b7ffa691c46a22bd3acab20357cf39a8ee3a0eb8bacda39d51945269ac000d888e2222c3d8a1ce5f06710d334a8bb8
diff --git a/games-puzzle/mindless/metadata.xml b/games-puzzle/mindless/metadata.xml
new file mode 100644
index 000000000000..d9b978565e96
--- /dev/null
+++ b/games-puzzle/mindless/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">mindless</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/mindless/mindless-1.6.ebuild b/games-puzzle/mindless/mindless-1.6.ebuild
new file mode 100644
index 000000000000..822da8b532d6
--- /dev/null
+++ b/games-puzzle/mindless/mindless-1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+ORANAME="OracleAll_050523.txt"
+DESCRIPTION="play collectable/trading card games (Magic: the Gathering and possibly others) against other people"
+HOMEPAGE="http://mindless.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
+	http://www.wizards.com/dci/oracle/${ORANAME}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+RESTRICT="mirror" # for the card database
+
+RDEPEND="x11-libs/gtk+:2
+	media-fonts/font-schumacher-misc"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cp "${DISTDIR}/${ORANAME}" "${WORKDIR}" || die "cp failed"
+	DATAFILE="${GAMES_DATADIR}/${PN}/${ORANAME}"
+}
+
+src_prepare() {
+	sed -i \
+		-e '/^CC=/d' \
+		-e '/^CFLAGS=/d' \
+		Makefile \
+		|| die 'sed failed'
+}
+
+src_install() {
+	dogamesbin mindless
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins "${WORKDIR}/${ORANAME}"
+	dodoc CHANGES README TODO
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	echo
+	elog "The first time you start ${PN} you need to tell it where to find"
+	elog "the text database of cards.  This file has been installed at:"
+	elog "${DATAFILE}"
+	echo
+}
diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
new file mode 100644
index 000000000000..a2bf2d7bb738
--- /dev/null
+++ b/games-puzzle/mirrormagic/Manifest
@@ -0,0 +1 @@
+DIST mirrormagic-2.0.2.tar.gz 1168098 SHA256 79b3f13d493523438eeb988beffc272c804bc7a4361b83167a082c77e74b3ce2 SHA512 cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03 WHIRLPOOL ac282f63b001b3c7d2d42fe99679fbbfb90659f522900329cff21e2a728896b9c5740b3ebd9888bb203ef1fdf5962d9d5f8977e5f6553a76738a429167efaa03
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
new file mode 100644
index 000000000000..e9b313423699
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
@@ -0,0 +1,43 @@
+From Debian:
+
+In src/libgame/gadgets.c, check for 64bit when handling
+GDI_TYPE,GDI_STATE in HandleGadgetTags() and use int instead of
+unsigned long.  Should probably really be uint32_t but I'll leave
+that decision to upstream. Thanks Pelle Nilsson (and son).
+64bit check borrowed from bug #496863.  Closes: #498912.
+
+--- src/libgame/gadgets.c
++++ src/libgame/gadgets.c
+@@ -18,6 +18,12 @@
+ #include "text.h"
+ #include "misc.h"
+ 
++/* check for 64bit */
++#ifdef _LP64
++#ifndef L64
++#define L64 1
++#endif
++#endif
+ 
+ /* values for DrawGadget() */
+ #define DG_UNPRESSED		0
+@@ -301,11 +307,19 @@
+ 	break;
+ 
+       case GDI_TYPE:
++#ifdef L64
++	gi->type = va_arg(ap, int);
++#else
+ 	gi->type = va_arg(ap, unsigned long);
++#endif
+ 	break;
+ 
+       case GDI_STATE:
++#ifdef L64
++	gi->state = va_arg(ap, int);
++#else
+ 	gi->state = va_arg(ap, unsigned long);
++#endif
+ 	break;
+ 
+       case GDI_CHECKED:
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
new file mode 100644
index 000000000000..316aa3b2946a
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
@@ -0,0 +1,10 @@
+--- src/main.h.old	2006-05-19 22:24:24.000000000 +0200
++++ src/main.h	2006-05-19 22:25:57.000000000 +0200
+@@ -459,7 +459,6 @@
+ #endif
+ extern struct HiScore		highscore[];
+ extern struct TapeInfo		tape;
+-extern struct JoystickInfo	joystick[];
+ extern struct SetupInfo		setup;
+ extern struct GameInfo		game;
+ extern struct LaserInfo		laser;
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
new file mode 100644
index 000000000000..5d5297f3c021
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.old	2010-06-03 09:43:15.000000000 +0200
++++ src/Makefile	2010-06-03 09:43:42.000000000 +0200
+@@ -146,7 +146,7 @@
+ endif
+ 
+ 
+-all: libgame_dir $(PROGNAME)
++all: $(PROGNAME)
+ 
+ $(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
+ 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
diff --git a/games-puzzle/mirrormagic/files/mirrormagic.xpm b/games-puzzle/mirrormagic/files/mirrormagic.xpm
new file mode 100644
index 000000000000..4e98696d3ef1
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic.xpm
@@ -0,0 +1,292 @@
+/* XPM */
+static char * mirrormagic_xpm[] = {
+"32 32 257 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #999999",
+"@ 	c #77AAFF",
+"# 	c #4C2208",
+"$ 	c #6E4C08",
+"% 	c #7F7F7F",
+"& 	c #AACCFF",
+"* 	c #777777",
+"= 	c #BB6622",
+"- 	c #0000CC",
+"; 	c #994411",
+"> 	c #00FF00",
+", 	c #EECC11",
+"' 	c #5D5D5D",
+") 	c #447F44",
+"! 	c #555555",
+"~ 	c #0000AA",
+"{ 	c #3B3B3B",
+"] 	c #009900",
+"^ 	c #990000",
+"/ 	c #007F00",
+"( 	c #005500",
+"_ 	c #CCCCCC",
+": 	c #CC0000",
+"< 	c #7F0000",
+"[ 	c #19447F",
+"} 	c #AAAAAA",
+"| 	c #FF0000",
+"1 	c #331900",
+"2 	c #888888",
+"3 	c #000055",
+"4 	c #663300",
+"5 	c #6E6E6E",
+"6 	c #666666",
+"7 	c #DD9911",
+"8 	c #5D3311",
+"9 	c #00337F",
+"0 	c #FFFFFF",
+"a 	c #00CC00",
+"b 	c #4C4C4C",
+"c 	c #FFFF00",
+"d 	c #444444",
+"e 	c #00AA00",
+"f 	c #7F7F00",
+"g 	c #DDDDDD",
+"h 	c #0066FF",
+"i 	c #006600",
+"j 	c #004C00",
+"k 	c #776608",
+"l 	c #3388FF",
+"m 	c #BBBBBB",
+"n 	c #0000FF",
+"o 	c #000000",
+"p 	c #000000",
+"q 	c #000000",
+"r 	c #000000",
+"s 	c #000000",
+"t 	c #000000",
+"u 	c #000000",
+"v 	c #000000",
+"w 	c #000000",
+"x 	c #000000",
+"y 	c #000000",
+"z 	c #000000",
+"A 	c #000000",
+"B 	c #000000",
+"C 	c #000000",
+"D 	c #000000",
+"E 	c #000000",
+"F 	c #000000",
+"G 	c #000000",
+"H 	c #000000",
+"I 	c #000000",
+"J 	c #000000",
+"K 	c #000000",
+"L 	c #000000",
+"M 	c #000000",
+"N 	c #000000",
+"O 	c #000000",
+"P 	c #000000",
+"Q 	c #000000",
+"R 	c #000000",
+"S 	c #000000",
+"T 	c #000000",
+"U 	c #000000",
+"V 	c #000000",
+"W 	c #000000",
+"X 	c #000000",
+"Y 	c #000000",
+"Z 	c #000000",
+"` 	c #000000",
+" .	c #000000",
+"..	c #000000",
+"+.	c #000000",
+"@.	c #000000",
+"#.	c #000000",
+"$.	c #000000",
+"%.	c #000000",
+"&.	c #000000",
+"*.	c #000000",
+"=.	c #000000",
+"-.	c #000000",
+";.	c #000000",
+">.	c #000000",
+",.	c #000000",
+"'.	c #000000",
+").	c #000000",
+"!.	c #000000",
+"~.	c #000000",
+"{.	c #000000",
+"].	c #000000",
+"^.	c #000000",
+"/.	c #000000",
+"(.	c #000000",
+"_.	c #000000",
+":.	c #000000",
+"<.	c #000000",
+"[.	c #000000",
+"}.	c #000000",
+"|.	c #000000",
+"1.	c #000000",
+"2.	c #000000",
+"3.	c #000000",
+"4.	c #000000",
+"5.	c #000000",
+"6.	c #000000",
+"7.	c #000000",
+"8.	c #000000",
+"9.	c #000000",
+"0.	c #000000",
+"a.	c #000000",
+"b.	c #000000",
+"c.	c #000000",
+"d.	c #000000",
+"e.	c #000000",
+"f.	c #000000",
+"g.	c #000000",
+"h.	c #000000",
+"i.	c #000000",
+"j.	c #000000",
+"k.	c #000000",
+"l.	c #000000",
+"m.	c #000000",
+"n.	c #000000",
+"o.	c #000000",
+"p.	c #000000",
+"q.	c #000000",
+"r.	c #000000",
+"s.	c #000000",
+"t.	c #000000",
+"u.	c #000000",
+"v.	c #000000",
+"w.	c #000000",
+"x.	c #000000",
+"y.	c #000000",
+"z.	c #000000",
+"A.	c #000000",
+"B.	c #000000",
+"C.	c #000000",
+"D.	c #000000",
+"E.	c #000000",
+"F.	c #000000",
+"G.	c #000000",
+"H.	c #000000",
+"I.	c #000000",
+"J.	c #000000",
+"K.	c #000000",
+"L.	c #000000",
+"M.	c #000000",
+"N.	c #000000",
+"O.	c #000000",
+"P.	c #000000",
+"Q.	c #000000",
+"R.	c #000000",
+"S.	c #000000",
+"T.	c #000000",
+"U.	c #000000",
+"V.	c #000000",
+"W.	c #000000",
+"X.	c #000000",
+"Y.	c #000000",
+"Z.	c #000000",
+"`.	c #000000",
+" +	c #000000",
+".+	c #000000",
+"++	c #000000",
+"@+	c #000000",
+"#+	c #000000",
+"$+	c #000000",
+"%+	c #000000",
+"&+	c #000000",
+"*+	c #000000",
+"=+	c #000000",
+"-+	c #000000",
+";+	c #000000",
+">+	c #000000",
+",+	c #000000",
+"'+	c #000000",
+")+	c #000000",
+"!+	c #000000",
+"~+	c #000000",
+"{+	c #000000",
+"]+	c #000000",
+"^+	c #000000",
+"/+	c #000000",
+"(+	c #000000",
+"_+	c #000000",
+":+	c #000000",
+"<+	c #000000",
+"[+	c #000000",
+"}+	c #000000",
+"|+	c #000000",
+"1+	c #000000",
+"2+	c #000000",
+"3+	c #000000",
+"4+	c #000000",
+"5+	c #000000",
+"6+	c #000000",
+"7+	c #000000",
+"8+	c #000000",
+"9+	c #000000",
+"0+	c #000000",
+"a+	c #000000",
+"b+	c #000000",
+"c+	c #000000",
+"d+	c #000000",
+"e+	c #000000",
+"f+	c #000000",
+"g+	c #000000",
+"h+	c #000000",
+"i+	c #000000",
+"j+	c #000000",
+"k+	c #000000",
+"l+	c #000000",
+"m+	c #000000",
+"n+	c #000000",
+"o+	c #000000",
+"p+	c #000000",
+"q+	c #000000",
+"r+	c #000000",
+"s+	c #000000",
+"t+	c #000000",
+"u+	c #000000",
+"v+	c #000000",
+"w+	c #000000",
+"x+	c #000000",
+"y+	c #000000",
+"z+	c #000000",
+"A+	c #000000",
+"B+	c #000000",
+"C+	c #000000",
+"D+	c #000000",
+"E+	c #000000",
+"F+	c #000000",
+"G+	c #000000",
+"H+	c #000000",
+"                                                                ",
+"                            - n n l h h : n - ~                 ",
+"                          n - - l l h n n n n -                 ",
+"        , 7             l l h h n : n n n n ~ ~ 7 ,             ",
+"        c 7 =         h l h h n n n n n - - ~ = 7 c             ",
+"        c , 7 , 7 ~ h h h n n n - - ~ ~ ~ 7 , 7 , c             ",
+"        , , 7 7 = ~ h h n n - - ~ ~ ~ ~ ~ = 7 7 , ,             ",
+"          , 7 = - ~ l _ } b 4 4 b b b ~ ~ - = 7 ,               ",
+"        ~ ~ 4 4 4 ~ m g 1 1 = = 1 1 d d h ~ 4 4 ~ ~             ",
+"    ~ ~ ~ ~ 4 4 4 l g g 7 7 , 7 ; ; d { @ h 4 4 4 ~ ~ ~         ",
+"    ~ ~ ~ ~ h h l l 0 g 7 7 , 7 ; ; d { @ @ h n 4 ~ ~ ~ n       ",
+"    @ @ @ @ @ @ l l 0 g } 7 , , ; d d { @ l h h n n n - -       ",
+"      @ @ | @ @ l 0 2 0 g } = = d d d { @ l h n n n n - -       ",
+"        @ @ & & @ @ l g + _ 2 2 6 6 ! @ @ l h n ^ n - -         ",
+"          @ & & @ @ l l } 2 _ _ 2 2 @ @ h h n n n n - -         ",
+"            @ @ @ | l l + _ _ } _ l @ h h h n n n - -           ",
+"            @ @ @ @ l l + _ _ _ } _ @ h h n n n n - -           ",
+"              @ @ @ l l h } _ _ } } h h h n n n - -             ",
+"              @ @ @ l l h h _ _ } } } h n ^ n - - -             ",
+"                @ n h h h h } _ _ } 2 2 n n - - -               ",
+"                @ n n h h h } _ _ _ 2 ~ n n ~ - -               ",
+"                n n n n | h ~ } } } ~ ~ - ~ ~ ~ -               ",
+"              h n n n h h h - ~ } } } - - ^ ~ ~ -               ",
+"              h n n h h h n - n - - * * ~ ~ ~ -                 ",
+"              h n h h h h n - n - - - - ~ ~ ~ - -               ",
+"            h l h h h l h h n n : - - - ~ ~ ~ ~ ^ -             ",
+"            h @ h | l l h n n n - - - ~ ~ ~ ~ ~ ~ -             ",
+"          n l @ l l l l h n n - ~ - - ~ ~ ~ ^ ~ ~ ~ -           ",
+"          n l @ l l l h n n - - ~ ~ - ~ ~ ~ ~ ~ ~ ~ -           ",
+"        n | h h h = ; ; 4 ~ - ~ ~ ~ - = ; ; 4 ~ ~ ~ ^ -         ",
+"        n - h h = = ; ; 4 4 ~ ~ ~ ~ = = ; ; 4 4 ~ ~ ~ -         ",
+"                                                                "};
diff --git a/games-puzzle/mirrormagic/metadata.xml b/games-puzzle/mirrormagic/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/mirrormagic/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..919e55b0d64c
--- /dev/null
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="a game like Deflektor (C 64) or Mindbender (Amiga)"
+HOMEPAGE="http://www.artsoft.org/mirrormagic/"
+SRC_URI="http://www.artsoft.org/RELEASES/unix/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="sdl"
+
+RDEPEND="!sdl? ( x11-libs/libX11 )
+	sdl? (
+		media-libs/libsdl[video]
+		media-libs/sdl-mixer
+		media-libs/sdl-image
+	)"
+DEPEND="${RDEPEND}
+	!sdl? ( x11-libs/libXt )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-64bit.patch
+	rm -f ${PN}
+}
+
+src_compile() {
+	emake \
+		-C src \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		OPTIONS="${CFLAGS}" \
+		EXTRA_LDFLAGS="${LDFLAGS}" \
+		RO_GAME_DIR="${GAMES_DATADIR}"/${PN} \
+		RW_GAME_DIR="${GAMES_STATEDIR}"/${PN} \
+		TARGET=$(use sdl && echo sdl || echo x11)
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r graphics levels music sounds
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry ${PN} "Mirror Magic II"
+	dodoc CHANGES CREDITS README TODO
+	prepgamesdirs
+}
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
new file mode 100644
index 000000000000..4043576a6c65
--- /dev/null
+++ b/games-puzzle/monsterz/Manifest
@@ -0,0 +1 @@
+DIST monsterz-0.7.1.tar.gz 1879537 SHA256 50828b8fa26d107bcc2bd134328f83c905b9f5e124846bdf239daf0eed34973d SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787 WHIRLPOOL d2aa08ae267f0ba7c57e62a25d54a670934498048d3cf4420e558564c1e1132e687051bfbc4175bd667d2f21411641ccc28820fbbab5d6f1348152cef4749585
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
new file mode 100644
index 000000000000..64d6527768f8
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
@@ -0,0 +1,26 @@
+Index: monsterz-0.7.1/monsterz.py
+===================================================================
+--- monsterz-0.7.1.orig/monsterz.py	2008-05-09 16:35:25.000000000 +0000
++++ monsterz-0.7.1/monsterz.py	2008-05-09 16:35:33.000000000 +0000
+@@ -108,7 +108,9 @@
+                 M = int(max(r, g, b))
+                 m = int(min(r, g, b))
+                 val = (2 * M + r + g + b) / 5
+-                p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
++                p[0] = (val + r) / 2
++                p[1] = (val + g) / 2
++                p[2] = (val + b) / 2
+                 if alpha[y][x] >= 250:
+                     alpha[y][x] = 255 - (M - m) * 3 / 4
+         del pixels
+@@ -129,7 +131,9 @@
+                 r, g, b = p
+                 M = int(max(r, g, b))
+                 m = int(min(r, g, b))
+-                p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
++                p[0] = (m + r) / 2
++                p[1] = (m + g) / 2
++                p[2] = (m + b) / 2
+                 if alpha[y][x] >= 250:
+                     alpha[y][x] = 255 - M * 2 / 3
+         del pixels
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
new file mode 100644
index 000000000000..8e55b23a327c
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
@@ -0,0 +1,32 @@
+--- monsterz.py
++++ monsterz.py
+@@ -829,10 +829,10 @@
+             pass
+         else:
+             for x in range(4):
+-                for y, p in enumerate(alpha[x]):
+-                    alpha[x][y] = p * x / 4
+-                for y, p in enumerate(alpha[406 - x - 1]):
+-                    alpha[406 - x - 1][y] = p * x / 4
++                for y in range(len(alpha[x])):
++                    alpha[x][y] = alpha[x][y] * x / 4
++                for y in range(len(alpha[406 - x - 1])):
++                    alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 4
+             for col in alpha:
+                 l = len(col)
+                 for y in range(4):
+@@ -1287,10 +1287,10 @@
+             pass
+         else:
+             for x in range(10):
+-                for y, p in enumerate(alpha[x]):
+-                    alpha[x][y] = p * x / 12
+-                for y, p in enumerate(alpha[406 - x - 1]):
+-                    alpha[406 - x - 1][y] = p * x / 12
++                for y in range(len(alpha[x])):
++                    alpha[x][y] = alpha[x][y] * x / 12
++                for y in range(len(alpha[406 - x - 1])):
++                    alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 12
+             del alpha
+             scroll.unlock()
+         system.blit(scroll, (13, 437))
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
new file mode 100644
index 000000000000..652450bf190b
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
@@ -0,0 +1,20 @@
+--- monsterz.py.orig	2006-05-12 18:55:51.000000000 -0400
++++ monsterz.py	2006-05-12 18:57:44.000000000 -0400
+@@ -1907,7 +1906,7 @@
+     print '          (C) Mike Kershaw <dragorn@kismetwireless.net>'
+ 
+     print 'This program is free software; you can redistribute it and/or modify it under'
+-    print 'the terms of the Do What The Fuck You Want To Public License, Version 2, as'
++    print 'the terms of the WTFPL, Version 2, as'
+     print 'published by Sam Hocevar. See http://sam.zoy.org/wtfpl/ for more details.'
+     print 'The sound effects are released under their own licences: applause.wav and'
+     print 'pop.wav are covered by the LGPL, the others are covered by the GPL.'
+@@ -1932,7 +1931,7 @@
+     global system, data, settings, fonter, monsterz
+     override = {}
+     scorefile = None
+-    sharedir = dirname(argv[0])
++    sharedir = "GENTOO_DATADIR"
+     outfd = None
+     try:
+         long = ['help', 'version', 'music', 'sound', 'fullscreen',
diff --git a/games-puzzle/monsterz/metadata.xml b/games-puzzle/monsterz/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/monsterz/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..ba1df0c5634f
--- /dev/null
+++ b/games-puzzle/monsterz/monsterz-0.7.1-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1 games
+
+DESCRIPTION="a little puzzle game, similar to the famous Bejeweled or Zookeeper"
+HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
+SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
+
+LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pygame[${PYTHON_USEDEP}]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-64bit.patch \
+		"${FILESDIR}"/${P}-blit.patch
+	sed -i \
+		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
+		monsterz.py || die "sed failed"
+	rm Makefile || die
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r graphics sound
+	newgamesbin monsterz.py ${PN}
+	newicon graphics/icon.png ${PN}.png
+	make_desktop_entry ${PN} Monsterz
+	dodoc README AUTHORS TODO
+	python_replicate_script "${ED%/}${GAMES_BINDIR}"/monsterz
+	prepgamesdirs
+}
diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
new file mode 100644
index 000000000000..50534d8e59ca
--- /dev/null
+++ b/games-puzzle/mures/Manifest
@@ -0,0 +1 @@
+DIST mures-0.5.tar.gz 638528 SHA256 84da71b52b6fc16587fae776f0ede1cf20ab08ea2f3ce1aaa220ed187cd757e2 SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff WHIRLPOOL 6cf0cf6fe3ce2c8919a1ed719c9e05fbd89a7331d78670880b079b4fc6311cc6a56986c0cf73295b23ca443f4cfba162495fce1e11f10bc47ad2f5d421e1e655
diff --git a/games-puzzle/mures/files/mures-0.5-save.patch b/games-puzzle/mures/files/mures-0.5-save.patch
new file mode 100644
index 000000000000..704dcf1f53bc
--- /dev/null
+++ b/games-puzzle/mures/files/mures-0.5-save.patch
@@ -0,0 +1,33 @@
+--- gi_sdl.c
++++ gi_sdl.c
+@@ -606,6 +606,7 @@
+ {
+   int i,found;
+   gi_sdl_data *data = &GI;
++  char temp_path[70];
+ 
+   switch(e.type) {
+ 
+@@ -714,7 +715,8 @@
+ 	  sim_start(&g->sim);
+ 	break;
+       case SDLK_F6:
+-	map_save(&g->sim.map, "saved.mus");
++	snprintf(temp_path, 70, "%s/.mures.save", getenv("HOME"));
++	map_save(&g->sim.map, temp_path);
+ 	break;
+       case SDLK_F1:
+ 	game_restart(g);
+
+--- output.c
++++ output.c
+@@ -215,7 +215,8 @@
+ 
+ void output_screenshot()
+ {
+-  char *l = "shot.bmp";
++  char l[70];
++  snprintf(l, 70, "%s/mures_shot.bmp", getenv("HOME"));
+   SDL_SaveBMP(screen, l);
+   printf("Screenshot saved to %s.\n", l);
+ }
diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch
new file mode 100644
index 000000000000..805cd0c7b35d
--- /dev/null
+++ b/games-puzzle/mures/files/mures-0.5-underlink.patch
@@ -0,0 +1,13 @@
+--- src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
++++ src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
+@@ -1,8 +1,8 @@
+ bin_PROGRAMS = mures
+ 
+ mures_LDADD = \
+-	-llua -L./lua
+-	$(STATIC_LIBS)
++	-llua -L./lua \
++	$(STATIC_LIBS) -lm
+ 
+ SUBDIRS = lua gui images maps sounds textures
+ 
diff --git a/games-puzzle/mures/metadata.xml b/games-puzzle/mures/metadata.xml
new file mode 100644
index 000000000000..6b7ddc83ba9b
--- /dev/null
+++ b/games-puzzle/mures/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">mures</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/mures/mures-0.5.ebuild b/games-puzzle/mures/mures-0.5.ebuild
new file mode 100644
index 000000000000..3831ba20ece0
--- /dev/null
+++ b/games-puzzle/mures/mures-0.5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+inherit autotools eutils games
+
+DESCRIPTION="A clone of Sega's Chu Chu Rocket"
+HOMEPAGE="http://mures.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mures/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="opengl"
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-image
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	opengl? ( virtual/opengl )"
+RDEPEND="${DEPEND}"
+
+dir=${GAMES_DATADIR}/${PN}
+
+src_prepare() {
+	# Disable OpenGL support if USE flag is not set
+	if ! use opengl ; then
+		sed -i \
+			-e 's: -DHAVE_GL::' \
+			-e 's: -lGL::' \
+			configure.in || die "sed failed"
+	fi
+
+	sed -i '$ s/\\//' \
+		src/lua/Makefile.am \
+		src/maps/battle/Makefile.am \
+		|| die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-underlink.patch
+
+	eautoreconf
+
+	cd src
+
+	# Save to HOME
+	epatch "${FILESDIR}"/${P}-save.patch
+
+	# Modify game data & scrips path
+	sed -i \
+		-e "s:gui/:${dir}/gui/:" \
+		-e "s:sounds/:${dir}/sounds/:" \
+		gui.c || die "sed gui.c failed"
+	sed -i \
+		-e "s:images/:${dir}/images/:" \
+		-e "s:textures/:${dir}/textures/:" \
+		go_sdl.c || die "sed go_sdl.c failed"
+	sed -i \
+		-e "s:textures/:${dir}/textures/:" \
+		go_gl.c || die "sed go_gl.c failed"
+	sed -i \
+		-e "s:input.lua:${dir}/input.lua:" \
+		gi_sdl.c || die "sed gi_sdl.c failed"
+	sed -i \
+		-e "s:images/:${dir}/images/:" \
+		anim.c output.c || die "sed anim.c output.c failed"
+	sed -i \
+		-e "s:maps/:${dir}/maps/:" \
+		load_maps.lua || die "sed load_maps.lua failed"
+	sed -i \
+		-e "s:sounds/:${dir}/sounds/:" \
+		audio_sdl.c || die "sed audio_sdl.c failed"
+	sed -i \
+		-e "s:load_maps.lua:${dir}/load_maps.lua:" \
+		map.c || die "sed map.c failed"
+}
+
+src_install() {
+	# Remove makefiles before installation
+	rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles"
+	insinto "${dir}"
+	doins -r src/{gui,images,sounds,textures,maps,*.lua}
+	dodoc README TODO ChangeLog AUTHORS
+	dogamesbin src/mures
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
new file mode 100644
index 000000000000..9160adcd8d42
--- /dev/null
+++ b/games-puzzle/neverball/Manifest
@@ -0,0 +1,2 @@
+DIST neverball-1.5.4.tar.gz 26767623 SHA256 ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6 SHA512 ffc0473ea3882edb84f190aa696c2e5fa1a38ea50f73bc144a3b694fd80c71a8d9936aa34f8bbd096523493849d428928a6efd2650c6da4c9962e0355d3cb9c2 WHIRLPOOL c0e6731ee28eb8ac987d5ca98ecbd93fb7d091060e2da51c6fe69043f05fe7d5f8179e62183f946e40b2f734a8041ab35ae1fdd4024e5ff6e25ab8633853e1f4
+DIST neverball-1.6.0.tar.gz 37772911 SHA256 73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787 WHIRLPOOL 017ac177b3557e0473d94288c0645ce7e6ddf15cdfbddb6798b22a6341d9864532d0d2263ed785bbed8c1bf5c9e4acbc6e31effdcc06b299a8fcf7c1fa60e514
diff --git a/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch b/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
new file mode 100644
index 000000000000..d7b224673186
--- /dev/null
+++ b/games-puzzle/neverball/files/neverball-1.5.4-libpng.patch
@@ -0,0 +1,21 @@
+Index: neverball-1.5.4/share/base_image.c
+===================================================================
+--- neverball-1.5.4.orig/share/base_image.c
++++ neverball-1.5.4/share/base_image.c
+@@ -15,6 +15,7 @@
+ #include <png.h>
+ #include <jpeglib.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+ 
+ #include "glext.h"
+@@ -94,7 +95,7 @@ static void *image_load_png(const char *
+         default: longjmp(png_jmpbuf(readp), -1);
+         }
+ 
+-        if (!(bytep = png_malloc(readp, h * png_sizeof(png_bytep))))
++        if (!(bytep = png_malloc(readp, h * sizeof(png_bytep))))
+             longjmp(png_jmpbuf(readp), -1);
+ 
+         /* Allocate the final pixel buffer and read pixels there. */
diff --git a/games-puzzle/neverball/files/neverball-1.5.4-lm.patch b/games-puzzle/neverball/files/neverball-1.5.4-lm.patch
new file mode 100644
index 000000000000..4245e28fe2f2
--- /dev/null
+++ b/games-puzzle/neverball/files/neverball-1.5.4-lm.patch
@@ -0,0 +1,28 @@
+Fix link faiure against -lm
+
+x86_64-pc-linux-gnu-gcc -Wall -ansi -pedantic -march=core2 -O2 -pipe -ggdb -o neverball-mapc share/vec3.o share/base_image.o share/solid.o share/binary.o share/base_config.o share/common.o share/fs.o share/fs_png.o share/fs_jpg.o share/dir.o share/array.o share/mapc.o -Wl,-O1 -Wl,--as-needed -ljpeg -lpng15 -lphysfs
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: share/mapc.o: undefined reference to symbol 'acosf@@GLIBC_2.2.5'
+/usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: note: 'acosf@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line
+
+Gentoo-bug: http://bugs.gentoo.org/464014
+diff --git a/Makefile b/Makefile
+index 62a87e9..1816707 100644
+--- a/Makefile
++++ b/Makefile
+@@ -132,6 +132,7 @@ ifdef DARWIN
+ endif
+ 
+ BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS)
++MAPC_LIBS := -lm # only acosf user
+ 
+ ifdef DARWIN
+     BASE_LIBS += -L/opt/local/lib
+@@ -318,7 +319,7 @@ $(PUTT_TARG) : $(PUTT_OBJS)
+ 	$(CC) $(ALL_CFLAGS) -o $(PUTT_TARG) $(PUTT_OBJS) $(LDFLAGS) $(ALL_LIBS)
+ 
+ $(MAPC_TARG) : $(MAPC_OBJS)
+-	$(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(BASE_LIBS)
++	$(CC) $(ALL_CFLAGS) -o $(MAPC_TARG) $(MAPC_OBJS) $(LDFLAGS) $(MAPC_LIBS) $(BASE_LIBS)
+ 
+ # Work around some extremely helpful sdl-config scripts.
+ 
diff --git a/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch b/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch
new file mode 100644
index 000000000000..c6f27cc2bf8a
--- /dev/null
+++ b/games-puzzle/neverball/files/neverball-1.5.4-underlink.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2011-06-22 06:30:52.441788160 +0200
++++ Makefile	2011-06-22 06:31:59.754087534 +0200
+@@ -138,7 +138,7 @@
+ endif
+ 
+ ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \
+-    -lvorbisfile $(OGL_LIBS)
++    -lvorbisfile $(OGL_LIBS) -lX11
+ 
+ #------------------------------------------------------------------------------
+ 
diff --git a/games-puzzle/neverball/metadata.xml b/games-puzzle/neverball/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/neverball/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/neverball/neverball-1.5.4.ebuild b/games-puzzle/neverball/neverball-1.5.4.ebuild
new file mode 100644
index 000000000000..4359a87c730a
--- /dev/null
+++ b/games-puzzle/neverball/neverball-1.5.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
+HOMEPAGE="http://icculus.org/neverball/"
+SRC_URI="http://icculus.org/neverball/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+RESTRICT="test"
+
+RDEPEND="media-libs/libsdl[sound,joystick,opengl,video]
+	media-libs/sdl-ttf
+	media-libs/libpng:0
+	virtual/jpeg
+	media-libs/libvorbis
+	virtual/opengl
+	dev-games/physfs
+	media-fonts/dejavu
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	sed -i \
+		-e 's:mapc:neverball-mapc:g' \
+		-e 's:MAPC:NEVERBALL-MAPC:g' \
+		-e '1 s/ 1 / 6 /' \
+		dist/mapc.1 \
+		|| die "sed failed"
+	sed -i \
+		-e 's:-O2:$(E_CFLAGS):' \
+		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
+		Makefile \
+		|| die "sed failed"
+	epatch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-libpng.patch \
+		"${FILESDIR}"/${P}-lm.patch
+}
+
+src_compile() {
+	emake \
+		ENABLE_NLS=$(use nls && echo 1 || echo 0) \
+		E_CFLAGS="${CFLAGS}" \
+		LOCALEDIR=/usr/share/locale \
+		DATADIR="${GAMES_DATADIR}/${PN}" \
+		|| die "emake failed"
+}
+
+src_install() {
+	dogamesbin ${PN}-mapc neverball neverputt || die
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data/* || die
+	rm -f "${D}${GAMES_DATADIR}/${PN}"/ttf/DejaVuSans-Bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+		"${GAMES_DATADIR}/${PN}"/ttf/DejaVuSans-Bold.ttf || die
+	if [[ -d locale ]] ; then
+		insinto /usr/share
+		doins -r locale || die
+	fi
+	dodoc CHANGES README || die
+
+	newicon dist/neverball_512.png neverball.png || die
+	newicon dist/neverputt_512.png neverputt.png || die
+	doman dist/*.6 || die
+	newman dist/mapc.1 neverball-mapc.6 || die
+	make_desktop_entry neverball Neverball || die
+	make_desktop_entry neverputt Neverputt neverputt || die
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "${P} will overwrite existing high-score files, so back them up if"
+	elog "you want to preserve your old scores and progress."
+}
diff --git a/games-puzzle/neverball/neverball-1.6.0.ebuild b/games-puzzle/neverball/neverball-1.6.0.ebuild
new file mode 100644
index 000000000000..73ca285c870e
--- /dev/null
+++ b/games-puzzle/neverball/neverball-1.6.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
+HOMEPAGE="http://neverball.org/"
+SRC_URI="http://neverball.org/${P}.tar.gz"
+
+LICENSE="GPL-2+ IJG"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+RESTRICT="test"
+
+RDEPEND="media-libs/libsdl2[sound,joystick,opengl,video]
+	media-libs/sdl2-ttf
+	media-libs/libpng:0
+	virtual/jpeg
+	media-libs/libvorbis
+	virtual/opengl
+	dev-games/physfs
+	media-fonts/dejavu
+	media-fonts/wqy-microhei
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	sed -i \
+		-e 's:mapc:neverball-mapc:g' \
+		-e 's:MAPC:NEVERBALL-MAPC:g' \
+		-e '1 s/ 1 / 6 /' \
+		dist/mapc.1 || die
+	sed -i \
+		-e '/CFLAGS.*O2/s:-O2:$(E_CFLAGS):' \
+		-e '/CXXFLAGS.*O2/s:-O2:$(E_CXXFLAGS):' \
+		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		ENABLE_NLS=$(use nls && echo 1 || echo 0) \
+		E_CFLAGS="${CFLAGS}" \
+		E_CXXFLAGS="${CXXFLAGS}" \
+		LOCALEDIR=/usr/share/locale \
+		DATADIR="${GAMES_DATADIR}/${PN}"
+}
+
+src_install() {
+	local font
+
+	dogamesbin ${PN}-mapc neverball neverputt
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data/*
+	for font in DejaVuSans-Bold.ttf wqy-microhei.ttc
+	do
+		rm -f "${D}${GAMES_DATADIR}/${PN}"/ttf/${font}
+		dosym /usr/share/fonts/*/${font} \
+			"${GAMES_DATADIR}/${PN}"/ttf/${font}
+	done
+	if [[ -d locale ]] ; then
+		insinto /usr/share
+		doins -r locale
+	fi
+	dodoc doc/{authors.txt,manual.txt,release-notes.md} README.md
+
+	local res name
+	for name in ball putt; do
+		for res in 16 32 64 128 256; do
+			newicon -s ${res} dist/never${name}_${res}.png never${name}.png
+		done
+	done
+
+	doman dist/*.6
+	newman dist/mapc.1 neverball-mapc.6
+	make_desktop_entry neverball Neverball
+	make_desktop_entry neverputt Neverputt neverputt
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+	elog "${P} will overwrite existing high-score files, so back them up if"
+	elog "you want to preserve your old scores and progress."
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/ngstar/Manifest b/games-puzzle/ngstar/Manifest
new file mode 100644
index 000000000000..a722d4c617cb
--- /dev/null
+++ b/games-puzzle/ngstar/Manifest
@@ -0,0 +1 @@
+DIST ngstar-2.1.8-src.tar.bz2 45851 SHA256 c8a2cf84d2a4bb40280d4ce307ceaed8f97d2183f79f7a82b38b78aaedb73fb3 SHA512 c96031148720b5dcc004a5de68137bbbdd5af9c6f0b33ff8bcee3180cbf4732a4d6a92737ef99754d512bb61454bc0a17487efba4cdb00339d23e38edfe3cb28 WHIRLPOOL 05b6492a324e49c210174864b73194cef1ef3deb405d04d1c9352ae3cb3bb539e3c2b5c4d11f09f2ea32ffe37a542aaf2438185f6df1330af88de0b122d6e5aa
diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-gcc43.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc43.patch
new file mode 100644
index 000000000000..72c0f70007a4
--- /dev/null
+++ b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc43.patch
@@ -0,0 +1,10 @@
+--- libngstar2/Configuration.hh
++++ libngstar2/Configuration.hh
+@@ -26,6 +26,7 @@
+ #include <fstream>
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ 
+ #include <getopt.h>
+ #include <sys/stat.h>
diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch
new file mode 100644
index 000000000000..2ddf0f53793d
--- /dev/null
+++ b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch
@@ -0,0 +1,11 @@
+--- src/Ncurses_UI.cc.old	2012-07-21 22:25:16.421521521 +0200
++++ src/Ncurses_UI.cc	2012-07-21 22:26:01.008390914 +0200
+@@ -23,6 +23,8 @@
+ /* includes */
+ #include "Ncurses_UI.hh"
+ 
++#include <unistd.h>
++
+ using namespace ngstar2;
+ 
+ Ncurses_UI::Ncurses_UI( NGStar2 *engine, Configuration* config, Scores *scores )
diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-gentoo-path.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-gentoo-path.patch
new file mode 100644
index 000000000000..84fa6de7e024
--- /dev/null
+++ b/games-puzzle/ngstar/files/ngstar-2.1.8-gentoo-path.patch
@@ -0,0 +1,14 @@
+--- configure.old	2006-04-19 22:00:42.000000000 +0200
++++ configure	2006-04-19 22:02:38.000000000 +0200
+@@ -193,8 +193,8 @@
+ MINOR = $VMINOR
+ REVISION = $VREVISION
+ 
+-LEVELSETS_DIR = \$(PREFIX)/share/\$(NAME)/levelsets
+-THEMES_DIR = \$(PREFIX)/share/\$(NAME)/themes
+-BIN_DIR = \$(PREFIX)/bin
++LEVELSETS_DIR = \$(PREFIX)@GENTOO_DATA@/\$(NAME)/levelsets
++THEMES_DIR = \$(PREFIX)@GENTOO_DATA@/\$(NAME)/themes
++BIN_DIR = \$(PREFIX)@GENTOO_BIN@
+ DOC_DIR = \$(PREFIX)/doc/\$(NAME)-\$(MAJOR).\$(MINOR).\$(REVISION)
+ LIB_DIR = \$(PREFIX)/lib
diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch
new file mode 100644
index 000000000000..17e0ed9f7188
--- /dev/null
+++ b/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch
@@ -0,0 +1,32 @@
+diff -ru ngstar-2.1.8.orig/src/Makefile ngstar-2.1.8/src/Makefile
+--- ngstar-2.1.8.orig/src/Makefile	2005-11-09 08:11:22.000000000 -0500
++++ ngstar-2.1.8/src/Makefile	2014-11-18 23:58:45.565366080 -0500
+@@ -33,8 +33,8 @@
+ endif
+ endif
+ ifdef USE_NCURSES
+-	CC_LIBS += -lncurses -lgpm
+-	CC_LIBS_STATIC += -lncurses -lgpm
++	CC_LIBS += $(shell pkg-config ncurses --libs) -lgpm
++	CC_LIBS_STATIC += $(shell pkg-config ncurses --libs) -lgpm
+ 
+ 	NCURSES_UI_OBJ = Ncurses_UI.o
+ 
+@@ -56,8 +56,7 @@
+ 
+ $(BIN) : $(SOURCE) $(BIN_DEPS)
+ 	echo "Compiling $(BIN)"
+-	$(CXX) $< $(BIN_DEPS) -o $@ $(CC_LIBS) $(CC_INCLUDES) $(CPPFLAGS)
+-	strip -s $@
++	$(CXX) ${LDFLAGS} $< $(BIN_DEPS) -o $@ $(CC_LIBS) $(CC_INCLUDES) $(CPPFLAGS)
+ ifdef USE_FLTK2
+ 	-ln -s `basename $(BIN)` $(BIN_FLTK2)
+ endif
+@@ -68,7 +67,6 @@
+ $(BIN_STATIC) : $(SOURCE) $(BIN_DEPS)
+ 	echo "Compiling $(BIN)"
+ 	$(CXX) -static $< $(BIN_DEPS) -o $@ $(CC_LIBS_STATIC) $(CC_INCLUDES) $(CPPFLAGS)
+-	strip -s $@
+ ifdef USE_FLTK2
+ 	-ln -s `basename $(BIN_STATIC)` $(BIN_STATIC_FLTK2)
+ endif
diff --git a/games-puzzle/ngstar/metadata.xml b/games-puzzle/ngstar/metadata.xml
new file mode 100644
index 000000000000..6dba63b5876e
--- /dev/null
+++ b/games-puzzle/ngstar/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<longdescription lang="en">
+NGStar is a clone of a HP48 game called dstar.
+The goal is to catch all gifts in the level to get access to the next one.
+Use the ball to catch them, use the cube to stop the ball. The ball only move
+to the next obstacle (wall or cube).
+</longdescription>
+	<upstream>
+		<remote-id type="freshmeat">ngstar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
new file mode 100644
index 000000000000..2a98419b33e6
--- /dev/null
+++ b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="NGStar is a clone of a HP48 game called dstar"
+HOMEPAGE="http://freshmeat.net/projects/ngstar"
+SRC_URI="mirror://gentoo//${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/gpm"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo-path.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-e "s:@GENTOO_DATA@:${GAMES_DATADIR}:" \
+		-e "s:@GENTOO_BIN@:${GAMES_BINDIR}:" \
+		-e "/^CPPFLAGS/s:+=:+= ${CXXFLAGS}:" \
+		-e "/SILENT/d" \
+		configure || die
+}
+
+src_configure() {
+	./configure \
+		--prefix "" \
+		--without-fltk2 || die
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
new file mode 100644
index 000000000000..b91b0bb4c5fc
--- /dev/null
+++ b/games-puzzle/nightsky/Manifest
@@ -0,0 +1 @@
+DIST nightskyhd-linux-1324519044.tar.gz 123971537 SHA256 def2b3b42239f9e786472a88d85ae739790f6675b8eadffe9941350d2100e9d0 SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e WHIRLPOOL b7aeef90eadaa47498da4d3cefd10c3f0c5ec8262ea9cf0125280aed6848ae5c8f05e591ccdedfa9a11f161f4abbb5ee03844ddee1a1c252cb61d53c5103cd0c
diff --git a/games-puzzle/nightsky/files/nightsky-wrapper b/games-puzzle/nightsky/files/nightsky-wrapper
new file mode 100644
index 000000000000..be838c7432cc
--- /dev/null
+++ b/games-puzzle/nightsky/files/nightsky-wrapper
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+HOMEDIR="${HOME}/.nightsky"
+GAMEDIR="@GAMES_PREFIX_OPT@/nightsky"
+
+# create root config dir
+[ -e "${HOMEDIR}" ] || mkdir "${HOMEDIR}"
+
+# symlink game data
+for i in `cd "${GAMEDIR}" || exit 1 ; ls -d *` ; do
+	[ -e "${HOMEDIR}/${i}" ] || ln -sf "${GAMEDIR}/${i}" "${HOMEDIR}/${i}"
+done
+# create empty Settings dir
+[ -e "${HOMEDIR}/Settings" ] || mkdir "${HOMEDIR}/Settings"
+
+cd "${HOMEDIR}"
+
+# start architecture dependent binary
+if [ -e "${HOMEDIR}/NightSkyHD_64" ] ; then
+	exec ./NightSkyHD_64 "$@"
+else
+	exec ./NightSky "$@"
+fi
diff --git a/games-puzzle/nightsky/metadata.xml b/games-puzzle/nightsky/metadata.xml
new file mode 100644
index 000000000000..d13413d31d91
--- /dev/null
+++ b/games-puzzle/nightsky/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222.ebuild
new file mode 100644
index 000000000000..70d9a0a22b1d
--- /dev/null
+++ b/games-puzzle/nightsky/nightsky-20111222.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+DESCRIPTION="Puzzle game that puts you inside and ambient and mysterious universe"
+HOMEPAGE="http://www.nicalis.com/nightsky/"
+SRC_URI="nightskyhd-linux-1324519044.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/NightSky*
+	${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/lib64/*"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXxf86vm
+	!bundled-libs? (
+		media-libs/freealut
+		media-libs/freeglut
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/openal
+		sys-libs/zlib
+	)"
+
+S=${WORKDIR}/NightSky
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	einfo "removing ${ARCH} unrelated files..."
+	rm -v NightSkyHD$(usex amd64 "" "_64") || die
+	rm -rv lib$(usex amd64 "" "64") || die
+
+	if ! use bundled-libs ; then
+		einfo "removing bundled libs..."
+		rm -rv lib* || die
+	fi
+
+	# empty dir, we create symlink here later
+	rm -r Settings || die
+
+	sed \
+		-e "s#@GAMES_PREFIX_OPT@#${GAMES_PREFIX_OPT}#" \
+		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
+}
+
+src_install() {
+	dogamesbin "${T}"/${PN}
+
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	newicon -s 128 "World/The Void/Physical"/Circle72.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	fperms +x "${MYGAMEDIR}"/NightSkyHD$(usex amd64 "_64" "")
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+
+	echo
+	elog "Saves and Settings are in ~/.nightsky/Settings"
+	echo
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
new file mode 100644
index 000000000000..79c8370df536
--- /dev/null
+++ b/games-puzzle/pathological/Manifest
@@ -0,0 +1 @@
+DIST pathological-1.1.3.tar.gz 6995274 SHA256 813ef0812ba6b3218b35c2ddea423c9c6ee912925824497f52d5310bc76f85de SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566 WHIRLPOOL 65f2f62c4d9991c3d0e69a9408e17e8c80a06575f38233ca4697054272b17bd3056cf681d40318786b6546ab7a43c34ce3d60bdaae08570457332bdaa0bee8da
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build.patch b/games-puzzle/pathological/files/pathological-1.1.3-build.patch
new file mode 100644
index 000000000000..d8793a6aef6e
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3-build.patch
@@ -0,0 +1,27 @@
+Use implicit rules to build write-highscores so we dont have to worry
+about CC/CFLAGS/LDFLAGS/etc...
+
+Include stdlib.h to get exit() prototype
+
+--- write-highscores.c
++++ write-highscores.c
+@@ -25,6 +25,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <stdlib.h>
+ 
+ #define BUFFER_SIZE 1024
+ 
+--- Makefile
++++ Makefile
+@@ -4,9 +4,6 @@
+ 
+ all: write-highscores html/wheel.png
+ 
+-write-highscores: write-highscores.c
+-	gcc -s -o write-highscores write-highscores.c
+-
+ html/wheel.png:
+ 	./makehtml
+ 
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
new file mode 100644
index 000000000000..9d67085dd13a
--- /dev/null
+++ b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
@@ -0,0 +1,23 @@
+Make sure music_pending_song is defined before we try using it
+
+http://bugs.gentoo.org/109272
+
+--- pathological.py
++++ pathological.py
+@@ -28,6 +28,7 @@
+ colorblind = 0
+ sound_on = 1
+ music_on = 1
++music_pending_song = 0
+ for arg in sys.argv[1:]:
+ 	if arg == '-s':
+ 		screenshot = 1
+@@ -194,7 +195,7 @@
+ 	sound_on = sound_on ^ 1
+ 
+ def toggle_music():
+-	global music_on
++	global music_pending_song, music_on
+ 	music_on = music_on ^ 1
+ 	if music_on:
+ 		if music_pending_song:
diff --git a/games-puzzle/pathological/metadata.xml b/games-puzzle/pathological/metadata.xml
new file mode 100644
index 000000000000..e5bd67a8578e
--- /dev/null
+++ b/games-puzzle/pathological/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<maintainer>
+		<email>mr_bones_@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pathological</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
new file mode 100644
index 000000000000..63e623b1bd36
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 games
+
+DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
+HOMEPAGE="http://pathological.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
+IUSE="doc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-shells/bash
+	>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+	doc? ( media-libs/netpbm )"
+
+pkg_setup() {
+	games_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unpack ./${PN}.6.gz
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-music-py.patch
+
+	if use doc ; then
+		sed -i -e '5,$ s/=/ /g' makehtml || die
+	else
+		echo "#!/bin/sh" > makehtml
+	fi
+
+	sed -i \
+		-e "s:/usr/share/games:${GAMES_DATADIR}:" \
+		-e "s:/var/games:${GAMES_STATEDIR}:" \
+		-e "s:exec:exec ${EPYTHON}:" \
+		${PN} || die
+
+	sed -i \
+		-e 's:\xa9:(C):' \
+		-e "s:/usr/lib/${PN}/bin:$(games_get_libdir)/${PN}:" \
+		${PN}.py || die
+
+	python_fix_shebang ${PN}.py
+}
+
+src_install() {
+	dogamesbin ${PN}
+
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe write-highscores
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r circuits graphics music sounds ${PN}.py
+
+	insinto "${GAMES_STATEDIR}"
+	doins ${PN}_scores
+	fperms 660 "${GAMES_STATEDIR}"/${PN}_scores
+
+	dodoc changelog README TODO
+	doman ${PN}.6
+	use doc && dohtml -r html/*
+
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} Pathological ${PN}
+
+	# remove some unneeded resource files
+	rm -f "${D}/${GAMES_DATADIR}"/${PN}/graphics/*.xcf
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if ! has_version "media-libs/sdl-mixer[mod]" ; then
+		echo
+		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
+		elog "no background music will be played."
+		echo
+	fi
+
+}
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
new file mode 100644
index 000000000000..4ecdb7c69ac1
--- /dev/null
+++ b/games-puzzle/pauker/Manifest
@@ -0,0 +1 @@
+DIST pauker-1.8.src.jar 33886665 SHA256 061be727408413696d148285d268a2cb37262a19d6d8a26b67d2233507545e05 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae WHIRLPOOL fc3e6cbcc0164656337002e89f880b4f1f075892f62ef561deb25671b764f25872e438d54cf72e1ff701e0b8c9ceab621027d9b360eed65f2d3d23682f8d20e5
diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch
new file mode 100644
index 000000000000..1ed79dbe4d86
--- /dev/null
+++ b/games-puzzle/pauker/files/pauker_bundledjars.patch
@@ -0,0 +1,14 @@
+--- build.xml.orig	2008-11-24 20:24:55.000000000 +1300
++++ build.xml	2008-11-24 20:25:33.000000000 +1300
+@@ -88,11 +88,6 @@
+              basedir="build/classes/"
+              includes="pauker/**,tools/**"
+              excludes="pauker/Changes.txt,pauker/TODO.txt,**/*BeanInfo*,**/GraphicalStatisticPanel.gif">
+-            <zipfileset src="${libs.swing-layout.classpath}"/>
+-            <zipfileset src="libs/jhall.jar" excludes="META-INF/**"/>
+-            <zipfileset src="libs/lucene-core-2.4.0.jar" excludes="META-INF/**"/>
+-            <zipfileset src="libs/BrowserLauncher2-1_3.jar"
+-                        excludes="META-INF/**,classes/,source/,package?cache/,.**,*.txt,build.xml"/>
+             <manifest>
+                 <attribute name="Main-Class" value="pauker.program.gui.swing.PaukerFrame"/>
+                 <attribute name="SplashScreen-Image" value="pauker/icons/Splash.png"/>
diff --git a/games-puzzle/pauker/metadata.xml b/games-puzzle/pauker/metadata.xml
new file mode 100644
index 000000000000..719168a735e3
--- /dev/null
+++ b/games-puzzle/pauker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">pauker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/pauker/pauker-1.8.ebuild b/games-puzzle/pauker/pauker-1.8.ebuild
new file mode 100644
index 000000000000..54c6402ddd49
--- /dev/null
+++ b/games-puzzle/pauker/pauker-1.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+inherit eutils java-pkg-2 java-ant-2 games
+
+DESCRIPTION="A java based flashcard program"
+HOMEPAGE="http://pauker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pauker/${P}.src.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+COMMON_DEP="dev-java/browserlauncher2:1.0
+			dev-java/javahelp
+			dev-java/lucene:2.4
+			dev-java/swing-layout:1"
+RDEPEND=">=virtual/jre-1.5
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+		app-arch/unzip
+		${COMMON_DEP}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	games_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_prepare() {
+	find . -iname '*.jar' -delete
+
+	epatch "${FILESDIR}/${PN}_bundledjars.patch"
+
+	java-pkg_jar-from --into libs browserlauncher2-1.0 browserlauncher2.jar BrowserLauncher2-1_3.jar
+	java-pkg_jar-from --into libs javahelp jhall.jar
+	java-pkg_jar-from --into libs lucene-2.4 lucene-core.jar lucene-core-2.4.0.jar
+	java-pkg_jar-from --into libs swing-layout-1 swing-layout.jar
+}
+
+src_compile() {
+	eant -Dfile.reference.BrowserLauncher2-1_3.jar="libs/BrowserLauncher2-1_3.jar" \
+		-Dlibs.swing-layout.classpath="libs/swing-layout.jar" \
+		-Dplatforms.JDK_1.5.home="${JAVA_HOME}" jar $(use_doc javadoc)
+}
+
+#test depend on jemmy, a netbeans module.  so unless it is packaged separately
+#tests cannot be build.
+
+src_install() {
+	java-pkg_jarinto "${GAMES_DATADIR}/${PN}"
+	java-pkg_newjar "dist/${P}.jar"
+
+	java-pkg_dolauncher ${PN} \
+		-into "${GAMES_PREFIX}" \
+		--pwd "${GAMES_DATADIR}"/${PN} \
+		--main pauker.program.gui.swing.PaukerFrame
+
+	use doc && java-pkg_dojavadoc dist/javadoc
+	use source && java-pkg_dosrc src
+
+	newicon src/pauker/icons/repeat.png ${PN}.png
+	make_desktop_entry pauker Pauker
+	prepgamesdirs
+}
diff --git a/games-puzzle/penguzzle/Manifest b/games-puzzle/penguzzle/Manifest
new file mode 100644
index 000000000000..54ad252dcae5
--- /dev/null
+++ b/games-puzzle/penguzzle/Manifest
@@ -0,0 +1 @@
+DIST penguzzle.zip 21542 SHA256 f3c2a4bc94fcd3d00cd8be9bf748bd3b0aa6d4251e64620fe92524e65fb951cd SHA512 fc6c57ac851df7fac7d91f90ec53fa543470e9721589966023028743951090994c372ff4538092c29aee12afc28809ad6e20a6b78ae9759bad2b41fed330b743 WHIRLPOOL 5c5e4b5a0c3f8640ee196eef73a84d8b7d472458e78f1bed3b09427cbd82cf3d3792b2b11219ff8e55f57638147f1e36ff2fcb939565d24b278ac711080d1a21
diff --git a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
new file mode 100644
index 000000000000..d8c078de6a91
--- /dev/null
+++ b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
@@ -0,0 +1,10 @@
+--- bin/penguzzle
++++ bin/penguzzle
+@@ -1,4 +1,6 @@
+-#!/usr/bin/wishx
++#!/usr/bin/wish
++package require Tk
++package require Tclx
+ 
+ source ~/puzz/lib/init
+ 
diff --git a/games-puzzle/penguzzle/metadata.xml b/games-puzzle/penguzzle/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/penguzzle/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
new file mode 100644
index 000000000000..58fa75f8dd4c
--- /dev/null
+++ b/games-puzzle/penguzzle/penguzzle-1.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Tcl/Tk variant of the well-known 15-puzzle game"
+HOMEPAGE="http://www.naskita.com/linux/penguzzle/penguzzle.shtml"
+SRC_URI="http://www.naskita.com/linux/${PN}/${PN}.zip"
+
+LICENSE="penguzzle"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/tk
+	dev-tcltk/tclx"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_prepare() {
+	sed -i \
+		-e "s:~/puzz/images:${GAMES_DATADIR}/${PN}:" \
+		lib/init \
+		|| die "sed init failed"
+	sed -i \
+		-e "s:~/puzz/lib:$(games_get_libdir)/${PN}:" \
+		bin/${PN} \
+		|| die "sed ${PN} failed"
+
+	epatch "${FILESDIR}"/${P}-tclx.patch
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins images/img0.gif
+
+	insinto "$(games_get_libdir)"/${PN}
+	doins lib/init
+
+	dogamesbin bin/${PN}
+
+	dodoc README
+	prepgamesdirs
+}
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
new file mode 100644
index 000000000000..305c24a04630
--- /dev/null
+++ b/games-puzzle/picpuz/Manifest
@@ -0,0 +1 @@
+DIST picpuz-2.5.tar.gz 267452 SHA256 3caf92b00dd4739f68c557d5c952216fef01ca5de3c83e453ef177648bdf70f0 SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386 WHIRLPOOL 0496c45d377a6fda3ce795a85fa640c06bf51c7308c164b3e08d76c125727d468eb4836657f11a3435341defd58eea03dee5d7c9b7386d2ede9974227dd2c614
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
new file mode 100644
index 000000000000..dfec57fe6ec0
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
@@ -0,0 +1,116 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Jul 21 17:03:11 UTC 2012
+
+--- picpuz-2.5/Makefile
++++ picpuz-2.5/Makefile
+@@ -11,24 +11,26 @@
+ 
+ # target install directories
+ BINDIR = $(PREFIX)/bin
+-SHAREDIR = $(PREFIX)/share/$(PROGRAM)
+-ICONDIR = $(SHAREDIR)/icons
+-LOCALESDIR = $(SHAREDIR)/locales
++DATADIR = $(PREFIX)/share/$(PROGRAM)
++ICONDIR = $(DATADIR)/icons
++LOCALESDIR = $(DATADIR)/locales
+ DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
+ MANDIR = $(PREFIX)/share/man/man1
+ MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
+ 
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
++CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
+ LIBS = `pkg-config --libs gtk+-3.0`
+ 
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+-	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
++	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
+ 
+ $(PROGRAM).o: $(SOURCE)
+-	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
++	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
++		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
+ 
+ zfuncs.o: zfuncs.cc
+-	$(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\"
++	$(CXX) $(CXXFLAGS) zfuncs.cc \
++		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
+ 
+ install: $(PROGRAM)
+ 	mkdir -p  $(DESTDIR)$(BINDIR)
+@@ -52,7 +54,7 @@
+ 
+ uninstall:
+ 	rm -f  $(DESTDIR)$(BINDIR)/$(PROGRAM)
+-	rm -R -f  $(DESTDIR)$(SHAREDIR)
++	rm -R -f  $(DESTDIR)$(DATADIR)
+ 	rm -R -f  $(DESTDIR)$(DOCDIR)
+ 	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
+ 	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
+--- picpuz-2.5/zfuncs.cc
++++ picpuz-2.5/zfuncs.cc
+@@ -3111,7 +3111,6 @@
+          /prefix/share/appname/locales/         translations: appname-de.po  etc.
+          /home/user/.appname/                   parameters etc. are copied here
+ 
+-   zprefix        install location              has /bin and /share subtrees
+    zdatadir       installed data files          .desktop, parameters, etc.
+    zdocdir        user documentation            README, changelog, user guide
+    zicondir       icons                         icon files .png
+@@ -3123,7 +3122,7 @@
+ namespace zfuncs
+ {
+    char        zappname[20];
+-   char        zprefix[200], zdatadir[200], zdocdir[200];                  //  app directories
++   char        zdatadir[200], zdocdir[200];                                //  app directories
+    char        zicondir[200], zlocalesdir[200], zuserdir[200];
+    char        zlang[8] = "en";                                            //  "lc" or "lc_RC"
+    char        JPGquality[4] = "85";                                       //  JPG file save quality
+@@ -3132,7 +3131,6 @@
+    pthread_t   tid_main = 0;                                               //  main thread ID               v.4.8
+ }
+ 
+-cchar * get_zprefix() { return zfuncs::zprefix; }                          //  /usr or /home/<userid>
+ cchar * get_zuserdir() { return zfuncs::zuserdir; }                        //  /home/user/.appname
+ cchar * get_zdatadir() { return zfuncs::zdatadir; }                        //  parameters, icons
+ cchar * get_zdocdir()  { return zfuncs::zdocdir;  }                        //  documentation files
+@@ -3156,19 +3154,15 @@
+    
+    catch_signals();                                                        //  catch segfault, do backtrace
+    
+-   strcpy(zappname,appname);                                               //  save app name
+-   
+-   #ifndef PREFIX                                                          //  install location                v.4.7
+-      #define PREFIX "/usr"
+-   #endif
+-   
+-   strncpy0(work,PREFIX,199);                                              //  /usr or /home/<userid>          v.4.6
+-   strcpy(zprefix,work);                                                   //  /prefix
+-   strncatv(zdatadir,199,work,"/share/",zappname,"/data",null);            //  /prefix/share/appname/data
+-   strncatv(zicondir,199,work,"/share/",zappname,"/icons",null);           //  /prefix/share/appname/icons
+-   strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
+-   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
+-   
++   strcpy(zappname,appname);
++
++   strcpy(zdatadir,DATADIR);                                               //  macros from build script
++   strcpy(zdocdir,DOCDIR);
++   strcpy(zicondir,zdatadir);
++   strcat(zicondir,"/icons");
++   strcpy(zlocalesdir,zdatadir);
++   strcat(zlocalesdir,"/locales");
++
+    snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);                //  /home/user/.appname/            v.4.3
+    err = stat(zuserdir,&statdat);                                          //  does it exist already?
+    if (err) {
+@@ -3366,9 +3360,9 @@
+    fputs(work,fid);
+    fputs("Type=Application\n",fid);                                        //  Type=Application
+    fputs("Terminal=false\n",fid);                                          //  Terminal=false
+-   snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command);                  //  Exec=/usr/bin/appname -options
++   snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname);                  //  Exec=/usr/bin/appname -options
+    fputs(work,fid);
+-   snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname);                 //  Icon=/usr/share/appname/icons/appname.png
++   snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname);                 //  Icon=/usr/share/appname/icons/appname.png
+    fputs(work,fid);
+    fclose(fid);
+ 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
new file mode 100644
index 000000000000..652231f1d4ff
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
@@ -0,0 +1,18 @@
+Fix underlinking on recent binutils:
+
+> x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
+> /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
+> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
+diff --git a/Makefile b/Makefile
+index 28638de..700b610 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
+ MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
+ 
+ CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
+-LIBS = `pkg-config --libs gtk+-3.0`
++LIBS = -pthread `pkg-config --libs gtk+-3.0`
+ 
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+ 	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/metadata.xml b/games-puzzle/picpuz/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/picpuz/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild
new file mode 100644
index 000000000000..5fb2ece89725
--- /dev/null
+++ b/games-puzzle/picpuz/picpuz-2.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils gnome2-utils games
+
+DESCRIPTION="A jigsaw puzzle program"
+HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
+SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch "${FILESDIR}"/${P}-pthread-underlinking.patch )
+
+src_compile() {
+	emake \
+		BINDIR="${GAMES_BINDIR}" \
+		DATADIR="${GAMES_DATADIR}"/${PN} \
+		DOCDIR=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r icons locales
+	doicon -s 48 icons/${PN}.png
+	make_desktop_entry ${PN} Picpuz
+	dohtml -r doc/{userguide-en.html,images}
+	dodoc doc/{changelog,README,translations}
+	newman doc/${PN}.man ${PN}.1
+	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/pingus/Manifest b/games-puzzle/pingus/Manifest
new file mode 100644
index 000000000000..01fa8384f52f
--- /dev/null
+++ b/games-puzzle/pingus/Manifest
@@ -0,0 +1 @@
+DIST pingus-0.7.6.tar.bz2 12622268 SHA256 759c1253075d1e72691bc1e770b24cdd51917041fd1857c1daf85b65a6686460 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188 WHIRLPOOL 2c4bafef86c40fec3fcfc9ff4b298e72919c8309d475aa4aeb4d368927ac611801f416375108091d9f40bdb2703633765125f6f7ea361186f637e2d5234e53e2
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
new file mode 100644
index 000000000000..b1397da31f68
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
@@ -0,0 +1,22 @@
+--- src/pingus/pingus_main.cpp.orig	2012-07-08 14:02:40.343767438 +0200
++++ src/pingus/pingus_main.cpp	2012-07-08 14:02:54.062768168 +0200
+@@ -465,7 +465,7 @@
+ void
+ PingusMain::print_greeting_message()
+ {
+-  std::string greeting = "Welcome to Pingus "VERSION;
++  std::string greeting = "Welcome to Pingus " VERSION;
+   greeting += "!";
+   std::cout <<  greeting << std::endl;
+   for (unsigned int i = 0; i < greeting.length(); ++i)
+--- src/pingus/screens/pingus_menu.cpp.orig	2012-07-08 14:03:05.549768782 +0200
++++ src/pingus/screens/pingus_menu.cpp	2012-07-08 14:03:17.015769393 +0200
+@@ -153,7 +153,7 @@
+                          gc.get_height()/2 - 280));
+ 
+   gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
+-                "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
++                "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
+                 "See the file AUTHORS for a complete list of contributors.\n"
+                 "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
+                 "welcome to redistribute it under certain conditions; see the file COPYING for details.\n");
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
new file mode 100644
index 000000000000..e474ef7376e5
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
@@ -0,0 +1,10 @@
+--- src/engine/display/display.cpp.orig	2012-06-30 00:30:13.043995049 -0400
++++ src/engine/display/display.cpp	2012-06-30 00:30:28.194501544 -0400
+@@ -28,6 +28,7 @@
+ #include "engine/display/delta/delta_framebuffer.hpp"
+ #include "engine/display/null_framebuffer.hpp"
+ #include "util/log.hpp"
++#include "util/raise_exception.hpp"
+ 
+ std::unique_ptr<Framebuffer> Display::s_framebuffer;
+ 
diff --git a/games-puzzle/pingus/metadata.xml b/games-puzzle/pingus/metadata.xml
new file mode 100644
index 000000000000..e5220f2a49c6
--- /dev/null
+++ b/games-puzzle/pingus/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<longdescription>Pingus is a free Lemmings clone for GNU/Linux and Windows covered under the GNU GPL. Pingus
+uses ClanLib and libxml and might also be usable on some other OSs like FreeBSD, but hasn't
+been tested there. Pingus is mainly developed under GNU/Linux, that's why the Windows port
+is sometimes a bit behind.
+If you don't know Lemmingstm, here comes a short introduction. Its a puzzle game developed
+in 1991 by DMA Design. The player takes command in the game of a bunch of small animals and
+has to guide them around in levels. Since the animals walk on their own, the player can only
+influence them by giving them commands, like build a bridge, dig a hole or redirect all
+animals in the other direction. The goal of each level is to reach the exit, for fix
+multiple combination of commands are necessary. The game is presented in a 2D site view.</longdescription>
+	<upstream>
+		<remote-id type="google-code">pingus</remote-id>
+	</upstream>
+	<use>
+		<flag name="music">Enable playing of background music</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-puzzle/pingus/pingus-0.7.6.ebuild b/games-puzzle/pingus/pingus-0.7.6.ebuild
new file mode 100644
index 000000000000..0a4ac7634642
--- /dev/null
+++ b/games-puzzle/pingus/pingus-0.7.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils scons-utils toolchain-funcs flag-o-matic games
+
+DESCRIPTION="free Lemmings clone"
+HOMEPAGE="http://pingus.seul.org/"
+SRC_URI="http://pingus.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="opengl music"
+
+RDEPEND="media-libs/libsdl[joystick,opengl?,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	music? ( media-libs/sdl-mixer[mod] )
+	opengl? ( virtual/opengl )
+	media-libs/libpng:0=
+	dev-libs/boost:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	strip-flags
+	epatch \
+		"${FILESDIR}"/${P}-noopengl.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_compile() {
+	escons \
+		CXX="$(tc-getCXX)" \
+		CCFLAGS="${CXXFLAGS}" \
+		LINKFLAGS="${LDFLAGS}" \
+		$(use_scons opengl with_opengl)
+}
+
+src_install() {
+	emake install-exec install-data \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		DATADIR="${GAMES_DATADIR}/${PN}" \
+		BINDIR="${GAMES_BINDIR}"
+	doman doc/man/pingus.6
+	doicon data/images/icons/pingus.svg
+	make_desktop_entry ${PN} Pingus
+	dodoc AUTHORS NEWS README TODO
+	prepgamesdirs
+}
diff --git a/games-puzzle/pipepanic/Manifest b/games-puzzle/pipepanic/Manifest
new file mode 100644
index 000000000000..3e26879a73ca
--- /dev/null
+++ b/games-puzzle/pipepanic/Manifest
@@ -0,0 +1 @@
+DIST pipepanic-0.1.3-source.tar.gz 232200 SHA256 4b02249c92228b03f4cc3c1d999cacf3fe52c16df53c6bf76fc6c1e2caa74318 SHA512 468f3194976c7030c2fa3d8f30eaa13cc25e0b04feeb48a5d1267d119eb991618bad14ddba0a8268e6b92f38f2a17bc5b119728b222b0ee50494807832ad2ab7 WHIRLPOOL bdbef665dcee14b1360d1726701986991f8adbfe4da1a4f429af725bfa74232efc9736ced944ecbd7a6b216a7af39d698a591fa48d2d279875f953f024020af4
diff --git a/games-puzzle/pipepanic/files/pipepanic-0.1.3-gentoo.patch b/games-puzzle/pipepanic/files/pipepanic-0.1.3-gentoo.patch
new file mode 100644
index 000000000000..1366b7d341c8
--- /dev/null
+++ b/games-puzzle/pipepanic/files/pipepanic-0.1.3-gentoo.patch
@@ -0,0 +1,21 @@
+diff -ru pipepanic-0.1.3-source.orig/Makefile pipepanic-0.1.3-source/Makefile
+--- pipepanic-0.1.3-source.orig/Makefile	2006-05-16 16:11:29.000000000 -0400
++++ pipepanic-0.1.3-source/Makefile	2009-11-03 13:38:52.109137983 -0500
+@@ -3,15 +3,12 @@
+ TARGET=pipepanic
+ 
+ # Settings for x86.
+-CC=gcc
+-CFLAGS=-O2 -Wall -pedantic `sdl-config --cflags`
+-LINK=gcc
+-LDFLAGS=
++CFLAGS+=`sdl-config --cflags`
+ LIBS=`sdl-config --libs`
+ 
+ all:
+ 	$(CC) $(CFLAGS) -c $(SOURCES)
+-	$(LINK) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)
++	$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)
+ 
+ .PHONY: clean
+ 
diff --git a/games-puzzle/pipepanic/metadata.xml b/games-puzzle/pipepanic/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/pipepanic/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
new file mode 100644
index 000000000000..e9e4a3b93e49
--- /dev/null
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A simple pipe connecting game"
+HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
+SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/${P}-source.tar.gz"
+
+LICENSE="GPL-2 FreeArt"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]"
+RDEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	# change harcoded data paths to match the install directory
+	sed -i \
+		-e "s:/opt/QtPalmtop/share/pipepanic/:${GAMES_DATADIR}/${PN}/:" \
+		main.h \
+		|| die "sed failed"
+}
+
+src_install() {
+	dogamesbin "${PN}"
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins *.bmp
+	newicon PipepanicIcon64.png ${PN}.png
+	make_desktop_entry ${PN} "Pipepanic"
+
+	dodoc AUTHORS ChangeLog README
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/pipewalker/Manifest b/games-puzzle/pipewalker/Manifest
new file mode 100644
index 000000000000..ee463aa8f9bc
--- /dev/null
+++ b/games-puzzle/pipewalker/Manifest
@@ -0,0 +1 @@
+DIST pipewalker-0.9.4.tar.gz 948399 SHA256 d6d7717f1f333847cc4a2e9d83e97b971b3bfb539d99d4ae30a5140de6e386f4 SHA512 f4930739732164153663d11036eb2ac09447766779bc80bff4d355fe1bb764d617510ecf8d804f1ce0d81f58204b4e4049fb76246bc4e599c06c492b9c771951 WHIRLPOOL 4bc9d4368829ed58704a7b31bb0d25f7e3414d61ff5431fef252f2b7b9cab8c9c1341d41dc3dcb998d13d9740c4ff5877201462b5914818eda8bada1bc59c77c
diff --git a/games-puzzle/pipewalker/metadata.xml b/games-puzzle/pipewalker/metadata.xml
new file mode 100644
index 000000000000..da28a3e934d2
--- /dev/null
+++ b/games-puzzle/pipewalker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">pipewalker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
new file mode 100644
index 000000000000..15f31a5af64d
--- /dev/null
+++ b/games-puzzle/pipewalker/pipewalker-0.9.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic games
+
+DESCRIPTION="Rotating pieces puzzle game"
+HOMEPAGE="http://pipewalker.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pipewalker/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[opengl,video]
+	virtual/opengl
+	virtual/glu"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	append-flags $(sdl-config --cflags)
+	egamesconf \
+		--datadir="${GAMES_DATADIR_BASE}"
+}
+
+src_install() {
+	emake -C data DESTDIR="${D}" install
+	dogamesbin src/${PN}
+	doicon extra/${PN}.xpm
+	make_desktop_entry ${PN} PipeWalker
+	dodoc AUTHORS ChangeLog README
+	prepgamesdirs
+}
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
new file mode 100644
index 000000000000..ccce20f7466a
--- /dev/null
+++ b/games-puzzle/quadra/Manifest
@@ -0,0 +1 @@
+DIST quadra-1.2.0.tar.gz 5103875 SHA256 0312d826668ccb71d60a1d7229ca644c547a04d12d1b738dbeac7ee68e5fb643 SHA512 1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837 WHIRLPOOL 62759ce2f916a219458fce8609f2137e836b5865e005058d70d74d4af35893f50dfdf5a481ce92f917e6bfd19b1149fbfc4b9c7704664f1b65b3887276bbdf19
diff --git a/games-puzzle/quadra/metadata.xml b/games-puzzle/quadra/metadata.xml
new file mode 100644
index 000000000000..56028c94595f
--- /dev/null
+++ b/games-puzzle/quadra/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="google-code">quadra</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/quadra/quadra-1.2.0.ebuild b/games-puzzle/quadra/quadra-1.2.0.ebuild
new file mode 100644
index 000000000000..d14db103d711
--- /dev/null
+++ b/games-puzzle/quadra/quadra-1.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A tetris clone with multiplayer support"
+HOMEPAGE="http://code.google.com/p/quadra/"
+SRC_URI="http://quadra.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXxf86vm
+	x11-libs/libXext
+	media-libs/libpng:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	sys-devel/bc
+	x11-proto/xextproto"
+
+src_prepare() {
+	sed -i \
+		-e "/^libgamesdir:=/s:/games:/${PN}:" \
+		-e "/^datagamesdir:=/s:/games:/${PN}:" \
+		config/config.mk.in || die
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins ${PN}.res
+	doicon images/${PN}.xpm
+	make_desktop_entry ${PN} Quadra
+
+	dodoc ChangeLog NEWS README
+	dohtml help/*
+	prepgamesdirs
+}
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
new file mode 100644
index 000000000000..4c202a4ca633
--- /dev/null
+++ b/games-puzzle/quadrapassel/Manifest
@@ -0,0 +1,2 @@
+DIST quadrapassel-3.14.0.tar.xz 1761600 SHA256 18cc54a4f0807bd1b62268419a25c00c2425c2d468a65b83a9d30ed6484f86c1 SHA512 459012284a7c4268ea84dc7d18298d14240c1b657ee27b77d848f74fd77c5397087697d524a64a180ce9a9900755d5c41e64350bd5fafb0d7a7c7d668022719a WHIRLPOOL 1d97810c3e3335d7b8454b634513764e528b1613ed6531d7af84164919d0b3ea05ca056a733680107cd3c0b8372c01684b3571b0a31b3a33e4dfbaf2fbe266a9
+DIST quadrapassel-3.16.1.tar.xz 1742988 SHA256 3dbf3377c1e5207f53fcaeb58632f58275e9d5cf355ba84a3072aafa646b869d SHA512 bd4a12324900d2868220a4645fbe93b5808b724c0e2b2ae25bd62e46100e29cac18c0e187547e0dc1b8700ddf6567e5ac30a2ab27a723c084037987acdd2ab0e WHIRLPOOL 9af487d8e7b7910eba0bd569d9e30948a8e4ad034a5c1bb75b80279dfd1d4b5e313252682e8010608cd5e4bafc6244a17713f26c6017c8395fc1bbdd3029df8e
diff --git a/games-puzzle/quadrapassel/metadata.xml b/games-puzzle/quadrapassel/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/quadrapassel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.14.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.14.0.ebuild
new file mode 100644
index 000000000000..43f5abe08241
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-3.14.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome-games vala
+
+DESCRIPTION="Fit falling blocks together"
+HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32.0:2
+	>=media-libs/clutter-1:1.0
+	>=media-libs/clutter-gtk-0.91.6:1.0
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=x11-libs/gtk+-3.12:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-util/appdata-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.16.1.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.16.1.ebuild
new file mode 100644
index 000000000000..788092c5d3c8
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-3.16.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome-games vala
+
+DESCRIPTION="Fit falling blocks together"
+HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=gnome-base/librsvg-2.32.0:2
+	>=media-libs/clutter-1:1.0
+	>=media-libs/clutter-gtk-0.91.6:1.0
+	>=media-libs/libcanberra-0.26[gtk3]
+	>=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() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/rezerwar/Manifest b/games-puzzle/rezerwar/Manifest
new file mode 100644
index 000000000000..d4a347167fb7
--- /dev/null
+++ b/games-puzzle/rezerwar/Manifest
@@ -0,0 +1 @@
+DIST rezerwar-0.4.2.tar.gz 4332498 SHA256 a93ca501803c2fdac0fb695d9a1eeed45807307316d28d3eb8abac8849fcaf02 SHA512 0ab1b00d982a96f2fd1346ff822efc68ae0e6c14a4d190ba0e8720fb119d7750851803c1387e83b93eee9cd43e332631360a67534495c20969366c885e2297ee WHIRLPOOL ee784734ac0e63de75a2e390396aaf2601285aeaf817da94b3e38056e8d7f93c13e6e6ad436ab50c703cb3da0baf9166ccec6e5ee4722b30a5694befc473a6e0
diff --git a/games-puzzle/rezerwar/metadata.xml b/games-puzzle/rezerwar/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/rezerwar/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
new file mode 100644
index 000000000000..f0c0f7b5e8aa
--- /dev/null
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Puzzle game like the known tetromino and the average pipe games"
+HOMEPAGE="http://tamentis.com/projects/rezerwar/"
+SRC_URI="http://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,joystick,video]
+	media-libs/sdl-mixer[vorbis]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e '/check_sdl$/d' \
+		-e 's/-O2 //' \
+		configure \
+		|| die 'sed failed'
+	sed -i \
+		-e '/CC.*OBJECTS/s:$(CC):$(CC) $(LDFLAGS):' \
+		mkfiles/Makefile.src \
+		|| die "sed failed"
+}
+
+src_configure() {
+	SDLCONFIG=sdl-config \
+	TARGET_BIN="${GAMES_BINDIR}" \
+	TARGET_DOC=/usr/share/doc/${PF} \
+	TARGET_DATA="${GAMES_DATADIR}/${PN}" \
+	./configure \
+	|| die "configure failed"
+	sed -i \
+		-e '/TARGET_DOC/d' \
+		Makefile \
+		|| die "sed failed"
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}"
+	default
+	dodoc doc/{CHANGES,README,TODO}
+	make_desktop_entry rezerwar Rezerwar
+	prepgamesdirs
+}
diff --git a/games-puzzle/scramble/Manifest b/games-puzzle/scramble/Manifest
new file mode 100644
index 000000000000..4b86b376ee95
--- /dev/null
+++ b/games-puzzle/scramble/Manifest
@@ -0,0 +1 @@
+DIST scramble-0.9.5.tar.gz 552301 SHA256 9f0d27c65962f333f2a54294d1b42150aed0302fc12548a89c44d9f721d5d56f SHA512 ff361cefe842d6b2019a78571182fe35fc77a1332d6365211af7cf292da8532023bd565b7eed8b44545716474d441b0793253e856a1cad937f62396a5a29bd2b WHIRLPOOL 6361eed7868d79ed556cec368c439a534e08d3a4fd9ab4edd97a4af515f9fe1d2bcb92d8c972e0395755b33a5ca432e820a6a1e960f0003db237f97f4fdda81d
diff --git a/games-puzzle/scramble/metadata.xml b/games-puzzle/scramble/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/scramble/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/scramble/scramble-0.9.5.ebuild b/games-puzzle/scramble/scramble-0.9.5.ebuild
new file mode 100644
index 000000000000..3b88d008a965
--- /dev/null
+++ b/games-puzzle/scramble/scramble-0.9.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools flag-o-matic games
+
+DESCRIPTION="Create as many words as you can before the time runs out"
+HOMEPAGE="http://www.shiftygames.com/scramble/scramble.html"
+SRC_URI="http://www.shiftygames.com/scramble/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.2[sound,video]
+	>=media-libs/sdl-mixer-1.2[vorbis]
+	>=media-libs/sdl-image-1.2[png]
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}
+	sys-apps/miscfiles"
+
+src_prepare() {
+	append-cflags $(sdl-config --cflags)
+	eautoreconf
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-puzzle/sdl-jewels/Manifest b/games-puzzle/sdl-jewels/Manifest
new file mode 100644
index 000000000000..7f434f2402ff
--- /dev/null
+++ b/games-puzzle/sdl-jewels/Manifest
@@ -0,0 +1 @@
+DIST SDL_jewels-1.1.1.tgz 195366 SHA256 c9a40b7e18fabb03e4065e656bc2c30f595103bf20dc74a10847c3f3aa138ee7 SHA512 720f1d89384bf267e8f5441efd70fcf94bfc89ddbd0ff90b1dafc6381e83e005281fcde256ee4cd0645f2832cf9c22aed487c105d7d9cf39711c5752e12763c4 WHIRLPOOL 8ce6f3409a50a2ff673e545f1333f7f12d6b37bd6020f22d004072d0266be3936e98e0212925457f5ede4adb7e0f2346bc5c8a00b3c8e74b3f4b61cb397f78f1
diff --git a/games-puzzle/sdl-jewels/files/sdl-jewels-1.1.1-Makefile.patch b/games-puzzle/sdl-jewels/files/sdl-jewels-1.1.1-Makefile.patch
new file mode 100644
index 000000000000..ba27fd5447bf
--- /dev/null
+++ b/games-puzzle/sdl-jewels/files/sdl-jewels-1.1.1-Makefile.patch
@@ -0,0 +1,17 @@
+--- SDL_jewels-1.1.1/Makefile.old	2010-11-13 00:46:47.196000082 +0000
++++ SDL_jewels-1.1.1/Makefile	2010-11-13 01:45:14.516000087 +0000
+@@ -1,11 +1,12 @@
+ EXE = gljewel
+ 
+-CFLAGS = -O2 -Wall $(shell sdl-config --cflags)
+-LDFLAGS = $(shell sdl-config --libs) -lGL -lm
++CFLAGS += -Wall $(shell sdl-config --cflags)
++LIBS = $(shell sdl-config --libs) -lGL -lm
+ 
+ OBJS	= $(EXE).o matrix.o sound.o
+ 
+ $(EXE):	$(OBJS)
++	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ $(EXE).o: $(EXE).c matrix.h misc.h
+ 
diff --git a/games-puzzle/sdl-jewels/metadata.xml b/games-puzzle/sdl-jewels/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/sdl-jewels/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
new file mode 100644
index 000000000000..395a8bb72f57
--- /dev/null
+++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points"
+HOMEPAGE="http://www.linuxmotors.com/gljewel/"
+SRC_URI="http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="media-libs/libsdl[opengl,video]
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/SDL_jewels-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	# fix the data dir locations as it looks to be intended to run from src dir
+	sed -i -e "s|\"data\"|\"${GAMES_DATADIR}/${PN}\"|" sound.c || die
+	sed -i -e "s|data/bigfont.ppm|${GAMES_DATADIR}/${PN}/bigfont.ppm|" gljewel.c || die
+	ecvs_clean
+}
+
+src_install() {
+	dogamesbin gljewel
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r data/*
+
+	dodoc ChangeLog README
+
+	make_desktop_entry gljewel SDL_jewels
+	prepgamesdirs
+}
diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest
new file mode 100644
index 000000000000..dba165add7a2
--- /dev/null
+++ b/games-puzzle/seatris/Manifest
@@ -0,0 +1 @@
+DIST seatris-0.0.14.tar.gz 53056 SHA256 797ec1403dec2e6c790ec77d41bc5201055cfbef4d9ad7054270845c909d0a2e SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2 WHIRLPOOL 97a509c9a2c5cc6595e647029a69ad59bf20df255a958ce777a3598dcaeb7055a98cf8b2897d08ac0230bb71ff80684d45bcb9367c67699fd66157f809f28964
diff --git a/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch b/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
new file mode 100644
index 000000000000..e77c0dd75077
--- /dev/null
+++ b/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11,7 +11,7 @@
+ 	parse.o readcfg.o
+ 
+ seatris: $(OBJS)
+-	$(CC) $(LFLAGS) $(LIBS) -o seatris $(OBJS)
++	$(CC) $(LDFLAGS) -o seatris $(OBJS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o seatris
diff --git a/games-puzzle/seatris/metadata.xml b/games-puzzle/seatris/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/seatris/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14.ebuild
new file mode 100644
index 000000000000..c5888ad3a69f
--- /dev/null
+++ b/games-puzzle/seatris/seatris-0.0.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="A color ncurses tetris clone"
+HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
+SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 x86"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "s:/var/lib/games:${GAMES_STATEDIR}:" \
+		scoring.h seatris.6 || die
+
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
+src_compile() {
+	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
+}
+
+src_install () {
+	dogamesbin seatris
+	doman seatris.6
+	dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
+	dodir "${GAMES_STATEDIR}"
+	touch "${D}${GAMES_STATEDIR}/seatris.score"
+	fperms 660 "${GAMES_STATEDIR}/seatris.score"
+	prepgamesdirs
+}
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
new file mode 100644
index 000000000000..46566bc96e42
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -0,0 +1 @@
+DIST puzzles-r9861.tar.gz 3255388 SHA256 cc08ffd96c20dfe249d6db0e97f32608e8c52da9ca00a0e8d7d67fd4a474c3a2 SHA512 fc8abf5912e7ecdf5c5166c6b8f354e5f6dc8c42d646ffeae812c3cea21496f9ff03671268453a32c3246d1c94dfaba83628bf65ebeb645b3deb208ee3045ba1 WHIRLPOOL 1f91bc25d5c8dbf531d71eb3783169477834c232810f529cf682d69a121688584af7dc51b00c380e85dfee3119f9644d2f741f4c9f9dfc2054bc72fa5dd88de5
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
new file mode 100644
index 000000000000..c4ac19eed57e
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-9861-gentoo.patch
@@ -0,0 +1,23 @@
+diff -ru puzzles-r9861.orig/mkfiles.pl puzzles-r9861/mkfiles.pl
+--- puzzles-r9861.orig/mkfiles.pl	2013-03-30 16:16:21.000000000 -0400
++++ puzzles-r9861/mkfiles.pl	2013-06-11 17:59:54.255885226 -0400
+@@ -1117,8 +1117,8 @@
+     "\n".
+     &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
+ 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
+-	       " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
+-    "XLIBS = `\$(GTK_CONFIG) --libs` -lm\n".
++	       " `pkg-config gtk+-2.0 --cflags` \$(CFLAGS)")."\n".
++    "XLIBS = `pkg-config gtk+-2.0 --libs` -lm\n".
+     "ULIBS = -lm#\n".
+     "INSTALL=install\n",
+     "INSTALL_PROGRAM=\$(INSTALL)\n",
+@@ -1138,7 +1138,7 @@
+       $objstr = &objects($p, "X.o", undef, undef);
+       print &splitline("\$(BINPREFIX)" . $prog . ": " . $objstr), "\n";
+       $libstr = &objects($p, undef, undef, "-lX");
+-      print &splitline("\t\$(CC) -o \$@ $objstr $libstr \$(XLFLAGS) \$(${type}LIBS)", 69),
++      print &splitline("\t\$(CC) \$(LDFLAGS) -o \$@ $objstr $libstr \$(XLFLAGS) \$(${type}LIBS)", 69),
+ 	  "\n\n";
+     }
+     foreach $d (&deps("X.o", undef, $dirpfx, "/")) {
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
new file mode 100644
index 000000000000..9879da77661f
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-9861.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils toolchain-funcs games
+if [[ ${PV} == "99999999" ]] ; then
+	ESVN_REPO_URI="svn://svn.tartarus.org/sgt/puzzles"
+	inherit subversion
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-r${PV}.tar.gz"
+	S=${WORKDIR}/puzzles-r${PV}
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( >=app-doc/halibut-1.0 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	./mkfiles.pl
+	sed -i \
+		-e 's:= -O2 -Wall -Werror -ansi -pedantic -g:= $(CPPFLAGS):' \
+		-e '/LDFLAGS/s:=:=$(LDFLAGS) :' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	if use doc ; then
+		halibut --text --html --info --pdf --ps puzzles.but
+	fi
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}"
+	emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install
+	dodoc README HACKING
+
+	local file name
+	for file in *.R ; do
+		[[ ${file} == "nullgame.R" ]] && continue
+		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
+		file=${file%.R}
+		if [[ ${PV} -lt 99999999 ]] ; then
+			newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png
+			make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
+		else
+			# No icons with the live version
+			make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}"
+		fi
+	done
+
+	dodoc puzzles.txt puzzles.chm
+	if use doc ; then
+		dohtml *.html
+		doinfo puzzles.info
+		dodoc puzzles.pdf puzzles.ps
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
+}
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
new file mode 100644
index 000000000000..8012c5d43060
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils toolchain-funcs games
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
+	inherit autotools git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-r${PV}.tar.gz"
+	S=${WORKDIR}/puzzles-r${PV}
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+	doc? ( >=app-doc/halibut-1.0 )"
+
+src_prepare() {
+	if [[ ${PV} == "99999999" ]] ; then
+		sed -i \
+			-e 's/-O2 -Wall -Werror -ansi -pedantic -g//' \
+			-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
+			mkfiles.pl || die
+		./mkfiles.pl || die
+		eautoreconf
+	else
+		sed -i \
+			-e 's:= -O2 -Wall -Werror -ansi -pedantic -g:= $(CPPFLAGS):' \
+			-e '/LDFLAGS/s:=:=$(LDFLAGS) :' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+	if use doc ; then
+		halibut --text --html --info --pdf --ps puzzles.but || die
+	fi
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}"
+	emake DESTDIR="${D}" gamesdir="${GAMES_BINDIR}" install
+	dodoc README
+
+	local file name
+	for file in *.R ; do
+		[[ ${file} == "nullgame.R" ]] && continue
+		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
+		file=${file%.R}
+		if [[ ${PV} -lt 99999999 ]] ; then
+			newicon -s 48 icons/${file}-48d24.png ${PN}-${file}.png
+			make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}" "${PN}-${file}"
+		else
+			# No icons with the live version
+			make_desktop_entry "${GAMES_BINDIR}/${file}" "${name}"
+		fi
+	done
+
+	if use doc ; then
+		dohtml *.html
+		doinfo puzzles.info
+		dodoc puzzles.pdf puzzles.ps puzzles.txt puzzles.chm
+	fi
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	[[ ${PV} -lt 99999999 ]] && gnome2_icon_cache_update
+}
diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest
new file mode 100644
index 000000000000..e44f57f8c8e8
--- /dev/null
+++ b/games-puzzle/shaaft/Manifest
@@ -0,0 +1 @@
+DIST Shaaft-0.5.0.tar.bz2 512996 SHA256 db8040c4fee36da9ec9653fd6c04ffb21112c4c9c2297ee66f08b94efa61dc80 SHA512 8fce8f1b8e2cfd78832a5f328d95c186bbd1c96a66685e87f993879e96564d8c9051576c3c822d7dbdb59141d71726ced08a07390b298c3d26969f2b59dceedf WHIRLPOOL 135128793b9f99c917af5de5dd24662ff1970550a68a140869c94c71278e7ad9fc38c8b0e9108078b0bb02a41ee46e3d26a810ec6fc9e06075874a39cbb1f2ce
diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch
new file mode 100644
index 000000000000..de3d59c90771
--- /dev/null
+++ b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch
@@ -0,0 +1,18 @@
+--- Shaaft-0.5.0.orig/utils/HashString.hpp
++++ Shaaft-0.5.0/utils/HashString.hpp
+@@ -21,6 +21,7 @@ using namespace std;
+ 
+ namespace HASH_NAMESPACE
+ {
++    template <>
+     struct hash<const string>
+     {
+ 	//a simple hash function for string
+@@ -32,6 +33,7 @@ namespace HASH_NAMESPACE
+ 	}
+     };
+ 
++    template <>
+     struct hash<string>
+     {
+ 	//a simple hash function for string
diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch
new file mode 100644
index 000000000000..87b07f109d2f
--- /dev/null
+++ b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch
@@ -0,0 +1,11 @@
+--- utils/hashMap.hpp.old
++++ utils/hashMap.hpp
+@@ -14,7 +14,7 @@
+ //
+ #if defined( __GNUC__ )
+ 
+-#  if (__GNUC__ == 3)
++#  if (__GNUC__ >= 3)
+ #    include <ext/hash_map>
+ 
+ #    if (__GNUC_MINOR__ == 0)
diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch
new file mode 100644
index 000000000000..2ddb37c75514
--- /dev/null
+++ b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch
@@ -0,0 +1,23 @@
+--- utils/ResourceManager.cpp
++++ utils/ResourceManager.cpp
+@@ -17,6 +17,7 @@
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <cstring>
+ 
+ #include <Trace.hpp>
+ #include <ResourceManager.hpp>
+--- utils/Value.hpp
++++ utils/Value.hpp
+@@ -15,8 +15,9 @@
+ #ifndef _Value_hpp_
+ #define _Value_hpp_
+ 
+-#include <stdio.h>
++#include <cstdio>
+ #include <string>
++#include <cstdlib>
+ 
+ #include <Trace.hpp>
+ 
diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch
new file mode 100644
index 000000000000..6773242ea6dc
--- /dev/null
+++ b/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch
@@ -0,0 +1,20 @@
+--- utilssdl/PNG.cpp
++++ utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@
+ {
+     png_uint_32 check;
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+     {
+ 	png_error( png, "Write Error");
+@@ -72,7 +72,7 @@
+ 	return false;
+     }
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
+ 	fclose( fp);
+ 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games-puzzle/shaaft/metadata.xml b/games-puzzle/shaaft/metadata.xml
new file mode 100644
index 000000000000..8b6d907abada
--- /dev/null
+++ b/games-puzzle/shaaft/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">criticalmass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
new file mode 100644
index 000000000000..57baf97814db
--- /dev/null
+++ b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+DESCRIPTION="A falling block game similar to Blockout"
+HOMEPAGE="http://packages.gentoo.org/package/games-puzzle/shaaft"
+SRC_URI="mirror://sourceforge/criticalmass/${P/s/S}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+	sys-libs/zlib
+	media-libs/libpng:0
+	media-libs/libsdl[sound,opengl,video]
+	media-libs/sdl-mixer[mod]
+	media-libs/sdl-image[png]"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P/s/S}
+
+src_prepare() {
+	sed -i \
+		-e 's:DATA_DIR:"'${GAMES_DATADIR}'\/'${PN/s/S}\/'":g' \
+		game/main.cpp || die
+
+	sed -i \
+		-e 's:png12:png:g' \
+		-e '/^CFLAGS=""/d' \
+		-e '/^CXXFLAGS=""/d' \
+		configure.in || die
+
+	epatch \
+		"${FILESDIR}"/${P}-gcc34.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	egamesconf --disable-optimize
+}
+
+src_install() {
+	DOCS="TODO.txt" default
+	rm -f "${D}/${GAMES_BINDIR}"/Packer
+	prepgamesdirs
+}
diff --git a/games-puzzle/skoosh/Manifest b/games-puzzle/skoosh/Manifest
new file mode 100644
index 000000000000..fc8186b764ab
--- /dev/null
+++ b/games-puzzle/skoosh/Manifest
@@ -0,0 +1 @@
+DIST skoosh-2.5.0.tar.gz 209945 SHA256 827a6c365bc1771f3ef7ad390cceec76427113f4b33979c9a6dc2286fe1d916a SHA512 e67f0036f09890af62bcfe0fe895d899a76efb2901c5fbdd9fb97951553a4b9f35dfddd0a3e24937b53a1c8d3686caee8b83d35e0327d4bbdaeb4c1e0ab58736 WHIRLPOOL a4fe55be01326410dfd6492a29e1d98d22aa95edcc9b5cfb14466d60b98deff72332bda4a8d3e157ef73910837e545147731793dd03e936632b6a270fd3e5aaf
diff --git a/games-puzzle/skoosh/files/skoosh-2.5.0-desktop.patch b/games-puzzle/skoosh/files/skoosh-2.5.0-desktop.patch
new file mode 100644
index 000000000000..09f120cc75f7
--- /dev/null
+++ b/games-puzzle/skoosh/files/skoosh-2.5.0-desktop.patch
@@ -0,0 +1,17 @@
+--- skoosh.desktop.old	2014-11-21 09:54:37.000861347 +0100
++++ skoosh.desktop	2014-11-21 09:54:47.898132607 +0100
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-Icon=skoosh.png
++Icon=skoosh
+ Name=Fifteen
+ Comment=Slide tiles to reveal a picture
+ Comment[fr]=Déplacez les tuiles pour révéler un dessin
+ Exec=skoosh
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Game;PuzzleGame;
++Categories=Game;
+ StartupNotify=true
+ X-GNOME-DocPath=skoosh/skoosh.xml
diff --git a/games-puzzle/skoosh/metadata.xml b/games-puzzle/skoosh/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/skoosh/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..e207433060d1
--- /dev/null
+++ b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Sliding tile puzzle for Gnome 2"
+HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html"
+SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="
+	>=gnome-base/gconf-2:2
+	gnome-base/libgnome-keyring
+	>=gnome-base/libgnomeui-2
+	nls? ( virtual/libintl )
+"
+# needs scrollkeeper-preinstall from rarian to build
+DEPEND="${RDEPEND}
+	app-text/rarian
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	# Fix .desktop file
+	epatch "${FILESDIR}/${PN}-2.5.0-desktop.patch"
+
+	# Need to apply omf fix or else we get access
+	# violation errors related to sandbox.
+	gnome2_omf_fix "${S}/help/C/Makefile.in"
+
+	gnome2_src_prepare
+}
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
new file mode 100644
index 000000000000..dde80364af67
--- /dev/null
+++ b/games-puzzle/splice/Manifest
@@ -0,0 +1 @@
+DIST splice-linux-1353389454.tar.gz 305838859 SHA256 5016610688f06fcc478b8669a0537614478e68077e044f21530066649830d331 SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44 WHIRLPOOL 9139a3077c78331989128bfe6771c8bfe8c7f8af57712139df8ffd60d295a7bed8dd9dca0a09a35f96cb70407505f7d7b8137caa619f99d226735e37477fc1d6
diff --git a/games-puzzle/splice/metadata.xml b/games-puzzle/splice/metadata.xml
new file mode 100644
index 000000000000..01a746edb196
--- /dev/null
+++ b/games-puzzle/splice/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+</pkgmetadata>
+
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120.ebuild
new file mode 100644
index 000000000000..acf8f3df79ad
--- /dev/null
+++ b/games-puzzle/splice/splice-20121120.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: unbundle mono? (seems hardcoded)
+#       icon
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="An experimental and artistic puzzler set in a microbial world"
+HOMEPAGE="http://www.cipherprime.com/games/splice/"
+SRC_URI="splice-linux-1353389454.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/Splice*
+	${MYGAMEDIR#/}/Splice_Data/Mono/*"
+
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXext"
+
+S=${WORKDIR}/Linux
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	einfo "removing ${ARCH} unrelated files..."
+	rm -v Splice.x86$(usex amd64 "" "_64") || die
+	rm -rv Splice_Data/Mono/x86$(usex amd64 "" "_64") || die
+
+	rm README~ || die
+	mv README "${T}"/ || die
+}
+
+src_install() {
+	dodoc "${T}"/README
+
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	make_desktop_entry ${PN}
+	games_make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
+
+	fperms +x "${MYGAMEDIR}"/Splice.x86$(usex amd64 "_64" "")
+	prepgamesdirs
+}
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
new file mode 100644
index 000000000000..80a317f56435
--- /dev/null
+++ b/games-puzzle/swell-foop/Manifest
@@ -0,0 +1,2 @@
+DIST swell-foop-3.14.0.tar.xz 2336392 SHA256 c52e5c03da5136e47eb04ed58982e93659c7c88411c282b143fc347350ec6dca SHA512 80b9546dfe10d637ca087f912c86c82100099505f7b216c710208bdd91d4a41744147548bb92f90cade103e182cb0da86ef9edd0eef624184024550ac5024d53 WHIRLPOOL fb082bb6233d22812244bd8099fb5c7f66d91b03e11a22e3ca39debac71f9001cdab371a2294cdda9a8c8a048f7c4ec219688279981c1d8e3666a50294e1ae4d
+DIST swell-foop-3.16.1.tar.xz 2372956 SHA256 8e7f09f8c28e3232a5b6726568d1a463c1a2af89cf030d7542ab612d99ac122e SHA512 3e2e024ca302273ba8d6aac7aa1bef0679388b3c67712ed34f0b120ad8bee7670c164098ec2f2ee88a248abfb95957a4a04bb9731be0fcb628da65ebf71a3b59 WHIRLPOOL 3dc1c1c334377881729f0532bf452f0ce538c279230ba2699a42ab6d0a20b80a914766b66fd2644f7439cab3dddac953eefdcd65fe3b935fd994479c3ba412c2
diff --git a/games-puzzle/swell-foop/metadata.xml b/games-puzzle/swell-foop/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/games-puzzle/swell-foop/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/games-puzzle/swell-foop/swell-foop-3.14.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.14.0.ebuild
new file mode 100644
index 000000000000..7f016fdadab6
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-3.14.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+"
+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-util/appdata-tools
+	>=dev-util/intltool-0.50
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/swell-foop/swell-foop-3.16.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.16.1.ebuild
new file mode 100644
index 000000000000..ed3670db22fa
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-3.16.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.22"
+
+inherit gnome-games vala
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+"
+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() {
+	gnome-games_src_prepare
+	vala_src_prepare
+}
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
new file mode 100644
index 000000000000..77c7361a630f
--- /dev/null
+++ b/games-puzzle/tanglet/Manifest
@@ -0,0 +1,2 @@
+DIST tanglet-1.2.1-src.tar.bz2 7814483 SHA256 94f4c5c76020ec1fe502ff076fbe5471e497d4b7bcabd1e9059e1022d1ce80c8 SHA512 25cb7d5f3884e32298562ca3c9655e4386f07a03911f436253d249d741f2ffad10646c3d37370da56e749b36e8926b3543e6f5f7ae560550a1c1efaf254fb121 WHIRLPOOL 71228788ef49538abca37ff54ff19d11806ba9d4f485bb9707402d635cc8089aa118653995d58dd4c2186fd72f6de96eaf86159fb9061777f0d9968a44df1a72
+DIST tanglet-1.3.1-src.tar.bz2 8461603 SHA256 d0eab174eaa8cdd5f3499ae275db4cd720172ef28346273db7f5988f2304e0d8 SHA512 b939ca45f26baf8e7e32da8775e673707472e5cd07d344642eeb15986ff99319e0ab1bacf78e2ea49f004ec67a6d081a91c939cf7c75228a195654d429235625 WHIRLPOOL e2ee97327b95b502b603c953c4b42636fd060f8476bd0787f4d7527c9ebf04774868bd0f923f5b7e89e24e4123143b87e8d9859087685fd62d83c46da26b145d
diff --git a/games-puzzle/tanglet/files/tanglet-1.2.1-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.2.1-datadir.patch
new file mode 100644
index 000000000000..af9dedc24918
--- /dev/null
+++ b/games-puzzle/tanglet/files/tanglet-1.2.1-datadir.patch
@@ -0,0 +1,21 @@
+--- tanglet-1.0.1.orig/src/main.cpp
++++ tanglet-1.0.1/src/main.cpp
+@@ -36,6 +36,7 @@
+ 
+ 	QString path = app.applicationDirPath();
+ 	QStringList paths;
++	paths.append("GENTOO_DIR");
+ 	paths.append(path + "/data/");
+ 	paths.append(path + "/../share/tanglet/data/");
+ 	paths.append(path + "/../Resources/");
+--- tanglet-1.0.1.orig/tanglet.pro
++++ tanglet-1.0.1/tanglet.pro
+@@ -48,7 +48,7 @@
+ 
+ unix:!macx {
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 
+ 	target.path = $$PREFIX/bin/
diff --git a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch
new file mode 100644
index 000000000000..6e5b46d7c7e0
--- /dev/null
+++ b/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch
@@ -0,0 +1,22 @@
+--- src/locale_dialog.cpp.old
++++ src/locale_dialog.cpp
+@@ -85,7 +85,7 @@
+ 	if (paths.isEmpty()) {
+ 		QString appdir = QCoreApplication::applicationDirPath();
+ 		paths.append(appdir);
+-		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
++		paths.append("@GENTOO_DATADIR@");
+ 		paths.append(appdir + "/../Resources");
+ 	}
+ 	foreach (const QString& path, paths) {
+--- src/main.cpp.old
++++ src/main.cpp
+@@ -46,7 +46,7 @@
+ 	QString path = app.applicationDirPath();
+ 	QStringList paths;
+ 	paths.append(path + "/data/");
+-	paths.append(path + "/../share/tanglet/data/");
++	paths.append("@GENTOO_DATADIR@/data/");
+ 	paths.append(path + "/../Resources/data/");
+ 	QDir::setSearchPaths("tanglet", paths);
+ 
diff --git a/games-puzzle/tanglet/metadata.xml b/games-puzzle/tanglet/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/tanglet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/tanglet/tanglet-1.2.1.ebuild b/games-puzzle/tanglet/tanglet-1.2.1.ebuild
new file mode 100644
index 000000000000..8e9373ac13ec
--- /dev/null
+++ b/games-puzzle/tanglet/tanglet-1.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils qt4-r2 games
+
+DESCRIPTION="A single player word finding game based on Boggle"
+HOMEPAGE="http://gottcode.org/tanglet/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-datadir.patch
+	sed -i \
+		-e "/target.path/s:\$\$PREFIX/bin:${GAMES_BINDIR}:" \
+		-e "/data_/s:\$\$PREFIX/share:${GAMES_DATADIR}:g" \
+		tanglet.pro || die
+	sed -i \
+		-e "s:GENTOO_DIR:${GAMES_DATADIR}/${PN}/data:g" \
+		src/main.cpp || die
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc ChangeLog CREDITS
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/tanglet/tanglet-1.3.1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
new file mode 100644
index 000000000000..052bdb82676f
--- /dev/null
+++ b/games-puzzle/tanglet/tanglet-1.3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+LANGS="cs de es en fr he hu it nl ro tr uk"
+LANGSLONG="es_CL"
+inherit eutils gnome2-utils qmake-utils games
+
+DESCRIPTION="A single player word finding game based on Boggle"
+HOMEPAGE="http://gottcode.org/tanglet/"
+SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-datadir.patch
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
+		src/locale_dialog.cpp \
+		src/main.cpp || die
+}
+
+src_configure() {
+	eqmake5 tanglet.pro
+}
+
+src_install() {
+	dogamesbin ${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data
+	#translations
+	insinto "${GAMES_DATADIR}"/${PN}/translations/
+	for lang in ${LINGUAS};do
+		for x in ${LANGS};do
+			if [[ ${lang} == ${x} ]];then
+				doins translations/${PN}_${x}.qm
+			fi
+		done
+	done
+
+	insinto /usr/share/icons
+	doins -r icons/hicolor
+
+	dodoc ChangeLog CREDITS NEWS
+
+	doicon icons/${PN}.xpm
+	domenu icons/${PN}.desktop
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/tetrinet/Manifest b/games-puzzle/tetrinet/Manifest
new file mode 100644
index 000000000000..b6980a579478
--- /dev/null
+++ b/games-puzzle/tetrinet/Manifest
@@ -0,0 +1 @@
+DIST tetrinet-0.11.tar.bz2 38607 SHA256 a7a32da072d0a7bb9f1a61ced5641336924c314692ed8ac3394147f3716b972c SHA512 8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa WHIRLPOOL c0331f1fb42560a46711c6545f0df4b2bdca7bc1694a0c3ff0f1fc14f4cd483dc13b993b8488909eff9ddc94cc7b8c7ed93da64227bfe70dd6da1afeefb2fea1
diff --git a/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch b/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch
new file mode 100644
index 000000000000..0540b7bc8ce9
--- /dev/null
+++ b/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch
@@ -0,0 +1,84 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,4 @@
+-CC = cc
+-
+-CFLAGS = -O2 -I/usr/include/ncurses -DHAVE_IPV6 -g -Wall
++CFLAGS += -I/usr/include/ncurses -g -Wall
+ OBJS = sockets.o tetrinet.o tetris.o tty.o xwin.o
+ 
+ ### If you want to have -server tetrinet client option, comment the two lines
+@@ -24,10 +22,10 @@
+ ########
+ 
+ tetrinet: $(OBJS)
+-	$(CC) -o $@ $(OBJS) -lncurses
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(shell ${PKG_CONFIG} --libs ncurses)
+ 
+ tetrinet-server: server.c sockets.c tetrinet.c tetris.c server.h sockets.h tetrinet.h tetris.h
+-	$(CC) $(CFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $<
+--- a/sockets.c
++++ b/sockets.c
+@@ -66,7 +66,7 @@
+     if (c == 0xFF)
+ 	ptr--;
+     *ptr = 0;
+-    if (log) {
++    if (logging) {
+ 	if (!logfile)
+ 	    logfile = fopen(logname, "a");
+ 	if (logfile) {
+@@ -89,7 +89,7 @@
+     unsigned char c = 0xFF;
+     int n = 0;
+ 
+-    if (log) {
++    if (logging) {
+ 	if (!logfile)
+ 	    logfile = fopen(logname, "a");
+ 	if (logfile) {
+--- a/tetrinet.c
++++ b/tetrinet.c
+@@ -21,7 +21,7 @@
+ /*************************************************************************/
+ 
+ int fancy = 0;		/* Fancy TTY graphics? */
+-int log = 0;		/* Log network traffic to file? */
++int logging = 0;		/* Log network traffic to file? */
+ char *logname;		/* Log filename */
+ int windows_mode = 0;	/* Try to be just like the Windows version? */
+ int noslide = 0;	/* Disallow piece sliding? */
+@@ -82,8 +82,7 @@
+ 	    else
+ 		winlist[i].team = 0;
+ 	    s++;
+-	    strncpy(winlist[i].name, s, sizeof(winlist[i].name)-1);
+-	    winlist[i].name[sizeof(winlist[i].name)] = 0;
++	    snprintf(winlist[i].name, sizeof(winlist[i].name), "%s", s);
+ 	    winlist[i].points = atoi(t);
+ 	    if ((t = strchr(t, ';')) != NULL)
+ 		winlist[i].games = atoi(t+1);
+@@ -590,7 +589,7 @@
+ 	    if (strcmp(av[i], "-fancy") == 0) {
+ 		fancy = 1;
+ 	    } else if (strcmp(av[i], "-log") == 0) {
+-		log = 1;
++		logging = 1;
+ 		i++;
+ 		if (i >= ac) {
+ 		    fprintf(stderr, "Option -log requires an argument\n");
+--- a/tetrinet.h
++++ b/tetrinet.h
+@@ -74,7 +74,7 @@
+ /* Externs */
+ 
+ extern int fancy;
+-extern int log;
++extern int logging;
+ extern char *logname;
+ extern int windows_mode;
+ extern int noslide;
diff --git a/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch b/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch
new file mode 100644
index 000000000000..addfd9a0047c
--- /dev/null
+++ b/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch
@@ -0,0 +1,11 @@
+--- a/sockets.c
++++ b/sockets.c
+@@ -188,7 +188,7 @@
+ 	return -1;
+     }
+     if (ipbuf)
+-	memcpy(retbuf, &sa.sin_addr, 4);
++	memcpy(ipbuf, &sa.sin_addr, 4);
+ #endif
+ 
+     return sock;
diff --git a/games-puzzle/tetrinet/metadata.xml b/games-puzzle/tetrinet/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/tetrinet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
new file mode 100644
index 000000000000..e3fa5718926c
--- /dev/null
+++ b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic games toolchain-funcs
+
+DESCRIPTION="console based tetrinet inc. standalone server"
+HOMEPAGE="http://tetrinet.or.cz/"
+SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ipv6"
+
+RDEPEND=">=sys-libs/ncurses-5"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-no-ipv6.patch \
+		"${FILESDIR}"/${P}-build.patch
+
+	use ipv6 && append-cflags -DHAVE_IPV6
+	tc-export PKG_CONFIG
+}
+
+src_install() {
+	dogamesbin tetrinet tetrinet-server
+	dodoc README TODO tetrinet.txt
+	prepgamesdirs
+}
diff --git a/games-puzzle/textmaze/Manifest b/games-puzzle/textmaze/Manifest
new file mode 100644
index 000000000000..76a87cfbe575
--- /dev/null
+++ b/games-puzzle/textmaze/Manifest
@@ -0,0 +1 @@
+DIST textmaze_v1.2.tar.gz 15827 SHA256 8dbd57584a57855bf052a47d366402cbd6257a546a5ae8e1166bdd91d0a6c0ad SHA512 f6a2733049ea461f15b40eec4a414356dbfe252d859d132278d9ea8a4efcdc6753a28817529b429bad662a2042f2f7cd5cb1f2383d9ddbf773c76b80ea2af7d9 WHIRLPOOL 697b12ca5d710c35b02efba0a6764c75b259c97470695e1dca1aa6ca6a26d52e67281e4124be22f27ea27ff0ae6ede6aab44f9933d33b14b42ac8ed596b88131
diff --git a/games-puzzle/textmaze/metadata.xml b/games-puzzle/textmaze/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/textmaze/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/textmaze/textmaze-1.2.ebuild b/games-puzzle/textmaze/textmaze-1.2.ebuild
new file mode 100644
index 000000000000..11063d9d01d0
--- /dev/null
+++ b/games-puzzle/textmaze/textmaze-1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+MY_P=${PN}_v${PV}
+DESCRIPTION="An ncurses-based maze solving game written in Perl"
+HOMEPAGE="http://robobunny.com/projects/textmaze/html/"
+SRC_URI="http://www.robobunny.com/projects/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-perl/Curses"
+
+S=${WORKDIR}/TextMaze
+
+src_prepare() {
+	sed -i \
+		-e "s#/usr/local/bin/perl#/usr/bin/perl#" \
+		textmaze || die
+}
+
+src_install() {
+	dogamesbin textmaze
+	dodoc CHANGES README
+	prepgamesdirs
+}
diff --git a/games-puzzle/tint/Manifest b/games-puzzle/tint/Manifest
new file mode 100644
index 000000000000..737ef7a9c8d1
--- /dev/null
+++ b/games-puzzle/tint/Manifest
@@ -0,0 +1 @@
+DIST tint_0.03b.tar.gz 16909 SHA256 f43fc82c5d16954a85ef532b0771599902cea86d8d9eea044e5b7454db91419c SHA512 f442122248987a4f2843e0abe3ed4b3fcecbb6024aad2b486087468c84d80f94310dcf4a37a3d93a647d0abe9aaf10e7d957c88ec6314c25a9fd90d4dfc16ec1 WHIRLPOOL 0828a78940d54070d7d5199d49a13dd61132c06e2ed54645a9d278cc9bc78ef7cbcfe26d0a700ebd500d3828ea6376b4170fb63593fca2b8c537d603127d18eb
diff --git a/games-puzzle/tint/files/tint-0.03b-ovflfix.patch b/games-puzzle/tint/files/tint-0.03b-ovflfix.patch
new file mode 100644
index 000000000000..341f027999ce
--- /dev/null
+++ b/games-puzzle/tint/files/tint-0.03b-ovflfix.patch
@@ -0,0 +1,33 @@
+diff -ru tint-0.03b.orig/io.c tint-0.03b/io.c
+--- tint-0.03b.orig/io.c	2001-12-07 10:48:20.000000000 -0500
++++ tint-0.03b/io.c	2010-11-08 13:40:16.786841434 -0500
+@@ -39,7 +39,7 @@
+ #define NUM_COLORS	8
+ 
+ /* Number of attributes defined in io.h */
+-#define NUM_ATTRS	7
++#define NUM_ATTRS	9
+ 
+ /* Cursor definitions */
+ #define CURSOR_INVISIBLE	0
+diff -ru tint-0.03b.orig/tint.c tint-0.03b/tint.c
+--- tint-0.03b.orig/tint.c	2005-07-17 07:26:43.000000000 -0400
++++ tint-0.03b/tint.c	2010-11-08 13:40:04.225203170 -0500
+@@ -365,7 +365,7 @@
+    FILE *handle;
+    int i,j;
+    score_t scores[NUMSCORES];
+-   char header[strlen (SCORE_HEADER)];
++   char header[strlen(SCORE_HEADER) + 1];
+    if (score == 0) return;	/* No need saving this */
+    for (i = 1; i < NUMSCORES; i++)
+ 	 {
+@@ -418,7 +418,7 @@
+    FILE *handle;
+    int i,j,ch;
+    score_t scores[NUMSCORES];
+-   char header[strlen (SCORE_HEADER)];
++   char header[strlen(SCORE_HEADER) + 1];
+    time_t tmp = 0;
+    if ((handle = fopen (scorefile,"r")) == NULL)
+ 	 {
diff --git a/games-puzzle/tint/metadata.xml b/games-puzzle/tint/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/tint/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/tint/tint-0.03b.ebuild b/games-puzzle/tint/tint-0.03b.ebuild
new file mode 100644
index 000000000000..0c5d6923dd1b
--- /dev/null
+++ b/games-puzzle/tint/tint-0.03b.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+MY_P=${P/-/_}
+DESCRIPTION="Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game"
+HOMEPAGE="http://oasis.frogfoot.net/code/tint/"
+SRC_URI="http://oasis.frogfoot.net/code/tint/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.4-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch )
+
+src_compile() {
+	emake \
+		STRIP=true \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		localstatedir="${GAMES_STATEDIR}"
+}
+
+src_install() {
+	dogamesbin tint
+	doman tint.6
+	dodoc CREDITS NOTES
+	insopts -m 0664
+	insinto "${GAMES_STATEDIR}"
+	doins tint.scores
+	prepgamesdirs
+}
diff --git a/games-puzzle/tiny-and-big/Manifest b/games-puzzle/tiny-and-big/Manifest
new file mode 100644
index 000000000000..e1c499e986c4
--- /dev/null
+++ b/games-puzzle/tiny-and-big/Manifest
@@ -0,0 +1 @@
+DIST tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2 1170058011 SHA256 6ff9053399145996da000991a3ac723523d5b6224c9b74ec59b4deb2de38846f SHA512 3dbf6ebbe6047f5258f482e776809c6817df8d14cfc20014fb6e4a6accc3db3e93051270ce29371bc0ef56d380bd382dbf8eb75b592c3f0097ca3546d889193e WHIRLPOOL 910ebeb6df0b6c9ad5289f6c40bf27135207a57e27b6dfd3352968ba6078155ee1d806b750fa428f1e97d7b9e6e8a9081934cedcf36f7d62aae35afe5300c0db
diff --git a/games-puzzle/tiny-and-big/metadata.xml b/games-puzzle/tiny-and-big/metadata.xml
new file mode 100644
index 000000000000..fcab3b2f70ac
--- /dev/null
+++ b/games-puzzle/tiny-and-big/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<use>
+		<flag name='bundled-libs'>
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
new file mode 100644
index 000000000000..fd57cc193f95
--- /dev/null
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: unbundle media-libs/cal3d, lib hacked or old version
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="Combines elements of adventure, jump&run and physical puzzles"
+HOMEPAGE="http://www.tinyandbig.com/"
+SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/bin32/*
+	${MYGAMEDIR#/}/bin64/*"
+
+DEPEND="app-arch/bzip2"
+RDEPEND="
+	virtual/opengl
+	media-libs/openal
+	x11-libs/libX11
+	!bundled-libs? (
+		media-gfx/nvidia-cg-toolkit
+	)"
+
+S=${WORKDIR}/tinyandbig
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_prepare() {
+	if use !bundled-libs ; then
+		rm -v $(usex amd64 "bin64" "bin32")/libCg{,GL}.so || die "unbundling libs failed!"
+	fi
+}
+
+src_install() {
+	local bindir=$(usex amd64 "bin64" "bin32")
+
+	insinto "${MYGAMEDIR}"
+	doins -r assets ${bindir}
+
+	games_make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
+	make_desktop_entry ${PN} "Tiny & Big"
+	dodoc readme.txt
+
+	fperms +x "${MYGAMEDIR}"/${bindir}/tinyandbig
+	prepgamesdirs
+}
diff --git a/games-puzzle/tod/Manifest b/games-puzzle/tod/Manifest
new file mode 100644
index 000000000000..82a6bc415819
--- /dev/null
+++ b/games-puzzle/tod/Manifest
@@ -0,0 +1 @@
+DIST wintod.zip 115653 SHA256 92265cd3266f5deecca8aba1f00bd68af2e758e9b00cd97f92ff487d05524686 SHA512 8cc203d9745cc4855c58c2f9119d06a1f02e1ecb9c1cc2c1dc1f1c77e5aa0553925bdcba3d744db462bbc77f3637a42e35a579a8807c8098aa2fde7452cc30cc WHIRLPOOL 4a3c2dd4d7a787d7b22c74ddf8db331a776677c2b32546d6f237df0bf46970404018edb6d1beb9865db2f1e6d91e6648a421e10ebd58d9f3c8466abcc88c2f83
diff --git a/games-puzzle/tod/files/tod-0-makefile.patch b/games-puzzle/tod/files/tod-0-makefile.patch
new file mode 100644
index 000000000000..cd17d1cce42b
--- /dev/null
+++ b/games-puzzle/tod/files/tod-0-makefile.patch
@@ -0,0 +1,13 @@
+--- makefile
++++ makefile
+@@ -1,8 +1,7 @@
+ OBJ = hiscore rec scrctl tetanus crc allegdlg hgrcos

+ HEADS = tod.h allegdlg.h crc.h hgrcos.h hiscore.h

+-LIBS = -lalleg

+-CFLAGS = -Wall -march=i486 -mcpu=i686 -O3 -ffast-math

+-LDFLAGS = -mwindows

++LIBS = `allegro-config --libs`

++CFLAGS += `allegro-config --cflags`

+ CC = gcc

+ 

+ 

diff --git a/games-puzzle/tod/metadata.xml b/games-puzzle/tod/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/tod/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/tod/tod-0.ebuild b/games-puzzle/tod/tod-0.ebuild
new file mode 100644
index 000000000000..aa7d99fa0876
--- /dev/null
+++ b/games-puzzle/tod/tod-0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Tetanus On Drugs simulates playing a Tetris clone under the influence of hallucinogenic drugs"
+HOMEPAGE="http://www.pineight.com/tod/"
+SRC_URI="http://www.pineight.com/pc/win${PN}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/allegro:0[X]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	sed -i \
+		-e "s:idltd\.dat:${GAMES_DATADIR}/${PN}/idltd.dat:" \
+		rec.c || die
+}
+
+src_install() {
+	newgamesbin tod-debug.exe tod
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins idltd.dat
+	dodoc readme.txt
+	prepgamesdirs
+}
diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
new file mode 100644
index 000000000000..eec3aa47209e
--- /dev/null
+++ b/games-puzzle/tong/Manifest
@@ -0,0 +1 @@
+DIST tong-1.2.tar.gz 88028070 SHA256 7514bf0c1c1a9a8d6985d0fbe83486b83f665d9a202beed2ae91e3f45e90942b SHA512 0544f489141bba37985f1ef3c316208e3e6dacdea8f8b79f37997a9489ff5c1710fd1426e02489f8adb33bf9a1511bb9a0250122fa2054ef4a6ef203c8881261 WHIRLPOOL 107d3009c2e70e78ef81781b388e329f3c45aac8e09470e5c362b3d8b152ad7b6a2d119490a2e2bc29899bb4a8ab36f9d9e86245c46257c260c6b2f65769ab16
diff --git a/games-puzzle/tong/files/tong-1.2-datadir.patch b/games-puzzle/tong/files/tong-1.2-datadir.patch
new file mode 100644
index 000000000000..d0279ac3b874
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-datadir.patch
@@ -0,0 +1,41 @@
+--- tong.cpp.orig
++++ tong.cpp
+@@ -202,7 +202,6 @@
+ 	Tetrad *tetrad, *nexttetrad;
+ 	Paddle *paddle;
+ 	Ball *ball;
+-	char datadir[256];
+ 	input_t input;
+ 	int volume = MIX_MAX_VOLUME;
+ 
+@@ -210,7 +209,6 @@
+ 	volume = 24;
+ #endif
+ 	memset(&input, 0, sizeof(input_t));
+-	strcpy(datadir, GAME_DATA_DIR);
+ 	if(argc>1) {
+ 		if(!strcmp(argv[1], "-v") || !strcmp(argv[1], "--version")) {
+ 			printf("%s\n", GAME_ID);
+@@ -219,10 +217,6 @@
+ 				   "warranty; not even for MERCHANTABILITY or"
+ 				   " FITNESS FOR A PARTICULAR PURPOSE.\n");
+ 			return 0;
+-		} else if(!strncmp(argv[1], "-p=", 3)) {
+-			strcpy(datadir, argv[1]+(3*sizeof(char)));
+-		} else if(!strncmp(argv[1], "--path=", 7)) {
+-			strcpy(datadir, argv[1]+(7*sizeof(char)));
+ 		} else {
+ 			printf("Usage: %s [OPTION]\n", argv[0]);
+ 			printf("Play TONG, a Free Software game (Tetris meets Pong)\n");
+@@ -237,11 +231,6 @@
+ #ifdef WII
+ 	fatInitDefault();
+ #endif
+-	if (chdir(datadir)) {
+-		printf("Could not chdir to %s (attempting to use current dir)\n",
+-			   datadir);
+-	}
+-
+ 	if(SDL_Init(SDL_INIT_AUDIO
+ 				|SDL_INIT_VIDEO
+ 				|SDL_INIT_TIMER
diff --git a/games-puzzle/tong/files/tong-1.2-fps.patch b/games-puzzle/tong/files/tong-1.2-fps.patch
new file mode 100644
index 000000000000..8ce66ebf1d31
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-fps.patch
@@ -0,0 +1,25 @@
+--- tong.cpp.orig
++++ tong.cpp
+@@ -64,6 +64,8 @@
+ 
+ #define DEMO_TIME           8000
+ 
++#define MIN_TIME            45
++
+ #define GP2X_BUTTON_UP         0
+ #define GP2X_BUTTON_UPLEFT     1
+ #define GP2X_BUTTON_LEFT       2
+@@ -1854,6 +1856,13 @@
+ 		SDL_Flip(screen);
+ 		lastlastupdate=lastupdate;
+ 		lastupdate=SDL_GetTicks();
++
++		// limit to 1000/MIN_TIME fps
++		if (lastupdate-lastlastupdate < MIN_TIME) {
++			SDL_Delay(MIN_TIME - (lastupdate - lastlastupdate));
++		}
++		lastupdate = SDL_GetTicks();
++
+ 	}  //main game loop
+ 
+ 	Mix_FreeMusic(music);
diff --git a/games-puzzle/tong/files/tong-1.2-makefile.patch b/games-puzzle/tong/files/tong-1.2-makefile.patch
new file mode 100644
index 000000000000..68b4547d9427
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-makefile.patch
@@ -0,0 +1,28 @@
+--- Makefile.orig
++++ Makefile
+@@ -1,11 +1,10 @@
+ # TONG! makefile, tweak as you see fit
+ 
+-SDL_CFLAGS := $(shell sdl-config --cflags)
++CXXFLAGS += $(shell sdl-config --cflags)
+ SDL_LDFLAGS := $(shell sdl-config --libs)
+ MIXER_FLAGS := -lSDL_mixer -lpthread
+ IMG_FLAGS := -lSDL_image
+ GAME_DATA_DIR := .
+-CC = g++ -O3 -Wall #-ggdb3 
+ SOURCES = tetris.cpp pong.cpp text.cpp option.cpp media.cpp
+ # these sources need to be linked to SDL libs, so may have special flag settings
+ SDL_SOURCES = tong.cpp
+@@ -29,11 +28,7 @@
+ 
+ # builds all, builds the target
+ all:	$(OBJS)
+-	$(CC) $(SDL_LDFLAGS) $(MIXER_FLAGS) $(IMG_FLAGS) $(OBJS) -o $(TARGET)
+-%.o: %.cpp
+-	$(CC) $(SDL_CFLAGS) -c -o $@ $<
+-tong.o: $(SDL_SOURCES)
+-	$(CC) -DGAME_DATA_DIR=\"$(GAME_DATA_DIR)\" $(SDL_CFLAGS) -c -o $@ $<
++	$(CXX) $(LDFLAGS) $(OBJS) $(SDL_LDFLAGS) $(MIXER_FLAGS) $(IMG_FLAGS) -o $(TARGET)
+ 
+ # clean out the mess
+ clean:
diff --git a/games-puzzle/tong/metadata.xml b/games-puzzle/tong/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/tong/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/tong/tong-1.2.ebuild b/games-puzzle/tong/tong-1.2.ebuild
new file mode 100644
index 000000000000..f320cbc63ec5
--- /dev/null
+++ b/games-puzzle/tong/tong-1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Tetris and Pong in the same place at the same time"
+HOMEPAGE="http://www.nongnu.org/tong/"
+SRC_URI="http://www.nongnu.org/tong/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-fps.patch" \
+		"${FILESDIR}/${P}-datadir.patch"
+	sed -i \
+		-e "s:\"media/:\"${GAMES_DATADIR}/${PN}/media/:" \
+		media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \
+		|| die
+	cp media/icon.png "${T}/${PN}.png" || die
+}
+
+src_install() {
+	dogamesbin tong
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r media/ "${D}/${GAMES_DATADIR}/${PN}" || die
+	dodoc CHANGELOG README making-of.txt CREDITS
+
+	make_desktop_entry tong TONG
+	doicon "${T}/${PN}.png"
+	prepgamesdirs
+}
diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest
new file mode 100644
index 000000000000..9cf51fc67f1a
--- /dev/null
+++ b/games-puzzle/toppler/Manifest
@@ -0,0 +1 @@
+DIST toppler-1.1.6.tar.gz 2117137 SHA256 7dbc2905389c2adba0f8c459f3319cf04045ba53ed407e273a50a3a67564cc45 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9 WHIRLPOOL 06c8dedb4f93289e067514c7592d4e002ac1b315fa5d52769fe05de0f9e31b2a14a4b9ab543736d9b580d6af79af4a09f64a1946a14f4f5bed9538b24b7285ff
diff --git a/games-puzzle/toppler/files/toppler-1.1.6-gentoo.patch b/games-puzzle/toppler/files/toppler-1.1.6-gentoo.patch
new file mode 100644
index 000000000000..d3f1ea52b9bc
--- /dev/null
+++ b/games-puzzle/toppler/files/toppler-1.1.6-gentoo.patch
@@ -0,0 +1,54 @@
+diff -ru toppler-1.1.6.orig/Makefile.in toppler-1.1.6/Makefile.in
+--- toppler-1.1.6.orig/Makefile.in	2012-12-22 06:03:04.000000000 -0500
++++ toppler-1.1.6/Makefile.in	2013-01-16 18:51:16.442336579 -0500
+@@ -385,8 +385,8 @@
+   txtsys.cc        txtsys.h        \
+   qnxicon.c
+ 
+-pixmapsdir = $(datadir)/pixmaps
+-applicationsdir = $(datadir)/applications
++pixmapsdir = /usr/share/pixmaps
++applicationsdir = /usr/share/applications
+ pkgdocdir = $(docdir)/$(PACKAGE)
+ pkglocalstatedir = $(localstatedir)/$(PACKAGE)
+ dist_pixmaps_DATA = $(PACKAGE).xpm
+@@ -1143,7 +1143,7 @@
+ info-am:
+ 
+ install-data-am: install-applicationsDATA install-dist_pixmapsDATA \
+-	install-dist_pkgdataDATA install-dist_pkgdocDATA \
++	install-dist_pkgdataDATA \
+ 	install-dist_pkglocalstateDATA install-man
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+diff -ru toppler-1.1.6.orig/po/Makefile.in.in toppler-1.1.6/po/Makefile.in.in
+--- toppler-1.1.6.orig/po/Makefile.in.in	2012-12-22 06:02:52.000000000 -0500
++++ toppler-1.1.6/po/Makefile.in.in	2013-01-16 18:52:01.929721259 -0500
+@@ -21,7 +21,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
+diff -ru toppler-1.1.6.orig/toppler.desktop.in toppler-1.1.6/toppler.desktop.in
+--- toppler-1.1.6.orig/toppler.desktop.in	2012-12-22 06:02:06.000000000 -0500
++++ toppler-1.1.6/toppler.desktop.in	2013-01-16 18:52:38.058438256 -0500
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-Categories=Application;Game;ArcadeGame;
++Categories=Game;ArcadeGame;
+ X-Desktop-File-Install-Version=0.2
+ Name=@FULLNAME@
+ Comment=A clone of the 'Nebulus' game on old 8 and 16 bit machines.
+ Comment[de]=Klon des alten Spiels 'Nebulus'
+ Comment[cs]=Klon hry 'Nebulus' z dob 8 a 16 bitovÜch počítačů.
+-Icon=@prefix@/pixmaps/@PACKAGE@.xpm
++Icon=@PACKAGE@
+ Exec=@prefix@/bin/toppler
+-Terminal=0
++Terminal=false
+ Type=Application
diff --git a/games-puzzle/toppler/metadata.xml b/games-puzzle/toppler/metadata.xml
new file mode 100644
index 000000000000..05e7ffdcd070
--- /dev/null
+++ b/games-puzzle/toppler/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">toppler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/toppler/toppler-1.1.6.ebuild b/games-puzzle/toppler/toppler-1.1.6.ebuild
new file mode 100644
index 000000000000..78d4c12b0807
--- /dev/null
+++ b/games-puzzle/toppler/toppler-1.1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Reimplementation of Nebulous using SDL"
+HOMEPAGE="http://toppler.sourceforge.net/"
+SRC_URI="mirror://sourceforge/toppler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="media-libs/libsdl[video]
+	media-libs/sdl-mixer[vorbis]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+	egamesconf $(use_enable nls)
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-puzzle/torrent/Manifest b/games-puzzle/torrent/Manifest
new file mode 100644
index 000000000000..a4aafa78eabc
--- /dev/null
+++ b/games-puzzle/torrent/Manifest
@@ -0,0 +1 @@
+DIST torrent-0.8.2.tar.gz 555686 SHA256 93890ed9287061f6b8d63993962c188013388fe7cf4d3d334ca7e72cc3209a67 SHA512 da7fbb21252a76fcd41c0b22ae4c0835e2fcabc4da5ce60ad04880c3fb633b6aaa951532ac0ce69d93f03b7608e4b110a23ed6f9f8839d053cd4a0d9500d1692 WHIRLPOOL b2a360bc6a20d8de67cbeec9808c914f4b1120b029e5367658ebf9ee46195fa63c9ca70fa41f5ec4adf3da744175aa31ea720564a5ed4ccb01e464ab274fc423
diff --git a/games-puzzle/torrent/metadata.xml b/games-puzzle/torrent/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/torrent/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/torrent/torrent-0.8.2.ebuild b/games-puzzle/torrent/torrent-0.8.2.ebuild
new file mode 100644
index 000000000000..631da64046c9
--- /dev/null
+++ b/games-puzzle/torrent/torrent-0.8.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="Match rising tiles to score as many points as possible before the tiles touch the top of the board"
+HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html"
+SRC_URI="http://www.shiftygames.com/torrent/${P}.tar.gz"
+
+KEYWORDS="amd64 ppc x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.2.4
+	>=media-libs/sdl-mixer-1.2
+	>=media-libs/sdl-image-1.2
+	media-libs/sdl-ttf"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
+		src/torrent.c \
+		|| die "sed failed"
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-puzzle/triptych-demo/Manifest b/games-puzzle/triptych-demo/Manifest
new file mode 100644
index 000000000000..00ce2a83a240
--- /dev/null
+++ b/games-puzzle/triptych-demo/Manifest
@@ -0,0 +1 @@
+DIST triptych.tar.gz 1748316 SHA256 2d583edc1b974fc346087ab73adb24d476cee040fb59912e28fbf7a8467db5a8 SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa WHIRLPOOL 53fb746b02c91a4434042a21b5b36f27b17528ac51ea9a3dcf4339cdf75c3ff93db2ffe71fb0c3123e3fbe9720264a18e183558cfda14c0320440e010c21b78d
diff --git a/games-puzzle/triptych-demo/metadata.xml b/games-puzzle/triptych-demo/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/triptych-demo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/triptych-demo/triptych-demo-0.ebuild b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
new file mode 100644
index 000000000000..589a67c0974e
--- /dev/null
+++ b/games-puzzle/triptych-demo/triptych-demo-0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="fast-paced tetris-like puzzler"
+HOMEPAGE="http://www.chroniclogic.com/triptych.htm"
+SRC_URI="http://s159260531.onlinehome.us/demos/triptych.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+RESTRICT="mirror bindist strip"
+
+DEPEND="x11-libs/libXext
+	media-libs/libsdl[opengl,sound,video]
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/triptych ${GAMES_PREFIX_OPT}/${PN}/setup"
+
+S=${WORKDIR}/triptych
+
+src_install() {
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+	dodir "${dir}"
+
+	cp -pPR * "${D}"/${dir}/ || die
+	games_make_wrapper triptych ./triptych "${dir}"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	# Fix perms on status files #74217
+	local f
+	for f in triptych.{clr,cnt,scr} ; do
+		f="${ROOT}/${GAMES_PREFIX_OPT}/${PN}/${f}"
+		if [[ ! -e ${f} ]] ; then
+			touch "${f}" \
+				&& chmod 660 "${f}" \
+				&& chown ${GAMES_USER}:${GAMES_GROUP} "${f}" \
+				|| die
+		fi
+	done
+}
diff --git a/games-puzzle/twindistress/Manifest b/games-puzzle/twindistress/Manifest
new file mode 100644
index 000000000000..3c301f2f2e7b
--- /dev/null
+++ b/games-puzzle/twindistress/Manifest
@@ -0,0 +1 @@
+DIST twind-1.1.0.tar.gz 2837845 SHA256 392a09e92862cf8a89a9b8c6f5ed7255c15c7f058a89d889c32f59ed8da73382 SHA512 f1b3be3e5706ce244dd291b6fba2160605593e51b60344521025daf882509e164aa5c201c8d696e56a64d6f3525d16ecd3fd78cc1b86f39f401d4137b615fe8f WHIRLPOOL bd6c54f7d558d7a099c26aaa420908b2cbaecec7244f7e4ed2e3b1703ce7f433af88e70201a856e55e2d9c8644298c4ae7adae91b467f50507e7cf61a9be4a71
diff --git a/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch b/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch
new file mode 100644
index 000000000000..0ac589d88368
--- /dev/null
+++ b/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2010-10-19 09:06:48.000000000 +0200
++++ Makefile	2010-10-19 09:06:59.000000000 +0200
+@@ -50,7 +50,7 @@
+ 	make twind MIXER_LIB= AUDIOFLAG=NOAUDIO
+  	
+ twind: twind.o
+-	$(CC) twind.o $(LIBS) $(SDL_LIBS) $(MIXER_LIB) -o twind
++	$(CC) $(LDFLAGS) twind.o $(LIBS) $(SDL_LIBS) $(MIXER_LIB) -o twind
+ 
+ twind.o: twind.c
+ 	$(CC) $(CFLAGS) $(SDL_CFLAGS) -c twind.c
diff --git a/games-puzzle/twindistress/files/twindistress-1.1.0-warnings.patch b/games-puzzle/twindistress/files/twindistress-1.1.0-warnings.patch
new file mode 100644
index 000000000000..67ee19149ec8
--- /dev/null
+++ b/games-puzzle/twindistress/files/twindistress-1.1.0-warnings.patch
@@ -0,0 +1,61 @@
+diff -ru twind-1.1.0.orig/twind.c twind-1.1.0/twind.c
+--- twind-1.1.0.orig/twind.c	2004-07-15 21:44:50.000000000 -0400
++++ twind-1.1.0/twind.c	2010-10-19 03:32:44.372280497 -0400
+@@ -674,10 +674,10 @@
+                     if (event.button.x >= MENULX && event.button.x < MENURX && event.button.y >= starty && event.button.y < (starty + height)) {
+                         current_menu_high = (event.button.y - starty) / game.font[font].height;
+                         /* re-assign current_menu_high if blank option */
+-                        if (menu_items[game.menu][current_menu_high] == "")
++                        if (*menu_items[game.menu][current_menu_high] == '\0')
+                             current_menu_high = game.last_menu_high;
+                         if (game.last_menu_high != current_menu_high) {
+-                            if (menu_items[game.menu][current_menu_high] != "") {
++                            if (*menu_items[game.menu][current_menu_high] != '\0') {
+                                 #ifndef NOAUDIO
+                                 if (game.audio_enabled) Mix_PlayChannel(MENU_OPTION, game.sound[MENU_OPTION], 0);
+                                 #endif
+@@ -697,7 +697,7 @@
+                         if (event.button.x >= MENULX && event.button.x < MENURX && event.button.y >= starty && event.button.y < (starty + height)) {
+                             current_menu_high = (event.button.y - starty) / game.font[font].height;
+                             /* make sure the option isn't blank */
+-                            if (menu_items[game.menu][current_menu_high] != "") {
++                            if (*menu_items[game.menu][current_menu_high] != '\0') {
+                                 #ifndef NOAUDIO
+                                 if (game.audio_enabled) Mix_PlayChannel(OPTION_CHOICE, game.sound[OPTION_CHOICE], 0);
+                                 #endif
+@@ -917,7 +917,7 @@
+         #endif
+         current_menu_high--;
+         /* if option blank, go to previous */
+-        while (menu_items[game.menu][current_menu_high] == "")
++        while (*menu_items[game.menu][current_menu_high] == '\0')
+             current_menu_high--;
+         /* wrap around to the bottom entry */
+         if (current_menu_high == -1)
+@@ -930,7 +930,7 @@
+         #endif
+         current_menu_high++;
+         /* if option blank, go to next */
+-        while (menu_items[game.menu][current_menu_high] == "")
++        while (*menu_items[game.menu][current_menu_high] == '\0')
+             current_menu_high++;
+         /* wrap around to the top entry */
+         if (current_menu_high == game.menu_item_cnt)
+@@ -1536,7 +1536,7 @@
+             if (level_time && game.stop_timer + game.added_time < game.best_time)
+                 game.best_time = game.stop_timer + game.added_time;
+             /* subtract a set amount of time after level 11 */
+-            if (game.current_level > 11)
++            if (game.current_level >= 11)
+                 game.level_time -= 10;
+             else
+                 game.level_time = times[level_time];
+@@ -1546,7 +1546,7 @@
+                 break;
+             }
+             /* increase time for next level */
+-            if (level_time != 12)
++            if (level_time != 10)
+                 level_time++;
+         }
+         if (game.exit_game != NEW_GAME) {
diff --git a/games-puzzle/twindistress/metadata.xml b/games-puzzle/twindistress/metadata.xml
new file mode 100644
index 000000000000..18f5be0deaa6
--- /dev/null
+++ b/games-puzzle/twindistress/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">twind</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/twindistress/twindistress-1.1.0.ebuild b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
new file mode 100644
index 000000000000..c982c6481767
--- /dev/null
+++ b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+MY_P="twind-${PV}"
+DESCRIPTION="Match and remove all of the blocks before time runs out"
+HOMEPAGE="http://twind.sourceforge.net/"
+SRC_URI="mirror://sourceforge/twind/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-mixer
+	media-libs/sdl-image[png]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i \
+		-e '/^CC/d' \
+		-e "/^CFLAGS/s:-g:${CFLAGS}:" \
+		-e "/^DATA_PREFIX/s:/.*$:${GAMES_DATADIR}/${PN}/:" \
+		-e "/^HIGH_SCORE_PREFIX/s:/.*$:${GAMES_STATEDIR}/${PN}/:" \
+		Makefile || die "sed failed"
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-warnings.patch
+}
+
+src_install() {
+	dogamesbin twind
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r graphics music sound
+
+	doicon graphics/twind.png
+	make_desktop_entry twind "Twin Distress"
+
+	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO
+
+	dodir "${GAMES_STATEDIR}/${PN}"
+	touch "${D}/${GAMES_STATEDIR}/${PN}/twind.hscr"
+	fperms 660 "${GAMES_STATEDIR}/${PN}/twind.hscr"
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if ! has_version "media-libs/sdl-mixer[vorbis]" ; then
+		ewarn "Music support will be disabled since sdl-mixer"
+		ewarn "wasn't built with USE=vorbis"
+	fi
+}
diff --git a/games-puzzle/wakkabox/Manifest b/games-puzzle/wakkabox/Manifest
new file mode 100644
index 000000000000..5ecedf2d5dca
--- /dev/null
+++ b/games-puzzle/wakkabox/Manifest
@@ -0,0 +1 @@
+DIST wakkabox-1.1.0.tar.gz 158231 SHA256 21c94bf994ffb3e4567538f6982091f3fc63e032cab08df37ac17547f47b5f8e SHA512 a97fcf382c3703fa59d6c2159397cb795b698d2a28253a7e60690b24b3d72b4950b9a7c569600bac0dc637b9d9a52577a45944036518cf5e79c601b377a092be WHIRLPOOL 4e76b1ad49bf437be90db864ebb1334e56f09d1014a7ec8997f4c181cbaacdc466c079cf2988aac282ef1d357d16977a32625b99a3fdc12b994a995436d273a8
diff --git a/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
new file mode 100644
index 000000000000..0be83307fa91
--- /dev/null
+++ b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
@@ -0,0 +1,53 @@
+--- configure.ac.old	2015-02-26 23:25:34.146334845 +0100
++++ configure.ac	2015-02-26 23:25:47.978312858 +0100
+@@ -17,6 +17,7 @@
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+-LIBS="$LIBS $SDL_LIBS"
++LIBS="$LIBS -lm $SDL_LIBS"
+ 
+-AC_SUBST(CFLAGS LIBS)
++AC_SUBST(CFLAGS)
++AC_SUBST(LIBS)
+ 
+ AC_OUTPUT(	Makefile  )
+--- configure.ac.old	2015-02-26 23:33:25.801552821 +0100
++++ configure.ac	2015-02-26 23:33:47.509542361 +0100
+@@ -1,4 +1,4 @@
+-AC_INIT( wakkabox.c )
++AC_INIT([[wakkabox.c]])
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
+--- wakkabox.c.old	2015-02-26 23:43:26.146386413 +0100
++++ wakkabox.c	2015-02-26 23:44:39.647389816 +0100
+@@ -249,22 +249,22 @@
+ 	printf("Loading bmp files from %s...", DATADIR);
+ 	
+ 	smallblockFname = (char*)malloc( strlen("smallblock.bmp") 
+-									 + strlen(DATADIR) );
++									 + strlen(DATADIR) + 2);
+ 	medblockhFname = (char*)malloc( strlen("medblockh.bmp") 
+-									+ strlen(DATADIR) );
++									+ strlen(DATADIR) + 2);
+ 	medblockvFname = (char*)malloc( strlen("medblockv.bmp") 
+-									+ strlen(DATADIR) );
++									+ strlen(DATADIR) + 2);
+ 	bigblockFname = (char*)malloc( strlen("bigblock.bmp") 
+-								   + strlen(DATADIR) );
++								   + strlen(DATADIR) + 2);
+ 
+ 	smallblockLocalName = (char*)malloc( strlen("smallblock.bmp") 
+-										 + strlen(".") );
++										 + strlen(".") + 2);
+ 	medblockhLocalName = (char*)malloc( strlen("medblockh.bmp") 
+-										+ strlen(".") );
++										+ strlen(".") + 2);
+ 	medblockvLocalName = (char*)malloc( strlen("medblockv.bmp") 
+-										+ strlen(".") );
++										+ strlen(".") + 2);
+ 	bigblockLocalName = (char*)malloc( strlen("bigblock.bmp") 
+-									   + strlen(".") );
++									   + strlen(".") + 2);
+ 	
+ 
+ 	sprintf( smallblockFname, "%s/smallblock.bmp", DATADIR );
diff --git a/games-puzzle/wakkabox/metadata.xml b/games-puzzle/wakkabox/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/wakkabox/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
new file mode 100644
index 000000000000..48b31945e531
--- /dev/null
+++ b/games-puzzle/wakkabox/wakkabox-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools games
+
+DESCRIPTION="A simple block-pushing game"
+HOMEPAGE="http://kenn.frap.net/wakkabox/"
+SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.0.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	rm aclocal.m4
+	eautoreconf
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}
diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
new file mode 100644
index 000000000000..8ebc31b41e93
--- /dev/null
+++ b/games-puzzle/wizznic/Manifest
@@ -0,0 +1 @@
+DIST Wizznic_src_build_306.tar.bz2 37019286 SHA256 864b51e20f97b918950d20631c8498e44ea55b8a79a64041ae60b73fa9a5926d SHA512 499b43bf8d1fe4b187e0a3c1f186fbd629ae7a7b3fa993d581b4db2a7f5025d44381f001fe5f3ca769d882040c4ae07d30f53025f119502cfa6f5a97e109ae54 WHIRLPOOL 6fd49bb67dd76a3ac7f8528a98961f1723fd097e9d8bb327edba34d921a711841f5a40c1788ddfc8e3db1ece1c1e0054054002deb462abb80c1e226055dac7f4
diff --git a/games-puzzle/wizznic/metadata.xml b/games-puzzle/wizznic/metadata.xml
new file mode 100644
index 000000000000..de9fd8181495
--- /dev/null
+++ b/games-puzzle/wizznic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">wizznic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/wizznic/wizznic-306.ebuild b/games-puzzle/wizznic/wizznic-306.ebuild
new file mode 100644
index 000000000000..c77919033fcf
--- /dev/null
+++ b/games-puzzle/wizznic/wizznic-306.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Block-clearing puzzle game"
+HOMEPAGE="http://wizznic.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wizznic/Wizznic_src_build_${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]"
+
+S=${WORKDIR}/Wizznic_src_build_${PV}
+
+src_prepare() {
+	sed \
+		-e '/^\(CC\|LD\|STRIP\)/d' \
+		-e 's/(LD)/(CC)/g' \
+		-e '/man1/s/1/6/g' \
+		Makefile.linux > Makefile || die
+	mv doc/wizznic.1 doc/wizznic.6 || die
+	sed -i \
+		-e '/Dt WIZZNIC/s/1/6/' \
+		doc/wizznic.6 || die
+}
+
+src_compile() {
+	emake \
+		DATADIR="${GAMES_DATADIR}/${PN}/" \
+		BINDIR="${GAMES_BINDIR}" \
+		STRIP=true
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DATADIR="${GAMES_DATADIR}/${PN}/" \
+		BINDIR="${GAMES_BINDIR}" \
+		install
+	dodoc doc/{changelog.txt,credits.txt,media-licenses.txt,ports.txt,readme.txt}
+	newicon data/wmicon.png ${PN}.png
+	make_desktop_entry wizznic "Wizznic!"
+	prepgamesdirs
+}
diff --git a/games-puzzle/wmpuzzle/Manifest b/games-puzzle/wmpuzzle/Manifest
new file mode 100644
index 000000000000..8b3ead90953f
--- /dev/null
+++ b/games-puzzle/wmpuzzle/Manifest
@@ -0,0 +1 @@
+DIST wmpuzzle-0.5.2.tar.gz 87373 SHA256 b48b9ddb0b0bb85fd9fa3aef859984bce77b5f5faa6dad9366d00c1862a74b9b SHA512 7d171d307e3829005dff4d718161655785e87129b07917d494bb498eff904adafc7c6f83e71f996759ee9e365fe70c67858a5ec9d2647fe573e0a1505126f6c0 WHIRLPOOL 8d91e237b85ccc46ca27308f7c4e69b1cc00d9602d7e679fe6340d7442dc4c7a47c8b2bef07ae1ccc4c0998fdee0b54d55ccfa9c9dfe85eb55ec3a7a5ba93508
diff --git a/games-puzzle/wmpuzzle/metadata.xml b/games-puzzle/wmpuzzle/metadata.xml
new file mode 100644
index 000000000000..724fa31d6f78
--- /dev/null
+++ b/games-puzzle/wmpuzzle/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<herd>desktop-dock</herd>
+	<upstream>
+		<remote-id type="freecode">wmpuzzle</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
new file mode 100644
index 000000000000..dd8dad5db915
--- /dev/null
+++ b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils games
+
+DESCRIPTION="wmpuzzle provides a 4x4 puzzle on a 64x64 mini window"
+HOMEPAGE="http://freecode.com/projects/wmpuzzle"
+SRC_URI="http://people.debian.org/~godisch/wmpuzzle/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+S=${WORKDIR}/${P}/src
+
+src_install() {
+	dogamesbin ${PN}
+
+	dodoc ../{CHANGES,README}
+	newicon -s 48 numbers.xpm ${PN}.xpm
+	doman ${PN}.6
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	games_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
new file mode 100644
index 000000000000..ac8939ff83c4
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo/Manifest
@@ -0,0 +1 @@
+DIST WorldOfGooDemo.1.41.tar.gz 34729052 SHA256 3177b5561c843182613621a3b69800e431d9e1c8cc36fbf42192edc9428fac59 SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a WHIRLPOOL 519c60c1715ec7a69c03381383ad30f5a73cc6b7de28d9b6e1a76f6119232fcd1dc46432b51cba285a3f7f1f0abc93bbd6029d2b8f9c5e14cf22bd27d613a238
diff --git a/games-puzzle/world-of-goo-demo/metadata.xml b/games-puzzle/world-of-goo-demo/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
new file mode 100644
index 000000000000..69aac993bdf8
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A puzzle game with a strong emphasis on physics"
+HOMEPAGE="http://2dboy.com/"
+
+if [[ ${PN} == *-demo ]] ; then
+	MY_PN="WorldOfGooDemo"
+	SRC_URI="${MY_PN}.${PV}.tar.gz"
+else
+	MY_PN="WorldOfGoo"
+	SRC_URI="${MY_PN}Setup.${PV}.tar.gz"
+fi
+
+LICENSE="2dboy-EULA"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="fetch strip"
+
+RDEPEND="media-libs/libsdl[sound,opengl,video]
+	media-libs/sdl-mixer[vorbis]
+	sys-libs/glibc
+	virtual/opengl
+	virtual/glu
+	>=sys-devel/gcc-3.4"
+DEPEND=""
+
+S=${WORKDIR}/${MY_PN}
+dir=${GAMES_PREFIX_OPT}/${PN}
+
+QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32
+	${dir:1}/${MY_PN%Demo}.bin64"
+
+pkg_nofetch() {
+	if [[ ${PN} == *-demo ]] ; then
+		elog "To download the demo, visit http://worldofgoo.com/dl2.php?lk=demo"
+		elog "and download ${A} and place it in ${DISTDIR}"
+	else
+		elog "Download ${A} from ${HOMEPAGE} and place it in ${DISTDIR}"
+	fi
+}
+
+src_install() {
+	exeinto "${dir}"
+	doexe ${MY_PN%Demo}*
+
+	games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
+
+	insinto "${dir}"
+	doins -r icons properties res
+	newicon icons/scalable.svg ${PN}.svg
+
+	if [[ ${PN} == *-demo ]] ; then
+		make_desktop_entry ${PN} "World of Goo (Demo)"
+	else
+		make_desktop_entry ${PN} "World of Goo"
+	fi
+
+	dodoc linux-issues.txt
+	dohtml readme.html
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
new file mode 100644
index 000000000000..8ef0443fb8b9
--- /dev/null
+++ b/games-puzzle/world-of-goo/Manifest
@@ -0,0 +1 @@
+DIST WorldOfGooSetup.1.41.tar.gz 66428181 SHA256 675a8a11bed6c9d810cd222bac5e9834f82acc31c2afc6990da40b45ba564566 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396 WHIRLPOOL 784192ec8161faad3bfab8f0e94bb77b8b900922b7df90b10c887e9fc111e895b859a9dd111cc170523de0a32c0d0fae9e4418c7b27d68f08425939d6bb2da4f
diff --git a/games-puzzle/world-of-goo/metadata.xml b/games-puzzle/world-of-goo/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/world-of-goo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
new file mode 100644
index 000000000000..31d25f55f7ba
--- /dev/null
+++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A puzzle game with a strong emphasis on physics"
+HOMEPAGE="http://2dboy.com/"
+
+if [[ ${PN} == *-demo ]] ; then
+	MY_PN="WorldOfGooDemo"
+	SRC_URI="${MY_PN}.${PV}.tar.gz"
+else
+	MY_PN="WorldOfGoo"
+	SRC_URI="${MY_PN}Setup.${PV}.tar.gz"
+fi
+
+LICENSE="2dboy-EULA"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RESTRICT="fetch strip"
+
+RDEPEND="media-libs/libsdl[alsa,sound,opengl,video]
+	media-libs/sdl-mixer[vorbis]
+	sys-libs/glibc
+	virtual/opengl
+	virtual/glu
+	>=sys-devel/gcc-3.4"
+DEPEND=""
+
+S=${WORKDIR}/${MY_PN}
+dir=${GAMES_PREFIX_OPT}/${PN}
+
+QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32
+	${dir:1}/${MY_PN%Demo}.bin64"
+
+pkg_nofetch() {
+	if [[ ${PN} == *-demo ]] ; then
+		elog "To download the demo, visit http://worldofgoo.com/dl2.php?lk=demo"
+		elog "and download ${A} and place it in ${DISTDIR}"
+	else
+		elog "Download ${A} from ${HOMEPAGE} and place it in ${DISTDIR}"
+	fi
+}
+
+src_install() {
+	exeinto "${dir}"
+	doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)}
+
+	games_make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
+
+	insinto "${dir}"
+	doins -r icons properties res
+	newicon icons/scalable.svg ${PN}.svg
+
+	if [[ ${PN} == *-demo ]] ; then
+		make_desktop_entry ${PN} "World of Goo (Demo)"
+	else
+		make_desktop_entry ${PN} "World of Goo"
+	fi
+
+	dodoc linux-issues.txt
+	dohtml readme.html
+
+	prepgamesdirs
+}
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
new file mode 100644
index 000000000000..243c818f0c50
--- /dev/null
+++ b/games-puzzle/xblockout/Manifest
@@ -0,0 +1 @@
+DIST xbl-1.1.6.tar.gz 136504 SHA256 85f456b6aca15f1642bbd233872250918432f0b5252d4b0d681bc2394fda5f84 SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0 WHIRLPOOL 94f3bd29f13d2e0774e491f0624b7b5d912e37c071fb9490d2b5a5320990731193cd78235aa49e860c2e7b976ced5223c5875a82baaaa846492154ebc5fe2a20
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
new file mode 100644
index 000000000000..bb0302963bdc
--- /dev/null
+++ b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
@@ -0,0 +1,46 @@
+--- initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
++++ initmenu.c	2008-10-27 23:22:52.000000000 +0100
+@@ -408,19 +408,17 @@
+   XCharStruct overall_return ;
+ 
+   m->xfont = XLoadQueryFont( x->display , opt->thefont ) ;
+-  m->font = XLoadFont( x->display , opt->thefont ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font=%s\n", opt->thefont) ;
+     }
+-  if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++  if ( m->xfont==0 )
+     {
+       fprintf(stderr,"Some problems when loading a font... trying others\n") ;
+       m->xfont = XLoadQueryFont( x->display , 
+ 				 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      m->font = XLoadFont( x->display , 
+-			   "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++      m->font = m->xfont->fid;
++      if ( m->xfont==0 )
+ 	{
+ 	  fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
+ 	  fprintf(stderr,"Have you A font?\n");
+@@ -428,17 +426,17 @@
+ 	  exit(1) ;
+ 	}
+     }
++  m->font = m->xfont->fid;
+   m->xfont2 = XLoadQueryFont( x->display , opt->thefont2 ) ;
+-  m->font2 = XLoadFont( x->display , opt->thefont2 ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font2=%s\n", opt->thefont2) ;
+     }
+-  if ( m->font2==BadAlloc || m->font2==BadName || m->xfont2==0 )
++  if ( m->xfont2==0 )
+     {
+-      m->font2 = m->font ;
+       m->xfont2 = m->xfont ;
+     }
++  m->font2 = m->xfont2->fid;
+ 
+   xgc.background = x->back_pixel ;
+   xgc.foreground = opt->backcolor!=7 ? x->white_pixel : x->black_pixel;
diff --git a/games-puzzle/xblockout/metadata.xml b/games-puzzle/xblockout/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/xblockout/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/xblockout/xblockout-1.1.6.ebuild b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
new file mode 100644
index 000000000000..d1d71140ac69
--- /dev/null
+++ b/games-puzzle/xblockout/xblockout-1.1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools flag-o-matic eutils games
+
+DESCRIPTION="X Window block dropping game in 3 Dimension"
+HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/"
+SRC_URI="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-${PV}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/xbl-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-font.patch
+	sed -i \
+		-e '/^CC/d' \
+		-e 's:-lm:-lm -lX11:' \
+		-e '/DGROUP_GID/d' \
+		-e "s:-g$:${CFLAGS}:" \
+		Makefile.in || die
+	# Don't know about other archs. --slarti
+	use amd64 && filter-flags "-fweb"
+	eautoreconf
+}
+
+src_compile() {
+	emake \
+		USE_SETGID= \
+		SCOREDIR="${GAMES_DATADIR}/${PN}" \
+		RESOURCEDIR="${GAMES_DATADIR}/${PN}" \
+		LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+	newgamesbin bl xbl
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	newins Xbl.ad Xbl
+
+	newman xbl.man xbl.6
+	dodoc README xbl-README
+	dohtml *.html *.gif
+	make_desktop_entry xbl XBlockOut
+	prepgamesdirs
+}
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
new file mode 100644
index 000000000000..f55deea83e16
--- /dev/null
+++ b/games-puzzle/xbomb/Manifest
@@ -0,0 +1 @@
+DIST xbomb-2.2a.tgz 25080 SHA256 be9372a0447b9b606af2f705bcf24760e7cf5a51e7e917da43d4804c6ca8f068 SHA512 e0b223fbbbc1e3bf552b045134856e460e3c11366ace1b27564f9d3ae44c7fd32d65ba78b327b460a5c7f70deea01ab63aa21c9dab4996f813543347c86bd282 WHIRLPOOL 3ccca22a384de9a487ab7a183acb7bf33339e5cd4aa82ac2903c83f5ef2271fa832b629ef70b4b0b5684f8186b1c2126ad312f343989b84977270f44c2236a43
diff --git a/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch
new file mode 100644
index 000000000000..945ac700be86
--- /dev/null
+++ b/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch
@@ -0,0 +1,35 @@
+diff -c xbomb-2.1/Makefile xbomb-2.1.new/Makefile
+*** xbomb-2.1/Makefile	1996-01-20 16:02:46.000000000 -0500
+--- xbomb-2.1.new/Makefile	2002-11-13 10:31:30.000000000 -0500
+***************
+*** 27,34 ****
+  
+  OBJ=xbomb.o xwindow.o hiscore.o
+  
+- INSTDIR=/usr/local
+- 
+  ########
+  
+  xbomb : $(OBJ)
+--- 27,32 ----
+***************
+*** 52,60 ****
+  
+  install :
+  	strip xbomb
+! 	install -d $(INSTDIR)/bin
+! 	install -d $(INSTDIR)/man/man6
+! 	install -d $(INSTDIR)/lib/app-defaults
+! 	install -m 755 xbomb $(INSTDIR)/bin
+! 	install -m 644 xbomb.6 $(INSTDIR)/man/man6
+! 	install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
+--- 50,58 ----
+  
+  install :
+  	strip xbomb
+! 	install -d $(DESTDIR)/usr/bin
+! 	install -d $(DESTDIR)/usr/share/man/man6
+! 	install -d $(DESTDIR)/etc/X11/app-defaults
+! 	install -m 755 xbomb $(DESTDIR)/usr/bin
+! 	install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6
+! 	install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb
diff --git a/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch
new file mode 100644
index 000000000000..b1a18784fa43
--- /dev/null
+++ b/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old	2010-09-22 14:18:37.000000000 +0200
++++ Makefile	2010-09-22 14:19:06.000000000 +0200
+@@ -30,7 +30,7 @@
+ ########
+ 
+ xbomb : $(OBJ)
+-	$(LINK) $(OBJ) -o $@ $(LIB) $(XLIB)
++	$(LINK) $(LDFLAGS) $(OBJ) -o $@ $(LIB) $(XLIB)
+ 
+ ########
+ 
diff --git a/games-puzzle/xbomb/metadata.xml b/games-puzzle/xbomb/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/xbomb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/xbomb/xbomb-2.2a.ebuild b/games-puzzle/xbomb/xbomb-2.2a.ebuild
new file mode 100644
index 000000000000..dc722a6adc54
--- /dev/null
+++ b/games-puzzle/xbomb/xbomb-2.2a.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
+HOMEPAGE="http://www.gedanken.demon.co.uk/xbomb/"
+SRC_URI="http://www.gedanken.demon.co.uk/download-xbomb/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-DESTDIR.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-e '/strip/d' \
+		-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
+		-e "s:/usr/bin:${GAMES_BINDIR}:" \
+		Makefile \
+		|| die "sed Makefile failed"
+	sed -i \
+		-e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \
+		hiscore.c \
+		|| die "sed hiscore.c failed"
+}
+
+src_install() {
+	default
+	dodoc LSM
+	dodir "${GAMES_STATEDIR}"/${PN}
+	touch "${D}/${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi || die "touch failed"
+	fperms 660 "${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi
+	prepgamesdirs
+}
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
new file mode 100644
index 000000000000..e21876fc56b1
--- /dev/null
+++ b/games-puzzle/xlogical/Manifest
@@ -0,0 +1,2 @@
+DIST xlogical-1.0-7.tar.bz2 1853575 SHA256 166d227770dcb7d94138f844a8a81380eff3fac7f564274bb2c66ae974e8e7ca SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d WHIRLPOOL 97c4b236156257a368b7687731da147f17643ca99c729e520e18fde3837c943e990009c7fe951cb1f7739bcfe6587162b0edd7a8773f1c1af7da0cc699788c96
+DIST xlogical_gfx.zip 347801 SHA256 1d6f97ad3cbcb7b78d3e3594643195d6457ab7ca613ccabd6256a5fe13a98f49 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42 WHIRLPOOL 5b33c7603b709c97975d28b264417e1645eeebfb9112d4ec6a84c689fd4bff0ade77188896615b77ec8ab764f61ca1e01ef6075acb25d82a114af32638ad1a6c
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
new file mode 100644
index 000000000000..19cd188b0e0e
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
@@ -0,0 +1,49 @@
+--- properties.h.old	2007-01-11 17:33:45.000000000 +0100
++++ properties.h	2007-01-11 17:34:32.000000000 +0100
+@@ -33,9 +33,7 @@
+ #include <map>
+ #include <string>
+ 
+-#ifdef WIN32
+ using namespace std;
+-#endif
+ 
+ #include "defs.h"
+ 
+--- anim.h.old	2007-01-11 17:36:20.000000000 +0100
++++ anim.h	2007-01-11 17:36:37.000000000 +0100
+@@ -27,9 +27,7 @@
+ // Language Includes
+ #include <list>
+ 
+-#ifdef WIN32
+ using namespace std;
+-#endif
+ 
+ // Application Includes
+ #include "graph.h"
+--- exception.h.old	2007-01-11 17:37:37.000000000 +0100
++++ exception.h	2007-01-11 17:38:21.000000000 +0100
+@@ -27,10 +27,9 @@
+ 
+ // Language Includes
+ #include <string>
++#include <iostream>
+ 
+-#ifdef WIN32
+ using namespace std;
+-#endif
+ 
+ #define CatchEx(aEx)		catch( CXLException aEx )
+ #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
+--- gamelogic.cpp.old	2007-01-11 17:38:52.000000000 +0100
++++ gamelogic.cpp	2007-01-11 17:39:12.000000000 +0100
+@@ -154,7 +154,7 @@
+ 		levelFile = NULL;
+ 	}
+ 
+-	currentMap = NULL;
++	currentMap = gameLevels.begin();
+ 
+ 	playerName = new char[32+1];
+ 	strcpy( playerName, "nobody" );
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
new file mode 100644
index 000000000000..4b64fcd67783
--- /dev/null
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
@@ -0,0 +1,51 @@
+--- gamelogic.cpp
++++ gamelogic.cpp
+@@ -25,6 +25,7 @@
+ #include<fstream>
+ #include<cstdio>
+ #include<cctype>
++#include <cstdlib>
+ 
+ #ifndef WIN32
+ #include<unistd.h>
+--- levelmap.cpp
++++ levelmap.cpp
+@@ -21,6 +21,7 @@
+ ////////////////////////////////////////////////////////////////////////

+ 

+ // Language Includes

++#include <cstdlib>
+ #include <cstdio>

+ #include <cctype>

+ #include <cstring>

+--- mapedit.cpp
++++ mapedit.cpp
+@@ -26,6 +26,8 @@
+ #include<cstdio>

+ #include<list>

+ #include<vector>

++#include <cstdlib>
++#include <cstring>
+ 

+ #ifndef WIN32

+ #include<unistd.h>

+--- modlist.cpp
++++ modlist.cpp
+@@ -22,6 +22,7 @@
+ 

+ #include <iostream>

+ #include <fstream>

++#include <cstdlib>

+ 

+ #ifdef WIN32

+ #include <afxwin.h>

+--- tile_spinner.cpp
++++ tile_spinner.cpp
+@@ -24,6 +24,7 @@
+ 
+ 
+ // Application Includes
++#include <cstdlib>
+ #include "audio.h"
+ #include "properties.h"
+ #include "defs.h"
diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml
new file mode 100644
index 000000000000..36ec4edcdc0d
--- /dev/null
+++ b/games-puzzle/xlogical/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<longdescription lang="en">
+XLogical is a puzzle game based on the Logical! game that was originally
+released by Rainbow Arts on the Commodore Amiga computer.
+</longdescription>
+  <use>
+    <flag name="alt_gfx">Use alternate graphics which are closer to the original Amiga version</flag>
+  </use>
+</pkgmetadata>
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
new file mode 100644
index 000000000000..b41fb073b0a2
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools versionator eutils games
+
+MY_PV=$(replace_version_separator 2 '-' )
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="SDL logical clone"
+HOMEPAGE="http://changeling.ixionstudios.com/xlogical/"
+SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+	alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alt_gfx"
+
+RDEPEND="media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}
+	alt_gfx? ( app-arch/unzip )"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	if use alt_gfx ; then
+		cd "${S}/images"
+		unpack xlogical_gfx.zip
+	fi
+}
+
+src_prepare() {
+	sed -i '/^CXXFLAGS/d' Makefile.am || die
+	edos2unix properties.h anim.h exception.h
+	epatch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+	mv configure.in configure.ac
+	eautoreconf
+}
+
+src_install() {
+	dogamesbin ${PN}
+
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r ${PN}.{properties,levels} music sound images
+	find "${D}" -name "Makefile*" -exec rm -f '{}' +
+
+	insinto "${GAMES_STATEDIR}"/${PN}
+	doins ${PN}.scores
+	fperms 0660 "${GAMES_STATEDIR}"/${PN}/${PN}.scores
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	make_desktop_entry ${PN} "Xlogical"
+	prepgamesdirs
+}
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
new file mode 100644
index 000000000000..47d23b32e538
--- /dev/null
+++ b/games-puzzle/xpired/Manifest
@@ -0,0 +1 @@
+DIST xpired-1.22-linux_source.tar.gz 478593 SHA256 7a2c0dd8bab0dc2b937684bbb3d213754921bf2d6bd891d9be00bf2db7bbb505 SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10 WHIRLPOOL 166f0149290c7bcd3ae24d26152f502b157a84439c79fbcd4a34e425b857dc8965584e60c455de2b387427e3f89c841f5a52c7f1ae20ee02bc9d5c0e17d77e2a
diff --git a/games-puzzle/xpired/files/xpired-1.22-ldflags.patch b/games-puzzle/xpired/files/xpired-1.22-ldflags.patch
new file mode 100644
index 000000000000..f3a1e6839cf4
--- /dev/null
+++ b/games-puzzle/xpired/files/xpired-1.22-ldflags.patch
@@ -0,0 +1,26 @@
+diff -ru src.orig/Makefile src/Makefile
+--- src.orig/Makefile	2002-08-01 14:42:51.000000000 -0400
++++ src/Makefile	2010-10-13 19:31:21.944183145 -0400
+@@ -1,18 +1,17 @@
+ PREFIX=/usr/local
+ SHARE_PREFIX=$(PREFIX)/share/xpired
+-CFLAGS=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\"
+-LDFLAGS=`sdl-config --libs` -lSDL -lSDL_mixer -lSDL_image -lSDL_gfx
+-CC=gcc
++CFLAGS+=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\"
++LDLIBS=`sdl-config --libs` -lSDL -lSDL_mixer -lSDL_image -lSDL_gfx
+ 
+ BINARIES = xpired xpiredit
+ 
+ all: $(BINARIES)
+ 
+ xpired: xpired.o
+-	$(CC) -o xpired xpired.o $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o xpired xpired.o $(LDLIBS)
+ 
+ xpiredit: xpiredit.o xpired_unix.h
+-	$(CC) -o xpiredit xpiredit.o $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o xpiredit xpiredit.o $(LDLIBS)
+ 
+ .PHONY: clean
+ 
diff --git a/games-puzzle/xpired/metadata.xml b/games-puzzle/xpired/metadata.xml
new file mode 100644
index 000000000000..11c360ed350a
--- /dev/null
+++ b/games-puzzle/xpired/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">xpired</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22.ebuild
new file mode 100644
index 000000000000..1db2245a4663
--- /dev/null
+++ b/games-puzzle/xpired/xpired-1.22.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="A Sokoban-styled puzzle game with lots more action"
+HOMEPAGE="http://xpired.sourceforge.net"
+SRC_URI="mirror://sourceforge/xpired/${P}-linux_source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="media-libs/sdl-gfx
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/src
+
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+
+src_compile() {
+	emake \
+		PREFIX=/usr/games \
+		SHARE_PREFIX=/usr/share/games/xpired
+}
+
+src_install() {
+	emake \
+		PREFIX="${D}/usr/games" \
+		SHARE_PREFIX="${D}/usr/share/games/${PN}" \
+		install
+	newicon img/icon.bmp ${PN}.bmp
+	make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp
+	make_desktop_entry xpiredit "Xpired Level Editor"
+	prepgamesdirs
+}
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
new file mode 100644
index 000000000000..0a3e016af62c
--- /dev/null
+++ b/games-puzzle/xtris/Manifest
@@ -0,0 +1 @@
+DIST xtris-1.15.tar.gz 52130 SHA256 5791b30795382a18536201c95c686f62ade6975fc4e63c651bff36226c933d68 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791 WHIRLPOOL 2a183a7eadc062fe658ca45b414067b117476386c47d3b9b4791fc32e0c35ada8ea2aa9dfb3928155c08ab29e1eaea86193c457d65b8248a7849fce45cda15fa
diff --git a/games-puzzle/xtris/files/xtris.xpm b/games-puzzle/xtris/files/xtris.xpm
new file mode 100644
index 000000000000..27ed16ef5ed7
--- /dev/null
+++ b/games-puzzle/xtris/files/xtris.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * xtris_xpm[] = {
+"34 34 4 1",
+" 	c None",
+".	c #00F000",
+"+	c #007000",
+"@	c #00A800",
+"                                  ",
+" ................................ ",
+" ...............+...............+ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" .+++++++++++++++.+++++++++++++++ ",
+" ++++++++++++++++++++++++++++++++ ",
+" ................................ ",
+" ...............+...............+ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" .+++++++++++++++.+++++++++++++++ ",
+" ++++++++++++++++++++++++++++++++ ",
+"                                  "};
diff --git a/games-puzzle/xtris/metadata.xml b/games-puzzle/xtris/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/xtris/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/xtris/xtris-1.15.ebuild b/games-puzzle/xtris/xtris-1.15.ebuild
new file mode 100644
index 000000000000..c18106d0ef52
--- /dev/null
+++ b/games-puzzle/xtris/xtris-1.15.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs games
+
+DESCRIPTION="a networked Tetris-like game"
+HOMEPAGE="http://www.iagora.com/~espel/xtris/xtris.html"
+SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		BINDIR="${GAMES_BINDIR}" \
+		MANDIR=/usr/share/man \
+		CFLAGS="${CFLAGS}" \
+		EXTRALIBS="${LDFLAGS}"
+}
+
+src_install() {
+	dogamesbin xtris xtserv xtbot
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry ${PN} xtris ${PN}
+	doman xtris.6 xtserv.6 xtbot.6
+	dodoc ChangeLog PROTOCOL README
+	prepgamesdirs
+}
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
new file mode 100644
index 000000000000..f70a9e3b90b4
--- /dev/null
+++ b/games-puzzle/xwelltris/Manifest
@@ -0,0 +1 @@
+DIST xwelltris-1.0.1.src.tar.gz 422822 SHA256 c7b6321a9a6e735d4e57ec350adc7a6eabf76b8e9fb9d4cf9d91243da2adb38b SHA512 6b1080c6e6d1b579c441d1f42bb6454dafed62a63790d5798e83cf137db7ff2ddc07db7e89b34402a5249770697cc3f8ad5e6222266142c7b43f6936828f2536 WHIRLPOOL 88e968bcafb8742e17d61532d564a9497cdfc5fc1ade1baa6015ef0c0a19f73cb4c281f03f355e34640033f9e45e142f37103316fcc16bbbf85bf02ab7722b2a
diff --git a/games-puzzle/xwelltris/metadata.xml b/games-puzzle/xwelltris/metadata.xml
new file mode 100644
index 000000000000..d3c2cc926f0b
--- /dev/null
+++ b/games-puzzle/xwelltris/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+</pkgmetadata>
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
new file mode 100644
index 000000000000..b00b12951d05
--- /dev/null
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+DESCRIPTION="2.5D tetris like game"
+HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
+SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-image[gif]"
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL_PROGRAM/s/-s //' \
+		src/Make.common.in || die
+	sed -i \
+		-e "/GLOBAL_SEARCH/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
+		src/include/globals.h.in || die
+}
+
+src_configure() {
+	# configure/build process is pretty messed up
+	egamesconf --with-sdl
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_install() {
+	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" /usr/share/man
+	emake install \
+		INSTDIR="${D}/${GAMES_BINDIR}" \
+		INSTLIB="${D}/${GAMES_DATADIR}/${PN}" \
+		INSTMAN=/usr/share/man
+	dodoc AUTHORS Changelog README*
+	prepgamesdirs
+}
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
new file mode 100644
index 000000000000..135c83d77e0a
--- /dev/null
+++ b/games-puzzle/xye/Manifest
@@ -0,0 +1 @@
+DIST xye-0.12.1.tar.gz 2850776 SHA256 bbeb3265b0795f14deb2851b4a3bda7dde9b07d624a7ca5fb88cd7acabcf3967 SHA512 aadafdb7b8e0546435838279c2929803be8dde00f3f3c08668c35d0a8ccf5bad511e65629e3f7261140edcf0980d19fda2be1401593ac4c0410beede542e857b WHIRLPOOL 7a1aa2708361b4eddb266037af35e6915852ba1a5037fcfebd95c0a8caab54209ca1c9e3827acecff64772fd15b077f5cded64a50b5820abd7b3cde937bbc2e0
diff --git a/games-puzzle/xye/files/xye-0.12.1-gcc47.patch b/games-puzzle/xye/files/xye-0.12.1-gcc47.patch
new file mode 100644
index 000000000000..04414abc6a2b
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.1-gcc47.patch
@@ -0,0 +1,22 @@
+--- src/editorsave.cpp.old
++++ src/editorsave.cpp
+@@ -642,7 +642,8 @@
+     file << "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
+     file << "<pack>\n<name>"<< stripXML(editorboard::filetitle) <<"</name><author>"<< stripXML(editorboard::author) <<"</author>\n<description>"<< stripXML(editorboard::description) <<"</description>\n";
+     
+-    for (int i=first; i<editorboard::CountLevels(); i++) {
++    int i;
++    for (i=first; i<editorboard::CountLevels(); i++) {
+         editorboard::LoadLevelNumber(board, i);
+         file << "\n<level>\n";
+         file << "<title>"<< stripXML(board->title) <<"</title>\n";
+--- src/gen.cpp.old
++++ src/gen.cpp
+@@ -21,6 +21,7 @@
+ #include<cstdio>

+ #include<iostream>

+ #include<fstream>

++#include <unistd.h>

+ 

+ const float F_RAND_MAX = (float)(RAND_MAX);

+ 

diff --git a/games-puzzle/xye/metadata.xml b/games-puzzle/xye/metadata.xml
new file mode 100644
index 000000000000..577d11240ad6
--- /dev/null
+++ b/games-puzzle/xye/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">xye</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/xye/xye-0.12.1.ebuild b/games-puzzle/xye/xye-0.12.1.ebuild
new file mode 100644
index 000000000000..81f5810a0989
--- /dev/null
+++ b/games-puzzle/xye/xye-0.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+DESCRIPTION="Free version of the classic game Kye"
+HOMEPAGE="http://xye.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-ttf
+	media-libs/sdl-image[png]
+	media-fonts/dejavu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+	sed -i -e '/^xye_LDFLAGS/d' Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	dogamesbin "${PN}"
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r levels res
+	rm -f "${D}${GAMES_DATADIR}/${PN}"/res/DejaVuSans*
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}"/res/DejaVuSans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}/${PN}"/res/DejaVuSans-Bold.ttf
+	dodoc AUTHORS ChangeLog README NEWS
+	dohtml ReadMe.html
+	doicon xye.svg
+	make_desktop_entry ${PN} Xye
+	prepgamesdirs
+}
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
new file mode 100644
index 000000000000..2877b90b668d
--- /dev/null
+++ b/games-puzzle/zaz/Manifest
@@ -0,0 +1 @@
+DIST zaz-1.0.0.tar.bz2 25170073 SHA256 e332cc1a6559e18a2b632940c53d20e2f2d2b583ba9dc1fd02a586437f9f0397 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb WHIRLPOOL 09e596a903a35378068005123388c6fcd981133ce27823d424574f1a35a8d243e79f05edf76ebf42d8bf7e93155c43af71c5f81554c92b6cf75fceb04ee31bea
diff --git a/games-puzzle/zaz/files/zaz-1.0.0-build.patch b/games-puzzle/zaz/files/zaz-1.0.0-build.patch
new file mode 100644
index 000000000000..bef2954bf088
--- /dev/null
+++ b/games-puzzle/zaz/files/zaz-1.0.0-build.patch
@@ -0,0 +1,19 @@
+diff -ru zaz-0.7.0.orig/Makefile.am zaz-0.7.0/Makefile.am
+--- zaz-0.7.0.orig/Makefile.am	2009-10-14 18:20:14.000000000 -0400
++++ zaz-0.7.0/Makefile.am	2010-05-13 15:49:59.404464060 -0400
+@@ -2,15 +2,6 @@
+ 
+ SUBDIRS = po src data extra
+ 
+-dist_doc_DATA = \
+-	README\
+-	COPYING\
+-	AUTHORS\
+-	ChangeLog\
+-	INSTALL\
+-	NEWS
+-
+-
+ EXTRA_DIST = config.rpath m4/ChangeLog\
+ 	$(shared_data_DATA) \
+ 	zaz.anjuta\
diff --git a/games-puzzle/zaz/metadata.xml b/games-puzzle/zaz/metadata.xml
new file mode 100644
index 000000000000..df24f65f7f3b
--- /dev/null
+++ b/games-puzzle/zaz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="sourceforge">zaz</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-puzzle/zaz/zaz-1.0.0.ebuild b/games-puzzle/zaz/zaz-1.0.0.ebuild
new file mode 100644
index 000000000000..d7f85145be65
--- /dev/null
+++ b/games-puzzle/zaz/zaz-1.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools flag-o-matic eutils games
+
+DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
+HOMEPAGE="http://sourceforge.net/projects/zaz/"
+SRC_URI="mirror://sourceforge/zaz/${P}.tar.bz2"
+
+LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 OFL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="virtual/opengl
+	virtual/glu
+	media-libs/libsdl[X,sound,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/libvorbis
+	media-libs/libtheora
+	media-libs/ftgl
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	local x=/usr/share/gettext/po/Makefile.in.in
+	[[ -e $x ]] && cp -f $x po/ #336119
+
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-libs -lvorbis
+	append-cflags $(pkg-config sdl --cflags)
+	append-cxxflags $(pkg-config sdl --cflags)
+	egamesconf \
+		--disable-dependency-tracking \
+		--with-applicationdir=/usr/share/applications \
+		--with-icondir=/usr/share/pixmaps \
+		--localedir=/usr/share/locale \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	prepgamesdirs
+}