summaryrefslogtreecommitdiff
path: root/games-puzzle
diff options
context:
space:
mode:
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/4stattack-2.1.4-r113
-rw-r--r--games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild45
-rw-r--r--games-puzzle/4stattack/Manifest4
-rw-r--r--games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff21
-rw-r--r--games-puzzle/4stattack/metadata.xml11
-rw-r--r--games-puzzle/Manifest.gzbin18440 -> 17778 bytes
-rw-r--r--games-puzzle/amoebax-0.2.1-r112
-rw-r--r--games-puzzle/amoebax/Manifest5
-rw-r--r--games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild40
-rw-r--r--games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch41
-rw-r--r--games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch12
-rw-r--r--games-puzzle/amoebax/metadata.xml8
-rw-r--r--games-puzzle/anagramarama-0.2-r112
-rw-r--r--games-puzzle/anagramarama/Manifest4
-rw-r--r--games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild44
-rw-r--r--games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch34
-rw-r--r--games-puzzle/anagramarama/metadata.xml8
-rw-r--r--games-puzzle/angrydd-1.0.1-r214
-rw-r--r--games-puzzle/angrydd/Manifest3
-rw-r--r--games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild47
-rw-r--r--games-puzzle/angrydd/metadata.xml8
-rw-r--r--games-puzzle/arrows-0.6-r111
-rw-r--r--games-puzzle/arrows/Manifest3
-rw-r--r--games-puzzle/arrows/arrows-0.6-r1.ebuild48
-rw-r--r--games-puzzle/arrows/metadata.xml8
-rw-r--r--games-puzzle/atomix-3.22.012
-rw-r--r--games-puzzle/atomix/Manifest3
-rw-r--r--games-puzzle/atomix/atomix-3.22.0.ebuild25
-rw-r--r--games-puzzle/atomix/metadata.xml8
-rw-r--r--games-puzzle/bastet-0.4312
-rw-r--r--games-puzzle/bastet/Manifest4
-rw-r--r--games-puzzle/bastet/bastet-0.43.ebuild32
-rw-r--r--games-puzzle/bastet/files/bastet-0.43-gentoo.patch15
-rw-r--r--games-puzzle/bastet/metadata.xml8
-rw-r--r--games-puzzle/biniax2-1.30-r112
-rw-r--r--games-puzzle/biniax2/Manifest6
-rw-r--r--games-puzzle/biniax2/biniax2-1.30-r1.ebuild42
-rw-r--r--games-puzzle/biniax2/files/biniax2-1.30-build.patch18
-rw-r--r--games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch60
-rw-r--r--games-puzzle/biniax2/files/biniax2.xpm41
-rw-r--r--games-puzzle/biniax2/metadata.xml8
-rw-r--r--games-puzzle/braincurses-0.5b-r19
-rw-r--r--games-puzzle/braincurses/Manifest5
-rw-r--r--games-puzzle/braincurses/braincurses-0.5b-r1.ebuild34
-rw-r--r--games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch27
-rw-r--r--games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch10
-rw-r--r--games-puzzle/braincurses/metadata.xml12
-rw-r--r--games-puzzle/brainparty-0.61-r112
-rw-r--r--games-puzzle/brainparty/Manifest6
-rw-r--r--games-puzzle/brainparty/brainparty-0.61-r1.ebuild55
-rw-r--r--games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch20
-rw-r--r--games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch11
-rw-r--r--games-puzzle/brainparty/files/brainparty-0.61-savegame.patch27
-rw-r--r--games-puzzle/brainparty/metadata.xml11
-rw-r--r--games-puzzle/brainworkshop-4.8.414
-rw-r--r--games-puzzle/brainworkshop/Manifest4
-rw-r--r--games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild59
-rw-r--r--games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch15
-rw-r--r--games-puzzle/brainworkshop/metadata.xml11
-rw-r--r--games-puzzle/color-lines-0.6-r112
-rw-r--r--games-puzzle/color-lines/Manifest4
-rw-r--r--games-puzzle/color-lines/color-lines-0.6-r1.ebuild47
-rw-r--r--games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch35
-rw-r--r--games-puzzle/color-lines/metadata.xml11
-rw-r--r--games-puzzle/colorcode-0.8.512
-rw-r--r--games-puzzle/colorcode/Manifest3
-rw-r--r--games-puzzle/colorcode/colorcode-0.8.5.ebuild39
-rw-r--r--games-puzzle/colorcode/metadata.xml8
-rw-r--r--games-puzzle/concentration-1.2-r212
-rw-r--r--games-puzzle/concentration/Manifest4
-rw-r--r--games-puzzle/concentration/concentration-1.2-r2.ebuild28
-rw-r--r--games-puzzle/concentration/files/concentration-1.2-gentoo.patch155
-rw-r--r--games-puzzle/concentration/metadata.xml8
-rw-r--r--games-puzzle/connectagram-1.2.812
-rw-r--r--games-puzzle/connectagram/Manifest4
-rw-r--r--games-puzzle/connectagram/connectagram-1.2.8.ebuild52
-rw-r--r--games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch76
-rw-r--r--games-puzzle/connectagram/metadata.xml8
-rw-r--r--games-puzzle/construo-0.2.2-r112
-rw-r--r--games-puzzle/construo/Manifest5
-rw-r--r--games-puzzle/construo/construo-0.2.2-r1.ebuild38
-rw-r--r--games-puzzle/construo/files/construo-0.2.2-gcc43.patch82
-rw-r--r--games-puzzle/construo/files/construo-0.2.2-lGLU.patch18
-rw-r--r--games-puzzle/construo/metadata.xml8
-rw-r--r--games-puzzle/cutemaze-1.2.312
-rw-r--r--games-puzzle/cutemaze/Manifest3
-rw-r--r--games-puzzle/cutemaze/cutemaze-1.2.3.ebuild41
-rw-r--r--games-puzzle/cutemaze/metadata.xml8
-rw-r--r--games-puzzle/cuyo-2.1.1-r113
-rw-r--r--games-puzzle/cuyo/Manifest6
-rw-r--r--games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild46
-rw-r--r--games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch11
-rw-r--r--games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch45
-rw-r--r--games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch30
-rw-r--r--games-puzzle/cuyo/metadata.xml11
-rw-r--r--games-puzzle/einstein-2.1.112
-rw-r--r--games-puzzle/einstein/Manifest5
-rw-r--r--games-puzzle/einstein/einstein-2.1.1.ebuild40
-rw-r--r--games-puzzle/einstein/files/einstein-2.0-as-needed.patch11
-rw-r--r--games-puzzle/einstein/metadata.xml11
-rw-r--r--games-puzzle/enigma-1.21-r313
-rw-r--r--games-puzzle/enigma/Manifest5
-rw-r--r--games-puzzle/enigma/enigma-1.21-r3.ebuild75
-rw-r--r--games-puzzle/enigma/files/enigma-1.21-build.patch110
-rw-r--r--games-puzzle/enigma/files/enigma-1.21-gcc6.patch25
-rw-r--r--games-puzzle/enigma/metadata.xml11
-rw-r--r--games-puzzle/ensemblist-04012612
-rw-r--r--games-puzzle/ensemblist/Manifest4
-rw-r--r--games-puzzle/ensemblist/ensemblist-040126.ebuild40
-rw-r--r--games-puzzle/ensemblist/files/ensemblist-040126-build.patch41
-rw-r--r--games-puzzle/ensemblist/metadata.xml8
-rw-r--r--games-puzzle/fbg-0.9-r212
-rw-r--r--games-puzzle/fbg/Manifest3
-rw-r--r--games-puzzle/fbg/fbg-0.9-r2.ebuild41
-rw-r--r--games-puzzle/fbg/metadata.xml11
-rw-r--r--games-puzzle/fish-fillets-1.0.1-r112
-rw-r--r--games-puzzle/fish-fillets/Manifest4
-rw-r--r--games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild59
-rw-r--r--games-puzzle/fish-fillets/metadata.xml11
-rw-r--r--games-puzzle/five-or-more-3.22.212
-rw-r--r--games-puzzle/five-or-more/Manifest3
-rw-r--r--games-puzzle/five-or-more/five-or-more-3.22.2.ebuild29
-rw-r--r--games-puzzle/five-or-more/metadata.xml8
-rw-r--r--games-puzzle/flobopuyo-0.20-r213
-rw-r--r--games-puzzle/flobopuyo/Manifest7
-rw-r--r--games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch25
-rw-r--r--games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch13
-rw-r--r--games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch136
-rw-r--r--games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild50
-rw-r--r--games-puzzle/flobopuyo/metadata.xml8
-rw-r--r--games-puzzle/freesweep-0.92-r112
-rw-r--r--games-puzzle/freesweep/Manifest3
-rw-r--r--games-puzzle/freesweep/freesweep-0.92-r1.ebuild28
-rw-r--r--games-puzzle/freesweep/metadata.xml11
-rw-r--r--games-puzzle/galaxis-1.8-r111
-rw-r--r--games-puzzle/galaxis/Manifest4
-rw-r--r--games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch60
-rw-r--r--games-puzzle/galaxis/galaxis-1.8-r1.ebuild24
-rw-r--r--games-puzzle/galaxis/metadata.xml8
-rw-r--r--games-puzzle/gemdropx-0.9-r212
-rw-r--r--games-puzzle/gemdropx/Manifest3
-rw-r--r--games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild47
-rw-r--r--games-puzzle/gemdropx/metadata.xml8
-rw-r--r--games-puzzle/gfifteen-1.0.3-r112
-rw-r--r--games-puzzle/gfifteen/Manifest3
-rw-r--r--games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild49
-rw-r--r--games-puzzle/gfifteen/metadata.xml8
-rw-r--r--games-puzzle/glightoff-1.0.0-r113
-rw-r--r--games-puzzle/glightoff/Manifest4
-rw-r--r--games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch15
-rw-r--r--games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild36
-rw-r--r--games-puzzle/glightoff/metadata.xml11
-rw-r--r--games-puzzle/gnome-klotski-3.22.312
-rw-r--r--games-puzzle/gnome-klotski/Manifest3
-rw-r--r--games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild36
-rw-r--r--games-puzzle/gnome-klotski/metadata.xml8
-rw-r--r--games-puzzle/gnome-sudoku-3.24.012
-rw-r--r--games-puzzle/gnome-sudoku/Manifest3
-rw-r--r--games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild37
-rw-r--r--games-puzzle/gnome-sudoku/metadata.xml8
-rw-r--r--games-puzzle/gnome-taquin-3.22.012
-rw-r--r--games-puzzle/gnome-taquin/Manifest3
-rw-r--r--games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild35
-rw-r--r--games-puzzle/gnome-taquin/metadata.xml8
-rw-r--r--games-puzzle/gnome-tetravex-3.22.012
-rw-r--r--games-puzzle/gnome-tetravex/Manifest3
-rw-r--r--games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild33
-rw-r--r--games-puzzle/gnome-tetravex/metadata.xml8
-rw-r--r--games-puzzle/gnudoku-0.93-r113
-rw-r--r--games-puzzle/gnudoku/Manifest4
-rw-r--r--games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch20
-rw-r--r--games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild41
-rw-r--r--games-puzzle/gnudoku/metadata.xml8
-rw-r--r--games-puzzle/gnurobbo-0.66-r112
-rw-r--r--games-puzzle/gnurobbo/Manifest4
-rw-r--r--games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch18
-rw-r--r--games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild40
-rw-r--r--games-puzzle/gnurobbo/metadata.xml11
-rw-r--r--games-puzzle/gottet-1.1.612
-rw-r--r--games-puzzle/gottet/Manifest3
-rw-r--r--games-puzzle/gottet/gottet-1.1.6.ebuild40
-rw-r--r--games-puzzle/gottet/metadata.xml8
-rw-r--r--games-puzzle/greedy-0.2.0-r112
-rw-r--r--games-puzzle/greedy/Manifest3
-rw-r--r--games-puzzle/greedy/greedy-0.2.0-r1.ebuild40
-rw-r--r--games-puzzle/greedy/metadata.xml8
-rw-r--r--games-puzzle/groundhog-1.4-r113
-rw-r--r--games-puzzle/groundhog/Manifest5
-rw-r--r--games-puzzle/groundhog/files/groundhog-1.4-flags.patch32
-rw-r--r--games-puzzle/groundhog/groundhog-1.4-r1.ebuild51
-rw-r--r--games-puzzle/groundhog/metadata.xml8
-rw-r--r--games-puzzle/gtetrinet-0.7.11-r313
-rw-r--r--games-puzzle/gtetrinet/Manifest7
-rw-r--r--games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch28
-rw-r--r--games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch16
-rw-r--r--games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch130
-rw-r--r--games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild58
-rw-r--r--games-puzzle/gtetrinet/metadata.xml27
-rw-r--r--games-puzzle/gtkballs-3.1.5-r213
-rw-r--r--games-puzzle/gtkballs/Manifest3
-rw-r--r--games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild41
-rw-r--r--games-puzzle/gtkballs/metadata.xml8
-rw-r--r--games-puzzle/gweled-0.9.1-r212
-rw-r--r--games-puzzle/gweled/Manifest4
-rw-r--r--games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch11
-rw-r--r--games-puzzle/gweled/gweled-0.9.1-r2.ebuild37
-rw-r--r--games-puzzle/gweled/metadata.xml11
-rw-r--r--games-puzzle/hangman-0.9.2-r112
-rw-r--r--games-puzzle/hangman/Manifest3
-rw-r--r--games-puzzle/hangman/hangman-0.9.2-r1.ebuild36
-rw-r--r--games-puzzle/hangman/metadata.xml8
-rw-r--r--games-puzzle/hexalate-1.1.312
-rw-r--r--games-puzzle/hexalate/Manifest3
-rw-r--r--games-puzzle/hexalate/hexalate-1.1.3.ebuild40
-rw-r--r--games-puzzle/hexalate/metadata.xml8
-rw-r--r--games-puzzle/hexamine-0.2.1-r113
-rw-r--r--games-puzzle/hexamine/Manifest3
-rw-r--r--games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild42
-rw-r--r--games-puzzle/hexamine/metadata.xml11
-rw-r--r--games-puzzle/hitori-3.22.412
-rw-r--r--games-puzzle/hitori/Manifest3
-rw-r--r--games-puzzle/hitori/hitori-3.22.4.ebuild26
-rw-r--r--games-puzzle/hitori/metadata.xml8
-rw-r--r--games-puzzle/hoh-bin-1.0112
-rw-r--r--games-puzzle/hoh-bin/Manifest3
-rw-r--r--games-puzzle/hoh-bin/hoh-bin-1.01.ebuild46
-rw-r--r--games-puzzle/hoh-bin/metadata.xml8
-rw-r--r--games-puzzle/icebreaker-1.9.6-r112
-rw-r--r--games-puzzle/icebreaker/Manifest7
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch247
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch28
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch20
-rw-r--r--games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch34
-rw-r--r--games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild48
-rw-r--r--games-puzzle/icebreaker/metadata.xml8
-rw-r--r--games-puzzle/jools-0.20-r314
-rw-r--r--games-puzzle/jools/Manifest4
-rw-r--r--games-puzzle/jools/jools-0.20-r3.ebuild55
-rw-r--r--games-puzzle/jools/metadata.xml15
-rw-r--r--games-puzzle/ksokoban-0.5.0_pre2017082713
-rw-r--r--games-puzzle/ksokoban-999911
-rw-r--r--games-puzzle/ksokoban/Manifest4
-rw-r--r--games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild31
-rw-r--r--games-puzzle/ksokoban/ksokoban-9999.ebuild29
-rw-r--r--games-puzzle/ksokoban/metadata.xml10
-rw-r--r--games-puzzle/lightsoff-3.24.012
-rw-r--r--games-puzzle/lightsoff/Manifest3
-rw-r--r--games-puzzle/lightsoff/lightsoff-3.24.0.ebuild34
-rw-r--r--games-puzzle/lightsoff/metadata.xml8
-rw-r--r--games-puzzle/lmarbles-1.0.812
-rw-r--r--games-puzzle/lmarbles/Manifest4
-rw-r--r--games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch15
-rw-r--r--games-puzzle/lmarbles/lmarbles-1.0.8.ebuild33
-rw-r--r--games-puzzle/lmarbles/metadata.xml11
-rw-r--r--games-puzzle/lpairs-1.0.4-r113
-rw-r--r--games-puzzle/lpairs/Manifest3
-rw-r--r--games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild45
-rw-r--r--games-puzzle/lpairs/metadata.xml11
-rw-r--r--games-puzzle/ltris-1.0.19-r113
-rw-r--r--games-puzzle/ltris/Manifest4
-rw-r--r--games-puzzle/ltris/files/ltris-1.0.19-gentoo.patch51
-rw-r--r--games-puzzle/ltris/ltris-1.0.19-r1.ebuild41
-rw-r--r--games-puzzle/ltris/metadata.xml11
-rw-r--r--games-puzzle/magiccube4d-2.2-r112
-rw-r--r--games-puzzle/magiccube4d/Manifest8
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch53
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch22
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch15
-rw-r--r--games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch11
-rw-r--r--games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild44
-rw-r--r--games-puzzle/magiccube4d/metadata.xml8
-rw-r--r--games-puzzle/meandmyshadow-0.4-r113
-rw-r--r--games-puzzle/meandmyshadow/Manifest4
-rw-r--r--games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch17
-rw-r--r--games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild54
-rw-r--r--games-puzzle/meandmyshadow/metadata.xml11
-rw-r--r--games-puzzle/metadata.xml33
-rw-r--r--games-puzzle/mindless-1.6-r113
-rw-r--r--games-puzzle/mindless/Manifest5
-rw-r--r--games-puzzle/mindless/metadata.xml11
-rw-r--r--games-puzzle/mindless/mindless-1.6-r1.ebuild62
-rw-r--r--games-puzzle/mirrormagic-2.0.2-r213
-rw-r--r--games-puzzle/mirrormagic/Manifest9
-rw-r--r--games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch43
-rw-r--r--games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch20
-rw-r--r--games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch10
-rw-r--r--games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch483
-rw-r--r--games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch11
-rw-r--r--games-puzzle/mirrormagic/files/mirrormagic.xpm292
-rw-r--r--games-puzzle/mirrormagic/metadata.xml8
-rw-r--r--games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild59
-rw-r--r--games-puzzle/monsterz-0.7.1-r414
-rw-r--r--games-puzzle/monsterz/Manifest6
-rw-r--r--games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch26
-rw-r--r--games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch32
-rw-r--r--games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch20
-rw-r--r--games-puzzle/monsterz/metadata.xml8
-rw-r--r--games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild47
-rw-r--r--games-puzzle/mures-0.5-r113
-rw-r--r--games-puzzle/mures/Manifest5
-rw-r--r--games-puzzle/mures/files/mures-0.5-save.patch33
-rw-r--r--games-puzzle/mures/files/mures-0.5-underlink.patch13
-rw-r--r--games-puzzle/mures/metadata.xml11
-rw-r--r--games-puzzle/mures/mures-0.5-r1.ebuild90
-rw-r--r--games-puzzle/neverball-1.6.0-r114
-rw-r--r--games-puzzle/neverball/Manifest3
-rw-r--r--games-puzzle/neverball/metadata.xml8
-rw-r--r--games-puzzle/neverball/neverball-1.6.0-r1.ebuild96
-rw-r--r--games-puzzle/nightsky-2011122214
-rw-r--r--games-puzzle/nightsky/Manifest4
-rw-r--r--games-puzzle/nightsky/files/nightsky-wrapper23
-rw-r--r--games-puzzle/nightsky/metadata.xml13
-rw-r--r--games-puzzle/nightsky/nightsky-20111222.ebuild94
-rw-r--r--games-puzzle/nudoku-1.0.012
-rw-r--r--games-puzzle/nudoku/Manifest3
-rw-r--r--games-puzzle/nudoku/metadata.xml15
-rw-r--r--games-puzzle/nudoku/nudoku-1.0.0.ebuild26
-rw-r--r--games-puzzle/numptyphysics-0.3.413
-rw-r--r--games-puzzle/numptyphysics-999912
-rw-r--r--games-puzzle/numptyphysics/Manifest26
-rw-r--r--games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch44
-rw-r--r--games-puzzle/numptyphysics/metadata.xml11
-rw-r--r--games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild68
-rw-r--r--games-puzzle/numptyphysics/numptyphysics-9999.ebuild76
-rw-r--r--games-puzzle/pathological-1.1.3-r314
-rw-r--r--games-puzzle/pathological/Manifest5
-rw-r--r--games-puzzle/pathological/files/pathological-1.1.3-build.patch27
-rw-r--r--games-puzzle/pathological/files/pathological-1.1.3-music-py.patch23
-rw-r--r--games-puzzle/pathological/metadata.xml11
-rw-r--r--games-puzzle/pathological/pathological-1.1.3-r3.ebuild95
-rw-r--r--games-puzzle/pauker-1.8-r113
-rw-r--r--games-puzzle/pauker/Manifest4
-rw-r--r--games-puzzle/pauker/files/pauker_bundledjars.patch14
-rw-r--r--games-puzzle/pauker/metadata.xml11
-rw-r--r--games-puzzle/pauker/pauker-1.8-r1.ebuild69
-rw-r--r--games-puzzle/penguzzle-1.0-r212
-rw-r--r--games-puzzle/penguzzle/Manifest4
-rw-r--r--games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch10
-rw-r--r--games-puzzle/penguzzle/metadata.xml8
-rw-r--r--games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild51
-rw-r--r--games-puzzle/picpuz-2.5-r112
-rw-r--r--games-puzzle/picpuz/Manifest5
-rw-r--r--games-puzzle/picpuz/files/picpuz-2.5-build.patch116
-rw-r--r--games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch18
-rw-r--r--games-puzzle/picpuz/metadata.xml8
-rw-r--r--games-puzzle/picpuz/picpuz-2.5-r1.ebuild54
-rw-r--r--games-puzzle/pingus-0.7.6-r113
-rw-r--r--games-puzzle/pingus/Manifest7
-rw-r--r--games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch13
-rw-r--r--games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch22
-rw-r--r--games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch21
-rw-r--r--games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch10
-rw-r--r--games-puzzle/pingus/metadata.xml24
-rw-r--r--games-puzzle/pingus/pingus-0.7.6-r1.ebuild62
-rw-r--r--games-puzzle/pipepanic-0.1.3-r111
-rw-r--r--games-puzzle/pipepanic/Manifest4
-rw-r--r--games-puzzle/pipepanic/files/pipepanic-0.1.3-gentoo.patch21
-rw-r--r--games-puzzle/pipepanic/metadata.xml8
-rw-r--r--games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild39
-rw-r--r--games-puzzle/pipewalker-0.9.4-r112
-rw-r--r--games-puzzle/pipewalker/Manifest3
-rw-r--r--games-puzzle/pipewalker/metadata.xml11
-rw-r--r--games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild32
-rw-r--r--games-puzzle/quadra-1.2.0-r112
-rw-r--r--games-puzzle/quadra/Manifest4
-rw-r--r--games-puzzle/quadra/files/quadra-1.2.0-format.patch11
-rw-r--r--games-puzzle/quadra/metadata.xml11
-rw-r--r--games-puzzle/quadra/quadra-1.2.0-r1.ebuild46
-rw-r--r--games-puzzle/quadrapassel-3.22.012
-rw-r--r--games-puzzle/quadrapassel/Manifest3
-rw-r--r--games-puzzle/quadrapassel/metadata.xml8
-rw-r--r--games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild37
-rw-r--r--games-puzzle/rezerwar-0.4.2-r112
-rw-r--r--games-puzzle/rezerwar/Manifest3
-rw-r--r--games-puzzle/rezerwar/metadata.xml8
-rw-r--r--games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild50
-rw-r--r--games-puzzle/scramble-0.9.5-r112
-rw-r--r--games-puzzle/scramble/Manifest3
-rw-r--r--games-puzzle/scramble/metadata.xml8
-rw-r--r--games-puzzle/scramble/scramble-0.9.5-r1.ebuild41
-rw-r--r--games-puzzle/sdl-jewels-1.1.1-r113
-rw-r--r--games-puzzle/sdl-jewels/Manifest4
-rw-r--r--games-puzzle/sdl-jewels/files/sdl-jewels-1.1.1-Makefile.patch17
-rw-r--r--games-puzzle/sdl-jewels/metadata.xml8
-rw-r--r--games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild43
-rw-r--r--games-puzzle/seatris-0.0.1412
-rw-r--r--games-puzzle/seatris/Manifest4
-rw-r--r--games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch11
-rw-r--r--games-puzzle/seatris/metadata.xml8
-rw-r--r--games-puzzle/seatris/seatris-0.0.14.ebuild39
-rw-r--r--games-puzzle/sgt-puzzles-2017102913
-rw-r--r--games-puzzle/sgt-puzzles-9999999912
-rw-r--r--games-puzzle/sgt-puzzles/Manifest8
-rw-r--r--games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch107
-rw-r--r--games-puzzle/sgt-puzzles/files/sgt-puzzles.directory4
-rw-r--r--games-puzzle/sgt-puzzles/files/sgt-puzzles.menu21
-rw-r--r--games-puzzle/sgt-puzzles/metadata.xml15
-rw-r--r--games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild116
-rw-r--r--games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild116
-rw-r--r--games-puzzle/skoosh-2.5.0-r113
-rw-r--r--games-puzzle/skoosh/Manifest4
-rw-r--r--games-puzzle/skoosh/files/skoosh-2.5.0-desktop.patch17
-rw-r--r--games-puzzle/skoosh/metadata.xml8
-rw-r--r--games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild39
-rw-r--r--games-puzzle/splice-2012112012
-rw-r--r--games-puzzle/splice/Manifest3
-rw-r--r--games-puzzle/splice/metadata.xml8
-rw-r--r--games-puzzle/splice/splice-20121120.ebuild60
-rw-r--r--games-puzzle/swell-foop-3.24.012
-rw-r--r--games-puzzle/swell-foop/Manifest3
-rw-r--r--games-puzzle/swell-foop/metadata.xml8
-rw-r--r--games-puzzle/swell-foop/swell-foop-3.24.0.ebuild33
-rw-r--r--games-puzzle/tanglet-1.5.212
-rw-r--r--games-puzzle/tanglet/Manifest4
-rw-r--r--games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch33
-rw-r--r--games-puzzle/tanglet/metadata.xml8
-rw-r--r--games-puzzle/tanglet/tanglet-1.5.2.ebuild48
-rw-r--r--games-puzzle/tetrinet-0.11-r113
-rw-r--r--games-puzzle/tetrinet/Manifest5
-rw-r--r--games-puzzle/tetrinet/files/tetrinet-0.11-build.patch84
-rw-r--r--games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch11
-rw-r--r--games-puzzle/tetrinet/metadata.xml8
-rw-r--r--games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild34
-rw-r--r--games-puzzle/textmaze-1.2-r110
-rw-r--r--games-puzzle/textmaze/Manifest3
-rw-r--r--games-puzzle/textmaze/metadata.xml8
-rw-r--r--games-puzzle/textmaze/textmaze-1.2-r1.ebuild31
-rw-r--r--games-puzzle/tint-0.03b-r111
-rw-r--r--games-puzzle/tint/Manifest4
-rw-r--r--games-puzzle/tint/files/tint-0.03b-ovflfix.patch33
-rw-r--r--games-puzzle/tint/metadata.xml8
-rw-r--r--games-puzzle/tint/tint-0.03b-r1.ebuild36
-rw-r--r--games-puzzle/tiny-and-big-1.4.114
-rw-r--r--games-puzzle/tiny-and-big/Manifest3
-rw-r--r--games-puzzle/tiny-and-big/metadata.xml13
-rw-r--r--games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild60
-rw-r--r--games-puzzle/tod-0-r112
-rw-r--r--games-puzzle/tod/Manifest4
-rw-r--r--games-puzzle/tod/files/tod-0-makefile.patch13
-rw-r--r--games-puzzle/tod/metadata.xml8
-rw-r--r--games-puzzle/tod/tod-0-r1.ebuild37
-rw-r--r--games-puzzle/tong-1.2-r112
-rw-r--r--games-puzzle/tong/Manifest6
-rw-r--r--games-puzzle/tong/files/tong-1.2-datadir.patch41
-rw-r--r--games-puzzle/tong/files/tong-1.2-fps.patch25
-rw-r--r--games-puzzle/tong/files/tong-1.2-makefile.patch28
-rw-r--r--games-puzzle/tong/metadata.xml8
-rw-r--r--games-puzzle/tong/tong-1.2-r1.ebuild44
-rw-r--r--games-puzzle/toppler-1.1.6-r112
-rw-r--r--games-puzzle/toppler/Manifest4
-rw-r--r--games-puzzle/toppler/files/toppler-1.1.6-gentoo.patch54
-rw-r--r--games-puzzle/toppler/metadata.xml11
-rw-r--r--games-puzzle/toppler/toppler-1.1.6-r1.ebuild28
-rw-r--r--games-puzzle/torrent-0.8.2-r112
-rw-r--r--games-puzzle/torrent/Manifest3
-rw-r--r--games-puzzle/torrent/metadata.xml8
-rw-r--r--games-puzzle/torrent/torrent-0.8.2-r1.ebuild36
-rw-r--r--games-puzzle/triptych-1.1612
-rw-r--r--games-puzzle/triptych/Manifest3
-rw-r--r--games-puzzle/triptych/metadata.xml8
-rw-r--r--games-puzzle/triptych/triptych-1.16.ebuild63
-rw-r--r--games-puzzle/twindistress-1.1.012
-rw-r--r--games-puzzle/twindistress/Manifest5
-rw-r--r--games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch11
-rw-r--r--games-puzzle/twindistress/files/twindistress-1.1.0-warnings.patch61
-rw-r--r--games-puzzle/twindistress/metadata.xml11
-rw-r--r--games-puzzle/twindistress/twindistress-1.1.0.ebuild59
-rw-r--r--games-puzzle/wakkabox-1.1.0-r112
-rw-r--r--games-puzzle/wakkabox/Manifest4
-rw-r--r--games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch53
-rw-r--r--games-puzzle/wakkabox/metadata.xml8
-rw-r--r--games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild30
-rw-r--r--games-puzzle/wizznic-369-r112
-rw-r--r--games-puzzle/wizznic/Manifest3
-rw-r--r--games-puzzle/wizznic/metadata.xml11
-rw-r--r--games-puzzle/wizznic/wizznic-369-r1.ebuild49
-rw-r--r--games-puzzle/wmpuzzle-0.5.2-r112
-rw-r--r--games-puzzle/wmpuzzle/Manifest3
-rw-r--r--games-puzzle/wmpuzzle/metadata.xml15
-rw-r--r--games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild38
-rw-r--r--games-puzzle/world-of-goo-1.41-r212
-rw-r--r--games-puzzle/world-of-goo-demo-1.41-r212
-rw-r--r--games-puzzle/world-of-goo-demo/Manifest3
-rw-r--r--games-puzzle/world-of-goo-demo/metadata.xml8
-rw-r--r--games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild69
-rw-r--r--games-puzzle/world-of-goo/Manifest3
-rw-r--r--games-puzzle/world-of-goo/metadata.xml8
-rw-r--r--games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild66
-rw-r--r--games-puzzle/xblockout-1.1.6-r112
-rw-r--r--games-puzzle/xblockout/Manifest4
-rw-r--r--games-puzzle/xblockout/files/xblockout-1.1.6-font.patch46
-rw-r--r--games-puzzle/xblockout/metadata.xml8
-rw-r--r--games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild60
-rw-r--r--games-puzzle/xbomb-2.2b12
-rw-r--r--games-puzzle/xbomb/Manifest5
-rw-r--r--games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch34
-rw-r--r--games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch11
-rw-r--r--games-puzzle/xbomb/metadata.xml8
-rw-r--r--games-puzzle/xbomb/xbomb-2.2b.ebuild40
-rw-r--r--games-puzzle/xlogical-1.0.713
-rw-r--r--games-puzzle/xlogical/Manifest6
-rw-r--r--games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch49
-rw-r--r--games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch51
-rw-r--r--games-puzzle/xlogical/metadata.xml15
-rw-r--r--games-puzzle/xlogical/xlogical-1.0.7.ebuild59
-rw-r--r--games-puzzle/xpired-1.22-r112
-rw-r--r--games-puzzle/xpired/Manifest4
-rw-r--r--games-puzzle/xpired/files/xpired-1.22-ldflags.patch26
-rw-r--r--games-puzzle/xpired/metadata.xml11
-rw-r--r--games-puzzle/xpired/xpired-1.22-r1.ebuild42
-rw-r--r--games-puzzle/xtris-1.15-r112
-rw-r--r--games-puzzle/xtris/Manifest4
-rw-r--r--games-puzzle/xtris/files/xtris.xpm41
-rw-r--r--games-puzzle/xtris/metadata.xml8
-rw-r--r--games-puzzle/xtris/xtris-1.15-r1.ebuild36
-rw-r--r--games-puzzle/xwelltris-1.0.112
-rw-r--r--games-puzzle/xwelltris/Manifest3
-rw-r--r--games-puzzle/xwelltris/metadata.xml8
-rw-r--r--games-puzzle/xwelltris/xwelltris-1.0.1.ebuild46
-rw-r--r--games-puzzle/xye-0.12.212
-rw-r--r--games-puzzle/xye/Manifest6
-rw-r--r--games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch45
-rw-r--r--games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch14
-rw-r--r--games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch18
-rw-r--r--games-puzzle/xye/metadata.xml11
-rw-r--r--games-puzzle/xye/xye-0.12.2.ebuild42
-rw-r--r--games-puzzle/zaz-1.0.0-r113
-rw-r--r--games-puzzle/zaz/Manifest4
-rw-r--r--games-puzzle/zaz/files/zaz-1.0.0-build.patch19
-rw-r--r--games-puzzle/zaz/metadata.xml11
-rw-r--r--games-puzzle/zaz/zaz-1.0.0-r1.ebuild49
531 files changed, 10962 insertions, 1328 deletions
diff --git a/games-puzzle/4stattack-2.1.4-r1 b/games-puzzle/4stattack-2.1.4-r1
deleted file mode 100644
index 487043be9e81..000000000000
--- a/games-puzzle/4stattack-2.1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Connect-4 game, single or network multiplayer
-EAPI=6
-HOMEPAGE=http://forcedattack.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/forcedattack/4stAttack-2.1.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=432fafc865caa46a4224d9a2f1d3277f
diff --git a/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild b/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..d04ec26a8f3f
--- /dev/null
+++ b/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+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 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pygame[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/4stAttack-${PV}"
+
+src_prepare() {
+ default
+
+ # 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
+ eapply "${FILESDIR}"/${P}-gentoo.diff
+}
+
+src_install() {
+ make_wrapper ${PN} "python2 ${PN}.py" /usr/share/${PN}
+ insinto /usr/share/${PN}
+ doins -r *
+ newicon kde/icons/64x64/forcedattack2.png ${PN}.png
+ make_desktop_entry ${PN} "4st Attack 2"
+ dodoc ../{README.txt,credits.txt,changelog.txt}
+}
diff --git a/games-puzzle/4stattack/Manifest b/games-puzzle/4stattack/Manifest
new file mode 100644
index 000000000000..d16e4839ca28
--- /dev/null
+++ b/games-puzzle/4stattack/Manifest
@@ -0,0 +1,4 @@
+AUX 4stattack-2.1.4-gentoo.diff 513 BLAKE2B 9cf9396347fb40d23bf89516653eaca79af24e20137228021a02679dd965a7d6a9db42f4c669cbbfe8da773fa279a3509a7ae3a55b17b57e6ff44d30b0b8d153 SHA512 def42479c82d4a5bce910028b5726602b2d07b97afdabf2cb464ae24bc8d081136c81e437fa8d997e171bda14a0af91e14b8d2f1f1b12d5264ebbb1e96fa727d
+DIST 4stAttack-2.1.4.tar.gz 1828247 BLAKE2B 82575adaa8994939f978a0ae796c6a57d64eacf715465ee3ea9614dda28b1543c199d2776408b989e82bf9e4b28cd90cf7b57dc7c21be1329aac2295043f8a57 SHA512 4819c0915bfe47bb965ea39d49fa007fb18cfa965b15e5e72a4b0ac3be8a03c616d9438c8dedd960ee257e44b48f98f75ced6bed5bfc77f3366328c797b30f3c
+EBUILD 4stattack-2.1.4-r1.ebuild 1070 BLAKE2B 27bc1a5465bf2191adbf28c2ff6ce29bbfda912e8f68ba594898c4e8c116498d9bcffc65b015b5b167ac4b826976436b5ec48258858df2cd460c1e987f4cb7bc SHA512 dfbad8200b667ac60167305922db97fc1730072f37c059a3857cc0d70371498e8dd76b3641b6e1d5eb3d8d5f85fece3a34ff90045cb92fe67701545b8e7c405a
+MISC metadata.xml 335 BLAKE2B 558a9365482fa1fec17fec2f638b22f02bbcdfa90529f0bc1524c611f7f90e192583f344105a9e619b009278f130e0c58a13a74d68860760486486aa84606a74 SHA512 eff7c6df19ba9adc535fcc0e33216dcbdad8a04a8a09544263c120ee6185842709c0d08065b64d89be09c37afa270f6736216e78ef779e3a13ac8b82ca0fa299
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..9cb5be53b793
--- /dev/null
+++ b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
@@ -0,0 +1,21 @@
+--- a/4stattack.py
++++ b/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..ddef1505ee47
--- /dev/null
+++ b/games-puzzle/4stattack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">forcedattack</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 16984faf5a5e..fc7e2ae8167f 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
Binary files differ
diff --git a/games-puzzle/amoebax-0.2.1-r1 b/games-puzzle/amoebax-0.2.1-r1
deleted file mode 100644
index 434c5d3a2ded..000000000000
--- a/games-puzzle/amoebax-0.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A cute and addictive action-puzzle game, similar to tetris
-EAPI=6
-HOMEPAGE=http://www.emma-soft.com/games/amoebax/
-KEYWORDS=~amd64 ~x86
-LICENSE=FreeArt GPL-2
-RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
-SLOT=0
-SRC_URI=http://www.emma-soft.com/games/amoebax/download/amoebax-0.2.1.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=8af41b7854fbed8597a05088ff9f490a
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
new file mode 100644
index 000000000000..88c3507409a8
--- /dev/null
+++ b/games-puzzle/amoebax/Manifest
@@ -0,0 +1,5 @@
+AUX amoebax-0.2.1-aclocal.patch 1536 BLAKE2B bb83bfc7e254ca1f649a735121ba8f9bc71abe35c7c935083d50682ee7cbd77b6eeb5f87ac35b5235f46d5abf8b0a995796548401ed2b943b3acf374bd6e18d9 SHA512 f5f501b0bbe76902c65d404e7aebf830d84c329cf8d84ee5c769660bb4a30cbfbae9a0e16eb2697bd693de77ef38811ac52e68fe799add00b97292c2e79a2d27
+AUX amoebax-0.2.1-compile.patch 227 BLAKE2B de56259f5d58fd3509b2fe2b6d51e7ecd3bdebee4196d03ca3529a24e10123f005529b6e0e9fb434a45c7a8caaaf8197ce9e730276bd3631ad5e3c1b47df2ffc SHA512 fe6b2b3b7d61f5548fc9959dce491e25cdf51313bc46141615e3ea5e96edff34084ac8294b0b8ddace6dc6a374a02cd173e3a4308cb9d56018535f62dfa6defe
+DIST amoebax-0.2.1.tar.bz2 10645579 BLAKE2B 0e8f5d5bb92dd20444bfcb735fdc28142bc359676e057471089b94a6df8a8b45cdecdb1462022909f025310fbc9da1946a50a4d716aa75e34ffc71b4fbc8cfbe SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181
+EBUILD amoebax-0.2.1-r1.ebuild 937 BLAKE2B 796983bbdbe49edcb964bc15095e2a049599ec0f523223277f124c42d3310369d176738ec99ab0834a063585b4e34134aed72cd005d96ab4b7da06a43fe27bdb SHA512 5f7de2cdf5fe0f91b32f012f61f8d3cd8a589e88dcf70d44b4139372e6e0df4541188c71e4bb3c1d4ec90fd1ee427ac91129802514587c9f95e7533c9c7c9ea3
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..316d438bcddd
--- /dev/null
+++ b/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+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() {
+ default
+
+ eapply \
+ "${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
+}
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..11d903516c19
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
@@ -0,0 +1,41 @@
+--- a/m4/objc.m4.old
++++ b/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..6be301674149
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
@@ -0,0 +1,12 @@
+--- a/src/binreloc.cxx
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/amoebax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/anagramarama-0.2-r1 b/games-puzzle/anagramarama-0.2-r1
deleted file mode 100644
index bc2c1e078b62..000000000000
--- a/games-puzzle/anagramarama-0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2
-DESCRIPTION=Create as many words as you can before the time runs out
-EAPI=6
-HOMEPAGE=http://www.coralquest.com/anagramarama/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 sys-apps/miscfiles
-SLOT=0
-SRC_URI=http://www.omega.clara.net/anagramarama/dist/anagramarama-0.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b9a4977cc7752821cb6985c79003ad0
diff --git a/games-puzzle/anagramarama/Manifest b/games-puzzle/anagramarama/Manifest
new file mode 100644
index 000000000000..251355711db0
--- /dev/null
+++ b/games-puzzle/anagramarama/Manifest
@@ -0,0 +1,4 @@
+AUX anagramarama-0.2-gentoo.patch 918 BLAKE2B da8f286fd932f9bf8f8b00541565ea11f60e3d13581a46b86c4b9cb0572fbaa821b672554b3448da026ad15e97c87e39766fcba8ab4ece464cf605cbbb582712 SHA512 d87759b401efc4bb51dcf7f121548038b736d89b026cfc9fb82e467c131dae10cc933dd0aa2ec668c3636d93cb37bb8b6325691ed46366b7668605d8921308ab
+DIST anagramarama-0.2.tar.gz 861484 BLAKE2B 9fb6b759b9d2f7a797e8ecf214c8723676577b8a7a88049da7b59a1e4287363c3ac58ee203033e7d7cad777d175599433fffc37fe824da4ca5511e85918b6ae8 SHA512 7cdafaf489100c184a71859f50b64fe8534210d953c4144d822727815ae2f7dd12302447b159039d95c9b3097711ab14931538789ac81c01233cc2c767291603
+EBUILD anagramarama-0.2-r1.ebuild 981 BLAKE2B c9684174378d228f6c147cd4677cb15c680073988797472fbde1f98b3fb624e4b31d0976b068948c8c32c37277ff1a2c46e814c1f8eb5762ca4db63430040398 SHA512 fbe12367b60218d971a180506d29b077aa7d8561874ff067b0b49570a81aea8fce7c0b199d7e684feb83dd7268e7b0603e7e2d70f43bba111ff5155349e4726a
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild b/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild
new file mode 100644
index 000000000000..4e1bc1d0b0b2
--- /dev/null
+++ b/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop vcs-clean
+
+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 ~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() {
+ default
+ ecvs_clean
+ sed -i \
+ -e "s:wordlist.txt:/usr/share/${PN}/wordlist.txt:" \
+ -e "s:audio/:/usr/share/${PN}/audio/:" \
+ -e "s:images/:/usr/share/${PN}/images/:" \
+ src/{ag.c,dlb.c} \
+ || die "sed failed"
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+ newbin ag ${PN}
+ insinto "/usr/share/${PN}"
+ doins wordlist.txt
+ doins -r images/ audio/
+ dodoc readme
+ make_desktop_entry ${PN} "Anagramarama"
+}
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..fb60615055db
--- /dev/null
+++ b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
@@ -0,0 +1,34 @@
+--- a/makefile.old 2009-02-08 18:24:33.000000000 +0100
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/anagramarama/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/angrydd-1.0.1-r2 b/games-puzzle/angrydd-1.0.1-r2
deleted file mode 100644
index f25781bf039a..000000000000
--- a/games-puzzle/angrydd-1.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter
-EAPI=6
-HOMEPAGE=https://www.sacredchao.net/~piman/angrydd/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1d951cea0d4049e8838f68371520673c
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
new file mode 100644
index 000000000000..14abbd385135
--- /dev/null
+++ b/games-puzzle/angrydd/Manifest
@@ -0,0 +1,3 @@
+DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
+EBUILD angrydd-1.0.1-r2.ebuild 1006 BLAKE2B 7e309de57f4417e00355df3c1a5da1441d1cabdcb105b00448e12933522ae61901e3da9b4ffa0b576067156268d7ac9b148e2bd2771e41279c7d78e77748b901 SHA512 6134d6a094786875b9f9b06ed4ab8b19c3496898752378a408145d3812de548039df78d86d0dccd2acfc677745c811d1ec469c54a1cf63457e838ebf9c4ff325
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..822cc2d5e973
--- /dev/null
+++ b/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
+HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/"
+SRC_URI="https://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pygame[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ python_fix_shebang .
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ PREFIX="/usr/share/" \
+ TO="${PN}" \
+ install
+ rm -rf "${ED}/usr/share/games" "${ED}/usr/share/share" || die
+
+ python_optimize "${ED}/usr/share/${PN}"
+
+ dodir /usr/bin
+ dosym "${ED}/usr/share/${PN}/angrydd.py" "/usr/bin/${PN}"
+ doman angrydd.6
+ dodoc README TODO HACKING
+
+ doicon angrydd.png
+ make_desktop_entry angrydd "Angry, Drunken Dwarves"
+}
diff --git a/games-puzzle/angrydd/metadata.xml b/games-puzzle/angrydd/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/angrydd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/arrows-0.6-r1 b/games-puzzle/arrows-0.6-r1
deleted file mode 100644
index 39d9b04e5ab4..000000000000
--- a/games-puzzle/arrows-0.6-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=x11-libs/gtk+-2.4:2 virtual/pkgconfig
-DESCRIPTION=Simple maze-like game where you navigate around and destroy arrows
-EAPI=6
-HOMEPAGE=http://noreason.ca/?file=software
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-libs/gtk+-2.4:2
-SLOT=0
-SRC_URI=http://noreason.ca/data/arrows-0.6.tar.gz
-_md5_=a04d2d96fa34e84ad10b04f1a4679859
diff --git a/games-puzzle/arrows/Manifest b/games-puzzle/arrows/Manifest
new file mode 100644
index 000000000000..14cbc0307882
--- /dev/null
+++ b/games-puzzle/arrows/Manifest
@@ -0,0 +1,3 @@
+DIST arrows-0.6.tar.gz 53374 BLAKE2B ba31d4ef1bc6e48ada197a13a359004a661a6dcf8875933da2a74f57ad90c3b0d422fd4c2427c4eb340fb26870952ebaa679ff8b0f88d7470f012bc3b8c0f868 SHA512 f6c55d616283ad25d9d830440deaa11de81bccfc2d8eabe627104626ea111d986e522f73d61e5aed58476cc34a3e2b3fe2a20ab1538b7ecef04ecb941f34d83e
+EBUILD arrows-0.6-r1.ebuild 895 BLAKE2B 2aab21a3b6e89451fe1972cd0eace456542641a47bde688958ee0602c75bce6b1fde432603c17c41e97ece3535a71eea7ad4da586dfce99928c4dac224e6e15e SHA512 bf8e71f225251531348c42b99cbd2718a9c68975e26f66f5b8ca16418f0efe4c0664bf00c7d86986d1e3bbc5fef344d413ba824ea03ea2b7131a29278c00d9cc
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/arrows/arrows-0.6-r1.ebuild b/games-puzzle/arrows/arrows-0.6-r1.ebuild
new file mode 100644
index 000000000000..5e3b5c6834b5
--- /dev/null
+++ b/games-puzzle/arrows/arrows-0.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+
+ # Modify path to data
+ sed -i \
+ -e "s:arrfl:/usr/share/${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() {
+ dobin arrows
+ insinto "/usr/share/${PN}"
+ doins arrfl*
+ einstalldocs
+}
diff --git a/games-puzzle/arrows/metadata.xml b/games-puzzle/arrows/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/arrows/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/atomix-3.22.0 b/games-puzzle/atomix-3.22.0
deleted file mode 100644
index da2e7b2bb984..000000000000
--- a/games-puzzle/atomix-3.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3 dev-libs/appstream-glib >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Build molecules, from simple inorganic to extremely complex organic ones
-EAPI=6
-HOMEPAGE=http://ftp.gnome.org/pub/GNOME/sources/atomix/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/atomix/3.22/atomix-3.22.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=47a0b5461ba034f6f3c654b2b7813cfa
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
new file mode 100644
index 000000000000..c2a7559d0db3
--- /dev/null
+++ b/games-puzzle/atomix/Manifest
@@ -0,0 +1,3 @@
+DIST atomix-3.22.0.tar.xz 551424 BLAKE2B be2c9c60a5e526ce810d8742bf3b799edc8aea8b493ddc0beb356dce2aef9f4daa6b38c885c2b48e7ce7fff80685522d546fddc134cd2d06c6cb72128522a52e SHA512 111c1d1cbd4e07ef7fdfa6d6431b2b7f460dfcceabd1460675640c3965e7f40fb145c921d27e0f3c06605e943190fd36af6d6d462533dca207b8d29487470212
+EBUILD atomix-3.22.0.ebuild 535 BLAKE2B 555c47c9d8226b8b229ec3783770453f8a657891618c55e436219b4378b1ee6b1ba601a8212b79c1e6c751db24edc702f6ffc0936b689c570d68b3ad8231697a SHA512 7551095fc1489cfdef0b86d4bb8e29e36bfe2f8439ec27bcb75acf5ed2245d9bc44bc913d817a861f43db5b215bcaaafb7f1e1659384ed1e213af07f52373acb
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/atomix/atomix-3.22.0.ebuild b/games-puzzle/atomix/atomix-3.22.0.ebuild
new file mode 100644
index 000000000000..a5b20639ca59
--- /dev/null
+++ b/games-puzzle/atomix/atomix-3.22.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Build 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 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ >=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/metadata.xml b/games-puzzle/atomix/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-puzzle/atomix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/bastet-0.43 b/games-puzzle/bastet-0.43
deleted file mode 100644
index 58a24239a9b7..000000000000
--- a/games-puzzle/bastet-0.43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0 dev-libs/boost:0
-DESCRIPTION=a simple, evil, ncurses-based Tetris(R) clone
-EAPI=5
-HOMEPAGE=http://fph.altervista.org/prog/bastet.shtml
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0 dev-libs/boost:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://fph.altervista.org/prog/files/bastet-0.43.tgz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0e07932b50c211515d72447fd4186617
diff --git a/games-puzzle/bastet/Manifest b/games-puzzle/bastet/Manifest
new file mode 100644
index 000000000000..caac8ee082e3
--- /dev/null
+++ b/games-puzzle/bastet/Manifest
@@ -0,0 +1,4 @@
+AUX bastet-0.43-gentoo.patch 474 BLAKE2B e05a58a66f3cb5df6dcbbb00c550ed322ee526b207f1e564edfb41af597eeccab1e80b5c45204d37ac73d4f46bd472c5bd1ede35f3a5a7bffaba51ef4bfa8c99 SHA512 8d381ecb59f141cfc16f64ec21eac18d91ece99e01e2ae327117545c8ea354e6e50a17cf966e43dc7bb5fe7ec6b1b3008fcf385098a222791cb15ec67bab400b
+DIST bastet-0.43.tgz 29115 BLAKE2B df8c866da77be5ecbee9ed24c26f506a26d84a218af3916ece8e6b1ea18dc6ff51e3d76a9553ddfe404212e0bed63073892cb53bdbd334e207ee115877ae4989 SHA512 a3683c2cea4df592d9cef2be1b0006acc2b6eddbe6b64aba1c21e81ba39df9bcff6494e0949b67a84f3d1a0fa6837f0d1b7cebb2eb8a551b54392e4a45f2e172
+EBUILD bastet-0.43.ebuild 732 BLAKE2B dd2a3dccf5853d8a5da1711b52ac867c284045857a19c2686b4926eccf3ab37a9ca104540a4ab1e868837160d5df1b807e46941e9068ab4a40af26bed35e01f7 SHA512 900f6161e7232a30624cc82eba64f534a4e8fa67111019f16abd515be3e962c54835da90163f0ff599faaf4149ea5ee3065a4d0ee0373168542a7cab7f8a889a
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/bastet/bastet-0.43.ebuild b/games-puzzle/bastet/bastet-0.43.ebuild
new file mode 100644
index 000000000000..c395170fbcbe
--- /dev/null
+++ b/games-puzzle/bastet/bastet-0.43.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:0
+ dev-libs/boost:0"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch "${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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/bastet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/biniax2-1.30-r1 b/games-puzzle/biniax2-1.30-r1
deleted file mode 100644
index e95c43394fa9..000000000000
--- a/games-puzzle/biniax2-1.30-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-DESCRIPTION=Logic game with arcade and tactics modes
-EAPI=6
-HOMEPAGE=http://biniax.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-SLOT=0
-SRC_URI=http://mordred.dir.bg/biniax/biniax2-1.30-fullsrc.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=45bf1bd59dfbe0011583d41638962045
diff --git a/games-puzzle/biniax2/Manifest b/games-puzzle/biniax2/Manifest
new file mode 100644
index 000000000000..574da8e3dffc
--- /dev/null
+++ b/games-puzzle/biniax2/Manifest
@@ -0,0 +1,6 @@
+AUX biniax2-1.30-build.patch 529 BLAKE2B 4c1a391a9d4534d83b017962c62d8cc776cf44a53f942d468f5e033287158ad7781451a174901e06103f73af216eb1792bb0f18f7941367c2ba9d1d2eaf7ec63 SHA512 3f335b2e71c81f46298c188a1cd3fc5e74210ddb79c4ec514156bfc581125aaf3aaee792f1f86b2b87edc6f8507cee577d817d3c15ce6691c45624c9def11b50
+AUX biniax2-1.30-dotfiles.patch 1372 BLAKE2B 2e33067d9fa951d371093ef33c61303e93760707730ce513f951235b3dad0ff146c6b8132f722da29ec05c61fb5a50eeb58e92ea50251a09e56bfcbd538a1b19 SHA512 7cc2c04ee62931038afe7b89eaeffef33e7e9312a206b987817760c6537c1923945634243abc380b059fc332d12b220d83660f5158f832d1dadb854dc1ea5fa3
+AUX biniax2.xpm 1292 BLAKE2B de60ee16f9229155b2a31682f759b025822eed85bfbe2b7c3d83cd18df230dd3a62bff7d5a5c11e496715a4e3565bee1e565cfbfae15b634993a3c26ec29b070 SHA512 5a53233b27f5e8dd792cd697d8233c8d34adaf00dda51944caad186deb50311e55bd76916f4aa6e352973fe14855d34a27bcf9a91a8f6a56238f5fe18f5d3b58
+DIST biniax2-1.30-fullsrc.tar.gz 3072220 BLAKE2B 7a62f9cf625e7f7d59ac6b84528911f939e489da131a7b414fcdc7cb4acffe1877363983a190aacbc2ce8ca87ae5a631ecc1f9bc937c103b65b6c0543c3cb641 SHA512 180564b24051b629c29bc6245664a36b7ff9881ac5003b03b91eeebff86c89b9507c028c1155387c42debaa51482d8f1e2b08e9e9236b77da1c3f286b78be8b5
+EBUILD biniax2-1.30-r1.ebuild 805 BLAKE2B e3277770de490616fa92e5e2f6bfac4f469a2ae6c31726f9e6e1818702a39248026550c7c4282df0a224d298ba8717e4d44facc43868159e81fcb33f0788f87d SHA512 d8f89846c14ff7232284a097032674d164ede3ce12b563be2a0afce5305deddcd1c460f42f299d798da235c56e098c31ee376dda47b0e41f190f5c3968a3b245
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
new file mode 100644
index 000000000000..e4710407e8e7
--- /dev/null
+++ b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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() {
+ default
+
+ rm -f data/Thumbs.db
+ sed -i \
+ -e "s:data/:/usr/share/${PN}/:" \
+ desktop/{gfx,snd}.c \
+ || die
+ eapply \
+ "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-dotfiles.patch
+}
+
+src_install() {
+ dobin ${PN}
+ insinto "/usr/share/${PN}"
+ doins -r data/*
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry ${PN} Biniax-2
+}
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..cce8abe91a93
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
@@ -0,0 +1,18 @@
+--- a/makefile
++++ b/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..00391677ce8a
--- /dev/null
+++ b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
@@ -0,0 +1,60 @@
+--- a/biniax.c
++++ b/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 )
+--- a/desktop/cfg.c
++++ b/desktop/cfg.c
+@@ -36,7 +36,7 @@
+ ******************************************************************************/
+
+ #define _Cfg_Buffer 255
+-#define csConfigName "config.bnx2"
++#define csConfigName ".config.bnx2"
+
+ struct BNX_SETUP
+ {
+--- a/game.h
++++ b/game.h
+@@ -37,7 +37,7 @@
+ DEFINITIONS
+ ******************************************************************************/
+
+-#define csSaveGameName "autosave.bnx2"
++#define csSaveGameName ".autosave.bnx2"
+
+ /******************************************************************************
+ CONSTANTS
+--- a/hof.c
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/biniax2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/braincurses-0.5b-r1 b/games-puzzle/braincurses-0.5b-r1
deleted file mode 100644
index de43a176e540..000000000000
--- a/games-puzzle/braincurses-0.5b-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=An ncurses-based mastermind clone
-EAPI=6
-HOMEPAGE=http://freshmeat.net/projects/braincurses/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/braincurses/braincurses-0.5b.tar.gz
-_md5_=8b9a89aec36e5a3b79fa3047e21cbeb7
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
new file mode 100644
index 000000000000..2cf5850d9cde
--- /dev/null
+++ b/games-puzzle/braincurses/Manifest
@@ -0,0 +1,5 @@
+AUX braincurses-0.5b-as-needed.patch 696 BLAKE2B e0d234562842a30aceec3b686c9315be7f856e14b0398c14a3f7c7350a9ccf34d9bd96d7a10e62978b372a28e99178ce81b54960416e08c23bb347935eebd2c3 SHA512 8788fe4ef94d3b501104e66dc31a4df43b55b0949ef35b1fe9d6acf936e178d8a7bacbc331af6db093a056218658e845a816e51746000085581f8e623fbcd42c
+AUX braincurses-0.5b-gcc43.patch 192 BLAKE2B 4f557c7666e4d1b772feb1de5a793868aaf38dcdec583f9feb795bc72b98262078924a5734e137cd5719cdd77cc35c596f758677d0682035859f6575b6c8eb6d SHA512 94a6664162be766918280af07201ba3eb55c22e0eabbf8701aecb5c7f0eb5151e24d7b65aadb6db4262373c1323b170c332f3700f5e90a74f048511600f88f64
+DIST braincurses-0.5b.tar.gz 18487 BLAKE2B 4d3874eb6625781e866ba2250da45ff165d662abaeabda2c4525bb300479b33e1efb91f997165310b7a4edc61f81ac841b00b940d319ef0c18b8684dd5355d60 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e
+EBUILD braincurses-0.5b-r1.ebuild 650 BLAKE2B aa7d73dd33fd0c1ee69b24c2de0aba5b73a926c1d35a724f7e5a2538b3f8e7a121c8b30ad02c268baa9f883ec891c2bf93dcb13694dce14407deb00b396198d2 SHA512 799cd2186eff518fb5c3ced616a2d42c1e56c22d487012e0794bd1e33f1c382999ddee8251a901679339eecfbbcc1c05ac886d594336a18a73473dd7ed2cae17
+MISC metadata.xml 388 BLAKE2B eb17cdee5b9a933eb9ee52b34a7b6085394d76fa182a1e696014a16fa32eea47c4c5372b342e203296dcc4cc590c1c90833a1ba1681b70c9c65aa20ed037c974 SHA512 22fb2671d0f2029bea4e513d469b2d9940fef9a5ed6a6d9b47dfc80aae50b41bae3d89a620ff4be028ab46ab2dcca801a4653e95feca142c3b2921d436e2e6c0
diff --git a/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild b/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
new file mode 100644
index 000000000000..609bfa218305
--- /dev/null
+++ b/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+ default
+
+ eapply "${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() {
+ dobin braincurses
+ einstalldocs
+}
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..2101602c6372
--- /dev/null
+++ b/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.old 2009-02-09 16:04:47.000000000 +0100
++++ b/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..6fa5509a7786
--- /dev/null
+++ b/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
@@ -0,0 +1,10 @@
+--- a/braincurses.h
++++ b/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..8444fd297f54
--- /dev/null
+++ b/games-puzzle/braincurses/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">braincurses</remote-id>
+ <remote-id type="freshmeat">braincurses</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/brainparty-0.61-r1 b/games-puzzle/brainparty-0.61-r1
deleted file mode 100644
index 89f2564fa7f6..000000000000
--- a/games-puzzle/brainparty-0.61-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
-DESCRIPTION=A puzzle-solving, brain-stretching game for all ages
-EAPI=6
-HOMEPAGE=http://www.tuxradar.com/brainparty
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
-SLOT=0
-SRC_URI=https://launchpad.net/brainparty/trunk/0.61/+download/brainparty0.61.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aba43fd12b129df0efafa4234fadb87c
diff --git a/games-puzzle/brainparty/Manifest b/games-puzzle/brainparty/Manifest
new file mode 100644
index 000000000000..84e8324bb1d8
--- /dev/null
+++ b/games-puzzle/brainparty/Manifest
@@ -0,0 +1,6 @@
+AUX brainparty-0.61-gcc49.patch 489 BLAKE2B f4f317679669fca33429e19a967945691e8baa24ec7ccea2d7a943e1ea4eed0108ea13c30208ac75b80d253b7166540556b20a7b47443e644bf8af8eeee78a82 SHA512 9859614d97c9fe8efd8cefedd8ef935cbdf4344154f2e272e0624268e48533b620a55654c9d0097e3726579ce1a7028ad44eb705c2e86bbc983cb490faec6295
+AUX brainparty-0.61-gnu_cxx-hash.patch 219 BLAKE2B 8a0570732bc55c2a0fe5b703e947650fe92200582581bc39857eb5a4898bdd9925ebd5e8568efc0e0c1765db26b4c9d5c15afab7fba49aa2a2016573e56be539 SHA512 d42cb49d0c320d91fc9c31706e2fb3e8cffcd0b08803b1a016ff30e283f35f86bbbdaae98a1f0ee3cece82d027dd767ce0a30ca8565887a2d2d619789ce51e30
+AUX brainparty-0.61-savegame.patch 674 BLAKE2B 051698e4fde8dab50ff591657705c32e5926d74ca83833ed0e901c6cc11bf82c66a6b7b5ef201d3e0ec2e27be0e8e0991c41216cfe34ece92ad21933606aaf0e SHA512 9e158b97ff15cfb4b6b8e4f6eb8006335841c48ff94b5da8bbb0cba03868b8ead92d2520bc8adae887d4baabac93c8104e44b46d87b6c4258792ab64376ce34a
+DIST brainparty0.61.tar.gz 40676905 BLAKE2B cfa1a408a66438491e6053be0e76ca64d1d78724be86379cb06e750fc842e9835b624af7b98163c232ee6e205a4c2f9478f9d42fe0eaa28d18b45e218db75971 SHA512 bc8578a551ce4b7f40e212d9ab9910b2435b88d8b7b7e90a1c088e37d5f26b5c6126fcb9ffee7e39981eff34c13144c8f3204e020532b5abf1c4815cc8074eb9
+EBUILD brainparty-0.61-r1.ebuild 1223 BLAKE2B eab12dfb377265408a9192c02ff20a0308d780acd7beee685dddfbec805aa4635e22f1cb09777f4b092cfdd4ecb58cd0f3f8f12993d4d25fa401add2a76dee11 SHA512 2dd1e3071749fe87480d37c3d4e8eebf0c24479cdbb624c28e0960b9dfd08eb830c5fe5dc25f3d987a02adbc141c2b3cc75fdc785ee40c734ca4bdb56dc99e4b
+MISC metadata.xml 331 BLAKE2B e2ed6c3f26c4637f2ca40dd55ecda347ffd596dc9c55db194668bd546f362bf37e41e52ba94a6777da6bcfa4d53513b865a6acb615b60b2a6ce8f6e6634087ac SHA512 bcea1853cf01102eb88c58723e585f81c55b4208be24b46bc421b62afa84405539116b33289e94c7b1da5c259ca91d0fc6553e6441e59ec5d41326525742a404
diff --git a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
new file mode 100644
index 000000000000..97d4b35c28aa
--- /dev/null
+++ b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
+HOMEPAGE="http://www.tuxradar.com/brainparty"
+SRC_URI="https://launchpad.net/brainparty/trunk/${PV}/+download/${PN}${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/libsdl[sound,opengl,video]
+ media-libs/sdl-gfx
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-ttf"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-savegame.patch
+ "${FILESDIR}"/${P}-gcc49.patch
+ "${FILESDIR}"/${P}-gnu_cxx-hash.patch
+)
+
+src_prepare() {
+ default
+
+ 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(\"/usr/share/${PN}\");\n" \
+ main.cpp || die
+}
+
+src_install() {
+ dobin brainparty
+
+ insinto /usr/share/${PN}/Content
+ doins -r Content/.
+
+ newicon Content/icon.bmp ${PN}.bmp
+ make_desktop_entry brainparty "Brain Party" /usr/share/pixmaps/${PN}.bmp
+}
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-gnu_cxx-hash.patch b/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch
new file mode 100644
index 000000000000..8d933462673b
--- /dev/null
+++ b/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch
@@ -0,0 +1,11 @@
+--- a/WordList.h
++++ b/WordList.h
+@@ -35,7 +35,7 @@
+ };
+ }
+
+-typedef hash_set<string, hash<string> > string_hash_set;
++typedef hash_set<string, __gnu_cxx::hash<string> > string_hash_set;
+
+ class WordList {
+ private:
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..441580ff56b3
--- /dev/null
+++ b/games-puzzle/brainparty/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">brainparty</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/brainworkshop-4.8.4 b/games-puzzle/brainworkshop-4.8.4
deleted file mode 100644
index 203bca98b8a1..000000000000
--- a/games-puzzle/brainworkshop-4.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Short-term-memory training N-Back game
-EAPI=5
-HOMEPAGE=http://brainworkshop.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenal || ( >=dev-python/pyglet-1.1.4[openal] >=dev-python/pyglet-1.1.4[alsa] ) games-misc/games-envd
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/brainworkshop/brainworkshop-4.8.4.zip
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23ed68ce35fc4d24d4cef90fcf27ad43
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
new file mode 100644
index 000000000000..02da8edfd58c
--- /dev/null
+++ b/games-puzzle/brainworkshop/Manifest
@@ -0,0 +1,4 @@
+AUX brainworkshop-4.8.4-fix-paths.patch 473 BLAKE2B 703ef1f87fe646b361fb9cb4e783cb33ebe1338a88c5c3cd464675a3a39cda954f7ac7396a3e6844bbce78d93d7d83f7f87a66e971ddee8feee0176e8660a5fb SHA512 858e837e001db04efd9a3c420860821e02ca9b7ef7197a8fe69221d0135f11a05cb6f2f9b4c19cd9eeec84c84ec5842c7e8126f08dc94f9ff79569f580f9d515
+DIST brainworkshop-4.8.4.zip 9373980 BLAKE2B 85af1f17755f0007f01c1684f4d746de6bab6580ed29c717e9462f8dd57115ce8ed7d2d61a411523e2d92191abe5a49d29b2598e937b014e68b3e1cb9ac3e059 SHA512 d3819036fef98fab9a89637ba01b2d844146babc7cb34b6ec6f4a589c18a7532fd23cf083c867ea1c917df9d7a6507ab51a5942e745d3ab9d01d938812486936
+EBUILD brainworkshop-4.8.4.ebuild 1238 BLAKE2B 2eb5ac9efd7a04445b1893ba33e3e7efc29777079c048a93f8827238964576b46724acb6f5edc09a7ec5c9dabf2cc4f9a372fac5fd785ec59eb9f6da71656974 SHA512 2a0b06c445c5da235da3da51672b2377c0a94b58ff1d7b2299f7763d8ed3f498a6593747b2203f8757319e27ad5230fd56670b11c0070fe013c68074e4ec1d05
+MISC metadata.xml 336 BLAKE2B 23696671d75d4a994a40ad18a57fdf4551932540ab62d153cfa0d41dafb59bec11466e0d8c14b3ff25ca1ed085e71f86d74aea672b56d9c53fa01d8d35243b7e SHA512 75e98aaef9436c2e488b304a19cfcaa1659748c97209ad217708046516aa4a76d9ac18c3c4762db08c496efe21a7ed5006bd4b2100989adb2b7fa0b9a8372b12
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..e454d7dd3448
--- /dev/null
+++ b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils gnome2-utils python-r1 games
+
+DESCRIPTION="Short-term-memory training N-Back game"
+HOMEPAGE="http://brainworkshop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/brainworkshop/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pyopenal
+ || ( >=dev-python/pyglet-1.1.4[openal]
+ >=dev-python/pyglet-1.1.4[alsa] )"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix-paths.patch
+ edos2unix ${PN}.pyw
+
+ sed -i \
+ -e 's#@GENTOO_DATADIR@#'${GAMES_DATADIR}'#' \
+ ${PN}.pyw || die
+}
+
+src_install() {
+ newgamesbin ${PN}.pyw ${PN}
+ python_replicate_script "${D}${GAMES_BINDIR}"/${PN}
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins -r res/*
+ dodoc Readme.txt data/Readme-stats.txt
+ newicon -s 48 res/misc/brain/brain.png ${PN}.png
+ make_desktop_entry ${PN} "Brain Workshop"
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/brainworkshop/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..c0fd59a21391
--- /dev/null
+++ b/games-puzzle/brainworkshop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">brainworkshop</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/color-lines-0.6-r1 b/games-puzzle/color-lines-0.6-r1
deleted file mode 100644
index dc65f9e36597..000000000000
--- a/games-puzzle/color-lines-0.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
-DESCRIPTION=Color lines game written with SDL with bonus features
-EAPI=6
-HOMEPAGE=https://github.com/OpenA/color-lines-sdl
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
-SLOT=0
-SRC_URI=https://color-lines.googlecode.com/files/lines_0.6.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=8bdaad715e716713d0f8c0d61f1a109d
diff --git a/games-puzzle/color-lines/Manifest b/games-puzzle/color-lines/Manifest
new file mode 100644
index 000000000000..558fbc61372e
--- /dev/null
+++ b/games-puzzle/color-lines/Manifest
@@ -0,0 +1,4 @@
+AUX color-lines-0.6-Makefile.patch 999 BLAKE2B 81490ece15e51ea8c267155152675def9442cd403e1f8736ee23f8c453d50d3b2712c10249999ad0a05e046f8d13bea5498cfd00e5e0debaa69218931107a947 SHA512 372707ef56d86fd4f8c439767495cb10eadcd9e9683053c7179dac7e655cf423a8a2b4a1b1e0a23667263370ac4e188aa8ec6a4123416f76d40b2d115ad41148
+DIST lines_0.6.tar.gz 862137 BLAKE2B 11be598d89963b7a32479565538d85531d8bab16e46b8c5851e30cda7fd480a9d40d43b10fd3d74f2d0f820f0606aabe775ff44bbe5dd9f55551095aeb95cb60 SHA512 fe9e96b598fb6cf0980d0970facbc070715b33491a8f0ad979c57332a22e97ab801e85dd17b5d0b2a1b8aba69b48b6c42dc115b01a36654ad05a5e9a06c5405a
+EBUILD color-lines-0.6-r1.ebuild 995 BLAKE2B 305616400e1967f08416b18813a78586d647e9e5fc1e976cbc96926429a883c72338ea53f46267567adc17b35e98e959b9e520bc5447b75b433246f74b3b21a5 SHA512 53ac641a27f9a3e4b71a4a042f419bd3ad5f42f3b54b05ef01580e13bdb43b06838e4d280556507e67f54407067867a8549067601b705ae242ffbf234fc8920d
+MISC metadata.xml 333 BLAKE2B 2a8b880fbec7f3e76183adc5b788587326e5560ee88419e72353c3450c106b362413b9a21d077ad336523626c11a83ad2059c5f7b0b30c21e10c3449788b75d7 SHA512 f0ff7b81095a841ea93ad665fb91e9504b5cbf97b5e3f020e61173f92fa1e2750a77732f49a2f3636b33f3d80505c4cfe0edfc9267f05e5279c38ef04e791d2a
diff --git a/games-puzzle/color-lines/color-lines-0.6-r1.ebuild b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
new file mode 100644
index 000000000000..e239fd1588a2
--- /dev/null
+++ b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Color lines game written with SDL with bonus features"
+HOMEPAGE="https://github.com/OpenA/color-lines-sdl"
+SRC_URI="https://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() {
+ default
+ eapply "${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'
+}
+
+src_compile() {
+ emake BINDIR="${EPREFIX}/usr/bin/" GAMEDATADIR="${EPREFIX}/usr/share/${PN}/"
+}
+
+src_install() {
+ insinto "/usr/share/${PN}"
+ doins -r gfx sounds
+
+ domenu ${PN}.desktop
+ doicon icon/${PN}.png
+ einstalldocs
+ dobin ${PN}
+}
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..bf1339b94a01
--- /dev/null
+++ b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
@@ -0,0 +1,35 @@
+--- a/Makefile.unix.orig 2013-04-12 13:56:42.131113000 +0400
++++ b/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..cb511abfbaf8
--- /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 type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">OpenA/color-lines-sdl</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/colorcode-0.8.5 b/games-puzzle/colorcode-0.8.5
deleted file mode 100644
index fad0e7b58199..000000000000
--- a/games-puzzle/colorcode-0.8.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-DESCRIPTION=A free advanced MasterMind clone
-EAPI=6
-HOMEPAGE=http://colorcode.laebisch.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=http://colorcode.laebisch.com/download/ColorCode-0.8.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e3e6bdc41cf938ff4c6195215dc1681c
diff --git a/games-puzzle/colorcode/Manifest b/games-puzzle/colorcode/Manifest
new file mode 100644
index 000000000000..a016a8ee1089
--- /dev/null
+++ b/games-puzzle/colorcode/Manifest
@@ -0,0 +1,3 @@
+DIST ColorCode-0.8.5.tar.gz 233676 BLAKE2B aa474cf7990cb425edd9452d0241dfe9ae9b8156200b14985a270897cb42fe2f86190503bf2eff72e8831416fb03312e7bdc148f1f26bb391cf95239ea4f856d SHA512 55f935944a91441ae09b1636fe85c8174de53ba10e04df0d9cef6c4f2441879735230ac0fe313b91cf9870777df24bc95d975767f27940156b5698716b78b507
+EBUILD colorcode-0.8.5.ebuild 683 BLAKE2B db4c1fad46894fd0e6548178c9c5a876ddc385f57bf0f6d1d1dbab716b9d796df2d926a355df6630f508c35abb5d649844287e9003001432e6e3d37166d373d7 SHA512 c886978d4d3981dc6a0302b6a06a5b1d5bda2e254f1507a6840b975c980d7f4cbcd7b58b202b69f45763322c8e0f052cbda2ef9d59184f69d12fabe9fd5d8565
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/colorcode/colorcode-0.8.5.ebuild b/games-puzzle/colorcode/colorcode-0.8.5.ebuild
new file mode 100644
index 000000000000..c304b720483c
--- /dev/null
+++ b/games-puzzle/colorcode/colorcode-0.8.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils qmake-utils
+
+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/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+ default
+ sed -i -e '/FLAGS/d' ${PN}.pro || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ dobin ${PN}
+ newicon img/cc64.png ${PN}.png
+ make_desktop_entry ${PN} ${MY_PN}
+}
diff --git a/games-puzzle/colorcode/metadata.xml b/games-puzzle/colorcode/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/colorcode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/concentration-1.2-r2 b/games-puzzle/concentration-1.2-r2
deleted file mode 100644
index f1e9fd73891e..000000000000
--- a/games-puzzle/concentration-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf
-DESCRIPTION=The classic memory game with some new life
-EAPI=6
-HOMEPAGE=https://packages.gentoo.org/package/games-puzzle/concentration
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf
-SLOT=0
-SRC_URI=mirror://gentoo/concentration-1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=d5aebd2609f1d4af129b817feb7ed6cb
diff --git a/games-puzzle/concentration/Manifest b/games-puzzle/concentration/Manifest
new file mode 100644
index 000000000000..4af5be1be537
--- /dev/null
+++ b/games-puzzle/concentration/Manifest
@@ -0,0 +1,4 @@
+AUX concentration-1.2-gentoo.patch 4615 BLAKE2B 9057a3518a3f93d4db73019e3128d00deb5b578ff6dcda11a5a05d0cae6a48b40832c1e0dd638d32aef75d70f81f9c2d75404300c261f35f3c16e9ed2115b092 SHA512 a513b43e96e6d401ea705fc9ebcfb868c4680af117551b166c20900417e977a588ab12d19ee6d7e4f58cfea1dc3799845581fb122470093b6fdba187d73689c4
+DIST concentration-1.2.tar.gz 1044563 BLAKE2B 2bd6c36be747ab16c77e5a9d01d270d82674957d3e66c07571c5dc5edbcb86aae59213992fe7a2d8ee34bbbbe8ff32157b5f5dd3125acc0ab0726e977c28c119 SHA512 afa9007cfaaa9a1cedcbfc490cb63d93d8ed1e91230ee714cece481ed3a39b73c82ec4cda65b29a27e9e71a7d2215be7f476e3217b487af54716eb4d692ca005
+EBUILD concentration-1.2-r2.ebuild 650 BLAKE2B abc116b14da1f8cb4c34ebf80f927c462336f45176ee2173c351375f25e9b1bed91a28242c138ba3af9ab3e3407fb1fd1d24111e4ac101dbd19a94365de18d8e SHA512 58296e33b985c3f77f148e32c4934c8ea923ea2ba46d65586b05bf01f486c40e76539d66f7a7e16d755af8a77215728b35b8f178ac8a890026af1a98a85b9527
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/concentration/concentration-1.2-r2.ebuild b/games-puzzle/concentration/concentration-1.2-r2.ebuild
new file mode 100644
index 000000000000..5233b13dc8d8
--- /dev/null
+++ b/games-puzzle/concentration/concentration-1.2-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~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}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_install() {
+ default
+ newicon pics/set1/19.png ${PN}.png
+ make_desktop_entry ${PN} Concentration
+}
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/concentration/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/connectagram-1.2.8 b/games-puzzle/connectagram-1.2.8
deleted file mode 100644
index 7767ef64ab5d..000000000000
--- a/games-puzzle/connectagram-1.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
-DESCRIPTION=A word unscrambling game
-EAPI=6
-HOMEPAGE=https://gottcode.org/connectagram/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.8-src.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5814a5b55b19eedfb78c8fad3ab80bd8
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
new file mode 100644
index 000000000000..926cb20cc477
--- /dev/null
+++ b/games-puzzle/connectagram/Manifest
@@ -0,0 +1,4 @@
+AUX connectagram-1.2.8-gentoo.patch 2479 BLAKE2B 128389ff604e5a7a623e5893d3366ff9f4b7e58f05b49e1435a70c546d754718d0640451fb79a56e1b5a12893445040a020aa09cbd876b31e1dc8042afde0250 SHA512 d45be3e0734c3f2832cbdf56aaf722df5e4fe37ebf9a1d44001463d2bbb0f90de762a55898699343ad99e999c751e7f041f0bb7cefa679a95f56454c6140571c
+DIST connectagram-1.2.8-src.tar.bz2 1760028 BLAKE2B db29251339abaa8ecbda69afff55366a2cc94ae9515bdc3750b9d328b7f5445613ee2da4c308008fb5ad09e20435cb294f97c5e9a23124a4330004cde11bd6c5 SHA512 f48fe0320745919f9532a0bb25799b05272dc30b9acba20e559d1df7ce15570eb37a29a2f746af94077f56306c45e2ee32d49f27585b6e4385477aeb795f4ed8
+EBUILD connectagram-1.2.8.ebuild 910 BLAKE2B 6975e489cb78a8994783b57bd43419eac6c1d00e55e6875aeca89103a28d24b7133289344ebd6b0172adbdbfaf7a1339747e56d026673ba2366b2da48feda22b SHA512 b868f018cea2ddeb980b5950669792a2972d749c614cc2f87f1daf3339af529c0de28b451004022e234001ec92d118566b624305e362ccc5b7c54a1dd69bb093
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/connectagram/connectagram-1.2.8.ebuild b/games-puzzle/connectagram/connectagram-1.2.8.ebuild
new file mode 100644
index 000000000000..8405ae6061d8
--- /dev/null
+++ b/games-puzzle/connectagram/connectagram-1.2.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="A word unscrambling game"
+HOMEPAGE="https://gottcode.org/connectagram/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s#@GAMES_BINDIR@#/usr/bin#" \
+ -e "s#@GAMES_DATADIR@#/usr/share#" \
+ ${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
+}
+
+src_configure() {
+ eqmake5 connectagram.pro
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
new file mode 100644
index 000000000000..7bb74baeee82
--- /dev/null
+++ b/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
@@ -0,0 +1,76 @@
+--- a/connectagram.pro 2018-07-11 19:19:33.058534696 +0200
++++ b/connectagram.pro 2018-07-11 19:20:30.536282297 +0200
+@@ -90,16 +90,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/
+@@ -114,7 +114,7 @@
+ appdata.path = $$PREFIX/share/metainfo/
+
+ qm.files = $$replace(TRANSLATIONS, .ts, .qm)
+- qm.path = $$PREFIX/share/connectagram/translations
++ qm.path = @GAMES_DATADIR@/connectagram/translations
+ qm.CONFIG += no_check_exist
+
+ man.files = doc/connectagram.6
+--- a/src/locale_dialog.cpp
++++ b/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/")) {
+--- a/src/new_game_dialog.cpp
++++ b/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);
+ }
+--- a/src/wordlist.cpp
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/connectagram/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/construo-0.2.2-r1 b/games-puzzle/construo-0.2.2-r1
deleted file mode 100644
index c4991662bf9e..000000000000
--- a/games-puzzle/construo-0.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-base/xorg-proto >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=2d construction toy with objects that react on physical forces
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/construo/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=http://freesoftware.fsf.org/download/construo/construo.pkg/0.2.2/construo-0.2.2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7b2dc80001455ee6f8c654e4ac55b3bf
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
new file mode 100644
index 000000000000..da7032b36ddf
--- /dev/null
+++ b/games-puzzle/construo/Manifest
@@ -0,0 +1,5 @@
+AUX construo-0.2.2-gcc43.patch 1813 BLAKE2B 514c17651894fa7f991abe397696fae5de567579730635d6b115cfe18099bd98a575e7bb104f73607b0809be90b7e882d41a72875fc4d34801694ec4c6479c6d SHA512 5865311df15e510a4212778cf7bfc2cf82c60449841f3d9717b4d04a2a241977319296b7696567a39c95e16b1f94fe2959c9eb8775b3b56b0e804335c73159ed
+AUX construo-0.2.2-lGLU.patch 429 BLAKE2B da44fd32544394f66fd0ab5f5cda3cccf0cbe65646b73d38b672902cc639355ddb9bbbfe8f6255fc9253fe78444468593dfffc7d6bf9c6b69aa16dfa0027a314 SHA512 2fcba9fdc7f96bd802341a42bba33ca659152421d1ba7f6a1d56a5de75f5811ee08298831f1c3951e364600146364e64efdc9a67a45bb9f946ab19867bff27b2
+DIST construo-0.2.2.tar.gz 442626 BLAKE2B c6c9c566c8e4014aba1e06d12af2c3c3076d533a9f11513e903a6fff027ecbd3b492c1ca35a50b42dbd0aea5064614147529f2dcfd6b75af2376a7a410fdc470 SHA512 b73854a64aedcb9ddcd8f2c3e809f975ef3d2f63bdefd2e126c808a4154d7ff3d402457f9da5f866e6b9d74c6010ffc58d44b04277976fe1a9aeabc20ea786a9
+EBUILD construo-0.2.2-r1.ebuild 829 BLAKE2B 865546804f13c8a201789d3d13d6b60605d4b3ea14c5e7f4b40d67c0f807e5576cb042d18dc642d10befbb026edf0c322a449f2a739678de73edf01faf0986ba SHA512 268821a99a0f74fb7d33e3105a41cdcac1f430f0253ab1050f9b03c1ac49d5bd9f7c07a5f1f3de401ff710a2e2fdad3248446f8e02a46774ca0217f35224550b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/construo/construo-0.2.2-r1.ebuild b/games-puzzle/construo/construo-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..4370d583ab81
--- /dev/null
+++ b/games-puzzle/construo/construo-0.2.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="
+ virtual/opengl
+ virtual/glu
+ media-libs/freeglut
+ x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+src_prepare() {
+ default
+ eapply \
+ "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-lGLU.patch
+ sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ make_desktop_entry "${PN}.glut" "${PN}.glut"
+ make_desktop_entry "${PN}.x11" "${PN}.x11"
+}
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..48165ed21df0
--- /dev/null
+++ b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
@@ -0,0 +1,82 @@
+--- a/command_line.cxx
++++ b/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"
+
+--- a/config.hxx
++++ b/config.hxx
+@@ -21,6 +21,7 @@
+ #define CONFIG_HH
+
+ #include <string>
++#include <cstdlib>
+
+ class Config
+ {
+--- a/lisp_reader.cxx
++++ b/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"
+
+--- a/unix_system.cxx
++++ b/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>
+--- a/vector.cxx
++++ b/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)
+--- a/world.cxx
++++ b/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"
+
+--- a/x11_display.cxx
++++ b/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..be8e7b604d6f
--- /dev/null
+++ b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac.old 2009-11-24 18:27:48.000000000 +0100
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/construo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/cutemaze-1.2.3 b/games-puzzle/cutemaze-1.2.3
deleted file mode 100644
index 24a53765f370..000000000000
--- a/games-puzzle/cutemaze-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
-DESCRIPTION=A simple, top-down game in which mazes are randomly generated
-EAPI=6
-HOMEPAGE=https://gottcode.org/cutemaze/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/cutemaze/cutemaze-1.2.3-src.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=60442de858295c9357b636a9a65bacb3
diff --git a/games-puzzle/cutemaze/Manifest b/games-puzzle/cutemaze/Manifest
new file mode 100644
index 000000000000..335d3f89df84
--- /dev/null
+++ b/games-puzzle/cutemaze/Manifest
@@ -0,0 +1,3 @@
+DIST cutemaze-1.2.3-src.tar.bz2 938593 BLAKE2B 004a793ce12cae345f00eb5a018d69d13b2c99d24424938da5a00420fe3c25403ea02fb04603cb662c87c170cc6d8b6daf36228e2ac002c3e4692ee01caafcf3 SHA512 d864cc8e61047948272e9b910c7b90d393ac974ce1ca63475c7d308cfc3c96d771edd87f3a5a93803a777dcddf6049feacc2f373d21529187a83de03aa5f08ea
+EBUILD cutemaze-1.2.3.ebuild 696 BLAKE2B b4a3b0198a3d0fed185a479de37d98ad675acfaef866a91bae622b3141b3e315a0c7922fea20ff901e15952219235f74121a89b0de52939090c70aca200eb2d6 SHA512 01c5115193cded98542e3f1d4f7fc60aab5a16f3760c68ca19086da28d37a88defc929e56243c238bd05c7e1b5d748405d17f61a8dbe25d6ebf111c54892c07b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild b/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild
new file mode 100644
index 000000000000..0f3981c5b115
--- /dev/null
+++ b/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="A simple, top-down game in which mazes are randomly generated"
+HOMEPAGE="https://gottcode.org/cutemaze/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+src_configure() {
+ eqmake5 PREFIX="/usr"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/cutemaze/metadata.xml b/games-puzzle/cutemaze/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/cutemaze/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/cuyo-2.1.1-r1 b/games-puzzle/cuyo-2.1.1-r1
deleted file mode 100644
index 9c8acf527d03..000000000000
--- a/games-puzzle/cuyo-2.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=highly addictive and remotely related to tetris
-EAPI=6
-HOMEPAGE=http://www.karimmi.de/cuyo/
-IUSE=+music
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9c42543f2c8d1db4c3683c0c17c1a874
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
new file mode 100644
index 000000000000..789809a6823c
--- /dev/null
+++ b/games-puzzle/cuyo/Manifest
@@ -0,0 +1,6 @@
+AUX cuyo-2.1.1-gcc44.patch 161 BLAKE2B f6b288dfdf81ac39d0c58e144e36ed554bbec67c5533eb57ae9458fc73f0ca2348b3a3d65170a9c62ff5c8734b61b8e90d631a3044b171981feb27c42a04fc90 SHA512 461bd27073288eb5327770d18ce5a10a38a4e6ceb3c6f5e39a50a47bc3f6f5c8a06f9ac13d80bfbbeae1a0f45dd62ee0fa084dd832eb2d1313096f3d8e5c3149
+AUX cuyo-2.1.1-gcc6.patch 1024 BLAKE2B 12331f090b146d9f26b1a1300830153a599354c302cbe6d400eb3b39b403071853fcdc0a9559da23a0167d863794499e97f9a1f409333b722d9b95cfa9492e3c SHA512 ae8733da8afceee4e54ac8cac5a11d20a1adce494d76cdfaa821ffeba64886d9b0c9680fdab013c67e641bac9c96ba3dc23d1ecb86d1b59ca3f354692d218d2c
+AUX cuyo-2.1.1-gentoo.patch 851 BLAKE2B 70c082a9e19ca1a093810c810825986390abe5a0b0c671eb97dd95e731ee529a9aea1491f3c59651648ad0e9c451ecb269a66d0b17b4f0b237b961e47117e9a7 SHA512 c96c855c4650f50d6ed1c38d7105047f386c1828592389ce482cecefeb46bae224ee46f6f07dc63bbed67d81e4beadd5868962ad52dcca8fd9f99f3ea0899f8a
+DIST cuyo-2.~-1.1.tar.gz 3005426 BLAKE2B af83365568b16d230b8f253589c0300e1ba29471c8a406bd161da20b8282da4ca845aa1a06b8c5b2bf076828a71e0add9c317b710c476f56540a29f87dc53194 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787
+EBUILD cuyo-2.1.1-r1.ebuild 941 BLAKE2B 37b6a8a120d67ec0fa16474ec79a42f320493d9e14b540eeccd3601f80bc3844f73ea44cb3e17b27cc7a909df24b2915cc261378f2a3d78486f4f7bb6f851f16 SHA512 e779d2b956903e8f587b52f5268bd264bbfbbc39a7c60340e2a968a2507059c63292afd6d3e0d96e90c1a88bf2f43492334b3f005c79e94ac595cf1873d87a60
+MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..55b13cc7ed85
--- /dev/null
+++ b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2-utils versionator
+
+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="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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() {
+ default
+ eapply \
+ "${FILESDIR}"/${P}-gcc44.patch \
+ "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
+ eautoreconf
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+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-gcc6.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch
new file mode 100644
index 000000000000..b1ba5b535de5
--- /dev/null
+++ b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch
@@ -0,0 +1,45 @@
+--- a/src/pfaditerator.h
++++ b/src/pfaditerator.h
+@@ -21,6 +21,11 @@
+ #include "stringzeug.h"
+
+
++#if __cplusplus >= 201103L
++#define NOEXCEPT noexcept(false)
++#else
++#define NOEXCEPT
++#endif
+
+
+ /** Iteriert durch alle Pfade, an denen sich eine
+@@ -43,7 +48,7 @@
+ class PfadIterator {
+ public:
+ PfadIterator(Str dat, bool auch_gz = false, bool setzDefault = false);
+- ~PfadIterator();
++ ~PfadIterator() NOEXCEPT;
+
+ /** N�chster Pfad */
+ PfadIterator & operator++();
+--- a/src/pfaditerator.cpp
++++ b/src/pfaditerator.cpp
+@@ -48,7 +48,7 @@
+ -1 und f�hren dann gleich ein ++ aus. */
+ ++(*this);
+ }
+-PfadIterator::~PfadIterator() {
++PfadIterator::~PfadIterator() NOEXCEPT {
+ /** Soll der default-Pfad gesetzt werden? */
+ if (mSetzDefault) {
+
+--- a/src/xpmladen.cpp
++++ b/src/xpmladen.cpp
+@@ -314,7 +314,7 @@
+ try {
+
+ /* Datei laden. Dabei werden gDatAnfang und gDatEnde gesetzt. */
+- if (!ladeDatei(na)) return false;
++ if (!ladeDatei(na)) return NULL;
+
+
+ gDatBei = gDatAnfang;
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..1329ada5712f
--- /dev/null
+++ b/games-puzzle/cuyo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+<use>
+ <flag name="music">Enable playing of background music</flag>
+</use>
+</pkgmetadata>
diff --git a/games-puzzle/einstein-2.1.1 b/games-puzzle/einstein-2.1.1
deleted file mode 100644
index 400d6a44ff88..000000000000
--- a/games-puzzle/einstein-2.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
-DESCRIPTION=A puzzle game inspired by Albert Einstein
-EAPI=6
-HOMEPAGE=https://github.com/lksj/einstein-puzzle
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
-SLOT=0
-SRC_URI=https://github.com/lksj/einstein-puzzle/archive/v2.1.1.tar.gz -> einstein-2.1.1.tar.gz mirror://gentoo/einstein.png
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=24bcd334ed9b044f2717419f4c4ab347
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
new file mode 100644
index 000000000000..11ee45776453
--- /dev/null
+++ b/games-puzzle/einstein/Manifest
@@ -0,0 +1,5 @@
+AUX einstein-2.0-as-needed.patch 314 BLAKE2B a76c5d93cf391eed152c151618c47db2029f70fa711dca0b816de9d6c282cb3da9f3455e99ddf0ba308db14daca1f228eef32ab76c26b5d53b300acb5ba0afc8 SHA512 4943199a89fb19025618c1a95afc4e57f740259992997460292af1cbdd764d668538c5acca2e1077bdfb78936c66b3a88e698194167ad72b3ee8e42501070dd3
+DIST einstein-2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
+DIST einstein.png 932 BLAKE2B 13ecf24e5600bf39bbaec662afda5b4fdba2c5adf4560e8f08996b2e6c475002857187be2dac2d2c898cdb63854cc7ea1748b6b1d34a67adcc2f4789aafd5c25 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283
+EBUILD einstein-2.1.1.ebuild 909 BLAKE2B d01a1d5614203f3da997ce819cab6a1660187c615ea4f987ebb55a797348fba072ae57e06b8853fb6fe27d253e38038b88439cb94c5bad6a504c79cf0d0b9d65 SHA512 cf7c474f025a4e0d9a8eef09d5e50047ece42e9c33682a9c84453ee0aff03753be660d310d8abbb71e15854e5f54906b55cfeea04a8a0f70da097eb323ad536a
+MISC metadata.xml 334 BLAKE2B bd52f381c3b7a79dfad6318f086d3ac04f1e52e0707dc4556a886dcd37416f191a36d4e47e22b67b7539d99b00159f179a12b12faeafe2c2c1ca7b42c4226255 SHA512 defe221da415005e05b0b8d58edd84050a565b3249bfd0eae9875f92a67ee0faf320f86cd2b6f703add270f86edfc187e8597fb659b4499e092825b82cd91f64
diff --git a/games-puzzle/einstein/einstein-2.1.1.ebuild b/games-puzzle/einstein/einstein-2.1.1.ebuild
new file mode 100644
index 000000000000..857e57a6e54a
--- /dev/null
+++ b/games-puzzle/einstein/einstein-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="A puzzle game inspired by Albert Einstein"
+HOMEPAGE="https://github.com/lksj/einstein-puzzle"
+SRC_URI="https://github.com/lksj/einstein-puzzle/archive/v${PV}.tar.gz -> ${P}.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}"
+
+S="${WORKDIR}/${PN}-puzzle-${PV}"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${PN}-2.0-as-needed.patch
+ sed -i \
+ -e "/PREFIX/s:/usr/local:/usr:" \
+ -e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \
+ || die
+}
+
+src_install() {
+ dobin "${PN}"
+ insinto "/usr/share/${PN}/res"
+ doins einstein.res
+ doicon "${DISTDIR}"/${PN}.png
+ make_desktop_entry ${PN} "Einstein Puzzle"
+ einstalldocs
+}
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..3edb666ad690
--- /dev/null
+++ b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.old 2009-02-09 16:37:58.000000000 +0100
++++ b/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/metadata.xml b/games-puzzle/einstein/metadata.xml
new file mode 100644
index 000000000000..c3f8c58cea81
--- /dev/null
+++ b/games-puzzle/einstein/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freecode">einsteinpuzzle</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/enigma-1.21-r3 b/games-puzzle/enigma-1.21-r3
deleted file mode 100644
index 930479b138c2..000000000000
--- a/games-puzzle/enigma-1.21-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=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 ) sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Puzzle game similar to Oxyd
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/enigma/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=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 ) media-fonts/dejavu x11-misc/xdg-utils
-SLOT=0
-SRC_URI=mirror://sourceforge/enigma-game/enigma-1.21.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a39fe1a5cc89e9ee6eb309833d4a085
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
new file mode 100644
index 000000000000..95e29c1ff023
--- /dev/null
+++ b/games-puzzle/enigma/Manifest
@@ -0,0 +1,5 @@
+AUX enigma-1.21-build.patch 3543 BLAKE2B bb4cd5fc8105b15cf913e8a5f6baeb58cba93965a422a7bd514fc4eea848f73f65853595da023e3458a48f861d7a42f1300dfd90418600f4432c327114ab4f17 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4
+AUX enigma-1.21-gcc6.patch 927 BLAKE2B 279415c5cf96e9f4db37b29b4555fe2d66ce82c3c04199281c175176bab812351a342633888c524558d4f9362ccd1b1602fd7fc100e062e45bbac85fe966e06f SHA512 d0eb1f356370431e3b3b96c7fa3a56ca52ed15fa94286d1b5075ba8a4b4b349deb676479bd8e045a7463f65a3885c44aab90166549850e19c510d606aed2e746
+DIST enigma-1.21.tar.gz 56409951 BLAKE2B c03cf3c66cb1df771671c6c92d5a64e66ab78c2abbf25008285dedb5db10fb1c8daf2053c15a09147e00f0a22a7882e47b1c6ed66588b2397deec084456af1b9 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0
+EBUILD enigma-1.21-r3.ebuild 1503 BLAKE2B 3e1a2bc825ed265e7cb362c9d42b73e01157123c48552406ed6ce52844759189292da998da668c6791f96eb18900d40f26aad125ec482a0a100e79e44ab352ed SHA512 052f053424ddafe241002e78a8107eafe412048113bd0d97f8ca0351d7fb3fd0fb30d021ec2b76ebc57ec9ed1a176559128afdfd517d59c95f25c3ebf1010ae2
+MISC metadata.xml 334 BLAKE2B 8e61a1119a930895b0773b8865550fde4bf532532ea4e904d537a6f4f93a27580841d121ff246bc4f9f60849a2224bedaf91bcb2e8ce3aa0b2a6ebee51dff1a8 SHA512 885fc4263252767f8861f2d45dc11a319cb5b0a7a9eccdf073a0433ba4908d97f7a590a96ae542372e53f16780a41cee4ee80556c0cedffbf34f6e4bcadeacc6
diff --git a/games-puzzle/enigma/enigma-1.21-r3.ebuild b/games-puzzle/enigma/enigma-1.21-r3.ebuild
new file mode 100644
index 000000000000..bdecef930251
--- /dev/null
+++ b/games-puzzle/enigma/enigma-1.21-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2-utils
+
+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 ~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() {
+ default
+ cp /usr/share/gettext/config.rpath .
+ eapply "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-gcc6.patch
+ sed -i \
+ -e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
+ src/main.cc || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-system-enet \
+ $(use_enable nls)
+}
+
+src_install() {
+ HTML_DOCS="doc/*" DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
+ default
+ dosym \
+ /usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
+ /usr/share/${PN}/fonts/DejaVuSansCondensed.ttf
+ dosym \
+ /usr/share/fonts/dejavu/DejaVuSans.ttf \
+ /usr/share/${PN}/fonts/vera_sans.ttf
+ doman doc/enigma.6
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+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/files/enigma-1.21-gcc6.patch b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch
new file mode 100644
index 000000000000..fd72dbc89065
--- /dev/null
+++ b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch
@@ -0,0 +1,25 @@
+Bug: https://bugs.gentoo.org/610778
+
+From e0f31f63ba4252ced7128d3ceec2bc668e8681f4 Mon Sep 17 00:00:00 2001
+From: Legimet <legimet.calc@gmail.com>
+Date: Sat, 13 Aug 2016 23:41:27 -0400
+Subject: [PATCH] Fix build error with GCC 6, caused by comparing
+ basic_ifstream to NULL
+
+---
+ src/lev/Proxy.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lev/Proxy.cc b/src/lev/Proxy.cc
+index 6d58c0ba..69f54a20 100644
+--- a/src/lev/Proxy.cc
++++ b/src/lev/Proxy.cc
+@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
+ } else if (haveLocalCopy) {
+ // plain file
+ basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
+- if (ifs != NULL)
++ if (ifs)
+ Readfile(ifs, extCode);
+ else
+ haveLocalCopy = false;
diff --git a/games-puzzle/enigma/metadata.xml b/games-puzzle/enigma/metadata.xml
new file mode 100644
index 000000000000..31c04074be24
--- /dev/null
+++ b/games-puzzle/enigma/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">enigma-game</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/ensemblist-040126 b/games-puzzle/ensemblist-040126
deleted file mode 100644
index e78c6c7eee63..000000000000
--- a/games-puzzle/ensemblist-040126
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/freeglut media-libs/libmikmod:0 media-libs/libpng:0 virtual/glu virtual/opengl x11-libs/libXmu
-DESCRIPTION=Put together several primitives to build a given shape. (C.S.G. Game)
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/ensemblist/index_en.html
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freeglut media-libs/libmikmod:0 media-libs/libpng:0 virtual/glu virtual/opengl x11-libs/libXmu games-misc/games-envd
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/ensemblist/ensemblist-040126.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d50f1d638e5ae12bf94c75a17a79176
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
new file mode 100644
index 000000000000..105aa905cf91
--- /dev/null
+++ b/games-puzzle/ensemblist/Manifest
@@ -0,0 +1,4 @@
+AUX ensemblist-040126-build.patch 1610 BLAKE2B 42492746d138019727da45c6f6ee89d155e73e45a1c1fd3a06a10cfd1b0639261901d52d32099f05e2633444e1cf9e445e9602c093d897ae98e89a855f4e31ef SHA512 19e9e9625786d43053a72ba633aaa08d18b7a91fe5995cb583b6830605f0ec2b37b8c002d7853db520fc7ccfc4bbe8699184d2ac69f62be51d4801b438ea6ce5
+DIST ensemblist-040126.tar.gz 1312095 BLAKE2B 715aba1d5d62b3b4f7889b87ed70f1a33441d8ce7fe878c17dbdd342b45906c9242eb34b9eca8d34f41e9146d1eceac771e28e49b209b85dac31fce8e16b21eb SHA512 59202fe3c6168cfd60a7204f64dba5ab9fec2aa80e32be2f649862cf60dd27df0a51f4359161f8ca1ab3cf541fb1ea127f4f83b2213c4cb40bf6a574c14c8052
+EBUILD ensemblist-040126.ebuild 859 BLAKE2B 7e9fd9a8d6873b8cd51a4fce1dcfb9810f88475891a195a19585feabfc7ca875cd78b92ecfc8d39f9d8f7a010854f8f5674ad9c666a16e5cabc78b730b402e21 SHA512 18e85ad3e9adb8b8793b83c30dfb791cc3a5c2e135bafb0183e9205195a662c62f81f28f991ecd36d66f55a15ad6770306be931163739279470e9def0886440d
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
new file mode 100644
index 000000000000..559fa92b6034
--- /dev/null
+++ b/games-puzzle/ensemblist/ensemblist-040126.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Put together several primitives to build a given shape. (C.S.G. Game)"
+HOMEPAGE="http://www.nongnu.org/ensemblist/index_en.html"
+SRC_URI="https://savannah.nongnu.org/download/ensemblist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="media-libs/freeglut
+ media-libs/libmikmod:0
+ media-libs/libpng:0
+ virtual/glu
+ virtual/opengl
+ x11-libs/libXmu"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+ emake DATADIR="\"${GAMES_DATADIR}\"/${PN}/datas" \
+ CFLAGSLD="${LDFLAGS}"
+}
+
+src_install() {
+ dogamesbin ensemblist
+ insinto "${GAMES_DATADIR}/${PN}"
+ doins -r datas
+ dodoc Changelog README
+ make_desktop_entry ${PN} Ensemblist
+ prepgamesdirs
+}
diff --git a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch b/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/ensemblist/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/fbg-0.9-r2 b/games-puzzle/fbg-0.9-r2
deleted file mode 100644
index 91ec72413859..000000000000
--- a/games-puzzle/fbg-0.9-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
-DESCRIPTION=A Tetris clone written in OpenGL
-EAPI=6
-HOMEPAGE=http://fbg.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
-SLOT=0
-SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=6496846e678673ab39646f9b6685c86c
diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
new file mode 100644
index 000000000000..26743052b907
--- /dev/null
+++ b/games-puzzle/fbg/Manifest
@@ -0,0 +1,3 @@
+DIST fbg-0.9.tar.gz 1127384 BLAKE2B c732f0bfce5cdf92ed94b75764403f1e64efebdb6be92b900704601922a9a3e9f86de975613778aad9c5685303fc9e31dbd624283cc8ad2964cbf3c9c42b27b6 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353
+EBUILD fbg-0.9-r2.ebuild 791 BLAKE2B 0eec4a1245d54542666bc46299034668774242b606a9e904d879661b295460b448f03ee9d02c99b15caed692c6b190ace7acfce91a8146b81c448d3abc59b01b SHA512 34ee1ebd58eaccb2dddbe8742c006dd5a6ddf47d8b5dc572cdd7ce0fbdd473313c80fdd1f5856c94d25f434b22cf80909a2d80a1b92ccb250b894d43cb8b96a5
+MISC metadata.xml 326 BLAKE2B 8488642d926fbabc6c18c7739859dbf7b3ff8f14253d3bf30bf6402000cc7dbc4d9143ecf4bcf04309200f5ce346b958e1a8c148ee8cc15455763b5983d9499f SHA512 530accf52134a0d9947a35e2499225d8557410008a5df1b8bb2189eabe7c8cda7787a5ce05ec4efe5af67a9a2e1aae30008c18bf97f2c46a9608d3625bdc5ea2
diff --git a/games-puzzle/fbg/fbg-0.9-r2.ebuild b/games-puzzle/fbg/fbg-0.9-r2.ebuild
new file mode 100644
index 000000000000..b0c84fa8eeca
--- /dev/null
+++ b/games-puzzle/fbg/fbg-0.9-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~x86"
+IUSE=""
+
+DEPEND="virtual/opengl
+ virtual/glu
+ dev-games/physfs
+ media-libs/libsdl[opengl,video]
+ media-libs/libmikmod
+ x11-libs/libXt"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "/FBGDATADIR=/s:\".*\":\"/usr/share/${PN}\":" \
+ -e '/^datadir=/d' \
+ configure || die
+}
+
+src_configure() {
+ econf --disable-fbglaunch
+}
+
+src_install() {
+ default
+ newicon startfbg/icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Falling Block Game" ${PN}
+ rm -rf "${ED}/usr/doc"
+}
diff --git a/games-puzzle/fbg/metadata.xml b/games-puzzle/fbg/metadata.xml
new file mode 100644
index 000000000000..3122d95d7524
--- /dev/null
+++ b/games-puzzle/fbg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">fbg</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/fish-fillets-1.0.1-r1 b/games-puzzle/fish-fillets-1.0.1-r1
deleted file mode 100644
index bdb7e2df41ba..000000000000
--- a/games-puzzle/fish-fillets-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=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:0 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Underwater puzzle game - find a safe way out
-EAPI=6
-HOMEPAGE=http://fillets.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-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:0
-SLOT=0
-SRC_URI=mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=de86afe409d07ddab620efb86ccdf5b6
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
new file mode 100644
index 000000000000..92509c1e6f18
--- /dev/null
+++ b/games-puzzle/fish-fillets/Manifest
@@ -0,0 +1,4 @@
+DIST fillets-ng-1.0.1.tar.gz 380290 BLAKE2B 675839cb451686c35611120b0b8e1044bc6511ce2369157f7d7c934eb0477b10e925268ffb35d5415070f25d7469da249027f148ac06ba65bd139fbddfb20a03 SHA512 fe4a5186f94e953cbc85fe8b0ce804c881c96feda385cfc36e1840e448cf094c3d815fdbe32976a6697a855038951f97a384c277a1c52a048520e8da71136718
+DIST fillets-ng-data-1.0.0.tar.gz 146418413 BLAKE2B 0359cee1db5d54a124f76520c4c416d954969bd9fc79eb9305613549722133684c2f6696b754729316ca4f4ebcc3aff63db845fd71ffc955d5e9584d89a50999 SHA512 61c7fe3980510a7dbd85f4c246e7e42a0f79d8e2aacd96a0c7a14189c5dee92292efb030ac92299474162995039073288283fee0f352cf08be6975a2c86703e7
+EBUILD fish-fillets-1.0.1-r1.ebuild 1292 BLAKE2B 0b87179878b44942f3341a23c965f96db07abe3e86eeb312e0081484196648d363a29635b9dc152ca6a2ef65c63cc6e55d216902e3812b1edc80a0e398f93891 SHA512 84a81e5956a0a23143d8f2c75936938b865c2705f093091a0ade7fb1808c26629c41beab6c5de90a1b585421836511ed33a943188fbcdb7f2c6825d36bfb92c6
+MISC metadata.xml 330 BLAKE2B 47ef211faf9977fbf1b3f58ead7b59c2b025e3b731433586d948d82b3f25b95470beb1904981bc001cd4f086deb133c809ac4676c553135502f0b00699c6b996 SHA512 dbe794bba7ca2d4414f5ea3b4ef5b8958268abf2f8bd45705300baddcca5cbb485ddc24b3328e25568b9aa741c50251417ee4100f3f118827fcc5c1a285dba66
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..722c291c1dd8
--- /dev/null
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop
+
+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 ~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:0
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/fillets-ng-${PV}"
+
+src_prepare() {
+ default
+ #.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
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf --datadir="/usr/share/${PN}"
+}
+
+src_install() {
+ default
+ insinto "/usr/share/${PN}"
+ cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
+ rm -f COPYING
+ einstalldocs
+ doins -r *
+ newicon images/icon.png ${PN}.png
+ make_desktop_entry fillets "Fish Fillets NG"
+}
diff --git a/games-puzzle/fish-fillets/metadata.xml b/games-puzzle/fish-fillets/metadata.xml
new file mode 100644
index 000000000000..e70cd0e424d2
--- /dev/null
+++ b/games-puzzle/fish-fillets/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">fillets</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/five-or-more-3.22.2 b/games-puzzle/five-or-more-3.22.2
deleted file mode 100644
index c4ee34086d82..000000000000
--- a/games-puzzle/five-or-more-3.22.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.12:3 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Five or More Game for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
-SLOT=0
-SRC_URI=mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.2.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdd7788621a56c8e59090c1c031cdfad
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
new file mode 100644
index 000000000000..16cc1ab8480b
--- /dev/null
+++ b/games-puzzle/five-or-more/Manifest
@@ -0,0 +1,3 @@
+DIST five-or-more-3.22.2.tar.xz 3297904 BLAKE2B d727f18946b9ce26351db1b98c9396b9b4d79db0c412ca48c8a08266f162c47639af1612a27bb2ba0b513719a88574126c54da856df35c9e80bb01fbbb763cf0 SHA512 a809e227f7ec59912915f4808676c25777a0264268a06dcc7524d121b943e32fc95cfb815f2153aa0960aa0cdd0b3fed054c15d9d0c12d89ed155f0352fcb6f3
+EBUILD five-or-more-3.22.2.ebuild 605 BLAKE2B 18af18d9d82bcd7062e3868d16f916850bdf7f4eb3da62181d402ca433228286b9c1cb068f1ffe2f11d81b59d89525e18ef085c36c5f716f6d11449f46118cca SHA512 7c470d8de623350a26af84eee5c0bdc755d361defbec0a5b18187871ff8e037cee18b08b64b39c1bd2867cc903f25b55815484e82d77ab504f5bf6c2a6ec29ff
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild b/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild
new file mode 100644
index 000000000000..074be2bc1d11
--- /dev/null
+++ b/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Five or More Game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=gnome-base/librsvg-2.32:2
+ >=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..39980802b1da
--- /dev/null
+++ b/games-puzzle/five-or-more/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/flobopuyo-0.20-r2 b/games-puzzle/flobopuyo-0.20-r2
deleted file mode 100644
index 5c203667ff50..000000000000
--- a/games-puzzle/flobopuyo-0.20-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
-DESCRIPTION=Clone of the famous PuyoPuyo game
-EAPI=6
-HOMEPAGE=http://www.ios-software.com/?page=projet&quoi=29
-IUSE=opengl
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=http://www.ios-software.com/flobopuyo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4757271660e5a721706e1fd8071b6c6b
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
new file mode 100644
index 000000000000..59ba75160a57
--- /dev/null
+++ b/games-puzzle/flobopuyo/Manifest
@@ -0,0 +1,7 @@
+AUX flobopuyo-0.20-gcc4.patch 967 BLAKE2B befdc13ec4da55497fae89f79aa1ad518738ffd69a8eae10167551dc45daeffbb9130adb319e426a8d5c65e2743a0bfc0d83dfec2ee19855d72fe86d0dba4478 SHA512 f1bfdbf6ba4e4fc2be453aa7d2299f70a2a47a1906e2b7043ef8c14a7b4c8e5bc1de29565e1404ba9c6688c03f4439f123b3325f3223bd3771eee9fe458ecd62
+AUX flobopuyo-0.20-gcc41.patch 447 BLAKE2B 189a5e2f970fd4e9ea1e5e12b6344e9c96d29a4de99ace9a9fbcaba35b832369159535d3195c871b91e75678b97f274fc0e4bf788a17608fdf7ab84a75716228 SHA512 05b888959fcc4e1bc0a1248c9efdbdc9768ee25382fb67dad1d49214c7180e97fa498853bca4483c7786f946d9b0527cfbd79065e5585cc26f72ade3900219ec
+AUX flobopuyo-0.20-libs.patch 4687 BLAKE2B fc571a5de46bb52bfa65eacc3078fddbe6b5c5f1e58378b2ff7e1f91b6130a0011705f6f17cf47dbe3c5417fbc7dfa3f708b970548f81f7234d467d11b6cf09e SHA512 fd879dca79a8532909286a50ec9d3d66b2fdf149a64602ee8990aad2a3de8dbed268f6837d39039db77774ab7e29a91b121f06dc172eae59a6c69c0f799a810b
+DIST flobopuyo-0.20.tgz 2949750 BLAKE2B 5e6b451ca05c4e3c497889fe350ceea8dffd9a0bc53b69747449e1ab607c26328ee3d2d1acb9ebf8a7fa634e43e12746f02c50166f16c7e2d3bbfa6531878250 SHA512 8ec7e690e53cfc171959663ef07912f2b23ae1842b72faa0125de8d6d2ad93672b9b4d68593b1f49f97c53a13409aca7bc5a598858fc7cff4698a4064ec95276
+DIST flobopuyo.png 25038 BLAKE2B ab9af4d0785614725c5b03942956c5cabfdfa38b3f5b2870dfbed9428ab51c553dad784b643f3387bfb4d90073befe9ea6d6bac57bbb266154b28092410d5c1d SHA512 6eca6fd1559d8ecb62b19be9fcaef2af1edb727154dd4e10f9f0f9ef9863d99c9445689bd64724cb5da0b251384efc491acfa40bf5105fa9bdcecad3f809ceb6
+EBUILD flobopuyo-0.20-r2.ebuild 1109 BLAKE2B 28e3b6500145e50fe01bc40f990b110859de6e3a60d39b818f5f24078e5e8d9697f2ab4a6b880c47f52513dfd429c90e52e2483ad177ea49af8c86a00779c426 SHA512 c47cd9c0d5475b7a8d4065d4d9cc8558612c9dcdbefb9e5405ae8f294da92553273d362e377d62af657bfd5e16e8cd24fba9d46faf7fac8cec557a7f4be26663
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..b9b55a333cb6
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
@@ -0,0 +1,136 @@
+--- a/Makefile.orig 2004-10-08 18:41:12.000000000 -0400
++++ b/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-r2.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
new file mode 100644
index 000000000000..41ee671603ff
--- /dev/null
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop toolchain-funcs
+
+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 ~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() {
+ default
+ eapply \
+ "${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=\"/usr/share/${PN}\":" \
+ -e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:/usr/bin:" \
+ 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
+}
diff --git a/games-puzzle/flobopuyo/metadata.xml b/games-puzzle/flobopuyo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/flobopuyo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/freesweep-0.92-r1 b/games-puzzle/freesweep-0.92-r1
deleted file mode 100644
index 2f0ba26d86f5..000000000000
--- a/games-puzzle/freesweep-0.92-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=Console Minesweeper
-EAPI=6
-HOMEPAGE=http://freshmeat.net/projects/freesweep
-KEYWORDS=~amd64 ~x86 ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep-0.92.tar.gz
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b75af3d4dc92cd83588e18171e0064c6
diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
new file mode 100644
index 000000000000..223568c85522
--- /dev/null
+++ b/games-puzzle/freesweep/Manifest
@@ -0,0 +1,3 @@
+DIST freesweep-0.92.tar.gz 87353 BLAKE2B 8775a5c135e5a7faba00af2e2fd279c619a8092ad905c8dfa3d3ac7755d0b6337cb39f4b93e0c4bb1e905a87770e946cb728256bc5a2897794802424fa5ebdc2 SHA512 9f7f33ba5fab62d1ea3a6a57b9a60323281c91255218afb51251c4e20500c123769f003ae1a3622205be34fa7cfe11b691e58ad8787782da4d0a7045d4f41122
+EBUILD freesweep-0.92-r1.ebuild 562 BLAKE2B 39f1d588d6245207d91fcb7637cd90f5abf278b3365284d4abbae573a3fa05168386293b45e32a5251a41f29d3cf13c6753067a82b239ae941523def9a2caed4 SHA512 0ac25425de4675260d51871255debb06e54603843afd8559e077c7421fa62a865519b4b64c63c3b91317f9c928cca758d97bbd2fe0dcf0263b04c4af599ff2f2
+MISC metadata.xml 330 BLAKE2B e435f3a2e4a5c8fba959c2e181052f9ae3cfabbd1d6ebb57b6a12704db3d2dd6acfefadb84bf4b27dbd0a68c201384dd2edf9a6373158655598f1a3680d02001 SHA512 4df540d39a83e0bfc22135a1463f8bce474615410c58d5fab2e323c82c5e9b3d732428417da18a76c09bd4ca41e1f04b8d141e29743690eb38b4142ce3920a37
diff --git a/games-puzzle/freesweep/freesweep-0.92-r1.ebuild b/games-puzzle/freesweep/freesweep-0.92-r1.ebuild
new file mode 100644
index 000000000000..fe5d96ca8f6d
--- /dev/null
+++ b/games-puzzle/freesweep/freesweep-0.92-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+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 ~x86 ~ppc-macos"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_compile() {
+ emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+ dobin freesweep
+ einstalldocs
+ doman freesweep.6
+}
diff --git a/games-puzzle/freesweep/metadata.xml b/games-puzzle/freesweep/metadata.xml
new file mode 100644
index 000000000000..7b6242aeadc0
--- /dev/null
+++ b/games-puzzle/freesweep/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freshmeat">freesweep</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/galaxis-1.8-r1 b/games-puzzle/galaxis-1.8-r1
deleted file mode 100644
index 843fa2c2286e..000000000000
--- a/games-puzzle/galaxis-1.8-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=sys-libs/ncurses-5.3:0=
-DESCRIPTION=Curses-based clone of the nifty little Macintosh freeware game Galaxis
-EAPI=6
-HOMEPAGE=http://www.catb.org/~esr/galaxis/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.3:0=
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/galaxis/galaxis-1.8.tar.gz
-_md5_=5bcba8b0402b86405ec1e49e356250dd
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
new file mode 100644
index 000000000000..b73b13ef9377
--- /dev/null
+++ b/games-puzzle/galaxis/Manifest
@@ -0,0 +1,4 @@
+AUX galaxis-1.8-gentoo.patch 1412 BLAKE2B be1f33db0ddd13a5db8dc4f7c5e7c7bd7e1311d8d9eba60b60a816bd9c7f79b7b123d8898d6ec74f696234744cea14424ed8158da02bb0810833f8450c249ea0 SHA512 110c500bdd46e7ea5fdd90bf93468e7560f9de7735b2f7b89f74ddd273d5d9afc1983891106103632429b73f3af16c667d7133987218ca7c5a7f5cceb1106301
+DIST galaxis-1.8.tar.gz 8962 BLAKE2B 3380d44ca6b168ddc71edf4e7fb61bc9a22c24cf73e1bbd4b60a87517a769f3b3b2475d64281168fe6ade7b88bbc75b3eec923cf1d26532b097d6820b14f9817 SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f
+EBUILD galaxis-1.8-r1.ebuild 531 BLAKE2B 6fd0836871c4b21c54392fe80970695beafd8dcaa4f14ba71d382c3c1048cf54b1d28fe3dbf03e038f35730b440c0ca601cc84500c5bfddee675cc740efc356b SHA512 24c6ddf649ace9a4ff56297a6f91c05e1eb03a6ec268aaae3c0c0b1c14887744b3ae60b478517854a2055319b374e5494fc45d6ecc0ea844ce8467e252882537
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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-r1.ebuild b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
new file mode 100644
index 000000000000..73020c4a91e1
--- /dev/null
+++ b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="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 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.3:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_install() {
+ dobin galaxis
+ doman galaxis.6
+ einstalldocs
+}
diff --git a/games-puzzle/galaxis/metadata.xml b/games-puzzle/galaxis/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/galaxis/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gemdropx-0.9-r2 b/games-puzzle/gemdropx-0.9-r2
deleted file mode 100644
index 1aa44920b990..000000000000
--- a/games-puzzle/gemdropx-0.9-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
-DESCRIPTION=A puzzle game where it's your job to clear the screen of gems
-EAPI=6
-HOMEPAGE=http://www.newbreedsoftware.com/gemdropx/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
-SLOT=0
-SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/gemdropx-0.9.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=e6ff3ad024f7e2ddaac256dd84c1b987
diff --git a/games-puzzle/gemdropx/Manifest b/games-puzzle/gemdropx/Manifest
new file mode 100644
index 000000000000..33b0de50b644
--- /dev/null
+++ b/games-puzzle/gemdropx/Manifest
@@ -0,0 +1,3 @@
+DIST gemdropx-0.9.tar.gz 903036 BLAKE2B 8ac4a7df1e0983cc48e17db07d3c0e66c76c23f34df5c094ddd690a8f18bc50ee0a4c0c378b23da1f266b61d4da634655d051daa71592f35d5a8645f0db29761 SHA512 f99292f44575cb86c50e29f220d5fd358b3e6dd379148dcd764eac5bca5edcc49f88e119f9bebddb14017403985378f1bc07633c987556a9264f36ce20cc6fb2
+EBUILD gemdropx-0.9-r2.ebuild 1068 BLAKE2B 9f647c38a0730c05d5fb97b6380964dddf8d20f7530f37544f8408a935c32f56b0a39c52d7377ab307c519af104ae46b3d33e1efbfb13068019cfa16e9787f66 SHA512 e1cab173982a30529b7a86bae686988f15ead3e027e8bdefbf2f3cc0103e1142f346d3f09244e75de9d5b5eb985cfac0b266748d6c5242b1bb171aeeae7460a9
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild
new file mode 100644
index 000000000000..307663065741
--- /dev/null
+++ b/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=media-libs/libsdl-1.2.3-r1[joystick,video]
+ >=media-libs/sdl-mixer-1.2.1[mod]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ 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="/usr/share/${PN}" \
+ XTRA_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+ dobin gemdropx
+ dodir "/usr/share/${PN}"
+ cp -r data/* "${ED}/usr/share/${PN}/" || die
+ dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
+ newicon data/images/gemdropx-icon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Gem Drop X" /usr/share/pixmaps/${PN}.xpm
+}
diff --git a/games-puzzle/gemdropx/metadata.xml b/games-puzzle/gemdropx/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/gemdropx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gfifteen-1.0.3-r1 b/games-puzzle/gfifteen-1.0.3-r1
deleted file mode 100644
index 8e75e8010524..000000000000
--- a/games-puzzle/gfifteen-1.0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Graphical implementation of the sliding puzzle game fifteen
-EAPI=6
-HOMEPAGE=https://frigidcode.com/code/gfifteen/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://frigidcode.com/code/gfifteen/gfifteen-1.0.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6067d752571b1e31c60ea9d134b142a
diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
new file mode 100644
index 000000000000..39ef45aa8121
--- /dev/null
+++ b/games-puzzle/gfifteen/Manifest
@@ -0,0 +1,3 @@
+DIST gfifteen-1.0.3.tar.gz 525454 BLAKE2B 253f74439d491b8ff30697c755dd8e04203a9282de0640603ae4e90fc37f3965ca7f1a02dc1263a71f5b00a18ccf42e7ac371cd20c5bc518fe9b12361fc80818 SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4
+EBUILD gfifteen-1.0.3-r1.ebuild 866 BLAKE2B 5f7df7a00769db391a9b2f678b0744efcfc79db8e20d55e8f81a9f67ceadd166402c61ce4d9aade6cbc57afe5f1988f8a5b930cb59f061b278f748f98130c9a1 SHA512 65147433ed36d9c67a979270adc0b371898b217681830173956d82de847e103c87f4eaa61d62d07f43be0520b6a6b131fe8c61b26aa79fd5666385a7d813a176
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..863fc84ff7f1
--- /dev/null
+++ b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2-utils
+
+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() {
+ default
+ # make it compile against newer gtk+:3 (bug #536994)
+ sed -i \
+ -e 's/-DGTK_DISABLE_DEPRECATED=1 //' \
+ Makefile.in || die
+}
+
+src_configure() {
+ econf --disable-assembly
+}
+
+src_install() {
+ default
+ doicon -s scalable ${PN}.svg
+ domenu gfifteen.desktop
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/gfifteen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/glightoff-1.0.0-r1 b/games-puzzle/glightoff-1.0.0-r1
deleted file mode 100644
index 4df64d0de685..000000000000
--- a/games-puzzle/glightoff-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2 >=dev-util/intltool-0.29 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A simple (but not so easy to solve!) puzzle game
-EAPI=5
-HOMEPAGE=http://glightoff.sourceforge.net/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2
-SLOT=0
-SRC_URI=mirror://sourceforge/glightoff/glightoff-1.0.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d0af3a754820db0c014254722d75d19
diff --git a/games-puzzle/glightoff/Manifest b/games-puzzle/glightoff/Manifest
new file mode 100644
index 000000000000..bb5b21bcc743
--- /dev/null
+++ b/games-puzzle/glightoff/Manifest
@@ -0,0 +1,4 @@
+AUX glightoff-1.0.0-desktop.patch 402 BLAKE2B 7963509566d34f84f6850385093774cd1829b6791e63494eaf774a2ec634288c68f57746046e47d76a8978dbf7dc9d6d4c6199a9c9358418a93d509892ac1c83 SHA512 4571865a471d210b5218775a09076bdc4003880e6683a245efeeba47a7e128822c11c6b1198fdfae21460900dce5fd747166c30f75c75d0322b1e8a68f7daa27
+DIST glightoff-1.0.0.tar.gz 349274 BLAKE2B 1c8198215ad1b5229f7ca9ef55df2858cf61474d18343ab0d506ace2104807573b29a3e570c5b88149fa788601c4f2fda872f2f36948cbd8f0de3dc2c5193293 SHA512 b3be7f65bfbb6b3affbddd20a12321ee401defb2bc0b64e58b5aed05d319e6ac51100cfa8dfb4beddb3c919deb9ee6931235dbc4183c12d3e501da5eb748ae94
+EBUILD glightoff-1.0.0-r1.ebuild 703 BLAKE2B 03d9201fa1b7dcc37f33affeb79add8924fe982e218f6ee652d5ec352eec2e9ba0b4cb42ddfe87abab8c1d3cee95488710dc9cd3080b4cc8d3a940e99ea0ef25 SHA512 2ea4bc1971fe1352c5c3e94a8150e20000ac5a8ffec0e295f3f39a645416c340d6470c2ebfc4499f218e47a0661d66d5092a51e223d4b61015416aa7084b3433
+MISC metadata.xml 332 BLAKE2B 31bf81162a12c4192ab3fcf74e2e72c1f0f188c163e74b6db1de3986de1c335d641250c125732172fd7a2412edad4a97f01e53dd0f7e9470163fae5e3947210a SHA512 83debe37911969e2b45ad0ca5ff90684a7d7e3dc3fd4bb504aa537c3c7823b68131f8e919075c9e5806d6b29a8874086f3c69fbfbb1335898d241d8b46f70e70
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..5a209fa62cf1
--- /dev/null
+++ b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~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..a6bc0cedd676
--- /dev/null
+++ b/games-puzzle/glightoff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">glightoff</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-klotski-3.22.3 b/games-puzzle/gnome-klotski-3.22.3
deleted file mode 100644
index f082127c1a42..000000000000
--- a/games-puzzle/gnome-klotski-3.22.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.19.0:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Slide blocks to solve the puzzle
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Klotski
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.19.0:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.3.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5eb47c03f26a36f6242842bccde1a5dd
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
new file mode 100644
index 000000000000..a75dd6c0e5c9
--- /dev/null
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-klotski-3.22.3.tar.xz 664380 BLAKE2B 3c5ca5da9baa30921796a8701fcd2e1f5214fe19070895390fd26617af6eac7dbe12c92e643cfd2b3b5b1bbb0303e4272e338100f23a79011939506a433be014 SHA512 d86b39c60b545abfe6fce2366dd40e2d603e635f4b33c42e76a4447b845981c51fadfdb8f9f073e515ccd9772c9ee5f29258ac63b6620acff03150cc52a51d0d
+EBUILD gnome-klotski-3.22.3.ebuild 679 BLAKE2B a9f706d663fadb1df9168610833f5abcd2d699c55174564d4cebfe9f2c8a0cf624576c41a3feed4a1dc4b591188c0079dffe4e875b3e57983dae49f1717b9851 SHA512 8715400c87b692733e3935f3319cd6cb806dae39703b26dba91a42bcfa4f0ad47b0d3901feccf8ea72ef194801a46dd9f9370276d84675eb6ec25b01e9d7f7aa
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
new file mode 100644
index 000000000000..8d225bd382fd
--- /dev/null
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 vala
+
+DESCRIPTION="Slide blocks to solve the puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ dev-libs/libgee:0.8=
+ dev-libs/libgnome-games-support:1
+ >=gnome-base/librsvg-2.32.0:2
+ >=x11-libs/gtk+-3.19.0:3
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ gnome2_src_prepare
+ vala_src_prepare
+}
diff --git a/games-puzzle/gnome-klotski/metadata.xml b/games-puzzle/gnome-klotski/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/games-puzzle/gnome-klotski/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-sudoku-3.24.0 b/games-puzzle/gnome-sudoku-3.24.0
deleted file mode 100644
index 9528596c73dd..000000000000
--- a/games-puzzle/gnome-sudoku-3.24.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection] || ( dev-lang/vala:0.36 ) app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Test your logic skills in this number grid puzzle
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54a5d6afef03c9c1401292e7899a9fed
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
new file mode 100644
index 000000000000..e7ce3ce75c74
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-sudoku-3.24.0.tar.xz 2890256 BLAKE2B 81e8c2cf8df3a441979dfcd6d5726439231d9c4175be1fc765f02aef5bd13bee3675708cd33694f1c2a3a0097e35a83023b6add3bfe7930c4289be576fbfbf2f SHA512 3e00726be6ceebe6107f0e7c1100e1072f815dcaf0f4d5f2ce5cf75ae0393457aead001fe8b43420d20ef6e09bc8a7d6fd79d8aaa72a87c21e7c9f8d18ee0809
+EBUILD gnome-sudoku-3.24.0.ebuild 772 BLAKE2B 7716caf3d721948cba678ee7e260aacb2defb1839c990a81d1686fcd211d48b3ff89f989e702938325a3967f8fc888af543a27fb4fe40538b2101fb2e7eed072 SHA512 b940bda715837ad7814a04e13ac1526cdd42a0c4673524783519d15e7eb91a29d0a45f5e76ec49e4b82227972f6200b1ecbf1172588fcec24bef3f9b3a58d8d5
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
new file mode 100644
index 000000000000..0da196bf2483
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.36"
+
+inherit gnome2 vala
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+ dev-libs/libgee:0.8=[introspection]
+ dev-libs/json-glib
+ >=dev-libs/qqwing-1.3.4
+ x11-libs/gdk-pixbuf:2[introspection]
+ >=x11-libs/gtk+-3.19.0:3[introspection]
+ x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ gnome2_src_prepare
+ vala_src_prepare
+}
diff --git a/games-puzzle/gnome-sudoku/metadata.xml b/games-puzzle/gnome-sudoku/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-taquin-3.22.0 b/games-puzzle/gnome-taquin-3.22.0
deleted file mode 100644
index 3b74dfe1c724..000000000000
--- a/games-puzzle/gnome-taquin-3.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Move tiles so that they reach their places
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Taquin
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0
-RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef6b5e40791ff5c6984c52b2a7735559
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
new file mode 100644
index 000000000000..c41e64f74a43
--- /dev/null
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-taquin-3.22.0.tar.xz 5030156 BLAKE2B e2757fe196a985c19de5b902d866fb1e9c6f97234dc25af59db10b3c066d1095a7280a5a0054b0c15c913fa93c541f4c0626f481257ab3bfefe5db9fdf308493 SHA512 9fbfa651b2546af16ca215ce0edb4466dd3663c90bf1c130c983422a0c5860f6146db97f7d9095b727d99ee98496e3bdb02afe46c9ced66672435638ba49788a
+EBUILD gnome-taquin-3.22.0.ebuild 681 BLAKE2B 548d984c52259163ab17e583ca5779f094511661e9e221e29dff65e38ffcbcf33b18747fd76283d758961abe396f2815478031ed9a4227f031ddc55a3b9bf97c SHA512 0ae6e60c94c1973c9cbe4fb842349925e15e279ddddb17f6d8fb1d9eff6da09ef501d7ed5d2e997ecd9760af0a368f25ae21738bd9b072ef59bd976dec9eb18e
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild
new file mode 100644
index 000000000000..6cba03479009
--- /dev/null
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 vala
+
+DESCRIPTION="Move tiles so that they reach their places"
+HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+ >=gnome-base/librsvg-2.32:2
+ >=media-libs/libcanberra-0.26[gtk3]
+ >=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ gnome2_src_prepare
+ vala_src_prepare
+}
diff --git a/games-puzzle/gnome-taquin/metadata.xml b/games-puzzle/gnome-taquin/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/games-puzzle/gnome-taquin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gnome-tetravex-3.22.0 b/games-puzzle/gnome-tetravex-3.22.0
deleted file mode 100644
index 6ddde107f880..000000000000
--- a/games-puzzle/gnome-tetravex-3.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.13.4:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Complete the puzzle by matching numbered tiles
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Tetravex
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.13.4:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c5898fe6fec94f0afe4e6d56398d966
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
new file mode 100644
index 000000000000..3369b5679f13
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-tetravex-3.22.0.tar.xz 2170464 BLAKE2B 43ee2d93a8d8b2a1f9515ee23a85a77be3f30b299652f2b5192d5f97bf3064d6a636f10e78438aee329ad91d1f0b7fed6ec2109593397b7c849c36ec727692d2 SHA512 d4497fae7e2c95f6d6e26b72690c86ec12250ccc6136f02436a53fa285215415a471d91f2ded10690faced6f6f856218750eb76313d368863a7a31afd02a9d2d
+EBUILD gnome-tetravex-3.22.0.ebuild 615 BLAKE2B 5d9bdf3ccd0cae3d817cf749a416510600c0b3b52039fdc41dadaaf815f521ef7951ba8a2ceec374c4bced011a393ec23976e57610c752204257b192f553e9bc SHA512 d8bb6588b321314a3895252aa0847901c18e1a132cd2e6bc07b1f63476182ab969750d8491409192bf9895c5a25c9e33d0b626c66d089d3bc9015d0bbee2266f
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
new file mode 100644
index 000000000000..73045c053f32
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Complete the puzzle by matching numbered tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+ >=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() {
+ gnome2_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..39980802b1da
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gnudoku-0.93-r1 b/games-puzzle/gnudoku-0.93-r1
deleted file mode 100644
index 9e9fb27af113..000000000000
--- a/games-puzzle/gnudoku-0.93-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-cpp/gtkmm-2.6:2.4 virtual/pkgconfig
-DESCRIPTION=A program for creating and solving Su Doku puzzles
-EAPI=6
-HOMEPAGE=http://www.icculus.org/~jcspray/GNUDoku
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-2.6:2.4
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.icculus.org/~jcspray/GNUDoku/GNUDoku-0.93.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=95eb1f668fb50f3cd66916f94a8e9b31
diff --git a/games-puzzle/gnudoku/Manifest b/games-puzzle/gnudoku/Manifest
new file mode 100644
index 000000000000..0f6ccc3a65eb
--- /dev/null
+++ b/games-puzzle/gnudoku/Manifest
@@ -0,0 +1,4 @@
+AUX gnudoku-0.93-gcc43.patch 329 BLAKE2B 7c76007733a0d78c71d0e11416a2ccc415cbe44260cb231d5391c980c018d0d759e07844376fe8ef92b0c6bf40966ddcc3b990534be8532ef5192577cef5fac8 SHA512 b7cbfbaad6a73029ee0b31cab0c630a594e7ac6433c6972255ed7ea475a5729fe004fe5791ec82b97df84f19637cbc40a37df8fa5ff29fde115d343b836bdfe0
+DIST GNUDoku-0.93.tar.gz 26212 BLAKE2B 77d47294dbdfb3b9074e7ffb4a2083d13a33caa7a6268bb70722970beb5b065e54b4cb16733686ab2c8d08d4e88855ed51cacdd639aff5a84f1c62c5ab43aa35 SHA512 124bde796149136320758de5088f7d177ec8a4ffe03190f22bd8b228c00d1adb790450c760110e14d1cc9bf70f7dd54477405582c313c91e8da97d39c8fc55a6
+EBUILD gnudoku-0.93-r1.ebuild 867 BLAKE2B db5adacbe1fe2ca0f41a87e85b7b7ac609e73cb57199a5008cd32b1c2b10dc30b7865b3bbd77cb1385807165e030c92788bd025c00d13fe09c033e1f9135d621 SHA512 5e615e8a0b5384084b90fa1ff5582c90e9b9cae2692f4cbe2b00d15466f552832de995867daf3051160603867735b9ffcae9b6df25916bb2a768fb02051a0fb9
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..bb92102a37de
--- /dev/null
+++ b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
@@ -0,0 +1,20 @@
+--- a/GNUDoku.C
++++ b/GNUDoku.C
+@@ -25,6 +25,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <ctime>
++#include <cstring>
+
+ #include <vector>
+ #include <cassert>
+--- a/sudoku.C
++++ b/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-r1.ebuild b/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild
new file mode 100644
index 000000000000..bfd07d1a9a25
--- /dev/null
+++ b/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop flag-o-matic
+
+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 ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-cpp/gtkmm-2.6:2.4"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-gcc43.patch
+ append-cxxflags -std=c++11
+ sed -i \
+ -e "s:\$(CXX):\$(CXX) ${CXXFLAGS} ${LDFLAGS}:" \
+ Makefile \
+ || die "sed failed"
+}
+
+src_install() {
+ dobin GNUDoku
+ newicon GNUDoku.png ${PN}.png
+ make_desktop_entry ${MY_PN} ${MY_PN}
+ dodoc ALGORITHM Changelog README TODO
+}
diff --git a/games-puzzle/gnudoku/metadata.xml b/games-puzzle/gnudoku/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/gnudoku/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gnurobbo-0.66-r1 b/games-puzzle/gnurobbo-0.66-r1
deleted file mode 100644
index 3c87a00975c0..000000000000
--- a/games-puzzle/gnurobbo-0.66-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
-DESCRIPTION=Robbo, a popular Atari XE/XL game ported to Linux
-EAPI=6
-HOMEPAGE=http://gnurobbo.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 BitstreamVera
-RDEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
-SLOT=0
-SRC_URI=mirror://sourceforge/gnurobbo/gnurobbo-0.66-source.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=0a434e079fbb44a64b5fb3bd81037b16
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
new file mode 100644
index 000000000000..f4924af58a2a
--- /dev/null
+++ b/games-puzzle/gnurobbo/Manifest
@@ -0,0 +1,4 @@
+AUX gnurobbo-0.66-underlink.patch 858 BLAKE2B b3ddef3a919afd45c5d949d5f48cecaaea1c013e1924fffd8ce17e32c407562c9054059696db92750322d9378b900ce8432cc30741d0c43b86b5c6b8dd407e4c SHA512 b2053326e1e06cc780647f0c40452729430dd7d0c641406719ce48ba5159e7dd160efc9c892de9424f50ac43386cd6f2a598558e604c34be41a3ccf15d937375
+DIST gnurobbo-0.66-source.tar.gz 1765034 BLAKE2B 4a88d1281fdea44516c86e704a828e1d3ef2116cc7d6401960524ea53435828bb09f73adf57016bf3b7a0fa107ee411c575ca2f288375148658bf1bdf0b16aa2 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c
+EBUILD gnurobbo-0.66-r1.ebuild 910 BLAKE2B 8b6e1f9b6d9a76d23a64a3a60231fb28763b6669a9d4ef861fdd8e31d85fead9f77650c263c82682a9cfef2e7bdb392f8ee16858a5335358b9a95133ef7cc78d SHA512 c59070e20efad3ccf4716bfc66408c059a25215517605b6d3b4defd4bbd221b025b772b40cb34b3e01a267117e3c5d10402df74285ac4bf94834ba77e54d054e
+MISC metadata.xml 331 BLAKE2B 9e3cb9283f67936d5be789e0c65509547ddbfee86c3695ded8ff72310458e7937710915e82b2f9c9f50102b0a78ab08d3d78e5da7e05923bc53bdb69bf8b75e1 SHA512 56663c15b5d9135317f5cfdef851959613abd44ced462fc3429540a76be55970f831bfc284d2fe06ace79ea98586109bc64489ba9d12fab9a0909186f40365da
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..af69bd9e1c9d
--- /dev/null
+++ b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.old 2011-06-20 21:19:49.578922392 +0200
++++ b/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-r1.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
new file mode 100644
index 000000000000..39a81fdcd790
--- /dev/null
+++ b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/libsdl[sound,video,joystick]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-ttf
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+
+src_compile() {
+ emake \
+ PACKAGE_DATA_DIR="/usr/share/${PN}" \
+ BINDIR="/usr/bin" \
+ DOCDIR="/usr/share/doc/${PF}"
+}
+
+src_install() {
+ dobin gnurobbo
+ insinto "/usr/share/${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
+}
diff --git a/games-puzzle/gnurobbo/metadata.xml b/games-puzzle/gnurobbo/metadata.xml
new file mode 100644
index 000000000000..446252dcc733
--- /dev/null
+++ b/games-puzzle/gnurobbo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">gnurobbo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/gottet-1.1.6 b/games-puzzle/gottet-1.1.6
deleted file mode 100644
index 141aad50dce8..000000000000
--- a/games-puzzle/gottet-1.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
-DESCRIPTION=A tetris clone based on Qt5
-EAPI=6
-HOMEPAGE=https://gottcode.org/gottet/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/gottet/gottet-1.1.6-src.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83edcbde256b9e458cc139d82f2face8
diff --git a/games-puzzle/gottet/Manifest b/games-puzzle/gottet/Manifest
new file mode 100644
index 000000000000..8fe7778f6950
--- /dev/null
+++ b/games-puzzle/gottet/Manifest
@@ -0,0 +1,3 @@
+DIST gottet-1.1.6-src.tar.bz2 527181 BLAKE2B 1cd090c81c6b4c629b3cf08c8c96a73b3aed18a86a70a1d837d866d0354e8adecfd438cdfc93a821991f9ab919263f2db7e542e13f2503abe16d4b311ea03c95 SHA512 6e004d96ccd11169c19ce5234691db35af34ff050139ae7fee3949f0a36170a1ec906f83ba2a1f2f15fc3538adb08da8c8b744fbfb3202dfc59ebfeea7136f0d
+EBUILD gottet-1.1.6.ebuild 644 BLAKE2B e1fbd0e68fec61bcaeb954ef4db063cd6269a0afe7ec6798e5b9d793c6dd6ba2601494563a4788713edc042e8b9473c82292383236d80a6811d60648ca22704d SHA512 8924ce580c1b7c3a5ede9dc29b5efd6434baff443b679aee4292032968aaa7bbdd3f9a2978c80df6cf98c4c2e9e93d12f610a02cb9c11dc7f2b188ab90f5f532
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gottet/gottet-1.1.6.ebuild b/games-puzzle/gottet/gottet-1.1.6.ebuild
new file mode 100644
index 000000000000..0d95a54b6a90
--- /dev/null
+++ b/games-puzzle/gottet/gottet-1.1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="A tetris clone based on Qt5"
+HOMEPAGE="https://gottcode.org/gottet/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+src_configure() {
+ eqmake5 PREFIX="/usr"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/gottet/metadata.xml b/games-puzzle/gottet/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/gottet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/greedy-0.2.0-r1 b/games-puzzle/greedy-0.2.0-r1
deleted file mode 100644
index a8a5dd0d2561..000000000000
--- a/games-puzzle/greedy-0.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
-DESCRIPTION=fun little ncurses puzzle game
-EAPI=5
-HOMEPAGE=http://www.kotinet.com/juhamattin/linux/index.html
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.kotinet.com/juhamattin/linux/download/greedy-0.2.0.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=342d575934ead774452e71d146639c7f
diff --git a/games-puzzle/greedy/Manifest b/games-puzzle/greedy/Manifest
new file mode 100644
index 000000000000..29a80e311f6d
--- /dev/null
+++ b/games-puzzle/greedy/Manifest
@@ -0,0 +1,3 @@
+DIST greedy-0.2.0.tar.gz 13152 BLAKE2B e31aa4965a3347ae86c2c598e7eb9cfb3a24657fd24cb49f6d1a925a77e67d162b64647a3f0ea74ff40ac14aa996faaafa305a47991b2a40cd46d3e293ee5859 SHA512 07376d003193244d336909f6336d68c4ce0f1e15388f28cc8e50121856b1f341f46f2aeba6e09118063b27d572916b4f596b75354543df3a72930a44b6b6f8ac
+EBUILD greedy-0.2.0-r1.ebuild 896 BLAKE2B c7983666a3718b661cc7b0385729eb1e069d472b2fc2405847fa743a0816a385f29eb8ce1c84b767802125f9d158cc597ef3c4ba45dcc3df81150b149b8cb57f SHA512 548171eafbf6a19ca223d98387e82935898142a5ef453c382c3731994d3fc5734772ef9435b33cb429a95e95f252907878fe15a541611e5342119ee1f8af708b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..dffb899aebff
--- /dev/null
+++ b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0"
+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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/greedy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/groundhog-1.4-r1 b/games-puzzle/groundhog-1.4-r1
deleted file mode 100644
index ed1e192fe318..000000000000
--- a/games-puzzle/groundhog-1.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Put the balls in the pockets of the same color by manipulating a maze of tubes
-EAPI=6
-HOMEPAGE=http://home-2.consunet.nl/~cb007736/groundhog.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://home-2.consunet.nl/~cb007736/groundhog-1.4.tar.gz mirror://debian/pool/main/g/groundhog/groundhog_1.4-9.diff.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f02b04e82a09b036001de4a0fe143c4d
diff --git a/games-puzzle/groundhog/Manifest b/games-puzzle/groundhog/Manifest
new file mode 100644
index 000000000000..b0bc9139eefb
--- /dev/null
+++ b/games-puzzle/groundhog/Manifest
@@ -0,0 +1,5 @@
+AUX groundhog-1.4-flags.patch 608 BLAKE2B aec098b6453a3541a087d382f93e4aa1c9ba9deb6435118836cef9825c617e417981a25040ca2b36268de6c688a29d71f62c8e1bab197e824aee9bec81da0d1d SHA512 ee6e08ead434e9285ee6d2b8580effd33528a8c4c13635e9ecf1973ca25a7869a98ed6231f95e4e789867bfa56e8b57e2a939ebf35107f15959eb643df880862
+DIST groundhog-1.4.tar.gz 221871 BLAKE2B e9b7dd2c7498b6320ee4fe396679ba76831c13357b1e7fc9cd14578f387de6d1ca38fa0f5aa4fb3461afb3c27080751de45e3b26ded281dcb59475d85eccbe35 SHA512 9d1cf9073658cd325c4dceb6009825f50d8d4c55d0cca1b762cfdd066663257958d92e0e67ad49593add5821ce202e19c1106793ae8c77e4776c3b2e1fdc093c
+DIST groundhog_1.4-9.diff.gz 8613 BLAKE2B 5bbfd5deaa0f7579369baea93be40e5b2ced14d9356417b0aaef595df830bb29abb4b3676878f49005e68ec81c5ec762ab418fce55c26fbbd2af062263757335 SHA512 ddbb7c8b51fe63a1d318e080133737a851276ab55324875e5d68650d2399ac141667c62ab79ee41ababd2b5426e7bee5f158e7aa4edfe8ee82c6c3b6fb8179b8
+EBUILD groundhog-1.4-r1.ebuild 1221 BLAKE2B c282f82e888dadf7330bce1e4b99018e17fcb3713894ff27591320de9a167b86bebdb93a7ddd9b29545eb205946f61c38b64f5614b958ea554299e9a3b9a6410 SHA512 982cefcc7b8b5df623a5d7e49531334c7453072569efdb9304b7a8445109c0051733c92f88a15c0f6a2b2cce9c00a6c8a4d71828336868776ecfd661f61cf72f
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..9726f249820b
--- /dev/null
+++ b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
@@ -0,0 +1,32 @@
+respect flags
+
+applied on top of debian patches
+
+--- a/configure.in
++++ b/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-r1.ebuild b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
new file mode 100644
index 000000000000..ba93616b6702
--- /dev/null
+++ b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop epatch autotools
+
+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 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ x11-libs/gtk+:2
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+ cd "${WORKDIR}"
+ epatch groundhog_${PV}-${DEB_VER}.diff
+ cd "${S}"
+ sed -e "s:groundhog-1.4/::" -i \
+ debian/patches/sv.po.patch || die
+ eapply \
+ $(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() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ default
+ doicon src/pixmaps/${PN}.xpm
+ make_desktop_entry ${PN} "Groundhog" /usr/share/pixmaps/${PN}.xpm
+}
diff --git a/games-puzzle/groundhog/metadata.xml b/games-puzzle/groundhog/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/groundhog/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gtetrinet-0.7.11-r3 b/games-puzzle/gtetrinet-0.7.11-r3
deleted file mode 100644
index 960bff838bc8..000000000000
--- a/games-puzzle/gtetrinet-0.7.11-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Tetrinet Clone for GNOME
-EAPI=5
-HOMEPAGE=http://gtetrinet.sourceforge.net/
-IUSE=nls ipv6 debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gtetrinet/0.7/gtetrinet-0.7.11.tar.bz2 mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f776c0f0f85c8184d8ac2313114466d
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
new file mode 100644
index 000000000000..25002f45de62
--- /dev/null
+++ b/games-puzzle/gtetrinet/Manifest
@@ -0,0 +1,7 @@
+AUX gtetrinet-0.7.11-desktopfile.patch 706 BLAKE2B 612988eb68f8bb1c8529ae7dfce1f9fb043887dc14e9729c26cfa8c3ea4216a82b464f676c7af0ecf1465b850311a21983876f7025c51640e5cfe8ec8bcd1b66 SHA512 d12b4f302388b3620ed77254916d3e3845b3da4bc3d1fc5b1c10c370e46088aea1a11603a8ce5ec844be5bf1026120d6b627170f4a09df663c5b579fe7ba937a
+AUX gtetrinet-0.7.11-format-security.patch 681 BLAKE2B ac89cac24dea4a350a0e79eb577bd288cbc371817023b516c2b66f02fc488798bf285265ae9dec9aaadad442a4e38bdf84a9c0b508bbee30768734195eb72573 SHA512 1f3236da7320249c6d8969a73d2d9f50c4dce68525e563958b52c3cfae5bd2c4fa0fda44960acce6bb9326a4b75560c60ab605aadce3b28d770c44c971209406
+AUX gtetrinet-0.7.11-noesd.patch 4007 BLAKE2B 446c6b3aa133ed29d96ff9735498575c32dc73e5eed750915c4409f7255a39441edd8b7af866fef8781aaf92dbea67b376e019f2826852c8ae9eca2e5c93cd5b SHA512 7674d4d54e4c4b0172e14c02036e88d08f8ebb7745ca7c34fff60dd1b2a46f54568fd89c77c19df12bce74296919bd5c6a7bd48a5ca4a427c6cc04d90384bfcc
+DIST gtetrinet-0.7.11.tar.bz2 416744 BLAKE2B f3bb72b307066e1af41de5c1483fa5b9c88377a3f70924520bc1e36206ad7b75c233d5fb10c0398aac4ed228d8cac6f26a1acaaf97c27858f1c24e4d0aebc4aa SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130
+DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 BLAKE2B 60ead98512ddd812cf1f95f041479f9dad9e7e0f3a55931779382b95fc7aada11498b6517cbd425547d3d46281bb6ec982325b0ad361ef339daa321d45a6ffe8 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d
+EBUILD gtetrinet-0.7.11-r3.ebuild 1233 BLAKE2B d2aa1906d70f9f501111068f46bda8be474980e762499fc21243a7ec42f084ff03142e4a4ba23d64bcbb4450344471574e41e8e16b3275eb3e7b4b59a32e9947 SHA512 7613d3054033d08043be560a025509e79bd51fcbd6d86d359f732963744eb6a755c749dd1e3d12f9bde6789a84efeb24b65b83de3ebf194ac13b7dbc0ba997d2
+MISC metadata.xml 923 BLAKE2B ed221250cd92620c983bdc77af5ec64483ae5cb34ca9c63d6d4445051a7766e104df6b8a2e48e0ae355cd01698807c3f1ef6aa59c8efc5803664d9f1ab33f323 SHA512 81b70c3f4973cd7664a064df27fbcfb8af1f2aa748b269c68d62d3def6f2aee829a0c965b6b93aca51176f60fc34cb170cc20984d5b3b2e1beeb26206fee4e9b
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..44052954303d
--- /dev/null
+++ b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~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..a29c0a42dfee
--- /dev/null
+++ b/games-puzzle/gtetrinet/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <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>
+ <upstream>
+ <remote-id type="sourceforge">gtetrinet</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/gtkballs-3.1.5-r2 b/games-puzzle/gtkballs-3.1.5-r2
deleted file mode 100644
index 9c688f2f2a0f..000000000000
--- a/games-puzzle/gtkballs-3.1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.10.38 )
-DESCRIPTION=An entertaining game based on the old DOS game lines
-EAPI=6
-HOMEPAGE=http://gtkballs.antex.ru/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://gtkballs.antex.ru/dist/gtkballs-3.1.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=73c20bf967cb11593ef98ecc9a728a01
diff --git a/games-puzzle/gtkballs/Manifest b/games-puzzle/gtkballs/Manifest
new file mode 100644
index 000000000000..7c768bd25574
--- /dev/null
+++ b/games-puzzle/gtkballs/Manifest
@@ -0,0 +1,3 @@
+DIST gtkballs-3.1.5.tar.gz 1176977 BLAKE2B b1da2eee3876df889cec576ce526d1f475b45b10aad40549bc36d710beb7e27b963719509818959bac884add72f0e91ae48e76745ab76c3d1e6063c780591067 SHA512 a22352a19368c3b957e6fbd21aea0b4636efd3042f4e6b1c44a40f946643eb89873b182fe35a8888111ca42277e69fccfe2e2b683e804358ad36f4feca235e8a
+EBUILD gtkballs-3.1.5-r2.ebuild 822 BLAKE2B c7ff0c7a44a6988346cf28ff6c1f5d70a194321aa9221407e232bd3266a62f8a89b02f78f646cc7a1e5ebdd5f00300558e5d587cfc9f876bf61edf7e54c61ea7 SHA512 cd1748adadf92e287a4da3cfe8ca87184d52b341d35604f0d72f75373dbbeccf8ebbcaee8c489ba39be71be4405b22412722a44664578d77953c9c15cc8b42c7
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild
new file mode 100644
index 000000000000..eece76f8cc06
--- /dev/null
+++ b/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ x11-libs/gtk+:2
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( >=sys-devel/gettext-0.10.38 )
+"
+
+src_prepare() {
+ default
+ 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() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ default
+ newicon gnome-gtkballs.png ${PN}.png
+ make_desktop_entry gtkballs "GTK Balls"
+}
diff --git a/games-puzzle/gtkballs/metadata.xml b/games-puzzle/gtkballs/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/gtkballs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/gweled-0.9.1-r2 b/games-puzzle/gweled-0.9.1-r2
deleted file mode 100644
index 918885e47ec7..000000000000
--- a/games-puzzle/gweled-0.9.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Bejeweled clone game
-EAPI=6
-HOMEPAGE=http://www.gweled.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2
-SLOT=0
-SRC_URI=https://launchpad.net/gweled/trunk/0.9.1/+download/gweled-0.9.1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c9b35f160ff6c6abe81faf6ab5d394c
diff --git a/games-puzzle/gweled/Manifest b/games-puzzle/gweled/Manifest
new file mode 100644
index 000000000000..5c80c135821e
--- /dev/null
+++ b/games-puzzle/gweled/Manifest
@@ -0,0 +1,4 @@
+AUX gweled-0.9.1-gentoo.patch 360 BLAKE2B a1e618e443d08693fe9cce4d263f1ba7095606f0af5a8504fef8eccbb5d46d3fc42792468263c36e26b448cafc487b92258422c2eb3d46c5ac3c83e7bd9b3a15 SHA512 38efa262f9144d64363d0724291d786545875c0e81fe2e537be456b9fbade2d3a29210e70c4680f28009f317dce9c907745259bc4bc6ded22b0acffb19cb4db4
+DIST gweled-0.9.1.tar.gz 403252 BLAKE2B 6a80e10fecc858a94d79deb7ad1a9dce0f5af36649bcb61c819816218fbcd72e70cdbfaa8915db13082a6274b75bd4c585c5f583f9f290bb95c2cb4468c4d2dd SHA512 12ac6f0033e9af037febca3ecc86f7531491498a38cdc36d7baf113fecece75da4a5b83f6c6e8f4fc6beebb24d479eac10087baa9effec4966cfcfb6c42df75a
+EBUILD gweled-0.9.1-r2.ebuild 696 BLAKE2B ce6a0c0215106eba80d0188bfc4e419cd0358f4ef44aef4bae606ea42e518d70690ff162d04523955f16458850eeae574c4625ce5934d1e28eeb832418052781 SHA512 538a19c85daf8808cee07785c427c272ed334ec85df64f63d023f2b13e4a79e3df8a7d61e42a37851bbcfbdf081519b17f8713b5c294f5952c6360ed7017c804
+MISC metadata.xml 327 BLAKE2B 7ffb95636156cb62206ed6ec1de127958d12d19ec71835683022f87da8943b715762871e930a678dd51bd3533fbf0ffacf4f9302c657d8a17ae4ddf59841d019 SHA512 cc3134245580e54c44dffa610e7910e4081dd175125bd4fad074eeeb119715f24698417dcc0683ae32e943d28cb79c5b82239648d1f70a00857fdba04b6804c4
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..fa5857492da3
--- /dev/null
+++ b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/configure.in.old 2014-06-03 09:21:52.868225743 +0200
++++ b/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-r2.ebuild b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..0f88623656e1
--- /dev/null
+++ b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="Bejeweled clone game"
+HOMEPAGE="http://www.gweled.org/"
+SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ x11-libs/gtk+:2
+ media-libs/libmikmod
+ gnome-base/librsvg:2
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -fomit-frame-pointer
+ append-ldflags -Wl,--export-dynamic
+
+ econf --disable-setgid
+}
diff --git a/games-puzzle/gweled/metadata.xml b/games-puzzle/gweled/metadata.xml
new file mode 100644
index 000000000000..47048a2c35ed
--- /dev/null
+++ b/games-puzzle/gweled/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">gweled</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/hangman-0.9.2-r1 b/games-puzzle/hangman-0.9.2-r1
deleted file mode 100644
index 3e542331318c..000000000000
--- a/games-puzzle/hangman-0.9.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf
-DESCRIPTION=The classic word guessing game
-EAPI=6
-HOMEPAGE=http://www.shiftygames.com/hangman/hangman.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf sys-apps/miscfiles
-SLOT=0
-SRC_URI=http://www.shiftygames.com/hangman/hangman-0.9.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=ee3bcaf5cbb1c580b0fd4fdf851f1629
diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
new file mode 100644
index 000000000000..aa3651698e14
--- /dev/null
+++ b/games-puzzle/hangman/Manifest
@@ -0,0 +1,3 @@
+DIST hangman-0.9.2.tar.gz 1023712 BLAKE2B d9d12e02cb48fb80e0cf9c5f9dcb52f57e6305342b41443a791252701758c302bdbfb15dfefcfbbc7c4fc39fe1bfaccd961d1eb3d9a351f937c219ce98c26a26 SHA512 cbf940310b4821cf4de27a99a5228bccf42093a65ca83b0a2582556865ee5cea5a4ee2ebe08d2e02ac93f0cfc8d190b1f5427adbd74e7ddb57b90cee84f85d65
+EBUILD hangman-0.9.2-r1.ebuild 736 BLAKE2B df7383c6bc804a56b9af4df28c2c63bef82acded3ae43acf4f3362bea4ad413b918525987edd6dd16e667db4ddc80aa69291faf5b72d3e15a0b92ae7e35bff6e SHA512 8ed9ba6285e05d5b87a8b3f8613618630c65fcf832f6ce52962cce900d25135d314c4d89d5d53654ff9529c357bb68708a80cdb9be29ac0a50fd18236d378451
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hangman/hangman-0.9.2-r1.ebuild b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..abfc77ca017b
--- /dev/null
+++ b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~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() {
+ default
+ 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
+}
diff --git a/games-puzzle/hangman/metadata.xml b/games-puzzle/hangman/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/hangman/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/hexalate-1.1.3 b/games-puzzle/hexalate-1.1.3
deleted file mode 100644
index fc714f2d3235..000000000000
--- a/games-puzzle/hexalate-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
-DESCRIPTION=A color matching game
-EAPI=6
-HOMEPAGE=https://gottcode.org/hexalate/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=https://gottcode.org/hexalate/hexalate-1.1.3-src.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=68bc1a94ac4802ce7ea3804c8bfe1d74
diff --git a/games-puzzle/hexalate/Manifest b/games-puzzle/hexalate/Manifest
new file mode 100644
index 000000000000..7d9c433b5fd0
--- /dev/null
+++ b/games-puzzle/hexalate/Manifest
@@ -0,0 +1,3 @@
+DIST hexalate-1.1.3-src.tar.bz2 798580 BLAKE2B 685a5fb106b9e4e33d63651059bc63b155c4b1afc1426506f8535b93c54bda1cbf8705244790fe130fe92e82bb6b7d9710c3aa8f245f0d578ddf09fa1e51551d SHA512 037dec9bb7b9dbc3cf3659e765c6e333dbbd0a94426e0b79c20695cf402cffb141c28c9ece4405281617dace7510b982180475c129648a871036be226e868bd6
+EBUILD hexalate-1.1.3.ebuild 640 BLAKE2B c2ff441c608e2880001395edf798962bae05bc3ba734358241e110722d573ee0dcfaf4b08da2c52e048501ed59efaca63e7fc4e13976ff4936c99f3dc46ebcc3 SHA512 29fc44d328d67558d0731cc7970abf0251b6a04433ade8a87e22cd430bd4d33d86da3d0aab001b85b1ae38fbb79a4dbc0ac59017cf670f3fbde7dc329b7242f7
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hexalate/hexalate-1.1.3.ebuild b/games-puzzle/hexalate/hexalate-1.1.3.ebuild
new file mode 100644
index 000000000000..23dec27a0760
--- /dev/null
+++ b/games-puzzle/hexalate/hexalate-1.1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="A color matching game"
+HOMEPAGE="https://gottcode.org/hexalate/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+src_configure() {
+ eqmake5 PREFIX="/usr"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/hexalate/metadata.xml b/games-puzzle/hexalate/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/hexalate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/hexamine-0.2.1-r1 b/games-puzzle/hexamine-0.2.1-r1
deleted file mode 100644
index b65368d90a50..000000000000
--- a/games-puzzle/hexamine-0.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=Hexagonal Minesweeper
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/hexamine
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/hexamine/hexamine-0.2.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b3260ee21c0171f3448cf22c8a331325
diff --git a/games-puzzle/hexamine/Manifest b/games-puzzle/hexamine/Manifest
new file mode 100644
index 000000000000..ac8b8fd309e6
--- /dev/null
+++ b/games-puzzle/hexamine/Manifest
@@ -0,0 +1,3 @@
+DIST hexamine-0.2.1.tar.gz 130603 BLAKE2B e49b60e78346d59f5d0bf60f8aaa3f1230e87e6e76052c49197984df695cb4aacf947a2b5855f0388ed62f59fa04e47853f2c36583c38c9249100910eb5b5ff7 SHA512 eaf7c110f1c2434c2ea7bc01cc13266ed8e91cbbf0fff4ee8d8a78c549f9fd3f8d877210f574ba1cefad5a6ea230f376aab7d9ced6a4e2f477b6be776332a640
+EBUILD hexamine-0.2.1-r1.ebuild 807 BLAKE2B 43c3d0be8faf714bd021d6505b020eb75d337753005c78865f381716795fbdaac28e73436834cab63a1981bb2311028cb0b3b4e28b83188fff84d2ea8790a57f SHA512 cdcc4a822d89da500a130542bb2582db91d15159a457bc55e158ec326e27367aa0f2eb6ce1762b2047e4587b7157660b43bae6175c2fcd1fad40361d70550c06
+MISC metadata.xml 331 BLAKE2B f3ccbece9bcd1b9fe00383805f636401bb5b3bd10d2e1a2d5564182aebfe2a7e6614e3366ddf28e90ba5a62725d78dc08d1072c65c07ec3bc4ab5761bd2d2f39 SHA512 452f03abf92762a26c6492a3823b4fb3957abd627ec039daa73bb90c14079b71f0b79ce5af0548e3290c74275f5bf02ff264655cff6bb72a607e258a32e36bde
diff --git a/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild b/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..67529d0521a4
--- /dev/null
+++ b/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-single-r1
+
+DESCRIPTION="Hexagonal Minesweeper"
+HOMEPAGE="https://sourceforge.net/projects/hexamine"
+SRC_URI="mirror://sourceforge/hexamine/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pygame
+"
+DEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ default
+ # Modify game data directory
+ sed -i \
+ -e "s:\`dirname \$0\`:/usr/share/${PN}:" \
+ -e "s:\./hexamine:exec ${EPYTHON} &:" \
+ hexamine || die
+}
+
+src_install() {
+ dobin hexamine
+ insinto "/usr/share/${PN}"
+ doins -r hexamine.* skins
+ einstalldocs
+ make_desktop_entry ${PN} "Hexamine"
+}
diff --git a/games-puzzle/hexamine/metadata.xml b/games-puzzle/hexamine/metadata.xml
new file mode 100644
index 000000000000..eaf56d416367
--- /dev/null
+++ b/games-puzzle/hexamine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">hexamine</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/hitori-3.22.4 b/games-puzzle/hitori-3.22.4
deleted file mode 100644
index 8ee4d841b59b..000000000000
--- a/games-puzzle/hitori-3.22.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4 app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Logic puzzle game for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Hitori
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4
-SLOT=0
-SRC_URI=mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91f2e2365aaa4095c9e4dc73a08b6971
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
new file mode 100644
index 000000000000..2594b1afcc2c
--- /dev/null
+++ b/games-puzzle/hitori/Manifest
@@ -0,0 +1,3 @@
+DIST hitori-3.22.4.tar.xz 471136 BLAKE2B e9581f9588ab307fba781b3907c1e5d5a34db462a9fa050cf6b2438efbae76ed74fc69623de28a2ec59c4340f487df68156dee453a314adab7cb6846edc347ef SHA512 8c75824d29918c096f3a33283dcb2e49e227c8259d37a4ae5e77d420d4a18a2760f789e12f32cfb8ffc16bfdf19e4aca26d93719d6b762c15b9ac4dbfca93e1a
+EBUILD hitori-3.22.4.ebuild 555 BLAKE2B 00ee8a59a0735d72bc6a4a5b4e005b9d272da3514044cd1501a05fec43b640a8835bf109237e27904727dabb5fda085baf891ce3603d0f37b26ad646fb8d1ac2 SHA512 5644692be1b2d64887746c951d85065832af2a36273f60619f29d159b527a2a7431c633c35e6fdcdb5b07c9ed2cb0cbdbb3182fe4058b766eef781b539960dc0
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.22.4.ebuild b/games-puzzle/hitori/hitori-3.22.4.ebuild
new file mode 100644
index 000000000000..aa2927ffbd30
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.22.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gtk+-3.22:3
+ >=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
diff --git a/games-puzzle/hitori/metadata.xml b/games-puzzle/hitori/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/games-puzzle/hitori/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/hoh-bin-1.01 b/games-puzzle/hoh-bin-1.01
deleted file mode 100644
index 10f92da80461..000000000000
--- a/games-puzzle/hoh-bin-1.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=PC remake of the spectrum game, Head Over Heels
-EAPI=5
-HOMEPAGE=http://retrospec.sgn.net/games/hoh/
-KEYWORDS=~amd64 ~x86
-LICENSE=free-noncomm
-RDEPEND=x11-libs/libX11[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-101.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64632342aa5c63ddf28d255047695f19
diff --git a/games-puzzle/hoh-bin/Manifest b/games-puzzle/hoh-bin/Manifest
new file mode 100644
index 000000000000..e966c632f3c3
--- /dev/null
+++ b/games-puzzle/hoh-bin/Manifest
@@ -0,0 +1,3 @@
+DIST hohlin-101.tar.bz2 14808528 BLAKE2B bfa0563f900f5bf7fdb05011baddd0fcc4c1f16eb30215f9db8b539e7c1b6f11e2c978a978c989732d832e309b3f61f0ee1ac4270c45c8c7d0e82f155d987004 SHA512 38f5815d9b2356c5d566d8b5b4730e1ed24192dfb5c3fcae9096b4a2c6110de60245b13da6bffc359032165d7fc0681a6adfa3503005c9281807c4734d519c0b
+EBUILD hoh-bin-1.01.ebuild 1083 BLAKE2B 45b2b531522742a77413a42fa305052660b3d400b53d5a05a8237141d00a554fcbadc02bf17eab83e4f114dd27dffbae3bdf1741efb65c2d73c82bfb7b2654a0 SHA512 a4bcd813fdfb8b9322e359389b7b1958c889881df7be9e4736e0f556ddb21ef7db664800bc9fbfc17cb7e37a1394eeac99d48f121b95f9e4397dafd0bc4f4e5b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
new file mode 100644
index 000000000000..ad681b47a18e
--- /dev/null
+++ b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="PC remake of the spectrum game, Head Over Heels"
+HOMEPAGE="http://retrospec.sgn.net/games/hoh/"
+SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-${PV/./}.tar.bz2"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
+
+S=${WORKDIR}/hoh-install-${PV}
+
+# bug #448420
+QA_PREBUILT="
+/opt/HoH/data/runtime/libstdc++-libc6.2-2.so.3
+/opt/HoH/data/HoH
+"
+
+src_compile() {
+ cat > "${T}/hoh" <<-EOF
+ #!/bin/bash
+ export LD_LIBRARY_PATH="${GAMES_PREFIX_OPT}/HoH/data/runtime"
+ cd "${GAMES_PREFIX_OPT}/HoH/data"
+ exec ./HoH \$@
+EOF
+}
+
+src_install() {
+ local DATADIR="${GAMES_PREFIX_OPT}/HoH/data"
+ local DOCDIR="${GAMES_PREFIX_OPT}/HoH/docs"
+
+ dogamesbin "${T}/hoh"
+ dodir "${DATADIR}" "${DOCDIR}"
+ cp -pPRf data/* "${D}/${DATADIR}/" || die
+ cp -pPRf docs/* "${D}/${DOCDIR}/" || die
+ make_desktop_entry hoh "Head Over Heels"
+ prepgamesdirs
+}
diff --git a/games-puzzle/hoh-bin/metadata.xml b/games-puzzle/hoh-bin/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/hoh-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/icebreaker-1.9.6-r1 b/games-puzzle/icebreaker-1.9.6-r1
deleted file mode 100644
index edf071e6e041..000000000000
--- a/games-puzzle/icebreaker-1.9.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
-DESCRIPTION=Trap and capture penguins on Antarctica
-EAPI=6
-HOMEPAGE=http://www.mattdm.org/icebreaker/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
-SLOT=0
-SRC_URI=http://www.mattdm.org/icebreaker/1.9.x/icebreaker-1.9.6.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=bb9cb78444bbc02e6ae914bf81ccd920
diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
new file mode 100644
index 000000000000..886ec33ffad3
--- /dev/null
+++ b/games-puzzle/icebreaker/Manifest
@@ -0,0 +1,7 @@
+AUX icebreaker-1.9.6-gentoo.patch 8599 BLAKE2B b572190c99b2d3d27cebf80751df57d6c80e36189d95e98c11987232ce630668d1158fa2bdb62d09e584a48d42e1cc1618cd607661809b4972e558ce796843a4 SHA512 36685c3a0534305d13385f88b259ece8befdeb1115c0e5958ec2edde5cb3502b213c4b7b2f39a8a2183bab94385b0c2e678346b4175f1a1aa057269b011a6a1c
+AUX icebreaker-1.9.6-ldflags.patch 874 BLAKE2B e888051b968e3139f21a4a912e8dbeb891d9c93bbe96d1a9ceb5a3d5690eb2ae4f74d7afe9aca3892011341d034f2648e41f8ee5bfc5d6ad392add8d3ea85457 SHA512 1c27aa4373744f3a5d59643d36a950aa50377b5ef26fec988754d66860dc3f262bb46e82e40cf4222abb000f0a7ab4aac03d9508e55536212fa5eb7d1a0f5e5f
+AUX icebreaker-1.9.6-ovfl.patch 699 BLAKE2B 9203cb2007abe94d6746512c1bdeca9a0163fda87c443ce9ca4b99a0a435d5553ed972ea368f7717912ec8c9c994f3471f14f187be336738dee6ee70de95c2f8 SHA512 49dae47f4f4d446fbdcb0f5faaa6ff01ecacd695d0af01e10f70001245680116e83aa78b2a9cb4fa80e0641e4cb02c5fc09c0fa87cc79207aa5c5d4dca5f0658
+AUX icebreaker-1.9.6-parallell-install.patch 1187 BLAKE2B 52c23882a6a1f6c265232effed850f34caebdbc8c63e15268e3f1a6fe42c604c5a9ca7d2c20eaee22c896733f7d77752ce7f75e30fdc49664954e302ea4034e5 SHA512 d315283c5e0605e4cddaebc1d891b72a86cd0e6f27693864896ac6557fd4c0f9e748e648b11ae8682d6d47ad9ff0f4c9d63fd4dde09e621886a70828001b8327
+DIST icebreaker-1.9.6.tgz 137333 BLAKE2B 3fdfde734f868493313a2a7b018582f79d6140fa71c1802a27b558d2973968eb9cc01efb55c0b5a45d95cd4d1bc94b66f74809a82853d6d8c0ce1b7bf767e362 SHA512 c3b085dc42d33757011d6d526016477312c5e1cbab4c5584c1e271a1e43b40d61ad1e7f0c96c8f41348550b2e198b3ee7bca65fbef90125dbfa32544cbdf357b
+EBUILD icebreaker-1.9.6-r1.ebuild 963 BLAKE2B 7e603e75245f247bc1f4f0312228891a585fbc791dfb09da804af15741c03ee66acbd7f991b36d4a190057c8216890eb6b22991c1aa3329b32ac0c5631f38e17 SHA512 2a65988b2199477a930771f03b0a2c215e6e7844c87ace0a2499358c9e8f0a0789c8db658f8963a4f93a82d87b021c0cb2324661163cb04322447ed0cf1e7e0b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..846d5b4141bc
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
@@ -0,0 +1,247 @@
+--- a/dialog.c
++++ b/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)!");
+
+--- a/menu.c
++++ b/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
+ {
+--- a/hiscore.c
++++ b/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]];
+ }
+ }
+--- a/line.c
++++ b/line.c
+@@ -30,8 +30,9 @@
+
+ Line createline(int linenum)
+ {
+- Line l;
++ static Line l;
+
++ memset(&l, 0, sizeof(l));
+ switch (linenum)
+ {
+ case 1:
+--- a/options.c
++++ b/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)
+--- a/penguin.c
++++ b/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:
+--- a/themes.c
++++ b/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..93b40fc67687
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.orig 2010-10-11 12:20:01.274684641 -0400
++++ b/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..5e8ffc01d8d2
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
@@ -0,0 +1,20 @@
+--- a/menu.c.old 2013-06-24 22:09:11.606750080 +0200
++++ b/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,"%s",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..419262791d98
--- /dev/null
+++ b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
@@ -0,0 +1,34 @@
+--- a/Makefile.old 2010-10-19 10:26:18.000000000 +0200
++++ b/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-r1.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
new file mode 100644
index 000000000000..f064951fac68
--- /dev/null
+++ b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="
+ media-libs/libsdl[video]
+ media-libs/sdl-mixer
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${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=/usr/bin \
+ datadir=/usr/share \
+ highscoredir="/var"
+}
+
+src_install() {
+ emake \
+ prefix="${D}/usr" \
+ bindir="${D}/usr/bin" \
+ datadir="${D}/usr/share" \
+ highscoredir="${D}/var" install
+
+ newicon ${PN}_48.bmp ${PN}.bmp
+ make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
+ einstalldocs
+}
diff --git a/games-puzzle/icebreaker/metadata.xml b/games-puzzle/icebreaker/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/icebreaker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/jools-0.20-r3 b/games-puzzle/jools-0.20-r3
deleted file mode 100644
index 375c6865e148..000000000000
--- a/games-puzzle/jools-0.20-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=clone of Bejeweled, a popular pattern-matching game
-EAPI=6
-HOMEPAGE=http://pessimization.com/software/jools/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://pessimization.com/software/jools/jools-0.20.tar.gz http://pessimization.com/software/jools/jools-musicpack-1.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f3ea436543d2e76a9a781d8e2090a843
diff --git a/games-puzzle/jools/Manifest b/games-puzzle/jools/Manifest
new file mode 100644
index 000000000000..b082e4e04e8a
--- /dev/null
+++ b/games-puzzle/jools/Manifest
@@ -0,0 +1,4 @@
+DIST jools-0.20.tar.gz 1710143 BLAKE2B 715c8be3e1e223cc5e8b8e6a0dfb0655c25bdd713bf5df678482063a6f68178449354f984b2ef0e52268379936e217786d0be7952ac2083f936d9bfe3551eca3 SHA512 11eadceb8208a72846a9e16a2dae0a1b1d7f8995d5ff2487ee03dd62811f3a232c0d08dc044c351f44c120e6e75eba11df1a727a9d5c6c57ce5e2ef8ee4d0986
+DIST jools-musicpack-1.0.tar.gz 4447501 BLAKE2B 2786a30d8a6cd09a05f1d13963b2c5f232b8d7c7c94bf83a5dc13979fc62349b9385bac1f08c2288e73134e38f78ef9bd48d84b4849f22c9ac791059be3b721b SHA512 1773beb8cd7df756cb4f7ba55729a6dfa995ca860f3381e2fed3884f42227d19955e13f8be9b2f6f64d4d86e452be9fe876963e24c85cd2c3cc42df62804b9c2
+EBUILD jools-0.20-r3.ebuild 1242 BLAKE2B c0db451dc3fad43264e5212de8ef3db07af83d4b939ba5c387fe8aa76aaedc0dda3af9b6681f86862794aa27c6c44fb286169fb90fcfd1a26a64eaec1137481d SHA512 578d076e12e0e71e9873b90bf0b5edfb9cf5e1beeb227ebd0238a40ec4bb7cb23d78b8395da9753d21690a44a5a6d584564be71ae37c1446175d33276276fd4c
+MISC metadata.xml 671 BLAKE2B 3d2b8089c8988076718719b26c9e0678ee0197297e72653baf5011a6a45a65bf210e0dababf5a17a254858af8c73155fad6d5cdde684c71169c76338e5630f9a SHA512 928c0217e8ef9222cee84694ef0da21cb7fa50bc190361979c4eb44e01081b49e805e441128baddfb13269b7a8f02f991cc4cb08b253cc1a475859d393f786c6
diff --git a/games-puzzle/jools/jools-0.20-r3.ebuild b/games-puzzle/jools/jools-0.20-r3.ebuild
new file mode 100644
index 000000000000..e70ad0267d87
--- /dev/null
+++ b/games-puzzle/jools/jools-0.20-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+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 ~x86"
+
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+ dev-python/pygame[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/jools"
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd "${S}"/music
+ unpack ${MUS_P}.tar.gz
+}
+
+src_prepare() {
+ default
+ echo "MEDIAROOT = \"/usr/share/${PN}\"" > config.py
+ python_fix_shebang .
+}
+
+src_install() {
+ make_wrapper ${PN} "${EPYTHON} ./__init__.py" /usr/"$(get_libdir)"/${PN}
+ insinto /usr/"$(get_libdir)"/${PN}
+ doins *.py
+ python_optimize "${ED}/usr/$(get_libdir)/${PN}"
+
+ insinto /usr/share/${PN}
+ doins -r fonts images music sounds
+
+ newicon images/ruby/0001.png ${PN}.png
+ make_desktop_entry ${PN} Jools
+
+ dodoc ../{ChangeLog,doc/{POINTS,TODO}}
+ HTML_DOCS="../doc/manual.html" einstalldocs
+}
diff --git a/games-puzzle/jools/metadata.xml b/games-puzzle/jools/metadata.xml
new file mode 100644
index 000000000000..5e917c0945b8
--- /dev/null
+++ b/games-puzzle/jools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+<longdescription lang="en">
+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/ksokoban-0.5.0_pre20170827 b/games-puzzle/ksokoban-0.5.0_pre20170827
deleted file mode 100644
index afc68a9da95a..000000000000
--- a/games-puzzle/ksokoban-0.5.0_pre20170827
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=The japanese warehouse keeper game
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/ksokoban.git
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=0
-SRC_URI=https://github.com/KDE/ksokoban/archive/048b42324ef6dac807af4351174065cda2f32f44.tar.gz -> ksokoban-0.5.0_pre20170827.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 5656d5465214c16946f295475046ea21 kde5-functions 475002208a2233f4ab555934b2b0ed0b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0641f5c81a35102f210b8c1bc6e0492
diff --git a/games-puzzle/ksokoban-9999 b/games-puzzle/ksokoban-9999
deleted file mode 100644
index db06705a8185..000000000000
--- a/games-puzzle/ksokoban-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils
-DESCRIPTION=The japanese warehouse keeper game
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/ksokoban.git
-IUSE=debug +handbook
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=0
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 5656d5465214c16946f295475046ea21 kde5-functions 475002208a2233f4ab555934b2b0ed0b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0cad6e6b2cf80cfe9e8f451bb3b0105c
diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
new file mode 100644
index 000000000000..8b5f0165af45
--- /dev/null
+++ b/games-puzzle/ksokoban/Manifest
@@ -0,0 +1,4 @@
+DIST ksokoban-0.5.0_pre20170827.tar.gz 433276 BLAKE2B b29624ea0bae724b798ebb88aaca0623c9912b6d0155f7bcfc945dc76d5b0ace51f36b9991b2e6314d4f0f9c12fe3892bc1eda56789a2eefa9263d1048a61414 SHA512 50b650733c021fe95ea087fdfc6e354071b587156ddc38dc1ae571d893c555bf7405f7d089403d3af3b907a956a3d5dc7beecc9279c8c687b867ac813c796d31
+EBUILD ksokoban-0.5.0_pre20170827.ebuild 802 BLAKE2B 9f0e4c4d4f08cbfe12bcc93fa95ea0c9327d453128d2512d765e3cd3cac0f50e52b7ab9e5160ad75ad2e8a9a4838e554294c2ef497514ef9b58aba75239fd802 SHA512 a5406f5e8ed282f0b3f388b662ff8888f6b6075617980046b123c1a44ae15ca00ca04e652d6653d3e0b7b4cf570c9969b6880b2416084b64f94477258b0f7d9a
+EBUILD ksokoban-9999.ebuild 651 BLAKE2B 78797363b971c6310710b113bba4d191b0af5b309a947101c525a9dcb4b585f4eaad54c739094c8d21b3c8a2631a3fa97c2901aba82aed69a536813cc66d0a60 SHA512 3fc37f0460f2fe7539b343e2ece45d16d91847bfa086dbfcaae6409ed1438e1891d749d9d393adaf4e87492052e11890818c314989fdd736508e1b04b48d0133
+MISC metadata.xml 296 BLAKE2B 8abfdabec906c0024c978d0df7911b26d1df5c21269f78f6b327da8ae9a3955e0a091540741553cd9b805cdae52c09c713d868df83fa92c59e43b203d5db3219 SHA512 50facad52c9acec67642e499d377ccd05b7a18f578f0d71b6b8b222e6ac6a310b24913d9374bb9ba995fbc3cd55612f79ae562c8fe9ecd1e451d472505bd8e14
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
new file mode 100644
index 000000000000..109daa9faf8b
--- /dev/null
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=048b42324ef6dac807af4351174065cda2f32f44
+EGIT_BRANCH="port-to-kf5"
+KDE_HANDBOOK="optional"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="The japanese warehouse keeper game"
+HOMEPAGE="https://cgit.kde.org/ksokoban.git"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/ksokoban/ksokoban-9999.ebuild
new file mode 100644
index 000000000000..632e47c6c561
--- /dev/null
+++ b/games-puzzle/ksokoban/ksokoban-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="port-to-kf5"
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="The japanese warehouse keeper game"
+HOMEPAGE="https://cgit.kde.org/ksokoban.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+DEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"
diff --git a/games-puzzle/ksokoban/metadata.xml b/games-puzzle/ksokoban/metadata.xml
new file mode 100644
index 000000000000..0328a782193f
--- /dev/null
+++ b/games-puzzle/ksokoban/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>bircoph@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">ksokoban</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/lightsoff-3.24.0 b/games-puzzle/lightsoff-3.24.0
deleted file mode 100644
index 3908c13e7f13..000000000000
--- a/games-puzzle/lightsoff-3.24.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.38: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.4:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Turn off all the lights
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Lightsoff
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=>=dev-libs/glib-2.38: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.4:3
-SLOT=0
-SRC_URI=mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ba7110f248914b90b4cf1047b839792
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
new file mode 100644
index 000000000000..43ddd5bb79e7
--- /dev/null
+++ b/games-puzzle/lightsoff/Manifest
@@ -0,0 +1,3 @@
+DIST lightsoff-3.24.0.tar.xz 1943672 BLAKE2B fc6c8643e791a7b6e3e1183ea9678138d53aab5ba7234c4c6417b576dda571a741c3eeb8fab36ae5a00b25420fcc1269e412800a4a5c56efc16943905d6002f5 SHA512 ef036512b3c4e60b4419005864c3f6f4f9447af2e4d12fac1df7603f5837adf2cbe0f41f6089d3e683c3606d021d35e0cc41589938054988506aef3881936e6a
+EBUILD lightsoff-3.24.0.ebuild 660 BLAKE2B 4dbace47d031bc653108e807136c5541794358b6140a92ba5b5f9a8d2925599020fe1401828a2e1175d03311ee030a149c80ff8583457803ea7ce2a10e431886 SHA512 f7631fa627778f32c69cb79091b20f4fdf11e6fdfb771a81b0fdea79de7345ad3e5c48234f8532290b06729e9558eefb8c98ff08d187eda8446fc9e0a3ec95cd
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
new file mode 100644
index 000000000000..065214d72703
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 vala
+
+DESCRIPTION="Turn off all the lights"
+HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.38: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.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() {
+ gnome2_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..39980802b1da
--- /dev/null
+++ b/games-puzzle/lightsoff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/lmarbles-1.0.8 b/games-puzzle/lmarbles-1.0.8
deleted file mode 100644
index 24162999bb3e..000000000000
--- a/games-puzzle/lmarbles-1.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=puzzle game inspired by Atomix and written in SDL
-EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/lmarbles-1.0.8.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=64ee62039f2cdf38a00db38da312751b
diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
new file mode 100644
index 000000000000..b41a13fedce0
--- /dev/null
+++ b/games-puzzle/lmarbles/Manifest
@@ -0,0 +1,4 @@
+AUX lmarbles-1.0.8-gentoo.patch 560 BLAKE2B e4eb5153feb40d53ac831fc7f53e5673a49a546f9ee8b4020f8fabc9643661f78e74ed12756409598f2e25def084376cbab762dc534d0243270110fa48efaee6 SHA512 158a253d346fc5bec9eb8ecdd8541df04fdd9946bc2f59d7404e5ae08415a161079f38697ecfde2b22065708c8704b2fd9232f13872c394ab8274063166d0d41
+DIST lmarbles-1.0.8.tar.gz 914238 BLAKE2B 263f069cdd82d300bd5185152158912a3972bd38b9baf254fe89ba5afced151edbc95c199acb43c2db00c805cbcaf2b0d6a13f4ac5f2a91580b70f3aabd4cb6f SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a
+EBUILD lmarbles-1.0.8.ebuild 714 BLAKE2B 5cdfb7482198c8c1c03b77fb9f20d8a9ea5a8c46af804c06080d6da2a451c19685f169ede54b0a443693eb55e83ae6037f7bcae47b3a6b6676602c16b9cc8d87 SHA512 172643957b074d7b285b69c2e477493584e9fb2b57542f02a2d0accd32083c596dd746031b8b78302dec1d266c7bc799973c52f775a230e7fa7099d417bf1d7c
+MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
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..59381278471a
--- /dev/null
+++ b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils games
+
+DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
+HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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..2cbba7c09d17
--- /dev/null
+++ b/games-puzzle/lmarbles/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">lgames</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/lpairs-1.0.4-r1 b/games-puzzle/lpairs-1.0.4-r1
deleted file mode 100644
index 412f70c97ff6..000000000000
--- a/games-puzzle/lpairs-1.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=A classical memory game
-EAPI=6
-HOMEPAGE=http://lgames.sourceforge.net/LPairs/
-IUSE=nls sound
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=779780f0046420930872d322047081d6
diff --git a/games-puzzle/lpairs/Manifest b/games-puzzle/lpairs/Manifest
new file mode 100644
index 000000000000..21f4686caf6f
--- /dev/null
+++ b/games-puzzle/lpairs/Manifest
@@ -0,0 +1,3 @@
+DIST lpairs-1.0.4.tar.gz 536625 BLAKE2B f020f50b47290b961d77335d567dd68bc009e0952e7ebd39d39c041fcc5a2d9e97d6827921b862dd3dd59c7bef0f11165356f41eda022d7583ca27f584e4b02b SHA512 637f9782c1c1faee3fe0d02adeeb7ea70704f1b625922e1ba086cd03e9a6cf1d61a082eff4753a2ec8be5fc7041bd029f193adf847a39e773e4eedd9eafb2b97
+EBUILD lpairs-1.0.4-r1.ebuild 939 BLAKE2B 93d2d8c38038efc7ceed0ca8a0554fa5489ca838591f2d36f918b4a54bfd3c6680f12332288b73f99d8d9c518a9e6632eb887c45b2d50fd710ed4b920b9399a2 SHA512 5ecf4fcbcdc5bd6487959c9fecc8027af2e60c01d7200072424ae3a212db96a59ae76984b23cf711456c65bb38abee596864d910d02607fe54eef88eab482fb2
+MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..0f13cdb89b69
--- /dev/null
+++ b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="A classical memory game"
+HOMEPAGE="http://lgames.sourceforge.net/LPairs/"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls sound"
+
+RDEPEND="
+ media-libs/libsdl[sound?,video]
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+ sed -i \
+ -e 's:$localedir:/usr/share/locale:' \
+ -e 's:$(localedir):/usr/share/locale:' \
+ configure po/Makefile.in.in || die
+ # gcc5 doesn't like the way inline is used. just punt it. (bug #568684)
+ sed -i -e 's/^inline//g' lpairs/{sdl.[ch],pairs.[ch]} || die
+}
+
+src_configure() {
+ econf \
+ --datadir=/usr \
+ $(use_enable nls) \
+ $(usex sound '' --disable-sound)
+}
+
+src_install() {
+ default
+ doicon lpairs.png
+ make_desktop_entry lpairs LPairs
+}
diff --git a/games-puzzle/lpairs/metadata.xml b/games-puzzle/lpairs/metadata.xml
new file mode 100644
index 000000000000..2cbba7c09d17
--- /dev/null
+++ b/games-puzzle/lpairs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">lgames</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/ltris-1.0.19-r1 b/games-puzzle/ltris-1.0.19-r1
deleted file mode 100644
index e459462f9a12..000000000000
--- a/games-puzzle/ltris-1.0.19-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Very polished Tetris clone
-EAPI=6
-HOMEPAGE=http://lgames.sourceforge.net/LTris/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/ltris-1.0.19.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=343a241586ab5af9c0a7c1423fda32a6
diff --git a/games-puzzle/ltris/Manifest b/games-puzzle/ltris/Manifest
new file mode 100644
index 000000000000..7c4903844dc4
--- /dev/null
+++ b/games-puzzle/ltris/Manifest
@@ -0,0 +1,4 @@
+AUX ltris-1.0.19-gentoo.patch 1769 BLAKE2B e7e30abae3b5d6a0ce088476164ad084c37acd95014a44ada8fdb2dcd27eb9331037bc3160d7956abe081fd746cc4267f2d97b6b02a054729df12a577681f69c SHA512 c0040258b95252efba67cc9da7e598ee2c2cb92b97702b14487d6b0c796bf25022af05350459540a95caf84249b95245d80d5da4be09bff6670f15ca754505a6
+DIST ltris-1.0.19.tar.gz 883543 BLAKE2B c175f8e85377e66b446bc5060c0808a258a22258b72e0b1f48491e12272e4ca63eb69900308d522877407b9aeb231e3a0885c6ca3da010755666d8151c1b4f10 SHA512 ab43b3d8f04ab40016be5b5c414f8679bee4f5f344ef9cab52c3628d48017458b84b0fbc0bcaecdfab43853a1ef628ee1cabf3a1373ea108650d4e76015881c5
+EBUILD ltris-1.0.19-r1.ebuild 822 BLAKE2B db6f23c999eaeb776a37658d8e073239b7cae3b165a141264372593b8a50b04e0defad9549f71251bfc8fea18c3b481936ee1b742f1d740c8d126412bb42ffd2 SHA512 819deaabff7c0c303b34eb62fa24987d2d65e687b09b4c06fc538c8912d055855ff9afe6e0bdef7542e12b8c8413fbdeea8a89adb3304c832b8f4f33e5bebddb
+MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
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-r1.ebuild b/games-puzzle/ltris/ltris-1.0.19-r1.ebuild
new file mode 100644
index 000000000000..9f3d02d2cc06
--- /dev/null
+++ b/games-puzzle/ltris/ltris-1.0.19-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic
+
+DESCRIPTION="Very polished Tetris clone"
+HOMEPAGE="http://lgames.sourceforge.net/LTris/"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ media-libs/libsdl[video]
+ media-libs/sdl-mixer
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+ mv configure.in configure.ac || die
+ AT_M4DIR=m4 eautoreconf
+ append-cflags -std=gnu89 # build with gcc5 (bug #570966)
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ default
+ newicon icons/ltris48.xpm ${PN}.xpm
+ make_desktop_entry ltris LTris
+}
diff --git a/games-puzzle/ltris/metadata.xml b/games-puzzle/ltris/metadata.xml
new file mode 100644
index 000000000000..2cbba7c09d17
--- /dev/null
+++ b/games-puzzle/ltris/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">lgames</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/magiccube4d-2.2-r1 b/games-puzzle/magiccube4d-2.2-r1
deleted file mode 100644
index ed2c6770d8b2..000000000000
--- a/games-puzzle/magiccube4d-2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libXaw
-DESCRIPTION=Four-dimensional analog of Rubik's cube
-EAPI=6
-HOMEPAGE=http://www.superliminal.com/cube/cube.htm
-KEYWORDS=~amd64 ~x86
-LICENSE=free-noncomm
-RDEPEND=x11-libs/libXaw
-SLOT=0
-SRC_URI=http://www.superliminal.com/cube/mc4d-src-2_2.tgz http://superliminal.com/cube/cube_transp.gif -> magiccube4d.gif
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=e214163ade0cde5381a80522bb08f8b2
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
new file mode 100644
index 000000000000..97074b4f57d1
--- /dev/null
+++ b/games-puzzle/magiccube4d/Manifest
@@ -0,0 +1,8 @@
+AUX magiccube4d-2.2-64bit-ptr.patch 1406 BLAKE2B 7741efef6045568adfb19b9cf64191ff682969dbcc4b12fdbbe62c55a9f4a4ae87a1208ad56fbd9ae8c331a33a79cde2ad28296da2a72d0c54810d1e183334ed SHA512 eb684cca4f6f02903c71e970146f6c110d9634ce2f1416e64bdf258b85264c79eaaa9b869f05ddb116373d908f4d0d2675c87d275ab79f76b21f77c5ce1c1563
+AUX magiccube4d-2.2-gcc41.patch 885 BLAKE2B 42990103d195d793e1b10efa573179373202de3d798168b309c14e96a868a80171501d63993e0adff569c8f5a072c55f312431b2eb0deab9f0f9dbb88fef7489 SHA512 2ac9eed48b4598b006ce866c319075eb6b06e8119890db28a0a88d6c680949606d89f5aa113a946c565a4abae529d07d22c7def72dd17beb810ea2f555833d69
+AUX magiccube4d-2.2-ldflags.patch 501 BLAKE2B 2abc1cf4e4b9d210634fae3da618848d21b818d006d30d67a316e750f4e9c77bb2ab8097fc07a1a34aace7efb64f5b3845d8975aa65e7ed83de662eb2dff7968 SHA512 76183b674fa09d330edb82e3c72b605b992a6fe24273c55a45d819ad08854869a7a73ae2ab0d03c14cd872fb13fc0836b75c8d17e3828559bb49d0064caa41b6
+AUX magiccube4d-EventHandler.patch 429 BLAKE2B 7572ff178552f47fe12012f6d6a822a2e2d2d63115eb14fce6ecc8bf489a7ab3c04a7f028d7a514d8de9adca27e6032051b0930386e7d40db08378ad16690a4c SHA512 e11bc6d31a41dca68b450773f575ff1708426daf1f8750117de81592f7050cebe9ea61385e24bd09186d166d764b2d00351b203552eb9d1c2a10be03b3be4f03
+DIST magiccube4d.gif 20739 BLAKE2B feaf1911e483bff7244476000c75b34794911fe279772b8f5d46ee8bd4125881fb71aaab0ebac891fd0a5db38b746c940991bf5fe9e1ad8a678240b2d6cddf82 SHA512 7a8902710eaa78a6580f024a86bfa1828870dc873a4fef30a7d4fa197a67cd1dde162d6d1d1ba0bea4307c13198d52505fb1a1fa3f6d10b3914af42d7c0ebd49
+DIST mc4d-src-2_2.tgz 144645 BLAKE2B 5b29963d056961ce425f7644b14c35e44ce94bc7be6ea5f3fbbb4048478366951005eb8e91fe7cb12e6f1424ad55add31493e0ad3a4ab18eea9e747f940c35f3 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6
+EBUILD magiccube4d-2.2-r1.ebuild 1028 BLAKE2B d8a43720dd54d430685c2ef90bb4425a764dab690af518c9ed524ba85b830604728f94735d6cf6a678edee6ddfea87d08fff6873e0a13b6b61c16dac8fd61dd9 SHA512 ffcb0d692bca7fb0684cb93f3d1d7eb809f2ddf20d196e6c949f5d4cbef5895ad7e3e5cbc1e63bcb7a778a74c9d4876595d14182c24a18c9f6884f720fce9d08
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..8e2aaf2b5fcd
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
@@ -0,0 +1,22 @@
+--- a/EventHandler.h.old 2006-05-19 22:11:48.000000000 +0200
++++ b/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;
+--- a/Machine.h.old 2006-05-19 22:12:17.000000000 +0200
++++ b/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..73d1b4a59dca
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile.in.old 2010-10-15 10:38:48.000000000 +0200
++++ b/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..d242438d8d05
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
@@ -0,0 +1,11 @@
+--- a/EventHandler.cpp.old 2004-11-04 22:58:13.735812448 +1100
++++ b/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-r1.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
new file mode 100644
index 000000000000..5f9eac856d8f
--- /dev/null
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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
+ http://superliminal.com/cube/cube_transp.gif -> ${PN}.gif"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-src-${MY_PV}"
+
+src_prepare() {
+ default
+ eapply "${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() {
+ dobin magiccube4d
+ dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt
+ doicon "${DISTDIR}"/${PN}.gif
+ make_desktop_entry ${PN} "Magic Cube 4D" /usr/share/pixmaps/${PN}.gif
+}
diff --git a/games-puzzle/magiccube4d/metadata.xml b/games-puzzle/magiccube4d/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/magiccube4d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/meandmyshadow-0.4-r1 b/games-puzzle/meandmyshadow-0.4-r1
deleted file mode 100644
index 0fa7c41af94d..000000000000
--- a/games-puzzle/meandmyshadow-0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-arch/libarchive dev-libs/openssl:0= media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-misc/curl x11-libs/libX11 opengl? ( virtual/opengl ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A puzzle/platform game with a player and its shadow
-EAPI=6
-HOMEPAGE=http://meandmyshadow.sourceforge.net/
-IUSE=opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 OFL-1.1 CC-BY-SA-2.5
-RDEPEND=app-arch/libarchive dev-libs/openssl:0= media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-misc/curl x11-libs/libX11 opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/meandmyshadow/0.4/meandmyshadow-0.4-src.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48d3316aaf9c363763022effb3a8cf9b
diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
new file mode 100644
index 000000000000..ef11b52bc354
--- /dev/null
+++ b/games-puzzle/meandmyshadow/Manifest
@@ -0,0 +1,4 @@
+AUX meandmyshadow-0.4-cmake.patch 479 BLAKE2B a242388410af6608f7bca6dd09c125049f5e62c142ac5633d63389755bad41b0a6a3761bb189fac5fde3bfec3fd45c6d39ccb097602a617f627f7e4860ff4222 SHA512 caf5db2cc564feb07753e86788b9f3deb7d280d5fb0474bfee0238fe80af0179aa5b7772b1a5033be55a6dff5f32c9913f8952f973cd30bbce7e1a992ed76e9e
+DIST meandmyshadow-0.4-src.tar.gz 16962805 BLAKE2B 607c08c0484b049e02ed54d2483f30f1c7af8aeffc31c977dba335e57eb14734517469f345387778875567db7f446b159dfbc7e51832cddc0d29e8352b308b29 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b
+EBUILD meandmyshadow-0.4-r1.ebuild 1183 BLAKE2B 370e15518b5d280e57f4e4f7954a19a1df6254dd3a1a8a3a64d0dea0f3101801a4176c220144e61d4a2bc12c72c0f0e8b6d3453c5ade55b5e0fee6bf27c4e820 SHA512 a715992109689a592c8dab50e890180b5bbc4c40ff0260732e176cedd2d9db777305d55b3757e4da202f18000912d71ed9e826151fd97e264ac5515924f58767
+MISC metadata.xml 336 BLAKE2B ef2dbc4f110f2be12490cafc36b1efa95c025822eebdcda0cbec755f1c943d4111304cb0b0a0b415b297ee8face8bef5328a062d28fac6f00ce5ab4f20a8f321 SHA512 8641b7544c71bf31e801587fb889e92e248b4c3500be88ae976423e39d93a6d870b18f05d7af9ce0e0c1d5e2ec081501cecb070cbf2a1452724cc20851617a55
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..504f6c0987a6
--- /dev/null
+++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/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-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
new file mode 100644
index 000000000000..567f9a34f9b4
--- /dev/null
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="A puzzle/platform 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="
+ app-arch/libarchive
+ dev-libs/openssl:0=
+ media-libs/libsdl[sound,video,X]
+ media-libs/sdl-gfx
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ media-libs/sdl-ttf
+ net-misc/curl
+ x11-libs/libX11
+ opengl? ( virtual/opengl )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ -DBINDIR="/usr/bin"
+ -DDATAROOTDIR="/usr/share"
+ -DICONDIR=/usr/share/icons
+ -DDESKTOPDIR=/usr/share/applications
+ -DHARDWARE_ACCELERATION=$(usex opengl)
+ )
+ cmake-utils_src_configure
+}
+
+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..d0cf56051e6c
--- /dev/null
+++ b/games-puzzle/meandmyshadow/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">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-1.6-r1 b/games-puzzle/mindless-1.6-r1
deleted file mode 100644
index 5a907e8ace85..000000000000
--- a/games-puzzle/mindless-1.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare unpack
-DEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc gnome-base/librsvg:2 virtual/pkgconfig
-DESCRIPTION=Play trading card games (Magic: the Gathering etc.) against other people
-EAPI=6
-HOMEPAGE=http://mindless.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/mindless/mindless-1.6.tar.gz http://www.wizards.com/dci/oracle/OracleAll_050523.txt http://mindless.sourceforge.net/images/logo.png -> mindless.png
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=27140614cc9cf4cccdb3d4fe45d8994f
diff --git a/games-puzzle/mindless/Manifest b/games-puzzle/mindless/Manifest
new file mode 100644
index 000000000000..e8364b713aa5
--- /dev/null
+++ b/games-puzzle/mindless/Manifest
@@ -0,0 +1,5 @@
+DIST OracleAll_050523.txt 1280717 BLAKE2B 8ae2c78cd0c1453785d5d5e382804e2e186d481a0195a92a93adf091dcd51833311d9111806641eff4489a47842eb362f09d9a6d69973817619c07b9be1cadd2 SHA512 d2d46e330a697974bc6c69b8616bdd08c959d1b20840468ccb20ca22a105d7cfac01dd0262113804fb84e790cb1f8ad439c1aa3c17927551617ec2f6de5b83e5
+DIST mindless-1.6.tar.gz 85620 BLAKE2B 5922cdb31ec83a0e7cda6c8646c75f35d1e52ce96711b62bd5749762e5074b39568f499bcd3dce39e4bb6d9d7e70097d62c310235bb59f1eda790d057197544a SHA512 bcb47311aebc127e30e10931e489cbbdb80845c6d95008834abab7ecbb7565eb61a38f47e68d24db5ed9da2cb3467fdaccccd05c6eaaca403afaf41cc76a991f
+DIST mindless.png 5119 BLAKE2B 19796bda1bc29c7a78a91cf083e98ef1a51fae0581cece3f8822f2474011cab5d20d0ffc797ef83912cebe406816271d67016cfef86393fe554c03dd42956541 SHA512 1a26d6f241889887a4464555189f25936e3961ef6df113dd4d3eab0f60699ea6bba9af3d88517e61ae9ad9dfc630e663a9d4c7ff0876ff3bcf21cbcee6a7f50a
+EBUILD mindless-1.6-r1.ebuild 1364 BLAKE2B 2a4bcd5db9a7155a0068502b1d4fe8489ec7d2a178383551ac0c1af82a74996cc28daff359d393a493910a978818c409b2c04baab93a0e0616f89a71fac4cdf8 SHA512 28097522c5e04e79bc7036e74cf5c728a99d39c10fba8808af23a5589e13e2238277193d91222529fe036a93abebb828c36944ae9249edef0d313debea9b7375
+MISC metadata.xml 331 BLAKE2B 7663f41ea5c4e0ce0680d1815f4d62ff469d25274a253aad5c9597836eaa1fb392636730c25b4535ecba191518b8a4a5cbf2f6cfc58767dcda05738bf3157f30 SHA512 bae00e9836e3224a3f2c4fc7c6be572153b8693f42de869c4670edc2c5b8f103182a5f7c97ab2abd7744a29b0ed30f2c5dc56c7c661bdc28f14aaa5355eb5b5a
diff --git a/games-puzzle/mindless/metadata.xml b/games-puzzle/mindless/metadata.xml
new file mode 100644
index 000000000000..c5f9e589b91f
--- /dev/null
+++ b/games-puzzle/mindless/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">mindless</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/mindless/mindless-1.6-r1.ebuild b/games-puzzle/mindless/mindless-1.6-r1.ebuild
new file mode 100644
index 000000000000..4777d0640580
--- /dev/null
+++ b/games-puzzle/mindless/mindless-1.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop readme.gentoo-r1
+
+ORANAME="OracleAll_050523.txt"
+DESCRIPTION="Play trading card games (Magic: the Gathering etc.) against other people"
+HOMEPAGE="http://mindless.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
+ http://www.wizards.com/dci/oracle/${ORANAME}
+ http://mindless.sourceforge.net/images/logo.png -> ${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror" # for the card database
+
+RDEPEND="
+ x11-libs/gtk+:2
+ media-fonts/font-schumacher-misc
+"
+DEPEND="${RDEPEND}
+ gnome-base/librsvg:2
+ virtual/pkgconfig
+"
+
+DATAFILE="/usr/share/${PN}/${ORANAME}"
+DOC_CONTENTS="
+ The first time you start ${PN} you need to tell it where to find
+ the text database of cards. This file has been installed at:
+ ${DATAFILE}
+"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ cp "${DISTDIR}/${ORANAME}" "${WORKDIR}" || die "cp failed"
+}
+
+src_prepare() {
+ default
+ sed -i \
+ -e '/^CC=/d' \
+ -e '/^CFLAGS=/d' \
+ Makefile \
+ || die 'sed failed'
+}
+
+src_install() {
+ dobin mindless
+ insinto "/usr/share/${PN}"
+ doins "${WORKDIR}/${ORANAME}"
+ einstalldocs
+ readme.gentoo_create_doc
+ doicon "${DISTDIR}"/${PN}.png
+ make_desktop_entry ${PN} "Mindless Automaton"
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/games-puzzle/mirrormagic-2.0.2-r2 b/games-puzzle/mirrormagic-2.0.2-r2
deleted file mode 100644
index eecb18493ea3..000000000000
--- a/games-puzzle/mirrormagic-2.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image ) !sdl? ( x11-libs/libXt )
-DESCRIPTION=A game like Deflektor (C 64) or Mindbender (Amiga)
-EAPI=6
-HOMEPAGE=http://www.artsoft.org/mirrormagic/
-IUSE=sdl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image )
-SLOT=0
-SRC_URI=http://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c9f3f0d80a3f5569451ef709b84b4f74
diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
new file mode 100644
index 000000000000..bfd2a6a44442
--- /dev/null
+++ b/games-puzzle/mirrormagic/Manifest
@@ -0,0 +1,9 @@
+AUX mirrormagic-2.0.2-64bit.patch 892 BLAKE2B afadf37d81290831ebd6c479d98520e2e3e80df12c84d7fadab93d78d720c9ec1d926a948fc424fa57b64d3d861c16bb5ecd246bfaf07496bb25c07c606f785f SHA512 c625eb00098c4d7c41ce58ed2ca3ee28f34f6a06025d20e0533f6b171cfc2f2b0cb01ce80fb057902d839868303aa20329452c67f7c7e86809472207aeba6207
+AUX mirrormagic-2.0.2-editor.patch 499 BLAKE2B 9b09e8e9962b018945fae2a1c5c6e72134b80e267c189e60774889761b0d5264410ce4015523edce73de1e313e780c2fdf0f62d263d8d3398dd8162eb365be60 SHA512 2d2d497402596b0108b0b79f8ce93d4e7404a64f20107582d40ac5d72291645379f920af5bd156e607f724e0427817bf6557223a7c152ebdf41b6787e81fb353
+AUX mirrormagic-2.0.2-gcc41.patch 271 BLAKE2B c9af7a0ca7cbdfeb752b914def445de7089d541e8c0a37b4cb17d6a5c0d2e60ff46c539d32bddf36c7c57ab1ed1adcdbf803e2967dd5932cedee07e3bbe2415a SHA512 7ff5419ecbf4598c30241dc68cf0191abe4b806226628533d261e10eb33b90c1f5909c7b6afedd2f2fad87bea7cc6a06dceafe513ec3a93e4ea9d6bda1d8eaea
+AUX mirrormagic-2.0.2-gcc5.patch 14581 BLAKE2B 70ead8b2ae5fef95d7c465c2dc80380789377f8d59df9a8f24ab641e8ee3fd0c4891de18ad2d85cbfa55fa940f698f19c7ab9395e16e0eff96672452f35aa59b SHA512 bf71d63c5bef22cb49f2dd9b63d7e8150ea6e6a49cc2430a834ebd31f07f9b2e26411330550ff181386654b9695682fd9a71a3975df24ead8e1386746756b59b
+AUX mirrormagic-2.0.2-parallel.patch 238 BLAKE2B 76e437bc253ec82381161748b24ff2b08d5723fc8ce9e6beb294904f8263f95ed06afb648f35898997f6b53524c5f921f3b4c4e4b49c46f892e2b56fc7ac0830 SHA512 54cd926d2278878b7647ef790138e5f9f77ac9086c7d86d047bbea7481e39efd760393c3aa5657070e1fb0d07fb82cab64d63a593234e9dc6eff7ba7794ec5ee
+AUX mirrormagic.xpm 6347 BLAKE2B a5bf1e854b3d0f379567649ddae43891c6929301472618cc5f2beeef0f46e1faa05f8f726825a94714fbe1b77d13ec68663299b4edb8903e812a6759d2cde6eb SHA512 5040a6232ba047fe0038276bf574ca22b5270827c21e9dbba0f130f0b25c2157be611cca1e662af2ff8cc43ab78f69a925b6687fcaedc4778672ebfedfe00227
+DIST mirrormagic-2.0.2.tar.gz 1168098 BLAKE2B 0feefa2e7af82b212c3c08a347154d701a8492c2fef35cf625f4176e4893888904d88a2ee6d36c4e239fbf2cb6f1f77aa8e273023a86dce04dce8f5b77b62946 SHA512 cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03
+EBUILD mirrormagic-2.0.2-r2.ebuild 1231 BLAKE2B 49d51d7b6a58f7eb04619445ad3cf1c4c82e25916649ff997f816d9732d6fea70c4c0cbdaa003d3bd972cb728f2535bb50920f9afefa59fd701861c411b883fe SHA512 96f248137e83883402c99854debe17869524763d7766a093ddd29baf40c54f4e8059f5648761f3f7bf9d20d95cd9651359480263ec50b901304dd7377c503516
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..4817f75786f8
--- /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.
+
+--- a/src/libgame/gadgets.c
++++ b/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-editor.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch
new file mode 100644
index 000000000000..459ffa6bf4aa
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch
@@ -0,0 +1,20 @@
+--- mirrormagic-2.0.2/src/editor.c.orig
++++ mirrormagic-2.0.2/src/editor.c
+@@ -2751,7 +2751,7 @@
+ break;
+ }
+
+- if (!LevelContainsPlayer)
++ if (!LevelContainsPlayer())
+ Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
+ else
+ {
+@@ -2766,7 +2766,7 @@
+ break;
+
+ case GADGET_ID_TEST:
+- if (!LevelContainsPlayer)
++ if (!LevelContainsPlayer())
+ Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
+ else
+ {
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..be7f701de42f
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
@@ -0,0 +1,10 @@
+--- a/src/main.h.old
++++ b/src/main.h
+@@ -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-gcc5.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch
new file mode 100644
index 000000000000..de2cc8042adc
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch
@@ -0,0 +1,483 @@
+gcc5 inline semantics changed and caused a build fauilure (bug #568618).
+
+--- mirrormagic-2.0.2.orig/src/libgame/misc.h
++++ mirrormagic-2.0.2/src/libgame/misc.h
+@@ -137,8 +137,8 @@
+ void sortLevelDirInfo(struct LevelDirInfo **,
+ int (*compare_function)(const void *, const void *));
+
+-inline void swap_numbers(int *, int *);
+-inline void swap_number_pairs(int *, int *, int *, int *);
++extern inline void swap_numbers(int *, int *);
++extern inline void swap_number_pairs(int *, int *, int *, int *);
+
+ char *getUserDataDir(void);
+ char *getSetupDir(void);
+--- mirrormagic-2.0.2.orig/src/libgame/msdos.h
++++ mirrormagic-2.0.2/src/libgame/msdos.h
+@@ -711,7 +711,7 @@
+ Pixmap XCreatePixmap(Display *, Drawable, unsigned int, unsigned int,
+ unsigned int);
+ void XSync(Display *, Bool);
+-inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int,
++extern inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int,
+ unsigned int, unsigned int, int, int);
+ int Read_PCX_to_Pixmap(Display *, Window, GC, char *, Pixmap *, Pixmap *);
+ int XReadBitmapFile(Display *, Drawable, char *,
+--- mirrormagic-2.0.2.orig/src/libgame/sdl.h
++++ mirrormagic-2.0.2/src/libgame/sdl.h
+@@ -314,20 +314,20 @@
+
+ /* SDL function definitions */
+
+-inline void SDLInitVideoDisplay(void);
+-inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
+-inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
+-inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
+-inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
+-inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
+-inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
+-inline Pixel SDLGetPixel(Bitmap *, int, int);
++extern inline void SDLInitVideoDisplay(void);
++extern inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
++extern inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
++extern inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
++extern inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
++extern inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
++extern inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
++extern inline Pixel SDLGetPixel(Bitmap *, int, int);
+
+ Bitmap *SDLLoadImage(char *);
+
+-inline void SDLOpenAudio(void);
+-inline void SDLCloseAudio(void);
++extern inline void SDLOpenAudio(void);
++extern inline void SDLCloseAudio(void);
+
+-inline void SDLNextEvent(Event *);
++extern inline void SDLNextEvent(Event *);
+
+ #endif /* SDL_H */
+--- mirrormagic-2.0.2.orig/src/libgame/system.c
++++ mirrormagic-2.0.2/src/libgame/system.c
+@@ -172,12 +172,12 @@
+ /* video functions */
+ /* ========================================================================= */
+
+-inline static int GetRealDepth(int depth)
++static int GetRealDepth(int depth)
+ {
+ return (depth == DEFAULT_DEPTH ? video.default_depth : depth);
+ }
+
+-inline void InitVideoDisplay(void)
++void InitVideoDisplay(void)
+ {
+ #if defined(TARGET_SDL)
+ SDLInitVideoDisplay();
+@@ -186,7 +186,7 @@
+ #endif
+ }
+
+-inline void CloseVideoDisplay(void)
++void CloseVideoDisplay(void)
+ {
+ KeyboardAutoRepeatOn();
+
+@@ -198,7 +198,7 @@
+ #endif
+ }
+
+-inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
++void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
+ int width, int height, int depth,
+ boolean fullscreen)
+ {
+@@ -215,7 +215,7 @@
+ #endif
+ }
+
+-inline Bitmap *CreateBitmapStruct(void)
++Bitmap *CreateBitmapStruct(void)
+ {
+ #ifdef TARGET_SDL
+ return checked_calloc(sizeof(struct SDLSurfaceInfo));
+@@ -224,7 +224,7 @@
+ #endif
+ }
+
+-inline Bitmap *CreateBitmap(int width, int height, int depth)
++Bitmap *CreateBitmap(int width, int height, int depth)
+ {
+ Bitmap *new_bitmap = CreateBitmapStruct();
+ int real_depth = GetRealDepth(depth);
+@@ -265,7 +265,7 @@
+ return new_bitmap;
+ }
+
+-inline void FreeBitmap(Bitmap *bitmap)
++void FreeBitmap(Bitmap *bitmap)
+ {
+ if (bitmap == NULL)
+ return;
+@@ -287,7 +287,7 @@
+ free(bitmap);
+ }
+
+-inline void CloseWindow(DrawWindow *window)
++void CloseWindow(DrawWindow *window)
+ {
+ #ifdef TARGET_X11
+ if (window->drawable)
+@@ -300,7 +300,7 @@
+ #endif
+ }
+
+-inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
++void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
+ int src_x, int src_y,
+ int width, int height,
+ int dst_x, int dst_y)
+@@ -314,7 +314,7 @@
+ #endif
+ }
+
+-inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
++void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
+ {
+ #ifdef TARGET_SDL
+ SDLFillRectangle(bitmap, x, y, width, height, 0x000000);
+@@ -329,7 +329,7 @@
+ #endif
+ #endif
+
+-inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
++void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
+ {
+ #ifdef TARGET_X11
+ if (clip_gc)
+@@ -343,7 +343,7 @@
+ #endif
+ }
+
+-inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
++void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
+ {
+ #ifdef TARGET_X11
+ if (clip_gc)
+@@ -357,7 +357,7 @@
+ #endif
+ }
+
+-inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
++void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
+ int src_x, int src_y,
+ int width, int height,
+ int dst_x, int dst_y)
+@@ -371,7 +371,7 @@
+ #endif
+ }
+
+-inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
++void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
+ int to_x, int to_y)
+ {
+ #ifdef TARGET_SDL
+@@ -384,7 +384,7 @@
+ }
+
+ #if !defined(TARGET_X11_NATIVE)
+-inline void DrawLine(Bitmap *bitmap, int from_x, int from_y,
++void DrawLine(Bitmap *bitmap, int from_x, int from_y,
+ int to_x, int to_y, Pixel pixel, int line_width)
+ {
+ int x, y;
+@@ -414,7 +414,7 @@
+ }
+ #endif
+
+-inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
++void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
+ Pixel pixel)
+ {
+ #if !defined(TARGET_X11_NATIVE)
+@@ -438,7 +438,7 @@
+ #endif
+ }
+
+-inline Pixel GetPixel(Bitmap *bitmap, int x, int y)
++Pixel GetPixel(Bitmap *bitmap, int x, int y)
+ {
+ #if defined(TARGET_SDL)
+ return SDLGetPixel(bitmap, x, y);
+@@ -458,7 +458,7 @@
+ #endif
+ }
+
+-inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
++Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
+ unsigned int color_g, unsigned int color_b)
+ {
+ Pixel pixel;
+@@ -481,7 +481,7 @@
+ return pixel;
+ }
+
+-inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
++Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
+ {
+ unsigned int color_r = (color >> 16) & 0xff;
+ unsigned int color_g = (color >> 8) & 0xff;
+@@ -491,7 +491,7 @@
+ }
+
+ /* execute all pending screen drawing operations */
+-inline void FlushDisplay(void)
++void FlushDisplay(void)
+ {
+ #ifndef TARGET_SDL
+ XFlush(display);
+@@ -499,14 +499,14 @@
+ }
+
+ /* execute and wait for all pending screen drawing operations */
+-inline void SyncDisplay(void)
++void SyncDisplay(void)
+ {
+ #ifndef TARGET_SDL
+ XSync(display, FALSE);
+ #endif
+ }
+
+-inline void KeyboardAutoRepeatOn(void)
++void KeyboardAutoRepeatOn(void)
+ {
+ #ifdef TARGET_SDL
+ SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2,
+@@ -518,7 +518,7 @@
+ #endif
+ }
+
+-inline void KeyboardAutoRepeatOff(void)
++void KeyboardAutoRepeatOff(void)
+ {
+ #ifdef TARGET_SDL
+ SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
+@@ -529,7 +529,7 @@
+ #endif
+ }
+
+-inline boolean PointerInWindow(DrawWindow *window)
++boolean PointerInWindow(DrawWindow *window)
+ {
+ #ifdef TARGET_SDL
+ return TRUE;
+@@ -546,7 +546,7 @@
+ #endif
+ }
+
+-inline boolean SetVideoMode(boolean fullscreen)
++boolean SetVideoMode(boolean fullscreen)
+ {
+ #ifdef TARGET_SDL
+ return SDLSetVideoMode(&backbuffer, fullscreen);
+@@ -567,7 +567,7 @@
+ #endif
+ }
+
+-inline boolean ChangeVideoModeIfNeeded(boolean fullscreen)
++boolean ChangeVideoModeIfNeeded(boolean fullscreen)
+ {
+ #ifdef TARGET_SDL
+ if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)||
+@@ -600,7 +600,7 @@
+ /* audio functions */
+ /* ========================================================================= */
+
+-inline void OpenAudio(void)
++void OpenAudio(void)
+ {
+ /* always start with reliable default values */
+ audio.sound_available = FALSE;
+@@ -627,7 +627,7 @@
+ #endif
+ }
+
+-inline void CloseAudio(void)
++void CloseAudio(void)
+ {
+ #if defined(TARGET_SDL)
+ SDLCloseAudio();
+@@ -640,7 +640,7 @@
+ audio.sound_enabled = FALSE;
+ }
+
+-inline void SetAudioMode(boolean enabled)
++void SetAudioMode(boolean enabled)
+ {
+ if (!audio.sound_available)
+ return;
+@@ -653,7 +653,7 @@
+ /* event functions */
+ /* ========================================================================= */
+
+-inline void InitEventFilter(EventFilter filter_function)
++void InitEventFilter(EventFilter filter_function)
+ {
+ #ifdef TARGET_SDL
+ /* set event filter to filter out certain events */
+@@ -661,7 +661,7 @@
+ #endif
+ }
+
+-inline boolean PendingEvent(void)
++boolean PendingEvent(void)
+ {
+ #ifdef TARGET_SDL
+ return (SDL_PollEvent(NULL) ? TRUE : FALSE);
+@@ -670,7 +670,7 @@
+ #endif
+ }
+
+-inline void NextEvent(Event *event)
++void NextEvent(Event *event)
+ {
+ #ifdef TARGET_SDL
+ SDLNextEvent(event);
+@@ -679,7 +679,7 @@
+ #endif
+ }
+
+-inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
++Key GetEventKey(KeyEvent *event, boolean with_modifiers)
+ {
+ #ifdef TARGET_SDL
+ #if 0
+@@ -707,7 +707,7 @@
+ #endif
+ }
+
+-inline boolean CheckCloseWindowEvent(ClientMessageEvent *event)
++boolean CheckCloseWindowEvent(ClientMessageEvent *event)
+ {
+ if (event->type != EVENT_CLIENTMESSAGE)
+ return FALSE;
+@@ -724,7 +724,7 @@
+ }
+
+
+-inline void dummy(void)
++void dummy(void)
+ {
+ #ifdef TARGET_SDL
+ #else
+--- mirrormagic-2.0.2.orig/src/libgame/system.h
++++ mirrormagic-2.0.2/src/libgame/system.h
+@@ -278,41 +278,41 @@
+ void InitGfxDoor2Info(int, int, int, int);
+ void InitGfxScrollbufferInfo(int, int);
+
+-inline void InitVideoDisplay(void);
+-inline void CloseVideoDisplay(void);
+-inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
+-inline Bitmap *CreateBitmapStruct(void);
+-inline Bitmap *CreateBitmap(int, int, int);
+-inline void FreeBitmap(Bitmap *);
+-inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
+-inline void ClearRectangle(Bitmap *, int, int, int, int);
+-inline void SetClipMask(Bitmap *, GC, Pixmap);
+-inline void SetClipOrigin(Bitmap *, GC, int, int);
+-inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
+-inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
+-inline void DrawLines(Bitmap *, struct XY *, int, Pixel);
+-inline Pixel GetPixel(Bitmap *, int, int);
+-inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
+-inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
+-
+-inline void FlushDisplay(void);
+-inline void SyncDisplay(void);
+-inline void KeyboardAutoRepeatOn(void);
+-inline void KeyboardAutoRepeatOff(void);
+-inline boolean PointerInWindow(DrawWindow *);
+-inline boolean SetVideoMode(boolean);
+-inline boolean ChangeVideoModeIfNeeded(boolean);
++extern inline void InitVideoDisplay(void);
++extern inline void CloseVideoDisplay(void);
++extern inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
++extern inline Bitmap *CreateBitmapStruct(void);
++extern inline Bitmap *CreateBitmap(int, int, int);
++extern inline void FreeBitmap(Bitmap *);
++extern inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
++extern inline void ClearRectangle(Bitmap *, int, int, int, int);
++extern inline void SetClipMask(Bitmap *, GC, Pixmap);
++extern inline void SetClipOrigin(Bitmap *, GC, int, int);
++extern inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
++extern inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
++extern inline void DrawLines(Bitmap *, struct XY *, int, Pixel);
++extern inline Pixel GetPixel(Bitmap *, int, int);
++extern inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
++extern inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
++
++extern inline void FlushDisplay(void);
++extern inline void SyncDisplay(void);
++extern inline void KeyboardAutoRepeatOn(void);
++extern inline void KeyboardAutoRepeatOff(void);
++extern inline boolean PointerInWindow(DrawWindow *);
++extern inline boolean SetVideoMode(boolean);
++extern inline boolean ChangeVideoModeIfNeeded(boolean);
+
+ Bitmap *LoadImage(char *);
+
+-inline void OpenAudio(void);
+-inline void CloseAudio(void);
+-inline void SetAudioMode(boolean);
+-
+-inline void InitEventFilter(EventFilter);
+-inline boolean PendingEvent(void);
+-inline void NextEvent(Event *event);
+-inline Key GetEventKey(KeyEvent *, boolean);
+-inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
++extern inline void OpenAudio(void);
++extern inline void CloseAudio(void);
++extern inline void SetAudioMode(boolean);
++
++extern inline void InitEventFilter(EventFilter);
++extern inline boolean PendingEvent(void);
++extern inline void NextEvent(Event *event);
++extern inline Key GetEventKey(KeyEvent *, boolean);
++extern inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
+
+ #endif /* SYSTEM_H */
+--- mirrormagic-2.0.2.orig/src/libgame/x11.c
++++ mirrormagic-2.0.2/src/libgame/x11.c
+@@ -21,7 +21,7 @@
+ static void X11InitDisplay();
+ static DrawWindow *X11InitWindow();
+
+-inline void X11InitVideoDisplay(void)
++void X11InitVideoDisplay(void)
+ {
+ /* initialize X11 video */
+ X11InitDisplay();
+@@ -30,7 +30,7 @@
+ video.default_depth = XDefaultDepth(display, screen);
+ }
+
+-inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
++void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
+ {
+ *window = X11InitWindow();
+
+--- mirrormagic-2.0.2.orig/src/libgame/x11.h
++++ mirrormagic-2.0.2/src/libgame/x11.h
+@@ -286,8 +286,8 @@
+
+ /* X11 function definitions */
+
+-inline void X11InitVideoDisplay(void);
+-inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
++extern inline void X11InitVideoDisplay(void);
++extern inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
+ Bitmap *X11LoadImage(char *);
+
+ #endif /* X11_H */
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..a7effd4b6984
--- /dev/null
+++ b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.old
++++ b/src/Makefile
+@@ -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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/mirrormagic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..812835fd25d0
--- /dev/null
+++ b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop toolchain-funcs
+
+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 ~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() {
+ default
+ eapply \
+ "${FILESDIR}"/${P}-gcc41.patch \
+ "${FILESDIR}"/${P}-parallel.patch \
+ "${FILESDIR}"/${P}-64bit.patch \
+ "${FILESDIR}"/${P}-gcc5.patch \
+ "${FILESDIR}"/${P}-editor.patch
+ rm -f ${PN} || die
+}
+
+src_compile() {
+ emake \
+ -C src \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ OPTIONS="${CFLAGS}" \
+ EXTRA_LDFLAGS="${LDFLAGS}" \
+ RO_GAME_DIR=/usr/share/${PN} \
+ RW_GAME_DIR=/var/${PN} \
+ TARGET=$(usex sdl sdl x11)
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/${PN}
+ doins -r graphics levels music sounds
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry ${PN} "Mirror Magic II"
+ einstalldocs
+}
diff --git a/games-puzzle/monsterz-0.7.1-r4 b/games-puzzle/monsterz-0.7.1-r4
deleted file mode 100644
index a9795eface79..000000000000
--- a/games-puzzle/monsterz-0.7.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-DESCRIPTION=A little puzzle game, similar to the famous Bejeweled or Zookeeper
-EAPI=6
-HOMEPAGE=http://sam.zoy.org/projects/monsterz/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-1+ LGPL-2+ WTFPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://sam.zoy.org/projects/monsterz/monsterz-0.7.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e46ffe7dc890d1c777c5087567866d6a
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
new file mode 100644
index 000000000000..7f42c1695386
--- /dev/null
+++ b/games-puzzle/monsterz/Manifest
@@ -0,0 +1,6 @@
+AUX monsterz-0.7.1-64bit.patch 1093 BLAKE2B a27d602e4087926e053abd4f1cefb22a88fa37f8a3a773e13ea2f5db0914d6589db5fb09c78551da2f6f5b78d5cfd6c46bf08b9d77e6cfed99a451ffb9311c24 SHA512 3098e5a287c2b3e5e415a06e9e671fb4e56ebd4405a4580c5bb3529c1708ada9efdb40b1369040c7dba50ee1e0c33b6f088da898a8eec7f2997e4d376b67dea4
+AUX monsterz-0.7.1-blit.patch 1298 BLAKE2B ef1c5961a0a1c48ab01a289f7504355b445beae6f7387f68a901b75d403c2422b53fd1c7a4923d954320de73555fd649ff913ddd68336fc1233f94655fb34b8b SHA512 682542801240d7b32497105774ed240b08eefd9a92dfd20caf66d00fb1d77ec563c97262ed323c96a71fa19e5c2f9a13cffd7a8698aae92b2dfd858d35d8ed98
+AUX monsterz-0.7.1-gentoo.patch 970 BLAKE2B 658224adbc150cf01dfe72a3f1ea5fd14d0122eb1ac3b55f1d52c1f89ecbefeafa88e3aff08d4d832f8b2b6b2922890514609652e0c8f3cee26889f66b0ca5bc SHA512 1dc1994cb03f794b9f015d8d812b8519c826b0a0d02ecb3a9f4bb0e25d69aeb8f3784dcf1fbc1624ca18f645b55e0889f0d2ce8f1339639e8ed55d305af0f3e1
+DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
+EBUILD monsterz-0.7.1-r4.ebuild 1100 BLAKE2B 9eee9e6e0cb08ac23cc78abea1981877d017046ea3dbe3136bc3ac2ff1c6ce53752729a5b53ee2ca12bd6853dc930154954596621e2f6ce9f147f34a8a44a8ab SHA512 6d83c1ad052d362b6e364fec40eb321696e68a70fdeb2138018f1a316dd9c2d4b528bea8e54777022d50ab6ed82274af4d2106bba0ae634bce30b3995ad96808
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..d0847d6c2c10
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
@@ -0,0 +1,32 @@
+--- a/monsterz.py
++++ b/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..6920e0e36971
--- /dev/null
+++ b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
@@ -0,0 +1,20 @@
+--- a/monsterz.py.orig 2006-05-12 18:55:51.000000000 -0400
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/monsterz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
new file mode 100644
index 000000000000..4cff31b75f8c
--- /dev/null
+++ b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit desktop python-r1
+
+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 ~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() {
+ default
+ eapply \
+ "${FILESDIR}"/${P}-gentoo.patch \
+ "${FILESDIR}"/${P}-64bit.patch \
+ "${FILESDIR}"/${P}-blit.patch
+ sed -i \
+ -e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
+ monsterz.py || die "sed failed"
+ rm Makefile || die
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins -r graphics sound
+ newbin monsterz.py ${PN}
+ newicon graphics/icon.png ${PN}.png
+ make_desktop_entry ${PN} Monsterz
+ einstalldocs
+ python_replicate_script "${ED%/}"/usr/bin/monsterz
+}
diff --git a/games-puzzle/mures-0.5-r1 b/games-puzzle/mures-0.5-r1
deleted file mode 100644
index 20ff4c29e7bc..000000000000
--- a/games-puzzle/mures-0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A clone of Sega's Chu Chu Rocket
-EAPI=6
-HOMEPAGE=http://mures.sourceforge.net/
-IUSE=opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/mures/mures-0.5.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ddd0ab80ab34d043bff861d4b385cae5
diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
new file mode 100644
index 000000000000..99ec18b21954
--- /dev/null
+++ b/games-puzzle/mures/Manifest
@@ -0,0 +1,5 @@
+AUX mures-0.5-save.patch 654 BLAKE2B 57992955c9bb850ec7f13c50039eaa02d81540abbe94dba7cc0d034d5dab3c0f63d82fcdeb666efc664494e39f47c152f84efebaa1b3c2a108b55ff5c960dacc SHA512 b1762660ecd5cd373d39957003a0e455c3f981886191955eca2ccdd54d6ce2a302f6eaed3d022ac5acd64cabed364a6c1dc6cbdf53e0fd32208ce3d12db0a187
+AUX mures-0.5-underlink.patch 300 BLAKE2B f20a6a2e2e82e0f16a9ed8f49d2cf4071d4f19c2149f12b98572e0e4a8e42e04556d02bd93675f5805dae96a496ea4586ce064ea2f33c33586a24afecab889ce SHA512 ffbd6e23fab8fff7ccb191c1fcc4f405b2c5cc6cffaa388eca11185244a5328d16b8f3301ce1dd29ba036637e281e55b08ac39c039ff187cac35f01f078ced21
+DIST mures-0.5.tar.gz 638528 BLAKE2B 35861cbc0497091c716664a6a1d38884a64981f6228637cbeb93b4be64c42bf84b8033c2f5d95f197c26436fbf621ff8322ffb5aa3dc241b50372e94a395599b SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff
+EBUILD mures-0.5-r1.ebuild 2079 BLAKE2B 9fded27b1529d579f3dd27673472396507f14061ea14f43c2d1997cc059241e432fd63bbdfc4bf9aefd597499f50f5069fd46072eb48b3879f48a193129414d7 SHA512 7bcaf4b664fe92b1ec3b4f5da68875daf5f6c0c64705ace569b082a6a8b6a6ed4c5609a2b3c9c7993d7b5efbcd4e56ba6b48b1b6843fec94f48466075cdac049
+MISC metadata.xml 328 BLAKE2B 10dbb393d6e09fe667ad28913d38f785c0d8d51da581bbc2fe2d19c18faea716bc901097829cc4927b6d3d0265ecd53e62635461f6bb3619cba1540b7b033c66 SHA512 f6818639d9ff510efe1dc98505eb03086d46024def2a1b5fef5273181e6eef91135ef4e7902613776da51a951c50373b5cc80848a9887d3919f7adfd9ef40f18
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..697db8ef7a28
--- /dev/null
+++ b/games-puzzle/mures/files/mures-0.5-save.patch
@@ -0,0 +1,33 @@
+--- a/gi_sdl.c
++++ b/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);
+
+--- a/output.c
++++ b/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..3acf0b0f7233
--- /dev/null
+++ b/games-puzzle/mures/files/mures-0.5-underlink.patch
@@ -0,0 +1,13 @@
+--- a/src/Makefile.am.old 2011-06-21 14:39:14.404333493 +0200
++++ b/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..adf89afdd42a
--- /dev/null
+++ b/games-puzzle/mures/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">mures</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/mures/mures-0.5-r1.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild
new file mode 100644
index 000000000000..36b51630c7e7
--- /dev/null
+++ b/games-puzzle/mures/mures-0.5-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop
+
+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 ~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="/usr/share/${PN}"
+
+src_prepare() {
+ default
+
+ # 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"
+
+ eapply "${FILESDIR}"/${P}-underlink.patch
+
+ mv configure.in configure.ac
+ eautoreconf
+
+ cd src
+
+ # Save to HOME
+ eapply "${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}
+ einstalldocs
+ dobin src/mures
+ newicon src/images/cat_right.png ${PN}.png
+ make_desktop_entry ${PN} "Mures"
+}
diff --git a/games-puzzle/neverball-1.6.0-r1 b/games-puzzle/neverball-1.6.0-r1
deleted file mode 100644
index c90554a2cefe..000000000000
--- a/games-puzzle/neverball-1.6.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl ) sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=Clone of Super Monkey Ball using SDL/OpenGL
-EAPI=6
-HOMEPAGE=https://neverball.org
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ IJG
-RDEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://neverball.org/neverball-1.6.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d338753e8733d30968ce143ed601f67b
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
new file mode 100644
index 000000000000..ef9bcc0eaabe
--- /dev/null
+++ b/games-puzzle/neverball/Manifest
@@ -0,0 +1,3 @@
+DIST neverball-1.6.0.tar.gz 37772911 BLAKE2B c9ebf9b5e87665055d3c09b93ffa71d8bf9b953b8a4b9ab7a0e7667c5521c94c80fa66c8df496066434b25319f7d22498ad19fa52e5ffee71ff4ee25188e3c41 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
+EBUILD neverball-1.6.0-r1.ebuild 1994 BLAKE2B 4ea20e44571cffddd17e7f972e59f8bce89c5838ca4aaa6e8812ae510b7015f5ae1d927d111f5ef4df2924bfb144ed0fb57b2cdfbe0baafe1d74efb597d5793e SHA512 8d0d793fcca8fd5268c3d84fb1f4a8a6c8b66e04dd2092c3de41f9c19b74a0f1be26eb9721419f38010ff799ab676af30fe47676a3214e8fc3a087f7dbf9e448
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/neverball/metadata.xml b/games-puzzle/neverball/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/neverball/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..f2991bb60a72
--- /dev/null
+++ b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2-utils
+
+DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
+HOMEPAGE="https://neverball.org"
+SRC_URI="https://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:0
+ 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() {
+ default
+ 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="/usr/share/${PN}"
+}
+
+src_install() {
+ local font
+
+ dobin ${PN}-mapc neverball neverputt
+ insinto "/usr/share/${PN}"
+ doins -r data/*
+ for font in DejaVuSans-Bold.ttf wqy-microhei.ttc; do
+ rm -f "${ED}/usr/share/${PN}"/ttf/${font}
+ dosym /usr/share/fonts/*/${font} \
+ "/usr/share/${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
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/nightsky-20111222 b/games-puzzle/nightsky-20111222
deleted file mode 100644
index 6b58317a214d..000000000000
--- a/games-puzzle/nightsky-20111222
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
-EAPI=5
-HOMEPAGE=http://www.nicalis.com/nightsky/
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-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 ) games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=nightskyhd-linux-1324519044.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4a9e34cca2a59985323f7b97aab9407d
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
new file mode 100644
index 000000000000..6ce1ead47d89
--- /dev/null
+++ b/games-puzzle/nightsky/Manifest
@@ -0,0 +1,4 @@
+AUX nightsky-wrapper 540 BLAKE2B 19eb62deb97cc4383e5b33920446278d369ec0c725dfa2a33709d7112cea8f97816724ee5976f7638b7610d110a4c3ff744ed23d248116c52113da141634e17d SHA512 6ecb52d390757bb6b1ffcd7b06c1a154d5a3253822e989d7b9276ede8627d241b203afb88afff731f33967a3e380d1fcaf3feeef61713485848f654df3855248
+DIST nightskyhd-linux-1324519044.tar.gz 123971537 BLAKE2B 52aafe22177ff3266bcff10a9de0b6a120f92c9dda0176a17c71140436b7ba6c13cab1775dd2406f8560ff0f8bfc2c4a38de4be40ef195535d9636edfb6005ba SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e
+EBUILD nightsky-20111222.ebuild 1878 BLAKE2B 229d53081e7e45e14a0b2ca812fc65ff4bf0cf72fb6be4643c22d85faf428e4bdeb092cbc2ff9641a35480b318622dba40ae1348298a83952ca923f9402e7676 SHA512 47f922164e5b28a0f344153c6835cf07442221383d0735dba964f0d47812816f590695bb596f757d4ab2d2f0ea276eeadcf787759ad1b47b981fee2441847337
+MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
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..b878aaa1812d
--- /dev/null
+++ b/games-puzzle/nightsky/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <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..aebfa6393e06
--- /dev/null
+++ b/games-puzzle/nightsky/nightsky-20111222.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/nudoku-1.0.0 b/games-puzzle/nudoku-1.0.0
deleted file mode 100644
index eda5856df8ea..000000000000
--- a/games-puzzle/nudoku-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=ncurses based sudoku game
-EAPI=6
-HOMEPAGE=https://jubalh.github.io/nudoku
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/jubalh/nudoku/archive/1.0.0.tar.gz -> nudoku-1.0.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=565d701689de99db65c27a8acdd03b6c
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
new file mode 100644
index 000000000000..548fcef53538
--- /dev/null
+++ b/games-puzzle/nudoku/Manifest
@@ -0,0 +1,3 @@
+DIST nudoku-1.0.0.tar.gz 20442 BLAKE2B b258362012b889a0756bc8cdbfbcdc9aba09e1162f6dc8a593061689e81d02935111bac8561648e89e7287af4702f110ea86fb20ae4e18bfba09f3578f0909cb SHA512 f29a698eec076729ce065633bb05e0146e229774ff1eb3f2bd5cd5733698e30b91085b55d871657d42f2d3d8bcf7bb45918f4a127d6a0464ebc8b90ccc384ec3
+EBUILD nudoku-1.0.0.ebuild 485 BLAKE2B 02f2a94050b3be4b5c76df209b536855752492fa5b484961f5e6446aa9f4b6472822313a285af551a24fbc8d76aa792d268bf0bbd53cc425fdeaea173f623f99 SHA512 0dd5d960c1d2314c7eed00fdd82c6d3e209ef4bb95f2bfb50a24959fd91171751ce7dd47c4ed501bc504f2604dc6f112c209d3abbecd3d9aed68bf36f98c2649
+MISC metadata.xml 442 BLAKE2B f41c2981dcecd90c3855fe81f16cb9fa07dea3416543e0459b75cf726e45796e5d8c186e9a1cdfe2640433d19e8478fda4649c3e6c82ef1fd6d0653bbe10d55e SHA512 43aaba52d460b3130d82e47f08c04253416ffe885e280d8beb03a8a750ab4367b01bd58caf0c83916c0e69115c629a48b5e0138229ba471a023171bb3e254a60
diff --git a/games-puzzle/nudoku/metadata.xml b/games-puzzle/nudoku/metadata.xml
new file mode 100644
index 000000000000..3f5e183bc801
--- /dev/null
+++ b/games-puzzle/nudoku/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>jubalh@iodoru.org</email>
+ <name>Michael Vetter</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jubalh/nudoku</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/nudoku/nudoku-1.0.0.ebuild b/games-puzzle/nudoku/nudoku-1.0.0.ebuild
new file mode 100644
index 000000000000..3277e1193f18
--- /dev/null
+++ b/games-puzzle/nudoku/nudoku-1.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="ncurses based sudoku game"
+HOMEPAGE="https://jubalh.github.io/nudoku"
+SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+}
diff --git a/games-puzzle/numptyphysics-0.3.4 b/games-puzzle/numptyphysics-0.3.4
deleted file mode 100644
index a9440d785baa..000000000000
--- a/games-puzzle/numptyphysics-0.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
-EAPI=6
-HOMEPAGE=http://thp.io/2015/numptyphysics/
-IUSE=+user-levels
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-libs/glib:2
-SLOT=0
-SRC_URI=user-levels? ( https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> numptyphysics-0.3.4.tar.gz http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d364278d0b6ce75bc162967721a932c3
diff --git a/games-puzzle/numptyphysics-9999 b/games-puzzle/numptyphysics-9999
deleted file mode 100644
index 0b77d46e8f2e..000000000000
--- a/games-puzzle/numptyphysics-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare unpack
-DEPEND=virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
-EAPI=6
-HOMEPAGE=http://thp.io/2015/numptyphysics/
-IUSE=+user-levels
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-libs/glib:2
-SLOT=0
-SRC_URI=user-levels? ( http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d9b00a506d92eff4bb81ed621a60cd5
diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
new file mode 100644
index 000000000000..b8f1faa7c50a
--- /dev/null
+++ b/games-puzzle/numptyphysics/Manifest
@@ -0,0 +1,26 @@
+AUX numptyphysics-0.3.4-gentoo.patch 1087 BLAKE2B 354c6a2e692ba0f75684696c77c6fb170a02cc258d49a248918baf4483754f846aade1eacab7aa879eaf7c53bf914cc1d4a87307f6bcc18b826beaa66b4bcd0d SHA512 84279382cf5f8faf1f77a44d87a49b4d9ef3adf11c3c3fbfe11c77cfd7aa7c4eaf7a6917f09ee4ac67e0e8bf8584406e7afb8ab86db11b2fd269e2cf7c0e6a13
+DIST butelo.npz 7209 BLAKE2B bfcc1e56d0bde0762db0253ea85d669cbd06295f037357e21d6b192710db36b767cc7932030f37ab18f60d35c1232d32c0c8f2af7a06f5911764acdfa14fc0a7 SHA512 a1f6ce15c0a921969a0e6c96d2e354aa666e760275a86d45b85db833731273e16ac9cdb4975beca71c1abcfe5dd64a0181f74bbc3e3aba1c2bb541c3bbe80090
+DIST catalyst.npz 8778 BLAKE2B e36c1651306af2cf2f43d300f674a665fd13aace71244173537165ddf5cb91bb150fb4370d15ecea28f83a79678626e501874efad30be59928a214781a76080d SHA512 ad2c02721e1b2ded3621a5a5217f78ed1022a86472f4de030c9b3d258f0b7b580e953fc2d017519477cea4df1b482e61fca565a3d98d511e894805e6683e6830
+DIST christeck.npz 4868 BLAKE2B c3a3a9416bea3160cdd16a5184b1923e3daedf369f973d0160b4683ab9c41b297ffea6a1fed025c3e296eb620d99fc30eef8f3978d385dcad2f8647ead9e2036 SHA512 562ed1fe6caa026dcc897aa914c5cad648aa191127714c888f5d1fbf82bbac15477928e49e02a5ab8940a84a085afb6e282e04ac1478a0ace5449541137f89fc
+DIST dneary.npz 5041 BLAKE2B 6ee77c20808d4d4bef812ff5396ae33d4247978fbe1fdd19003ad5432929a94eafbe5ce987036f2d6723daf18cee5b109180785014ea88c9889ee46e99847b24 SHA512 94bf7238bda8c9ba4133bd4bb8f6c978bb06f42432a6854ba570466d3a4b780a737a2138702072fbb9d6b913307a52734b3747a255d3f611df8e8753751d1c55
+DIST gnuton.npz 3734 BLAKE2B cd3de0fa77202c275a0dcadc41e7d87ae412e7b24e9b4f74987f95fbfe053859d1eec322b219c31ce2998125b8a919bc33d01fdcdce8cdf82944f8268db61207 SHA512 f3c910ac426b8044400ff882c0f8e193a19d35d1de2f6a8b5729acb9cc2fe383b116f79854897d3162c9ce223df92c76981a676ffc83268716fb20d8fecca13c
+DIST gudger.npz 7101 BLAKE2B db05d8c733e247302dbc69811a4fa7f01981b3b8fa09259e4df8bb659a2417854ca96194accb9db8211ff4a1694c01b59db9f9b15bd66483c099ef40e6ed8c0c SHA512 507536e83ef99a135d187b54369e12ea585a0aaa354ee4e8cf50540ffcd9b12798f11807940ee487d759617379794d447ab06bc185cb1021d06cca51908f35aa
+DIST guile.npz 27182 BLAKE2B e1e679f7f1169c5fd018ca45a7abade20953fbc85b450a6bde288845ba9e015535b8c78e8ea4d15a82f7f814d67759a72f3367ee441a87349de9cb946140ddcd SHA512 62a98d028335ce0a2a78cec86ef0e9164d10d057f0d99e5c27352f604ca06c6f0634617517ffb5d4c2609859f4316367ce805669d70002058168d332dee2f81e
+DIST hurd.npz 7819 BLAKE2B 3c0154a3ac261bd813a355b02045f7bad497ec6839810bd66d834c1024a7639bdcf424f2eadea3f0ac9b37adc00e0d62075306bd7e4e90e4d264241d8b07c9be SHA512 5a7ce05af8c0cb8b63296a19827286bee46e41c876817cd4a190f8294be8c3c53fdfab63908c9d64b93c9e104d9b36f812fc3c3e05e47dcfdb7a47f9c0a15dab
+DIST ioan.npz 8672 BLAKE2B eff0e2affc5902817da94b2ea813968c093c0fc77943ad7220a2c96f77aea96bb4019cdd345d37d0a453970e0b4c388c668e4870743612473aa1d4b0b1b442d6 SHA512 aeb707ffa3a7fc64d1a401a9f1f2c59b5d031c4443e6b679cf534be0824493f54dc20e1ceb127352e7847ac403dc1971470b52369b0bb0933f0c8ade299961d4
+DIST jhoff80.npz 4612 BLAKE2B 167174fe7e7ed9a765964a4325ac7478d1f60b7e5ea22c55b082582c68395d7c7634fbcd2e7246f7dca35d34c836da781b539300dc5e131c7ca42179eea449d4 SHA512 4d060a35f18204509726db2f1cdfd8a69444bf10e784fcc32ce54a76aa541628903e5ce70d65a64b3ea079095cdc979475ff553e428bb321640d7a87e60f6384
+DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a11150c88145727914595d39fb2ee2a8c1d3f21320ed69b06991bf7db521ff68984fae04600b18487 SHA512 789cdde6313b7cc9e8616c7969d86ed44866baa9ae88befa605d7066ca8134f167aac9490afa3918305929dbbc0acaf46708e02be4353f98ebeb3dbe3b0eefa1
+DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
+DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
+DIST numptyphysics-0.3.4.tar.gz 1646818 BLAKE2B a78b68437bf446036b227dd9e37bcc3b7e3098f9998aa4a6172e68736b5b840db153538c063a20a02b3a1e7e2d5b0c9b3e976f5ffa8b631a44b8544e9c34bb24 SHA512 2934303737309c058f64ba9dc24a292553e065c7604c8f0964365a9ca2ef68356a68515df5d71b2d3a0f59d115ebcc8b052a17f66ca2cfd5ffa80b68a38ca407
+DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
+DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
+DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
+DIST siminz.npz 187396 BLAKE2B b7374c44aecf78ed6bf5347ff76b4cab142e2375504e48d86ebee4d6c193ebd46c337027d845a596048385c1d66edf2484e496cc6363f966275c267957dccdb9 SHA512 cedf3d90bc93adb2dac45ea69a8f87965002810527ce35122c5b1bcf1bf07fa1de9230f33bb84e542eeb0b4235216eb633d8a79cef1db34e24f8fff25f846758
+DIST szymanowski.npz 2577 BLAKE2B 827b5e15d6c1d6003d311cdf58b02b70a0986ab3232d196089f9838049cec4da1441f5e6fec2ea357820aa5e666124008b4c369f0102660c707aefb32ba9014a SHA512 b87be9d66cb3025a6168855fa473377609268c7d5fd6dbe53df7fc6156bc58dbb2d35c7e7a5d6caf88bbd92eb08ae2ac5b5d06dce6da9858e1ff1fa3553d3228
+DIST therealbubba.npz 6684 BLAKE2B debdb3a6788425726101a5368d27ade150edd1c0badcbf19903c6e9ae688adfce51c17ce276dd7c477d4d816526fe33541b34d0398563bfd0be6da5ded928c0a SHA512 c71a84345f0c6e0cde87e76b3084d89b2222d33b512458efd98d91c099b54e817b8421ea70001de6e5556c0e28be1c9fc1c19ad1411dd1b2bf194f987cdbdec6
+DIST werre.npz 7739 BLAKE2B 09f6ebfa4ffb3cc39149b39ce70940ba0437fbfd8e6ec1c905096c0d8093874d4caa7bde92b90ab4100472339b068218f75d1b64425d06f6910d1f32c39e0f90 SHA512 1caac7964cc51c6300648fa6be21f7ac3c0d585288ea2e18e725f5575a732b461b77bfd0ddf3118f5d4c922f16a30466e168bb38e81498291214597fd4442bcd
+DIST zeez.npz 8633 BLAKE2B 758382345615f942a095399e15faf8ed98e467e4454e0cc156b55d38f1cf994a23cf4bbe7895b3a276da7516758ea7bc0e7983595f77a784eca078b347590b36 SHA512 8f1945d79dc43e0bc6e2b814640d1587fc38bf8ca19f6b949821d3095eb22e9837a3f82433e452ce851b97e29d90440045866dfc6a28f9f5b31ffcf35f467e41
+EBUILD numptyphysics-0.3.4.ebuild 2294 BLAKE2B 7475c812f49a3799b50ba1568ecfcd9cb4f65aecd64de731e6093edc1be8a71686a73649a8ae87699d875ab82b69624ec8f4658edbae46121ddbad0e7624cfe6 SHA512 16d2b66c143d6f7d8bc78dd4884b4e4c99db07fc77b9581ad9a6503edd2ed8360013eab2f16314bce77936e07778f7ab0a4acd143a693a37ad3cffa26c729268
+EBUILD numptyphysics-9999.ebuild 2582 BLAKE2B 4d72ce01297bb7473f6d1809df05a6b3ca1c3f5ba47bad3c7df1f879a5ebf9063ec4b44c1634014182d834510af67ea17ce9d874fa97ee5ec1c1db2d41c191dd SHA512 4b09987f37bf36dab6d4605860d5f8d73255cdccc52bab37f5724a4a7e8dc9b846d69aa659b1502b984d081169401e2aa4f6e39d294a4099419a506ab205ecbf
+MISC metadata.xml 339 BLAKE2B 9e41c9460f243a37e945b14949cd7b4d46cde5ac5df468fddb8d3752d47cc19583d1a63d8b6287952f15bdf4cdc24e8bebb328ff0f37b895719f27805dc2d470 SHA512 a007e8ee484f70548c0348d35bf1c616da363968370ccdf30693eacef552d552e7b839e8d32d81aec1c452aeb184f3cc2af79992c2f0cd73c1fdcc010f13d29f
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
new file mode 100644
index 000000000000..e3a7b2ee372f
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
@@ -0,0 +1,44 @@
+diff --git a/external/glaserl/makefile b/external/glaserl/makefile
+index 4120459..f49d9e7 100644
+--- a/external/glaserl/makefile
++++ b/external/glaserl/makefile
+@@ -1,7 +1,5 @@
+ TARGET := libglaserl.a
+
+-CFLAGS += -g -O2
+-
+ SOURCES := $(wildcard *.c)
+ OBJECTS := $(SOURCES:.c=.o)
+
+diff --git a/makefile b/makefile
+index 0f9a9b6..292b759 100644
+--- a/makefile
++++ b/makefile
+@@ -1,7 +1,6 @@
+ APP := numptyphysics
+
+ SOURCES := $(wildcard src/*.cpp)
+-CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
+
+ all: app
+
+@@ -13,7 +12,7 @@ app: $(TARGET)
+
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ $(SILENTMSG) "\tLD\t$@\n"
+- $(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++ $(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+ $(SILENTMSG) "\tCLEAN\n"
+diff --git a/src/Os.cpp b/src/Os.cpp
+index b5d7fb9..6a0ccf4 100644
+--- a/src/Os.cpp
++++ b/src/Os.cpp
+@@ -262,5 +262,5 @@ Os::globalDataDir()
+ }
+
+ // System-wide installation
+- return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
++ return "/usr/share/numptyphysics/data";
+ }
diff --git a/games-puzzle/numptyphysics/metadata.xml b/games-puzzle/numptyphysics/metadata.xml
new file mode 100644
index 000000000000..dc8c227d5260
--- /dev/null
+++ b/games-puzzle/numptyphysics/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <use>
+ <flag name="user-levels">Install some fun user-created levels</flag>
+ </use>
+</pkgmetadata>
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild
new file mode 100644
index 000000000000..f06dc622d84b
--- /dev/null
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils flag-o-matic
+
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="http://thp.io/2015/numptyphysics/"
+
+# This is only the SRC_URI for the user levels. The code is in git repo.
+SRC_URI="user-levels? (
+ https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> ${P}.tar.gz
+ http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
+ http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
+ http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
+ http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
+ http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
+ http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
+ http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
+ http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
+ http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
+ http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
+ http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
+ http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
+ http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
+ http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
+ http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
+ http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
+ http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
+ http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
+ http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
+ http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
+ http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
+)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+user-levels"
+
+RDEPEND="
+ media-libs/libsdl2[opengl,video]
+ media-libs/sdl2-image[png]
+ media-libs/sdl2-ttf
+ virtual/opengl
+ dev-libs/glib:2
+"
+DEPEND="${DEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ append-cxxflags -std=c++11 -Isrc
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
new file mode 100644
index 000000000000..01e05708917e
--- /dev/null
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils flag-o-matic git-r3
+
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="http://thp.io/2015/numptyphysics/"
+
+# This is only the SRC_URI for the user levels. The code is in git repo.
+SRC_URI="user-levels? (
+ http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
+ http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
+ http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
+ http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
+ http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
+ http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
+ http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
+ http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
+ http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
+ http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
+ http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
+ http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
+ http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
+ http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
+ http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
+ http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
+ http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
+ http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
+ http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
+ http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
+ http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
+)"
+
+EGIT_REPO_URI="https://github.com/thp/numptyphysics"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="+user-levels"
+
+RDEPEND="media-libs/libsdl2[opengl,video]
+ media-libs/sdl2-image[png]
+ media-libs/sdl2-ttf
+ virtual/opengl
+ dev-libs/glib:2"
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+src_unpack() {
+ git-r3_src_unpack
+}
+
+src_prepare() {
+ append-cxxflags -std=c++11 -Isrc
+ sed -i '/-g -O2/d' external/Box2D/Source/Makefile \
+ external/glaserl/makefile || die
+ sed -i "/return thp::/s% thp::.*$%\"/usr/share/${PN}/data\";%" \
+ src/Os.cpp || die
+ sed -e '/CXXFLAGS +=/s/\(CXXFLAGS +=\).*\( -DAPP=.*\)/\1\2/' \
+ -e '/SILENTCMD/s/$(LIBS)$/$(LDFLAGS) $(LIBS)/' \
+ -i makefile || die
+ eapply_user
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/pathological-1.1.3-r3 b/games-puzzle/pathological-1.1.3-r3
deleted file mode 100644
index 5c9cd422b1d1..000000000000
--- a/games-puzzle/pathological-1.1.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( media-libs/netpbm )
-DESCRIPTION=An enriched clone of the game 'Logical' by Rainbow Arts
-EAPI=5
-HOMEPAGE=http://pathological.sourceforge.net/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-shells/bash >=dev-python/pygame-1.5.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-misc/games-envd
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97a5d4a136ad0b7369c8ff6edf822045
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
new file mode 100644
index 000000000000..1d9194351507
--- /dev/null
+++ b/games-puzzle/pathological/Manifest
@@ -0,0 +1,5 @@
+AUX pathological-1.1.3-build.patch 527 BLAKE2B eb58b42104ee13d4f438800656ac056e2b404c48615472ad18eda144c6976828e1ea3f58551d4ee9dc8032299bab492fc7c8af12048bbd6807b84af26822357a SHA512 d18b8e55d3f40fa69d0a551749b1242ba055ba8eb5bde517d7df8a46414d81232836bf232b28e77b1dcab8f0d049b3ee46ef666621674ac1be68e343e53f1c34
+AUX pathological-1.1.3-music-py.patch 475 BLAKE2B f73a83c4feba6810a39bca173845dd3b5c24ce752414f03e626879185ee53ee073c249136d9568f4866a337111d22f3aea2d13aeaeaed5b1da22a7cf520d26a5 SHA512 4a96a35d299f10ba90ff979ec77c7b117228d6e593be0b5858233fd44a0c746ad3abd52fe2751496e2ace813afc95ae7ee76c2e3d940678236de973cdae7aa87
+DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
+EBUILD pathological-1.1.3-r3.ebuild 1965 BLAKE2B 9a1856c81705fd53a79e00b847ae89e510a4f038039fe939cf94269a51ee7674a0d5ff82ca787ed78fde174276e9bea74a4554a24dd8c4a3193b3aac61e12898 SHA512 bc36d2f3f012273c2c3cdc9f74c656bfe40d51c568a3e916fd35b31d45a428717ffa9c7b6fe99de08940d66cd112912781cbaa15cb4967c822be996ccdb9801f
+MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
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..f5be49640ddd
--- /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>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </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..88e3d609d04c
--- /dev/null
+++ b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1 games
+
+DESCRIPTION="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 ~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-1.8-r1 b/games-puzzle/pauker-1.8-r1
deleted file mode 100644
index 961f8e5a4bd8..000000000000
--- a/games-puzzle/pauker-1.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A java based flashcard program
-EAPI=6
-HOMEPAGE=http://pauker.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0403618efb9058285364cfa647a7afe3
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
new file mode 100644
index 000000000000..9edccff11199
--- /dev/null
+++ b/games-puzzle/pauker/Manifest
@@ -0,0 +1,4 @@
+AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
+DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
+EBUILD pauker-1.8-r1.ebuild 1704 BLAKE2B 51df59fb8de90a8cb03f93fbbae9e60ecc68b076eae4bab2b1a3695b716296fb1ac2828382d2ea7d8a6c553e19a588c30d240a7b373499bf9d8451f1f2dc3203 SHA512 056bfe6a4fdf2490f02a5b1681a5173b34933b29aeb8abc24e89ba4d972933e549486c10aab32f929b9058ee4f9716a7840e309de953c09a6f99a4100a6f7da2
+MISC metadata.xml 329 BLAKE2B ac3b4fc371bc34aec1c68eccb0be370cc51c1dffb14fa0b13c5e50aa3476a5e557686a10922379026eccc8d61e60133bc199c9746484cd6a5ff588dcdfe61f67 SHA512 392a3af58bf88c1cfa5ad5f3a240b7c16d2cf4a469700d3e7628917923606b69d3aa65c01d258e17d1ad362fa4f64c424e75a73f849f4fd438f97ba951df8203
diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch
new file mode 100644
index 000000000000..bebcbd088b12
--- /dev/null
+++ b/games-puzzle/pauker/files/pauker_bundledjars.patch
@@ -0,0 +1,14 @@
+--- a/build.xml.orig 2008-11-24 20:24:55.000000000 +1300
++++ b/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..80f7ca2adf2d
--- /dev/null
+++ b/games-puzzle/pauker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">pauker</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/pauker/pauker-1.8-r1.ebuild b/games-puzzle/pauker/pauker-1.8-r1.ebuild
new file mode 100644
index 000000000000..62c31d7abb45
--- /dev/null
+++ b/games-puzzle/pauker/pauker-1.8-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+JAVA_PKG_IUSE="doc source"
+
+inherit desktop java-pkg-2 java-ant-2
+
+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 ~x86"
+IUSE=""
+
+COMMON_DEP="
+ dev-java/browserlauncher2:1.0
+ dev-java/javahelp
+ dev-java/lucene:2.4
+ dev-java/swing-layout:1
+"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5
+"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ app-arch/unzip
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+ find . -iname '*.jar' -delete
+
+ eapply "${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 "/usr/share/${PN}"
+ java-pkg_newjar "dist/${P}.jar"
+
+ java-pkg_dolauncher ${PN} \
+ -into "/usr" \
+ --pwd /usr/share/${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
+}
diff --git a/games-puzzle/penguzzle-1.0-r2 b/games-puzzle/penguzzle-1.0-r2
deleted file mode 100644
index 2f4813f38b51..000000000000
--- a/games-puzzle/penguzzle-1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Tcl/Tk variant of the well-known 15-puzzle game
-EAPI=6
-HOMEPAGE=http://www.naskita.com/linux/penguzzle/penguzzle.shtml
-KEYWORDS=~amd64 ~x86
-LICENSE=penguzzle
-RDEPEND=dev-lang/tk:0= dev-tcltk/tclx
-SLOT=0
-SRC_URI=http://www.naskita.com/linux/penguzzle/penguzzle.zip
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=1541fd8ee0d9ee97371e3e1e5148f1b4
diff --git a/games-puzzle/penguzzle/Manifest b/games-puzzle/penguzzle/Manifest
new file mode 100644
index 000000000000..801accda21f6
--- /dev/null
+++ b/games-puzzle/penguzzle/Manifest
@@ -0,0 +1,4 @@
+AUX penguzzle-1.0-tclx.patch 161 BLAKE2B 2b7ffa6419d44f45f17d23166bd22729e07002f85408f34036e2f9e9e197cff302c70562f39f1d1d7576a2c33a9dfc164d596078de5fd15fd132b16f9c92546c SHA512 41292cdd6da21611de72eb363e277670bb6d641a4e9651e8ebdb4d73400a389cdc51191e0c551daab575888cbe88ff6f257c080c36c71b5000f7eb7b0d59e2c8
+DIST penguzzle.zip 21542 BLAKE2B d8f7de3c4ddac7c05aef1fafd04da81a00a22f246adaa0165dd491bf818081b3f384421f7786b4353e1d889e651568d2d10e64531573bce0636824dafbb4ace8 SHA512 fc6c57ac851df7fac7d91f90ec53fa543470e9721589966023028743951090994c372ff4538092c29aee12afc28809ad6e20a6b78ae9759bad2b41fed330b743
+EBUILD penguzzle-1.0-r2.ebuild 989 BLAKE2B 887999e3af25af6b4a1df6557340e05379556aea0d73c596459dab65135345b19e056394060fd5d132b9d7695b63b755e0752a8f1e5a8e140c8e1fd77170b463 SHA512 42d07ab7525b902c0e67080b5a95d7fb2bc5e8720c33f476467b3c32b3c4bc18d65172915413a9ee460b66f4921b586018173fab51c7ccad66cdbd47017d9fba
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..0f2ca8b8b23d
--- /dev/null
+++ b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
@@ -0,0 +1,10 @@
+--- a/bin/penguzzle
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/penguzzle/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild
new file mode 100644
index 000000000000..54cc98723ec2
--- /dev/null
+++ b/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-lang/tk:0=
+ dev-tcltk/tclx
+"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s:~/puzz/images:/usr/share/${PN}:" \
+ lib/init \
+ || die "sed init failed"
+ sed -i \
+ -e "s:~/puzz/lib:/usr/$(get_libdir)/${PN}:" \
+ bin/${PN} \
+ || die "sed ${PN} failed"
+
+ eapply "${FILESDIR}"/${P}-tclx.patch
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins images/img0.gif
+
+ insinto /usr/"$(get_libdir)"/${PN}
+ doins lib/init
+
+ dobin bin/${PN}
+
+ newicon images/img0.gif ${PN}.gif
+ make_desktop_entry ${PN} "Penguzzle" /usr/share/pixmaps/${PN}.gif
+
+ einstalldocs
+}
diff --git a/games-puzzle/picpuz-2.5-r1 b/games-puzzle/picpuz-2.5-r1
deleted file mode 100644
index 789dd4661804..000000000000
--- a/games-puzzle/picpuz-2.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A jigsaw puzzle program
-EAPI=6
-HOMEPAGE=http://kornelix.squarespace.com/picpuz/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:3
-SLOT=0
-SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c9e9a90f88b221e752a70f252ba1b0b
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
new file mode 100644
index 000000000000..5d66c15f6100
--- /dev/null
+++ b/games-puzzle/picpuz/Manifest
@@ -0,0 +1,5 @@
+AUX picpuz-2.5-build.patch 5499 BLAKE2B cb568f817502eef15695e5f1cdaad837127e6004616b63596125b3538421c51e11edafc9421b173809cc22fb166d636eb47467d23ad12b5a7446a21638e5d9ea SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11
+AUX picpuz-2.5-pthread-underlinking.patch 842 BLAKE2B c347703e5b8d069872c34b7af776ea5e5e27967683db9fa7834c876482e22dd41e36d3c16b7da31235bd0e5f5228dccf1e279be80969757a69acc8bc1b215532 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658
+DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
+EBUILD picpuz-2.5-r1.ebuild 1044 BLAKE2B eb75be02e73ea8f0c4d0faa9f062a3b8591ce1c6a388f7a92b661dd1d0274c59accc2d3c3183139554ec7e83e9538e98d18b1e7dcb0b079aa9945dd53ac0b654 SHA512 32bd76f61cd94c14bdb3f6c831896249f4b657522eff6d8a7cc7e42c05bc28584bd772d080f50c5555293dcd448068b17eef3f59d130393873a29ce9c5e1cf17
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/picpuz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
new file mode 100644
index 000000000000..5da7fe0df616
--- /dev/null
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop gnome2-utils
+
+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="/usr/bin" \
+ DATADIR=/usr/share/${PN} \
+ DOCDIR=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/${PN}
+ doins -r icons locales
+ doicon -s 48 icons/${PN}.png
+ make_desktop_entry ${PN} Picpuz
+ HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
+ dodoc doc/{changelog,README,translations}
+ newman doc/${PN}.man ${PN}.1
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/pingus-0.7.6-r1 b/games-puzzle/pingus-0.7.6-r1
deleted file mode 100644
index e76d2d9475fc..000000000000
--- a/games-puzzle/pingus-0.7.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=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:= virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=free Lemmings clone
-EAPI=6
-HOMEPAGE=https://pingus.seul.org
-IUSE=opengl music
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-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:=
-SLOT=0
-SRC_URI=https://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 scons-utils abbc7625ff457854eae0edaa1fd55cc7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=89179850ecbbacbeb05ba54e67934123
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
new file mode 100644
index 000000000000..7b9cd8bb1b49
--- /dev/null
+++ b/games-puzzle/pingus/Manifest
@@ -0,0 +1,7 @@
+AUX pingus-0.7.6-echo-e.patch 489 BLAKE2B 4268205c1c12bc5e8d4a4fb44b49b15b460763a10056a0720b28c25e76a23a0fa8568ca8163195f6ab531084fdd25c53c78d6caf8e7301123621cff58f39e10c SHA512 eb9f2859dcd68b2c1158499435a4742062069cb148e6658396c36fed6b1bba7589d9fbace40c25052e6d42a2b05cdca49561be45053dd9716ee9d9f41a5ab612
+AUX pingus-0.7.6-gcc47.patch 1096 BLAKE2B 8e7a56634eb69cc1c0797a2fa020b30e0eecf0e2ea7c00a0738915a92fd3dd4b5f51fe6dac3f7bd0cb84fea72f68f9e8edbac398b4d067dd7be2ff76560bb7be SHA512 7be7935ad664cde7c78d4363eef7391783ea868f096fc9dd03ce3e3eaaab69a839da5cb569449c106eae1779c41d9850f1a5683542bea4bf5cb98570f9d18e7d
+AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15b972ad6942b65c5c333f5f29e6ace7dd37a9d7541468906a2864925df5a899c5c98a6404b65dbfa802a9f5b7 SHA512 7e7fc8d7b23453b33899452d9ee19a134fe7ab1326a2560698624dc686de98108baeb026401704c06dd262c69542499b0cc3727c57d47f924f3a4020ff386027
+AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
+DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
+EBUILD pingus-0.7.6-r1.ebuild 1253 BLAKE2B 919c9b7804a82de227d068eab374816e85162180d34f3e979e2e5f4d96146d5ad0f97487d71ecee65fd81c13f846ab92acd9a1da7135d2e44d18d511fe1f5bf8 SHA512 5108028d928f683cb4ea2d612f7b3078798a88aff38570f9ff73344771580d2b21f0a2c8352054593d15fa01c8af07e756fb8808750f2e9f569458f98423656a
+MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
new file mode 100644
index 000000000000..ab772d8c72e9
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
@@ -0,0 +1,13 @@
+# Work around Gentoo's crippled dash
+
+--- pingus-0.7.6/Makefile
++++ pingus-0.7.6/Makefile
+@@ -39,7 +39,7 @@
+ install -d "$(DESTDIR)$(BINDIR)"
+
+ install -D build/pingus "$(DESTDIR)$(BINDIR)/pingus.bin"
+- echo -e "#!/bin/sh\nexec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
++ printf '%s\n%s' "#!/bin/sh" "exec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
+ chmod 755 "$(DESTDIR)$(BINDIR)/pingus"
+
+ install-data:
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..3c1cac5589e4
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
@@ -0,0 +1,22 @@
+--- a/src/pingus/pingus_main.cpp
++++ b/src/pingus/pingus_main.cpp
+@@ -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)
+--- a/src/pingus/screens/pingus_menu.cpp
++++ b/src/pingus/screens/pingus_menu.cpp
+@@ -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-gcc7.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
new file mode 100644
index 000000000000..bf04ccd047cc
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
@@ -0,0 +1,21 @@
+From df6e2f445d3e2925a94d22faeb17be9444513e92 Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Mon, 30 Jan 2017 15:41:53 +0000
+Subject: [PATCH] Add missing header for std::function and std::bind
+
+---
+ src/pingus/screens/demo_session.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp
+index e3ec49a2c..f887e50f0 100644
+--- a/src/pingus/screens/demo_session.cpp
++++ b/src/pingus/screens/demo_session.cpp
+@@ -18,6 +18,7 @@
+
+ #include <algorithm>
+ #include <iostream>
++#include <functional>
+
+ #include "engine/gui/gui_manager.hpp"
+ #include "engine/gui/surface_button.hpp"
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..6d1af794b032
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
@@ -0,0 +1,10 @@
+--- a/src/engine/display/display.cpp
++++ b/src/engine/display/display.cpp
+@@ -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..844c1d47bf96
--- /dev/null
+++ b/games-puzzle/pingus/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <longdescription>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-r1.ebuild b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..e23d02f4dafb
--- /dev/null
+++ b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
+
+DESCRIPTION="free Lemmings clone"
+HOMEPAGE="https://pingus.seul.org"
+SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~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"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-noopengl.patch
+ "${FILESDIR}"/${P}-gcc47.patch
+ "${FILESDIR}"/${P}-echo-e.patch
+ "${FILESDIR}"/${P}-gcc7.patch
+)
+
+src_prepare() {
+ default
+ strip-flags
+}
+
+src_compile() {
+ escons \
+ CXX="$(tc-getCXX)" \
+ CCFLAGS="${CXXFLAGS}" \
+ LINKFLAGS="${LDFLAGS}" \
+ with_opengl=$(usex opengl 1 0)
+}
+
+src_install() {
+ emake install-exec install-data \
+ DESTDIR="${D}" \
+ PREFIX="/usr"
+ doman doc/man/pingus.6
+ doicon data/images/icons/pingus.svg
+ make_desktop_entry ${PN} Pingus
+ dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/games-puzzle/pipepanic-0.1.3-r1 b/games-puzzle/pipepanic-0.1.3-r1
deleted file mode 100644
index 784cbd2c7348..000000000000
--- a/games-puzzle/pipepanic-0.1.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[video]
-DESCRIPTION=A simple pipe connecting game
-EAPI=6
-HOMEPAGE=http://www.users.waitrose.com/~thunor/pipepanic/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FreeArt
-SLOT=0
-SRC_URI=http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=18b1ddd84168a77f76f89b2e4322ba4b
diff --git a/games-puzzle/pipepanic/Manifest b/games-puzzle/pipepanic/Manifest
new file mode 100644
index 000000000000..422d4981cf64
--- /dev/null
+++ b/games-puzzle/pipepanic/Manifest
@@ -0,0 +1,4 @@
+AUX pipepanic-0.1.3-gentoo.patch 584 BLAKE2B 7a785fc5494f71c14d2298caa87168a52d695e3b5c450c6f1395b9dee8f911fd35e28d23db4c14b252e337b203727647a48c4113b0b6349289a7044ed3c4145f SHA512 0fef3b79063bcae38412679ce5644d8d119ba3a86b8a752234d97b7009044373f6cda8e983b53864f266e5c00203fb278c61fa44af432014b1aba5a402d41bab
+DIST pipepanic-0.1.3-source.tar.gz 232200 BLAKE2B 25a344d0a78196d8416d7da663e4400acfe010b6020c3b64764c1dcf6f07d7a434add6d5c2c607a17ca356eb67fb0c8572d72410ea8ca5df915f9802792400d9 SHA512 468f3194976c7030c2fa3d8f30eaa13cc25e0b04feeb48a5d1267d119eb991618bad14ddba0a8268e6b92f38f2a17bc5b119728b222b0ee50494807832ad2ab7
+EBUILD pipepanic-0.1.3-r1.ebuild 869 BLAKE2B 8b4700bf2865b09dcf6f865e8cafdb5c5af4143bc986743c995042ed4b7d8f6e2e19eeb947911ef2aa557f3541656421e00aa7b8b303e7959c4c77b1eec2f5a5 SHA512 f1e1fb22f5c701a5e0a488c3610ec44f5ff540eb4e5f75d83b8b227add221b1986bcf15f2754ac430cd6045690edb958974ab12bbc94121965bab04c924543ce
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/pipepanic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..bc849e724279
--- /dev/null
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]"
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-source"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+ # change harcoded data paths to match the install directory
+ sed -i \
+ -e "s:/opt/QtPalmtop/share/pipepanic/:/usr/share/${PN}/:" \
+ main.h \
+ || die "sed failed"
+}
+
+src_install() {
+ dobin "${PN}"
+
+ insinto "/usr/share/${PN}"
+ doins *.bmp
+ newicon PipepanicIcon64.png ${PN}.png
+ make_desktop_entry ${PN} "Pipepanic"
+ einstalldocs
+}
diff --git a/games-puzzle/pipewalker-0.9.4-r1 b/games-puzzle/pipewalker-0.9.4-r1
deleted file mode 100644
index 799355e3fae5..000000000000
--- a/games-puzzle/pipewalker-0.9.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
-DESCRIPTION=Rotating pieces puzzle game
-EAPI=6
-HOMEPAGE=http://pipewalker.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
-SLOT=0
-SRC_URI=mirror://sourceforge/pipewalker/pipewalker-0.9.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fe502f2a63c0916f37efe06c421419a0
diff --git a/games-puzzle/pipewalker/Manifest b/games-puzzle/pipewalker/Manifest
new file mode 100644
index 000000000000..50787c98da6c
--- /dev/null
+++ b/games-puzzle/pipewalker/Manifest
@@ -0,0 +1,3 @@
+DIST pipewalker-0.9.4.tar.gz 948399 BLAKE2B 262cb373fca5aa5fd895a48d29d91e4efed5550b4798adf26bfdc869ec9153610cd04a0a0358d02909c885a41fb96f15a15ecc901b6ba95047d240d07d449685 SHA512 f4930739732164153663d11036eb2ac09447766779bc80bff4d355fe1bb764d617510ecf8d804f1ce0d81f58204b4e4049fb76246bc4e599c06c492b9c771951
+EBUILD pipewalker-0.9.4-r1.ebuild 672 BLAKE2B f5a17e6a68d15d2290161a6abf11f319ea7ecfb43480a4fa5e02ed68e16f20453abe73b1568cc0df7a20d62ba2b17173f2cfe994be935e6fa507700c1b4f1ea3 SHA512 cf7d64489227b6c4aafd4b4b42bd3e3f1e104a55ef97b808620ec513b6c4120334019d9b3af8c370724a6aa4b1a88dd31faf6b23ef509ad3642762704a3ec94f
+MISC metadata.xml 333 BLAKE2B 79283adcb9b624e2ce653dbc467cd87eeec420841e088a45bcb4726876bb796fd370a3d6feee64bc643e940ec18b8e83cca1cf3eaced4cc8127b3548ae610678 SHA512 51d60e626855010c46bc4d9022cb7b84965eac827ec82fe2cf02db6e9f7706f9f81cb2af66fe4e4bab64963cc64b7d5d6009aa38a850ec87322fb07ac1c7f0dd
diff --git a/games-puzzle/pipewalker/metadata.xml b/games-puzzle/pipewalker/metadata.xml
new file mode 100644
index 000000000000..ae5d354a68f5
--- /dev/null
+++ b/games-puzzle/pipewalker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">pipewalker</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..bab059bfdd7e
--- /dev/null
+++ b/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop flag-o-matic
+
+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)
+ econf --datadir="/usr/share"
+}
+
+src_install() {
+ emake -C data DESTDIR="${D}" install
+ dobin src/${PN}
+ doicon extra/${PN}.xpm
+ make_desktop_entry ${PN} PipeWalker
+ einstalldocs
+}
diff --git a/games-puzzle/quadra-1.2.0-r1 b/games-puzzle/quadra-1.2.0-r1
deleted file mode 100644
index d8b4d3404707..000000000000
--- a/games-puzzle/quadra-1.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0= sys-libs/zlib sys-devel/bc x11-base/xorg-proto
-DESCRIPTION=A tetris clone with multiplayer support
-EAPI=6
-HOMEPAGE=https://github.com/quadra-game/quadra
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0= sys-libs/zlib
-SLOT=0
-SRC_URI=https://github.com/quadra-game/quadra/archive/v1.2.0.tar.gz -> quadra-1.2.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=f5aee0ddbf294a2c4d921eb20e92c6ce
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
new file mode 100644
index 000000000000..1c3b62b8f221
--- /dev/null
+++ b/games-puzzle/quadra/Manifest
@@ -0,0 +1,4 @@
+AUX quadra-1.2.0-format.patch 491 BLAKE2B 21341a7d0a6fa1556d9d79d3fa55f2cb1fc4cf6244dc8fbdc937acb9250bec258818ffd6644d1f40a5fc0db07e64555121f2d0ce5c9ef9ffeadf2da6ebe78412 SHA512 a0a05c3ced44a88d7766a0ef2053dce378df4e6cec74acc7d074a27bffc48d6c43977289e779bc526d730b9d5c8acc18c1cc46c865f3ea7de0a6226937a08ffe
+DIST quadra-1.2.0.tar.gz 5103875 BLAKE2B 7b0bce4e8be77de2e357cd14f60ebdbf3ef72f2262013954bca9a8d1a9a2833e00a0fe59f818b78603628999e7e1204c6974a5d9f74f4ea9bb288325d518744c SHA512 1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837
+EBUILD quadra-1.2.0-r1.ebuild 916 BLAKE2B 93ae5d77d1550e6093955fd293ee12ca3b794d8237ffe34d760e99192418a1e1a35c9a6e875be5d0e5810fb2592f5d1fbe04ccb1da4f394f5609bc176c3e1262 SHA512 0291db9fde214222cdea677e5a287c71d2186d7ee84579c7655a8c45acaaf4544f2cfd39d7372e1e9b29e0ff09ad1a2455095ef55ade8ce52d835528aa7e83cd
+MISC metadata.xml 329 BLAKE2B b57a9d305d40db5c2682878b7c26c6150bbcc7825c17169c9380a288b69aec71d51793dbf0071f157a8e03be1d90632d26227cffc6855982562d37b606982a1e SHA512 81750413c002a39166c0802840aac367a3b07f61a1c711bb68fdea6f8dff71f4689c24ccf75c61336f03ddea9993c45c5b869d2f3467540f4695a35da9a6438f
diff --git a/games-puzzle/quadra/files/quadra-1.2.0-format.patch b/games-puzzle/quadra/files/quadra-1.2.0-format.patch
new file mode 100644
index 000000000000..ca56f5b4cc00
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.2.0-format.patch
@@ -0,0 +1,11 @@
+--- a/source/net_list.cpp.old 2015-12-08 21:41:16.782404098 +0100
++++ b/source/net_list.cpp 2015-12-08 21:41:33.153114600 +0100
+@@ -693,7 +693,7 @@
+ //Drawn at a total higher or equal to end_value: suspense!
+ // or maybe timer just elapsed and the game is drawn
+ // (still suspense! :))
+- sprintf(st, ST_GAMETIED);
++ sprintf(st, "%s", ST_GAMETIED);
+ message(-1, st);
+ { Sfx stmp(sons.levelup, 0, 0, -1, 18050); }
+ { Sfx stmp(sons.levelup, 0, 0, -1, 18100); }
diff --git a/games-puzzle/quadra/metadata.xml b/games-puzzle/quadra/metadata.xml
new file mode 100644
index 000000000000..018874d4b550
--- /dev/null
+++ b/games-puzzle/quadra/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">quadra</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..c811bb17564e
--- /dev/null
+++ b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="A tetris clone with multiplayer support"
+HOMEPAGE="https://github.com/quadra-game/quadra"
+SRC_URI="https://github.com/${PN}-game/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~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-base/xorg-proto
+"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "/^libgamesdir:=/s:/games:/${PN}:" \
+ -e "/^datagamesdir:=/s:/games:/${PN}:" \
+ config/config.mk.in || die
+ eapply "${FILESDIR}"/${P}-format.patch
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /usr/share/${PN}
+ doins ${PN}.res
+ doicon images/${PN}.xpm
+ make_desktop_entry ${PN} Quadra
+
+ HTML_DOCS="help/*" einstalldocs
+}
diff --git a/games-puzzle/quadrapassel-3.22.0 b/games-puzzle/quadrapassel-3.22.0
deleted file mode 100644
index ae5df68f7cd6..000000000000
--- a/games-puzzle/quadrapassel-3.22.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=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 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Fit falling blocks together
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Quadrapassel
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-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
-SLOT=0
-SRC_URI=mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5e0fe5fb53be53799e1a65cfafc50a7
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
new file mode 100644
index 000000000000..c697a447c235
--- /dev/null
+++ b/games-puzzle/quadrapassel/Manifest
@@ -0,0 +1,3 @@
+DIST quadrapassel-3.22.0.tar.xz 1737252 BLAKE2B fb3d611f59b4b42d1e3278e562b5d537bbd3fa5de9d433d8445c291971a777b674ec384d7faf6c3b09fd6187555fc448fb38d2a379ea3c2bb7f7b321e6a9346a SHA512 82cbac9b8bc1e7d0bc7958807037893c2dd0286fdc63c2f35ffc7fdcfd839cc6ddd115bada057aa9a3694fbb2736c0c7b852e0156be6fd59a85f6eb06f6f9a84
+EBUILD quadrapassel-3.22.0.ebuild 724 BLAKE2B 732d7c3f9e4d6feaeaff5aa838013e197096294a8fc02c0047ffcc5ea19be7b7a2b1d73b8047a19db42ae072b60bba01390221579e02ae6f046a9acd8fb47c30 SHA512 8b7790d19eb8a9fcc2105539afa79b2baa06146f32630079f755f41b49120ddbde87adb3a21d360524c4ef15b4709c0017d94fe6e5a59fdce793ab49a0e8d9c4
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/metadata.xml b/games-puzzle/quadrapassel/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/games-puzzle/quadrapassel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
new file mode 100644
index 000000000000..175f792c2862
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Fit falling blocks together"
+HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+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() {
+ gnome2_src_prepare
+ vala_src_prepare
+}
diff --git a/games-puzzle/rezerwar-0.4.2-r1 b/games-puzzle/rezerwar-0.4.2-r1
deleted file mode 100644
index 6da2c0615e2b..000000000000
--- a/games-puzzle/rezerwar-0.4.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
-DESCRIPTION=Puzzle game like the known tetromino and the average pipe games
-EAPI=6
-HOMEPAGE=http://tamentis.com/projects/rezerwar/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
-SLOT=0
-SRC_URI=http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=e3167945521888ff630b1232d03b7d82
diff --git a/games-puzzle/rezerwar/Manifest b/games-puzzle/rezerwar/Manifest
new file mode 100644
index 000000000000..3a57c79814b9
--- /dev/null
+++ b/games-puzzle/rezerwar/Manifest
@@ -0,0 +1,3 @@
+DIST rezerwar-0.4.2.tar.gz 4332498 BLAKE2B d1eab4137fe56ba39c81c04ab75b9b0b9dac7baaf01e861d84801aee255074c4dc0c24662aa61993af7b80f0dbe831dfef1574fd1b2686ecb8500aaa68b6c279 SHA512 0ab1b00d982a96f2fd1346ff822efc68ae0e6c14a4d190ba0e8720fb119d7750851803c1387e83b93eee9cd43e332631360a67534495c20969366c885e2297ee
+EBUILD rezerwar-0.4.2-r1.ebuild 1063 BLAKE2B 9ede59c7616f3f397e476e10fe8a9589ae38512d0f613300ec7bd35f973652b1fcc00d94c6baeeb7120033273b58bd8568179b2ac520823652349a745fbe320f SHA512 ff9bcd00ab7dde9ac9f740eafcd21921ffb3df533c4c6cb755038f40a03ac725646da5dbfb7fa301008f28c71ec2bc088a7d5b18a31b703c1672c71ea06ce0cf
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/rezerwar/metadata.xml b/games-puzzle/rezerwar/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/rezerwar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..042921d7df86
--- /dev/null
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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() {
+ default
+ 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="/usr/bin" \
+ TARGET_DOC=/usr/share/doc/${PF} \
+ TARGET_DATA="/usr/share/${PN}" \
+ ./configure || die "configure failed"
+ sed -i \
+ -e '/TARGET_DOC/d' \
+ Makefile \
+ || die "sed failed"
+}
+
+src_install() {
+ dodir /usr/bin
+ default
+ dodoc doc/{CHANGES,README,TODO}
+ make_desktop_entry rezerwar Rezerwar
+}
diff --git a/games-puzzle/scramble-0.9.5-r1 b/games-puzzle/scramble-0.9.5-r1
deleted file mode 100644
index 3cbad2583070..000000000000
--- a/games-puzzle/scramble-0.9.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-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 media-libs/libpng:0 sys-apps/miscfiles >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Create as many words as you can before the time runs out
-EAPI=6
-HOMEPAGE=http://www.shiftygames.com/scramble/scramble.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=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
-SLOT=0
-SRC_URI=http://www.shiftygames.com/scramble/scramble-0.9.5.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=22c7f934147e914c51c80fae8418f85f
diff --git a/games-puzzle/scramble/Manifest b/games-puzzle/scramble/Manifest
new file mode 100644
index 000000000000..92809aa388ea
--- /dev/null
+++ b/games-puzzle/scramble/Manifest
@@ -0,0 +1,3 @@
+DIST scramble-0.9.5.tar.gz 552301 BLAKE2B 9bbdbe1551ba03dc66342eaab9b7e85356ca6fa78f2bbf7423b79a65cfe46711f0818ff41cba81a98b3888c9558692ec9879095e6353216675a869ab4544753f SHA512 ff361cefe842d6b2019a78571182fe35fc77a1332d6365211af7cf292da8532023bd565b7eed8b44545716474d441b0793253e856a1cad937f62396a5a29bd2b
+EBUILD scramble-0.9.5-r1.ebuild 977 BLAKE2B 6bb090026f26a0c4c90ebfb542bb21d9f187fb5fe7d07a2290fefdf9725efd49d6c086c7b2a20f0737623f51aa16fd52bbe16ea5ecd5ea91b5bb9654acc6ba3c SHA512 938d635fe8e1eacbf36d1183e939278bd1cd1f16325b9c6dfc3e2b464436fb969bbb58acd7a6320362eafa1b367db1fe0d45091055227f15d375b6377f5d26db
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/scramble/metadata.xml b/games-puzzle/scramble/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/scramble/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/scramble/scramble-0.9.5-r1.ebuild b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..9158e8985e9a
--- /dev/null
+++ b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=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
+"
+DEPEND="${RDEPEND}
+ media-libs/libpng:0
+ sys-apps/miscfiles
+"
+
+src_prepare() {
+ default
+ pngfix -q --out=pics/background-fixed.png pics/background.png
+ mv -f pics/background-fixed.png pics/background.png
+ append-cflags $(sdl-config --cflags)
+ sed -i -e 's/inline //' src/scramble.c || die
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_install() {
+ default
+ newicon pics/sg_icon.png ${PN}.png
+ make_desktop_entry ${PN} "Scramble"
+}
diff --git a/games-puzzle/sdl-jewels-1.1.1-r1 b/games-puzzle/sdl-jewels-1.1.1-r1
deleted file mode 100644
index 8388adfdd299..000000000000
--- a/games-puzzle/sdl-jewels-1.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[opengl,video] virtual/opengl
-DESCRIPTION=Swap and match 3 or more jewels in a line in order to score points
-EAPI=6
-HOMEPAGE=http://www.linuxmotors.com/gljewel/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-1.1.1.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=add4b9d26537ab66f22c9995879e93d3
diff --git a/games-puzzle/sdl-jewels/Manifest b/games-puzzle/sdl-jewels/Manifest
new file mode 100644
index 000000000000..a37e58f09e40
--- /dev/null
+++ b/games-puzzle/sdl-jewels/Manifest
@@ -0,0 +1,4 @@
+AUX sdl-jewels-1.1.1-Makefile.patch 488 BLAKE2B 95eceefb92d28c8968790c7b2b3954d957bc2f59a0764efb66aea618b6db0f01272a2bf7a56a6789b601e2e76a6f96497074a8c4689e924c5f08a7bd7ebb2317 SHA512 9d83dea588f699ef09f89ed320bece1bb001ee0a1bfa4d3e4d4b8c679af9b2028d535469c078f387564b37a16ee0e76f3e9cf20a4248784bf322ac902aa03f26
+DIST SDL_jewels-1.1.1.tgz 195366 BLAKE2B 4f8e3c85b8d6cc6388846fe3783cc3fed3cf1901a57788c8ebd62473ac3f0635eaf0f3f1017a06961706ec3143f8807b8170dc0a715b570e44c66a578eb7dae3 SHA512 720f1d89384bf267e8f5441efd70fcf94bfc89ddbd0ff90b1dafc6381e83e005281fcde256ee4cd0645f2832cf9c22aed487c105d7d9cf39711c5752e12763c4
+EBUILD sdl-jewels-1.1.1-r1.ebuild 968 BLAKE2B b2377f0968329902e5397f91d65978a933d6c8df57498165f6aca1c535907b1bb7d5faef0952232c6d71ef2c4dd099330a4fdb856a138e5dd0a7a6832d1c240e SHA512 50381f1020f1b8037ecfc9ac099e44c8850ecde13ce9aae6f5f45fe758d23b4399865dd7ea8a9470b5262d5f6b786c79463e8a6bdebfc8b5a27d52b9494545ae
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/sdl-jewels/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..e9f6f0422ae1
--- /dev/null
+++ b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop vcs-clean
+
+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"
+
+RDEPEND="
+ media-libs/libsdl[opengl,video]
+ virtual/opengl
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/SDL_jewels-${PV}"
+
+src_prepare() {
+ default
+ eapply "${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\"|\"/usr/share/${PN}\"|" sound.c || die
+ sed -i -e "s|data/bigfont.ppm|/usr/share/${PN}/bigfont.ppm|" gljewel.c || die
+ ecvs_clean
+}
+
+src_install() {
+ dobin gljewel
+
+ insinto "/usr/share/${PN}"
+ doins -r data/*
+
+ einstalldocs
+ make_desktop_entry gljewel SDL_jewels
+}
diff --git a/games-puzzle/seatris-0.0.14 b/games-puzzle/seatris-0.0.14
deleted file mode 100644
index 24f21b2bd755..000000000000
--- a/games-puzzle/seatris-0.0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A color ncurses tetris clone
-EAPI=5
-HOMEPAGE=http://www.earth.li/projectpurple/progs/seatris.html
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.earth.li/projectpurple/files/seatris-0.0.14.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65abdf2ad1381b147940bb8deacb163d
diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest
new file mode 100644
index 000000000000..2faca1e489c0
--- /dev/null
+++ b/games-puzzle/seatris/Manifest
@@ -0,0 +1,4 @@
+AUX seatris-0.0.14-as-needed.patch 215 BLAKE2B 3d2ea91214f6f00ec767aa00bfce6c77c7a42132a94f0e394d0a7f89c1eeaa3ff9d8638cce1321f6fb97bec614fbdb0f07fcbc68a2cd65fbd48373887aaa5846 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b
+DIST seatris-0.0.14.tar.gz 53056 BLAKE2B 8efbc4531f98f06857815c86e2833ede03de3206bfc89efe387e2b388252c05d11b404e4a72fe6b33f215908cf03bc5687c627fa61943cb549c59bfb82455939 SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2
+EBUILD seatris-0.0.14.ebuild 916 BLAKE2B 13f466c641404c7abd4c2dddeae48c93dceef273c709291b803d49caef50013bfdf437c079c79fd42352c4b5e865a0bad5b7548b73c979ff4dd7b28eb283086e SHA512 a4fd27855ebd40034b4d7878dd953019148d6c5ed7b1403c4a75b2ead6c8840b0776ab2bf340348268ee1dc9eb440841acf77f237728d5c41e89976e3347378f
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/seatris/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14.ebuild
new file mode 100644
index 000000000000..30d84fd4afed
--- /dev/null
+++ b/games-puzzle/seatris/seatris-0.0.14.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~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-20171029 b/games-puzzle/sgt-puzzles-20171029
deleted file mode 100644
index 2b8c17a8617d..000000000000
--- a/games-puzzle/sgt-puzzles-20171029
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.2 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Simon Tatham's Portable Puzzle Collection
-EAPI=6
-HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
-IUSE=+doc gtk3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20171029.69773d8.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e602c2fa5ba2bca72e78f24bf3570910
diff --git a/games-puzzle/sgt-puzzles-99999999 b/games-puzzle/sgt-puzzles-99999999
deleted file mode 100644
index 7f182e8f7886..000000000000
--- a/games-puzzle/sgt-puzzles-99999999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.2 ) >=sys-apps/sed-4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Simon Tatham's Portable Puzzle Collection
-EAPI=6
-HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
-IUSE=+doc gtk3
-LICENSE=MIT
-RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/sgt-puzzles/sgt-puzzles-icons-20160315.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc git-r3 8f6de46b0aa318aea0e8cac62ece098b gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b16b42700f5a383216cd7fa2e1664b30
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
new file mode 100644
index 000000000000..eb0a71b2d714
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -0,0 +1,8 @@
+AUX sgt-puzzles-20161207-builtin-help.patch 3086 BLAKE2B 80af8579911c9abd09324664609eac6b849cdec14925e0b6f86c014153980003ccf7c2c42ee532e4a4373a9ec31df9753d2ddd2d6b198561d478bd316812383f SHA512 daa001156ae8eadb8b4012d6713a327efb52e43271c9dbae936bf1002575548c2ef6b1aa39ea95278a602b38d443cd90507d4d9fedd4e4494b1fbf3222250fe4
+AUX sgt-puzzles.directory 65 BLAKE2B c51b022658d8bcc7b004f953f58c9848a992e5f82cfe5354d5dd3399fb12f355f609a33f3216998398572efc328cb19dc2228b70f55fb3488d8f05be3b089eb7 SHA512 b6cada99b9afae8407b494e066ce271cd65980e2d225e512d55b1905e93e70af3763e7e6e76fcdf30314005dfa309a5daa7e2ac6d83d312edaf2f74869d8079c
+AUX sgt-puzzles.menu 556 BLAKE2B 3e7ca65d13dbdd2d54520d549728cbf5d53e59f7d6cd836fa5807d8b883de157dbc006a8023831e15bdcceaa5828f5ce5cb19bbf89e635a352cbe0e864b18691 SHA512 2b3d68ae2eef33199953fe85af08c87ba91cfc8c1ea92b535af90c5f07fcbbccec124a0b9701b8cafe92786d945f2ed499e046a55d1e6da1bbb02ae5f02e5ee9
+DIST puzzles-20171029.69773d8.tar.gz 2923623 BLAKE2B 2e97005aa5ea7e95b4f312067d406fd37f5f89638b335c5eee748f4d8c2977f663cde91ea29d57ffb1cb3eb5264cad36a46106dc8f14ddedcb0dc5f4b3e4c1f6 SHA512 ca9885bcadd0bb979167f2f0b6129a17aeab6d7fd31eeabc9d29ab526a5a137b03f1f4aea7a268109c5aee1a522d514bf522ad25673705f50addd685401d7fb8
+DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
+EBUILD sgt-puzzles-20171029.ebuild 2469 BLAKE2B 2eb3149c037babbf64ed85b10f2eb948b2555d6ac015e3c5cc8ca0be7d85de6b0e6dfeac4580662c87d086f9e00643bacaea3e853548e0d25c68cb9f0b7fdec1 SHA512 dffa784d55c7a82ce632956f29e970091de1e3ee46b7a558072831d570498d4f4df82a40d9302b21719fafe3c6876f0e54559b2a4260fc948b6d947d0050cf03
+EBUILD sgt-puzzles-99999999.ebuild 2471 BLAKE2B 0abde514c681107afd85fc119ed58be61ce039408a26ad73433afec8d286e3031473bb8ba7b6c36b7679f498cd1081a0c9143bf9f7722d49468eb422cd71aea5 SHA512 c32aa429bb8943444c9d2291882a17e8469716448d2ca4bf3344030dbf46773e2ecf8a9b78103a892a5aa0a427f2750c614e53614c59aae3e47a149a8e4411d6
+MISC metadata.xml 450 BLAKE2B dd64e755862b5c621530b5dc2f612247acb16fda51d5f6018bfb9ca580cc7176d8cd62eda86b540cb260d2056572a887ecf7fdad8ddd563aaf13c494d42689db SHA512 1f1187d3e661b3913f0a9c02fc9b2980c90bc7829daf87ef5f59b03d87fb32680f30cbf2c922b92fde7c79f961872d1d7b13368db8b8eacba79340c6de2778ff
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
new file mode 100644
index 000000000000..a5c3a3695bd1
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
@@ -0,0 +1,107 @@
+Based on http://sources.debian.net/patches/sgt-puzzles/20160429.b31155b-1/202_online-help.diff/
+Simply opens HTML help files with xdg-open
+
+Author: Ben Hutchings <ben@decadent.org.uk>
+Description: Add HTML-based online help
+
+This works along the same lines as the Windows implementation,
+though we have to try a bit harder to find a help browser.
+
+--- a/gtk.c 2016-12-08 07:53:06.812409184 -0500
++++ b/gtk.c 2016-12-08 07:58:06.426415886 -0500
+@@ -2,6 +2,10 @@
+ * gtk.c: GTK front end for my puzzle collection.
+ */
+
++#ifndef _POSIX_C_SOURCE
++#define _POSIX_C_SOURCE 1 /* for PATH_MAX */
++#endif
++
+ #include <stdio.h>
+ #include <assert.h>
+ #include <stdlib.h>
+@@ -10,6 +14,9 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <math.h>
++#include <limits.h>
++#include <unistd.h>
++#include <locale.h>
+
+ #include <sys/time.h>
+ #include <sys/resource.h>
+@@ -2270,6 +2277,37 @@
+ resize_fe(fe);
+ }
+
++static void show_help(frontend *fe, const char *topic)
++{
++ char path[PATH_MAX + 1];
++
++ sprintf(path, "%s/%s.html", HTMLDIR, topic);
++ if (access(path, R_OK) != 0) {
++ error_box(fe->window, "Help file could not be found");
++ return;
++ }
++
++ const char *argv[3];
++
++ argv[0] = "xdg-open";
++ argv[1] = path;
++ argv[2] = NULL;
++ if (! g_spawn_async(NULL, (char **)argv, NULL,
++ G_SPAWN_SEARCH_PATH,
++ NULL, NULL, NULL, NULL))
++ error_box(fe->window, "Failed to open help file");
++}
++
++static void menu_help_contents_event(GtkMenuItem *menuitem, gpointer data)
++{
++ show_help((frontend *)data, "index");
++}
++
++static void menu_help_specific_event(GtkMenuItem *menuitem, gpointer data)
++{
++ show_help((frontend *)data, thegame.htmlhelp_topic);
++}
++
+ static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
+ {
+ frontend *fe = (frontend *)data;
+@@ -2590,6 +2628,25 @@
+ menu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
+
++ menuitem = gtk_menu_item_new_with_label("Contents");
++ gtk_container_add(GTK_CONTAINER(menu), menuitem);
++ g_signal_connect(G_OBJECT(menuitem), "activate",
++ G_CALLBACK(menu_help_contents_event), fe);
++ gtk_widget_show(menuitem);
++
++ if (thegame.htmlhelp_topic) {
++ char *item;
++ assert(thegame.name);
++ item = snewn(9+strlen(thegame.name), char); /*ick*/
++ sprintf(item, "Help on %s", thegame.name);
++ menuitem = gtk_menu_item_new_with_label(item);
++ sfree(item);
++ gtk_container_add(GTK_CONTAINER(menu), menuitem);
++ g_signal_connect(G_OBJECT(menuitem), "activate",
++ G_CALLBACK(menu_help_specific_event), fe);
++ gtk_widget_show(menuitem);
++ }
++
+ menuitem = gtk_menu_item_new_with_label("About");
+ gtk_container_add(GTK_CONTAINER(menu), menuitem);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+--- a/Recipe
++++ b/Recipe
+@@ -95,6 +95,7 @@ Puzzles.dmg: Puzzles
+
+ !begin am
+ bin_PROGRAMS = $(GAMES)
++GTK_CFLAGS += -DHTMLDIR="\"$(htmldir)\""
+ !end
+ !begin am_begin
+ GAMES =
+
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory b/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
new file mode 100644
index 000000000000..25aa1aefbf5b
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Directory
+Name=Puzzles
+Icon=sgt-puzzles_map
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
new file mode 100644
index 000000000000..e3f3264cff97
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
@@ -0,0 +1,21 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
+<Menu>
+ <Name>Applications</Name>
+ <Menu>
+ <Name>Games</Name>
+ <Exclude>
+ <Category>X-sgt-puzzles</Category>
+ </Exclude>
+ <Menu>
+ <Name>Puzzles</Name>
+ <Directory>sgt-puzzles.directory</Directory>
+ <Include>
+ <And>
+ <All></All>
+ <Category>X-sgt-puzzles</Category>
+ </And>
+ </Include>
+ </Menu> <!-- End Puzzles -->
+ </Menu> <!-- End Games -->
+</Menu> <!-- End Applications -->
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
new file mode 100644
index 000000000000..744f27f1fda6
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>NP-Hardass@gentoo.org</email>
+ <name>NP-Hardass</name>
+ </maintainer>
+ <use>
+ <flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
+ </use>
+</pkgmetadata>
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
new file mode 100644
index 000000000000..cfc0b290bca1
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils toolchain-funcs autotools
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
+ GENTOO_ICONS="20160315"
+ SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
+ KEYWORDS=""
+else
+ MAGIC=69773d8
+ SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
+ S=${WORKDIR}/puzzles-${PV}.${MAGIC}
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+doc gtk3"
+
+COMMON_DEPEND="
+ !gtk3? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )"
+
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/xdg-utils" # Used by builtin help patch
+
+DEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ virtual/pkgconfig
+ doc? ( >=app-doc/halibut-1.2 )"
+
+PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
+
+src_unpack() {
+ default
+ if [[ ${PV} == "99999999" ]]; then
+ git-r3_src_unpack
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's|-Werror||g' \
+ configure.ac || die
+ sed -i \
+ -e 's/-O2 -Wall .* -g/-Wall/' \
+ -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
+ mkfiles.pl || die
+ ./mkfiles.pl || die
+ eautoreconf
+
+ # Import icons from latest Gentoo tarball for live
+ if [[ ${PV} == "99999999" ]]; then
+ cp -R ../${PN}-icons/icons . || die
+ fi
+}
+
+src_configure() {
+ econf \
+ --program-prefix="${PN}_" \
+ --with-gtk=$(usex gtk3 3 2)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+ if use doc ; then
+ halibut --text --html --info --pdf --ps puzzles.but || die
+ fi
+}
+
+src_install() {
+ default
+
+ local file name
+ for file in *.R ; do
+ [[ ${file} == "nullgame.R" ]] && continue
+ name=$(awk -F: '/exe:/ { print $3 }' "${file}")
+ file=${file%.R}
+ newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
+ make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
+ done
+
+ if use doc ; then
+ DOCS=( puzzles.{pdf,ps,txt} )
+ HTML_DOCS=( *.html )
+ einstalldocs
+ doinfo puzzles.info{,-1,-2,-3}
+ fi
+
+ insinto /etc/xdg/menus/applications-merged
+ doins "${FILESDIR}/${PN}.menu"
+ insinto /usr/share/desktop-directories
+ doins "${FILESDIR}/${PN}.directory"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ 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..7eaeac646bc6
--- /dev/null
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils toolchain-funcs autotools
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.tartarus.org/simon/puzzles.git"
+ GENTOO_ICONS="20160315"
+ SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
+ KEYWORDS=""
+else
+ MAGIC=69773d8
+ SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
+ S=${WORKDIR}/puzzles-${PV}.${MAGIC}
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+doc gtk3"
+
+COMMON_DEPEND="
+ !gtk3? ( x11-libs/gtk+:2 )
+ gtk3? ( x11-libs/gtk+:3 )"
+
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/xdg-utils" # Used by builtin help patch
+
+DEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ virtual/pkgconfig
+ doc? ( >=app-doc/halibut-1.2 )"
+
+PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
+
+src_unpack() {
+ default
+ if [[ ${PV} == "99999999" ]]; then
+ git-r3_src_unpack
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's|-Werror||g' \
+ configure.ac || die
+ sed -i \
+ -e 's/-O2 -Wall .* -g/-Wall/' \
+ -e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
+ mkfiles.pl || die
+ ./mkfiles.pl || die
+ eautoreconf
+
+ # Import icons from latest Gentoo tarball for live
+ if [[ ${PV} == "99999999" ]]; then
+ cp -R ../${PN}-icons/icons . || die
+ fi
+}
+
+src_configure() {
+ econf \
+ --program-prefix="${PN}_" \
+ --with-gtk=$(usex gtk3 3 2)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+ if use doc ; then
+ halibut --text --html --info --pdf --ps puzzles.but || die
+ fi
+}
+
+src_install() {
+ default
+
+ local file name
+ for file in *.R ; do
+ [[ ${file} == "nullgame.R" ]] && continue
+ name=$(awk -F: '/exe:/ { print $3 }' "${file}")
+ file=${file%.R}
+ newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
+ make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
+ done
+
+ if use doc ; then
+ DOCS=( puzzles.{pdf,ps,txt} )
+ HTML_DOCS=( *.html )
+ einstalldocs
+ doinfo puzzles.info{,-1,-2,-3}
+ fi
+
+ insinto /etc/xdg/menus/applications-merged
+ doins "${FILESDIR}/${PN}.menu"
+ insinto /usr/share/desktop-directories
+ doins "${FILESDIR}/${PN}.directory"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/skoosh-2.5.0-r1 b/games-puzzle/skoosh-2.5.0-r1
deleted file mode 100644
index d7df01e9d571..000000000000
--- a/games-puzzle/skoosh-2.5.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=gnome-base/gconf-2:2 gnome-base/libgnome-keyring >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) app-text/rarian nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Sliding tile puzzle for Gnome 2
-EAPI=5
-HOMEPAGE=http://homepages.ihug.co.nz/~trmusson/programs.html
-IUSE=nls debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=gnome-base/gconf-2:2 gnome-base/libgnome-keyring >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=http://homepages.ihug.co.nz/~trmusson/stuff/skoosh-2.5.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0eca8c10e477d8f48d2814bd8db9cc63
diff --git a/games-puzzle/skoosh/Manifest b/games-puzzle/skoosh/Manifest
new file mode 100644
index 000000000000..a29c8b4b5cbd
--- /dev/null
+++ b/games-puzzle/skoosh/Manifest
@@ -0,0 +1,4 @@
+AUX skoosh-2.5.0-desktop.patch 476 BLAKE2B 190a5dc7087d5112a9b957a865cd568a228c3f4cd05bbdfaae4655756719a8e71d9b2e193ec3b4af9a17bad2baad34a9d89e341db67b89781a3b917b7e31377d SHA512 0cded581a8a24902771ef49674171d1522ed50eabff20d48b65892e09671d5a25e41b046f45a7ac80e0a23fb13a638293d5f6073d99f4a5f3473c3b882b860ac
+DIST skoosh-2.5.0.tar.gz 209945 BLAKE2B 5797e93b2ff593b0da0b404b16758a37a17bf93f76829ba9297df7b572573ec28a7052275b343cf0b774757fb5463c143b9073ae3653c1eac3ab1039194489a2 SHA512 e67f0036f09890af62bcfe0fe895d899a76efb2901c5fbdd9fb97951553a4b9f35dfddd0a3e24937b53a1c8d3686caee8b83d35e0327d4bbdaeb4c1e0ab58736
+EBUILD skoosh-2.5.0-r1.ebuild 869 BLAKE2B e40ebb430b0749e81fb1c843e1e9be833248861f81f52f340ebf69e15a5ee2e844d23f8d35d8ed038e6c8c7cbcbf778ac123583f5f2f79f6af37aa180d1bcffc SHA512 4fefa0bab3c67fa6e83804937ea2d0ce06b524e5fbef561386cb693f25df6d6fe6c3e23266876ee2466309cb748dd3ab06279cf393ac3c807d4e3a0baeb7ca1f
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/skoosh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..04f48cd4ecca
--- /dev/null
+++ b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~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-20121120 b/games-puzzle/splice-20121120
deleted file mode 100644
index 426547300efb..000000000000
--- a/games-puzzle/splice-20121120
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DESCRIPTION=An experimental and artistic puzzler set in a microbial world
-EAPI=5
-HOMEPAGE=http://www.cipherprime.com/games/splice/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=splice-linux-1353389454.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d9ff46156c44c69d7b50eea255996b29
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
new file mode 100644
index 000000000000..6d55a3efcde1
--- /dev/null
+++ b/games-puzzle/splice/Manifest
@@ -0,0 +1,3 @@
+DIST splice-linux-1353389454.tar.gz 305838859 BLAKE2B ef8c6ae70b48f6c1860e3d6591876063abea77fe0f9a7597f91e32295bee8e517fed1bf6fa3fa5e491ea11e8da7faffa26ad9d9329d960269e29dda7adf8a14d SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44
+EBUILD splice-20121120.ebuild 1295 BLAKE2B f5b9bd1310df8d856d22d902c731e973aa7270463628f421dfceb590d7d89ace1f6abe5fd63e7753226c69fb576f295d28c36632572fb26731a0b86d7cc5fbf9 SHA512 4b3e62b2bfed9a7c5a33df7594a7dcb8558c1b255fe03b33bae9175e896281539e414d13747965569eb48298f42a4c1fbe9b06b7ff4e79b69e0698790690f0cc
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/splice/metadata.xml b/games-puzzle/splice/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-puzzle/splice/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120.ebuild
new file mode 100644
index 000000000000..cd9f3346db97
--- /dev/null
+++ b/games-puzzle/splice/splice-20121120.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# 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-3.24.0 b/games-puzzle/swell-foop-3.24.0
deleted file mode 100644
index 038e438eaf89..000000000000
--- a/games-puzzle/swell-foop-3.24.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=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 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2+ FDL-1.1+
-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
-SLOT=0
-SRC_URI=mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e1ebe3ea028e357f4b37713e8d3ba8d
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
new file mode 100644
index 000000000000..a41bb5a51b16
--- /dev/null
+++ b/games-puzzle/swell-foop/Manifest
@@ -0,0 +1,3 @@
+DIST swell-foop-3.24.0.tar.xz 2313656 BLAKE2B 2a52751eb1390a7bff7956ed21058fef913e5b125f04f6415ccb9aef28cd5517d1c4683318379dafa820c8124d7798ed2142c4ed1277234d70c1b9dfe8403b86 SHA512 470bcf9715e280b9cc7bba79d1d50e924416b6d29058ba0105aee48d30ee58971262e2304610334f92f2f6a9fc6983898047d3ad05443a2cb062e15564388ab0
+EBUILD swell-foop-3.24.0.ebuild 666 BLAKE2B 6813c366536c6a35d6b47417d8474922ac41371d1646989393ce5ab9eb335092f79ba0c6e27cf0b4e46b1af0d41f8d3f3982c607dd9bbd33191a1add264a2a8b SHA512 195d833ba4322ebcc2c6f8a1f1bfd2e871961b8f533eebf280a14730d1eb303b6c72a1545ead8356187322d40cf55ed2447c3dc9b56267c647ad2ec5ad53b174
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/metadata.xml b/games-puzzle/swell-foop/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/games-puzzle/swell-foop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
new file mode 100644
index 000000000000..d0c5883d967d
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 vala
+
+DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
+HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.36:2
+ >=media-libs/clutter-1.14:1.0
+ >=media-libs/clutter-gtk-1.5:1.0
+ >=x11-libs/gtk+-3.12:3
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ gnome2_src_prepare
+ vala_src_prepare
+}
diff --git a/games-puzzle/tanglet-1.5.2 b/games-puzzle/tanglet-1.5.2
deleted file mode 100644
index e9627aaa6fa9..000000000000
--- a/games-puzzle/tanglet-1.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib:= dev-qt/linguist-tools:5 >=sys-apps/sed-4
-DESCRIPTION=A single player word finding game based on Boggle
-EAPI=6
-HOMEPAGE=https://gottcode.org/tanglet/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib:=
-SLOT=0
-SRC_URI=https://gottcode.org/tanglet/tanglet-1.5.2-src.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90e9164e3bbec5f9a479fb170e3b098f
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
new file mode 100644
index 000000000000..15886c8da228
--- /dev/null
+++ b/games-puzzle/tanglet/Manifest
@@ -0,0 +1,4 @@
+AUX tanglet-1.5.2-gentoo.patch 981 BLAKE2B a581aca772c797e31ad7bd85adf1fd1f12d2e768c9bee87139871f100eb8d4a77bfe343d86b1d29840a67338bdf5b003ff427acc6653abcd2fa4b182b8a362c4 SHA512 541d1feaf1b12acdf8ff477bf3e165d6ea6fa615eca8def32b092925dfb8902759ce29b3fe6f76d761688d298b3b452c71815e94e2cd71a9b07e6641f05386e6
+DIST tanglet-1.5.2-src.tar.bz2 8646616 BLAKE2B 0a38690069550e27a302f28e7db3753eaf67af7add730d8069ec4df001a431843e204603475146d56049cdf40c0be20d8ef83ea9f47b27cf82cc232e4fecef35 SHA512 a97b9fe3c9c80a843c4696766d15edcab48369bd905e893c2975bfb9faf91d4a58a3c440d242be91f5838aacdf1526022b5ce8c463adfd8b0bb62e008be460ee
+EBUILD tanglet-1.5.2.ebuild 876 BLAKE2B 0d3134ed3ee30c442b361d1b264c1172ef0e4ebba7b9abae289bcb9ae60a0794d2869ec53dcced262e317a2f0b28d70380896cee56170090b87254a1ccb9f8bd SHA512 75dd82c10284077788f1fe4dd01b9669f51c56dfe719cac263c24c8855e52782f10d402204a7e3966fdaf18ef0d1aace1f46c24c5ac900e0a6fdb71686d07ef9
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
new file mode 100644
index 000000000000..8409f2cc48cf
--- /dev/null
+++ b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
@@ -0,0 +1,33 @@
+--- a/src/src.pro 2018-05-29 13:11:55.000000000 +0200
++++ b/src/src.pro 2018-07-11 20:02:51.415773874 +0200
+@@ -99,7 +99,7 @@
+ RESOURCES += ../icons/icon.qrc
+
+ isEmpty(PREFIX) {
+- PREFIX = /usr/local
++ PREFIX = /usr
+ }
+ isEmpty(BINDIR) {
+ BINDIR = bin
+--- a/src/locale_dialog.cpp
++++ b/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("/usr/share");
+ paths.append(appdir + "/../Resources");
+ }
+ foreach (const QString& path, paths) {
+--- a/src/main.cpp
++++ b/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("/usr/share/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/tanglet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/tanglet/tanglet-1.5.2.ebuild b/games-puzzle/tanglet/tanglet-1.5.2.ebuild
new file mode 100644
index 000000000000..2595d233626d
--- /dev/null
+++ b/games-puzzle/tanglet/tanglet-1.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils xdg-utils
+
+DESCRIPTION="A single player word finding game based on Boggle"
+HOMEPAGE="https://gottcode.org/tanglet/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+ eqmake5 tanglet.pro
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/games-puzzle/tetrinet-0.11-r1 b/games-puzzle/tetrinet-0.11-r1
deleted file mode 100644
index 90cc8717abb3..000000000000
--- a/games-puzzle/tetrinet-0.11-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=sys-libs/ncurses-5:0= virtual/pkgconfig
-DESCRIPTION=Console based tetrinet inc. standalone server
-EAPI=6
-HOMEPAGE=http://tetrinet.or.cz/
-IUSE=ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=>=sys-libs/ncurses-5:0=
-SLOT=0
-SRC_URI=http://tetrinet.or.cz/download/tetrinet-0.11.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f915e222c86f112588e4c4a4a52aa64c
diff --git a/games-puzzle/tetrinet/Manifest b/games-puzzle/tetrinet/Manifest
new file mode 100644
index 000000000000..b9f3f7c6f804
--- /dev/null
+++ b/games-puzzle/tetrinet/Manifest
@@ -0,0 +1,5 @@
+AUX tetrinet-0.11-build.patch 2331 BLAKE2B a23200aff602acaf0dd6c1341a8c63b3b4d16b417478034dc46db4d90081c2910a8026d5b419e18432309ded69de64e16bcdaf4d2301767dcb1a857367eb8207 SHA512 e56a43ef53d9df84c4ba49b39ba2d77f99de1b616f9e81e105d4c49553b909f418f74cb13d431dbd658c41c99388321e0806dbeb63294817ec85f7148f2d2ae0
+AUX tetrinet-0.11-no-ipv6.patch 185 BLAKE2B 47b66d15eaf30d233a60f0c877fd03b66ad6007630c4a45c1c208cb21582add109ccfc3ca77d741214dbb5d00a4719a55556ab404420d5383e098e748f6c055b SHA512 1851623b20e2685548650d54f290a49f9572b65a2293848c0d83a6fdc1c1256ebcdd0f737b2f32f7fb4bd921aa69c17e7120cfc8acb1d8c5a97342741964890f
+DIST tetrinet-0.11.tar.bz2 38607 BLAKE2B f794660b037d2605990b775a00381279eea64a361e4b66dcb9314a3f784ce77a0cfc87cea52d183fb5553f05f95b466318b6a1e98dbd735f34618964d2d901d2 SHA512 8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa
+EBUILD tetrinet-0.11-r1.ebuild 698 BLAKE2B bb5f84fad0c3940b313221d36e2079c53037ae1f57ee48eb34629fe785b9329fecb32f548cf9f097b67f4b7ee5cccc7f0dba9770740c8007652a59d6adb63a95 SHA512 c61e799893a744e1a5c14ecb2d2e8445681f632c2ee618878ed929416fb0254e8c735b26203740ed26e9ae26d8c3e76256b2187aa09ca641ebe63ecd2e626963
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/tetrinet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild b/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild
new file mode 100644
index 000000000000..013dcef24a21
--- /dev/null
+++ b/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic 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 ~x86"
+IUSE="ipv6"
+
+RDEPEND=">=sys-libs/ncurses-5:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ eapply \
+ "${FILESDIR}"/${P}-no-ipv6.patch \
+ "${FILESDIR}"/${P}-build.patch
+
+ use ipv6 && append-cflags -DHAVE_IPV6
+ tc-export PKG_CONFIG
+}
+
+src_install() {
+ dobin tetrinet tetrinet-server
+ dodoc README TODO tetrinet.txt
+}
diff --git a/games-puzzle/textmaze-1.2-r1 b/games-puzzle/textmaze-1.2-r1
deleted file mode 100644
index 306eaf179075..000000000000
--- a/games-puzzle/textmaze-1.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=An ncurses-based maze solving game written in Perl
-EAPI=6
-HOMEPAGE=http://robobunny.com/projects/textmaze/html/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Curses
-SLOT=0
-SRC_URI=http://www.robobunny.com/projects/textmaze/textmaze_v1.2.tar.gz
-_md5_=960719f25146395a0938628732a531e6
diff --git a/games-puzzle/textmaze/Manifest b/games-puzzle/textmaze/Manifest
new file mode 100644
index 000000000000..a66fe6f1237a
--- /dev/null
+++ b/games-puzzle/textmaze/Manifest
@@ -0,0 +1,3 @@
+DIST textmaze_v1.2.tar.gz 15827 BLAKE2B df66068bef5b39f18b03d4ce9243ebaa2ddc52f58f3d5b2d8a46ff81efd188467e1a9f13ab818fc592f25dd1acaecaba80aca153b7d3900d527cb9cc1d45c034 SHA512 f6a2733049ea461f15b40eec4a414356dbfe252d859d132278d9ea8a4efcdc6753a28817529b429bad662a2042f2f7cd5cb1f2383d9ddbf773c76b80ea2af7d9
+EBUILD textmaze-1.2-r1.ebuild 590 BLAKE2B 987c83c64716a66b65c6f8090325fcfebba2af2b2efba21954599fd372a671516742aaa72e88b9899f59b336d40bc1062012079270e656c90ea6367f1dbffd43 SHA512 baca7e929bc639bb20ea91a7e4cd854fbd23c39847992bd3e2c4533775ec3d4d97934cc26679403bf72bc17c45071bd480c3395f0bd31237b66eeb7e355116ca
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/textmaze/metadata.xml b/games-puzzle/textmaze/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/textmaze/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/textmaze/textmaze-1.2-r1.ebuild b/games-puzzle/textmaze/textmaze-1.2-r1.ebuild
new file mode 100644
index 000000000000..959e94bd77ec
--- /dev/null
+++ b/games-puzzle/textmaze/textmaze-1.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Curses"
+DEPEND=""
+
+S="${WORKDIR}/TextMaze"
+
+src_prepare() {
+ default
+ sed -i \
+ -e "s#/usr/local/bin/perl#/usr/bin/perl#" \
+ textmaze || die
+}
+
+src_install() {
+ dobin textmaze
+ einstalldocs
+}
diff --git a/games-puzzle/tint-0.03b-r1 b/games-puzzle/tint-0.03b-r1
deleted file mode 100644
index 8fce94e812d1..000000000000
--- a/games-puzzle/tint-0.03b-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=sys-libs/ncurses-5.4-r1:0=
-DESCRIPTION=Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game
-EAPI=6
-HOMEPAGE=http://oasis.frogfoot.net/code/tint/
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.4-r1:0=
-SLOT=0
-SRC_URI=http://oasis.frogfoot.net/code/tint/download/0.03b/tint_0.03b.tar.gz
-_md5_=e49bbb7058639af5c79d069570b26cd7
diff --git a/games-puzzle/tint/Manifest b/games-puzzle/tint/Manifest
new file mode 100644
index 000000000000..28edb3d62d99
--- /dev/null
+++ b/games-puzzle/tint/Manifest
@@ -0,0 +1,4 @@
+AUX tint-0.03b-ovflfix.patch 1021 BLAKE2B e6188aff5847d05e6fa3909317d2dc054433ccd5a9dcd89a76f8e990efa182405b93ac8b06b81e58f9b12ae56a0981fedbd4c28659c6a87418b40392fcd636bc SHA512 da4d5871b46c57ee5e37f0a4b6e779c33bf7b5c45dcba281b84ccad308195d9b2498489ee22f105e6eef00274cf60757855ab9aa91a146f19159713971b828bf
+DIST tint_0.03b.tar.gz 16909 BLAKE2B 4d619b0def118f76f5d07b12f1fe6ccbe2688f3275d49c3514af9448cd74e6b199a55976fd4340dd8122f101f84a5a7be1c5e9fce6727850ed3ee4c684ec8118 SHA512 f442122248987a4f2843e0abe3ed4b3fcecbb6024aad2b486087468c84d80f94310dcf4a37a3d93a647d0abe9aaf10e7d957c88ec6314c25a9fd90d4dfc16ec1
+EBUILD tint-0.03b-r1.ebuild 759 BLAKE2B 71eb5ae49e191cdeba17d06f2a80f18496d1fd2c4fe7ab0e2861d2f1edf4658d0e195fb082d2344ee0b24a96b495ec4e882ddde6ff87978c3c3a5686b9e4134b SHA512 b78af49089beab3aba6cd2aeaea5fa178fb24db73c53188961eabb3e9cb1ef264f8aa0ce8927109ada319699f59e0ab89c92e92dc63b104295737dfd469cb7cf
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/tint/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/tint/tint-0.03b-r1.ebuild b/games-puzzle/tint/tint-0.03b-r1.ebuild
new file mode 100644
index 000000000000..4b2d9dc72843
--- /dev/null
+++ b/games-puzzle/tint/tint-0.03b-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.4-r1:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch )
+
+src_compile() {
+ emake \
+ STRIP=true \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ localstatedir="/var/lib"
+}
+
+src_install() {
+ dobin tint
+ doman tint.6
+ dodoc CREDITS NOTES
+ insopts -m 0664
+ insinto /var/lib
+ doins tint.scores
+}
diff --git a/games-puzzle/tiny-and-big-1.4.1 b/games-puzzle/tiny-and-big-1.4.1
deleted file mode 100644
index 64c1d62dbc91..000000000000
--- a/games-puzzle/tiny-and-big-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/bzip2
-DESCRIPTION=Combines elements of adventure, jump&run and physical puzzles
-EAPI=5
-HOMEPAGE=http://www.tinyandbig.com/
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/opengl media-libs/openal x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit ) games-misc/games-envd
-RESTRICT=bindist fetch bundled-libs? ( splitdebug )
-SLOT=0
-SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=622ecf0dff83cd393572fa9d4f4b8c8c
diff --git a/games-puzzle/tiny-and-big/Manifest b/games-puzzle/tiny-and-big/Manifest
new file mode 100644
index 000000000000..3f7c8466e7dd
--- /dev/null
+++ b/games-puzzle/tiny-and-big/Manifest
@@ -0,0 +1,3 @@
+DIST tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2 1170058011 BLAKE2B 2c1845165408cca68fd791b2d6f91c49e1131c25c29a49ab8512e82cf0664d52fcb8526741693e045e3ea1560ace47ed3d8a8e51a4851d6ce57adce6f2bcd445 SHA512 3dbf6ebbe6047f5258f482e776809c6817df8d14cfc20014fb6e4a6accc3db3e93051270ce29371bc0ef56d380bd382dbf8eb75b592c3f0097ca3546d889193e
+EBUILD tiny-and-big-1.4.1.ebuild 1389 BLAKE2B 8264701b9f84f4f20228be060cd557d843bcb970fde1b256b3a016bc77c7e424744a908f2129c8e8267725842c10c24f883b6cd32630aee370b81c71ed4a43df SHA512 3f18ac776c1e8ee9bb34dd6da4d9122b1e433e104430105de5c301d6a90fb5406e6111969e76d7a656c8e17079892bf6724e93d68ef358c3a24ae51f8339695f
+MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/tiny-and-big/metadata.xml b/games-puzzle/tiny-and-big/metadata.xml
new file mode 100644
index 000000000000..b878aaa1812d
--- /dev/null
+++ b/games-puzzle/tiny-and-big/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <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..aea1846bd3c1
--- /dev/null
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# 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-0-r1 b/games-puzzle/tod-0-r1
deleted file mode 100644
index ff39ef6520cb..000000000000
--- a/games-puzzle/tod-0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/allegro:0[X] app-arch/unzip
-DESCRIPTION=Tetanus On Drugs simulates playing Tetris under the influence of drugs
-EAPI=6
-HOMEPAGE=http://www.pineight.com/tod/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/allegro:0[X]
-SLOT=0
-SRC_URI=http://www.pineight.com/pc/wintod.zip
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=8049a612202b49240ebcdba0b6b521d8
diff --git a/games-puzzle/tod/Manifest b/games-puzzle/tod/Manifest
new file mode 100644
index 000000000000..5d5da4e54316
--- /dev/null
+++ b/games-puzzle/tod/Manifest
@@ -0,0 +1,4 @@
+AUX tod-0-makefile.patch 336 BLAKE2B 914b05d5bf298a3d60c6ac836ef45127c253859fa8b620adf5827abbc3dd3375c02eebd614ab79277bd3c52f7f383a4b4458e80d8fabd8549e4d49ca5702959f SHA512 efd342bfedacdb1dcd20d5a938a02c555c7d260bf9584a0d6d24c4aa0617df7ba8e37fdfacc5b0e0f600a2cae752e50347ba8b6992c5ba2dc22c1b62306e7438
+DIST wintod.zip 115653 BLAKE2B 9c54be567954892eabc353bf5985579ff11fcb9e00304bf92792ef787bbaccf29084c68a58faae46229856fae103c4b27c462b62c2da489bfe635d474fd564ef SHA512 8cc203d9745cc4855c58c2f9119d06a1f02e1ecb9c1cc2c1dc1f1c77e5aa0553925bdcba3d744db462bbc77f3637a42e35a579a8807c8098aa2fde7452cc30cc
+EBUILD tod-0-r1.ebuild 748 BLAKE2B a78c2a73d87c13263a8400df1312e2c9d02972d92a2882080a6801e1a7dac7c8bd6545ce8546bcbc31d8927888b4c09a673985316d4b637fa4cbca2f33f74071 SHA512 e3b4566e211a670b1fce84958e79d95dee9af188ce73ce415976fc835f44f77639b989e3c3c8ceaf8d6e1a768bd239364a1e14ca08d19171fd57ffe01e429612
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..9783fab0c4bc
--- /dev/null
+++ b/games-puzzle/tod/files/tod-0-makefile.patch
@@ -0,0 +1,13 @@
+--- a/makefile
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/tod/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/tod/tod-0-r1.ebuild b/games-puzzle/tod/tod-0-r1.ebuild
new file mode 100644
index 000000000000..0ed9a29063f0
--- /dev/null
+++ b/games-puzzle/tod/tod-0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Tetanus On Drugs simulates playing Tetris under the influence of 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() {
+ default
+ eapply "${FILESDIR}"/${P}-makefile.patch
+ sed -i \
+ -e "s:idltd\.dat:/usr/share/${PN}/idltd.dat:" \
+ rec.c || die
+}
+
+src_install() {
+ newbin tod-debug.exe tod
+ insinto /usr/share/${PN}
+ doins idltd.dat
+ dodoc readme.txt
+ make_desktop_entry ${PN} "Tetanus On Drugs"
+}
diff --git a/games-puzzle/tong-1.2-r1 b/games-puzzle/tong-1.2-r1
deleted file mode 100644
index 0d7176350c6e..000000000000
--- a/games-puzzle/tong-1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
-DESCRIPTION=Tetris and Pong in the same place at the same time
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/tong/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
-SLOT=0
-SRC_URI=http://www.nongnu.org/tong/tong-1.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=6aa120c4e5260a069b954a092b3bca49
diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
new file mode 100644
index 000000000000..d9fb526a8084
--- /dev/null
+++ b/games-puzzle/tong/Manifest
@@ -0,0 +1,6 @@
+AUX tong-1.2-datadir.patch 1109 BLAKE2B dfc55c8bf75942e047440ec25fb6c9d51bbaa13f3a62329a6aac4ae82283cc14fe9f3f80ad11a13f563952bb0566a4f4d8aa47d72b3bdbd031b54d584ba89642 SHA512 8f35bc65273a77ed9190bdff9acaa932ae96030092023e5282bb3edd651e51fa29f52eedfbcdaf504540b5fbc67b76364b839be20e4a93dde01fee852a8dd80e
+AUX tong-1.2-fps.patch 557 BLAKE2B 5123aab67c2552c5e0b2ba4a2ad9082b24fa6276056c22c9fe97de6f1aa725c119a85cea79ea6d9e7ebb6c13e18610dd804c776000ddf3396d22e4a07af7c902 SHA512 a29b875ad777dc912c4080d339e5e00f8087322f4e0995631eb30180d2c409b9ede0d7ac6e6aab5a194fca0ca6e405685310e5b898fefd75d74e469129242c8b
+AUX tong-1.2-makefile.patch 901 BLAKE2B 7619c3b3155c1c56f239a2c529affbd3f1e1a8a5cf738a5235f1b928a065cc1aaacc5a09000a48b55f299e6130aad707e3399d2fe22937dd44de71efea1f9bab SHA512 1e15918cbb9fa98e174e2853be5c99ff369667035371cda95756b30ea246a640be22d308f86052a355f58596b676843dbb546caf8dd1aac9a66aad4cb1f7b34a
+DIST tong-1.2.tar.gz 88028070 BLAKE2B b82b5c012f5d12953a6e84dfe38921cff2f0e244c2a9ad9ef606b5ee41c2f455dbb288ddb477f4eb96471ed3dd4cb4de2a8cea9155942c51f850d263fb22ee71 SHA512 0544f489141bba37985f1ef3c316208e3e6dacdea8f8b79f37997a9489ff5c1710fd1426e02489f8adb33bf9a1511bb9a0250122fa2054ef4a6ef203c8881261
+EBUILD tong-1.2-r1.ebuild 1011 BLAKE2B e65ec73abd842e978831156ee44cd89fc74944f2ea2dbcc2aa0894856fbcbee2f0191544c8076fb02abb7b2daa5e7cd2f2da8e5674b6b301eb98e0a4db4e0e9b SHA512 002557b55e0e4e46feedba17eee0746300d7c0ce28b7de0c13a78f292cbf662ea7517df08e0418689d9ccf2339f1cb2d940719d1c65c123fbe6dcdea07c81c0f
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..92a8bb4c18a1
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-datadir.patch
@@ -0,0 +1,41 @@
+--- a/tong.cpp.orig
++++ b/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..86566646b8d6
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-fps.patch
@@ -0,0 +1,25 @@
+--- a/tong.cpp.orig
++++ b/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..ad9b283f4785
--- /dev/null
+++ b/games-puzzle/tong/files/tong-1.2-makefile.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.orig
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/tong/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/tong/tong-1.2-r1.ebuild b/games-puzzle/tong/tong-1.2-r1.ebuild
new file mode 100644
index 000000000000..a16067fc57ba
--- /dev/null
+++ b/games-puzzle/tong/tong-1.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~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() {
+ default
+ eapply \
+ "${FILESDIR}/${P}-makefile.patch" \
+ "${FILESDIR}/${P}-fps.patch" \
+ "${FILESDIR}/${P}-datadir.patch"
+ sed -i \
+ -e "s:\"media/:\"/usr/share/${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() {
+ dobin tong
+ dodir "/usr/share/${PN}"
+ cp -r media/ "${ED}/usr/share/${PN}" || die
+ dodoc CHANGELOG README making-of.txt CREDITS
+
+ make_desktop_entry tong TONG
+ doicon "${T}/${PN}.png"
+}
diff --git a/games-puzzle/toppler-1.1.6-r1 b/games-puzzle/toppler-1.1.6-r1
deleted file mode 100644
index fc326ce4573e..000000000000
--- a/games-puzzle/toppler-1.1.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Reimplementation of Nebulous using SDL
-EAPI=6
-HOMEPAGE=http://toppler.sourceforge.net/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/toppler/toppler-1.1.6.tar.gz
-_md5_=768162c55d0cb726eb5abb31ba39c88a
diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest
new file mode 100644
index 000000000000..280337638895
--- /dev/null
+++ b/games-puzzle/toppler/Manifest
@@ -0,0 +1,4 @@
+AUX toppler-1.1.6-gentoo.patch 2004 BLAKE2B cc1221d33b4cf30bda597c4b95e669aa6c4ba7698669e5a762a89a4d8a5f8c637c81d07c47c22e7f0f85f96e9bd40f7da7e8c0be937ed28ec11c863e6604863f SHA512 0fc2d8eb7200c0c4e4986e0f53298d8a7b49f8be0d46bf2dc370e145a4ff39f7342874b5d80a18f703f7d134fd59274a72679afa7317f94609469042942dbfb4
+DIST toppler-1.1.6.tar.gz 2117137 BLAKE2B 1cff164e71924786d109a0c3f36ade3df8251872d454cb86d25b6f95553473dd10d5bc0f90fa0a3c43bcebfb6f3ef105ddf0d77f974282d65d0c510176b04ac9 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9
+EBUILD toppler-1.1.6-r1.ebuild 558 BLAKE2B af00a1ff59f976c81fcb7c27be2cc1b9a2c1111fa569a5a2243a760572c6743fef0cf169755cda011a1b6c7ee0d941a82a391a699245310d3fca89e1fd2c2308 SHA512 199e0ce86bbdaf9689dd519b68de170e372dc9d8b38d6e1880fd6fbb11f94a615698f8cda31dcc6ec9806fd7a5fa3aee9a0812ffd9811415e8d77baf2e8c6dad
+MISC metadata.xml 330 BLAKE2B 924a2ff052635a1a394488cd20e1f1db9660abe63852e044d6da76f514475f472ad4221b750fdf12a8bfdfa1fbb219d957a0a0201bf4c53d262521e351595404 SHA512 68e3d67a21f67e1c0ede15141c8002156029bed457e521cdb532ae6524dff1e2bfe00b205a515ff816d61b953aca3c0ed5c9400a9a69cb44a859bd59c2394a62
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..fdbdf5d6a77b
--- /dev/null
+++ b/games-puzzle/toppler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">toppler</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/toppler/toppler-1.1.6-r1.ebuild b/games-puzzle/toppler/toppler-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..98307d76c751
--- /dev/null
+++ b/games-puzzle/toppler/toppler-1.1.6-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ media-libs/libsdl[video]
+ media-libs/sdl-mixer[vorbis]
+ nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+ econf $(use_enable nls)
+}
diff --git a/games-puzzle/torrent-0.8.2-r1 b/games-puzzle/torrent-0.8.2-r1
deleted file mode 100644
index 94f53472f7f8..000000000000
--- a/games-puzzle/torrent-0.8.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
-DESCRIPTION=Match rising tiles before reaching the top to score as many points as possible
-EAPI=6
-HOMEPAGE=http://www.shiftygames.com/torrent/torrent.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
-SLOT=0
-SRC_URI=http://www.shiftygames.com/torrent/torrent-0.8.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=8bc56a032dda80c80d0ce25aa780ba7f
diff --git a/games-puzzle/torrent/Manifest b/games-puzzle/torrent/Manifest
new file mode 100644
index 000000000000..3f062ba19334
--- /dev/null
+++ b/games-puzzle/torrent/Manifest
@@ -0,0 +1,3 @@
+DIST torrent-0.8.2.tar.gz 555686 BLAKE2B 17834483730fc9e4771899fed12b687568502e857e1f00355174944c2bf21a10065a762af801df556eead7248c74883c98e7732a2c5a6f377c88605024764ba8 SHA512 da7fbb21252a76fcd41c0b22ae4c0835e2fcabc4da5ce60ad04880c3fb633b6aaa951532ac0ce69d93f03b7608e4b110a23ed6f9f8839d053cd4a0d9500d1692
+EBUILD torrent-0.8.2-r1.ebuild 775 BLAKE2B 8619a1abb32de986396aede59561a6ab48c3aea9f519eace238d4adbd4994452d390c74569cefeb95ee08ce618a01917a77c7689869af593df926f9ad066cadb SHA512 87028937ce1e635c1999861052bf2ec465df90583e5f20444f978c5cb583d57c265e1618598ed3c801b5fd2479b8b1ca40c28abdfda9d6e6ff0274fdf74a3bdc
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/torrent/metadata.xml b/games-puzzle/torrent/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/torrent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/torrent/torrent-0.8.2-r1.ebuild b/games-puzzle/torrent/torrent-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..76d28a5eee3a
--- /dev/null
+++ b/games-puzzle/torrent/torrent-0.8.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Match rising tiles before reaching the top to score as many points as possible"
+HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html"
+SRC_URI="http://www.shiftygames.com/torrent/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ >=media-libs/libsdl-1.2.4
+ >=media-libs/sdl-mixer-1.2
+ >=media-libs/sdl-image-1.2
+ media-libs/sdl-ttf
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -i \
+ -e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
+ src/torrent.c \
+ || die "sed failed"
+}
+
+src_install() {
+ default
+ newicon pics/sg_icon.png ${PN}.png
+ make_desktop_entry ${PN} Torrent ${PN}
+}
diff --git a/games-puzzle/triptych-1.16 b/games-puzzle/triptych-1.16
deleted file mode 100644
index c6e37c93050d..000000000000
--- a/games-puzzle/triptych-1.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DESCRIPTION=Fast-paced Tetris-like puzzler
-EAPI=7
-HOMEPAGE=http://www.chroniclogic.com/triptych.htm
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=>=media-libs/libsdl-1.2[abi_x86_32,opengl,sound,video] virtual/opengl[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32]
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=http://www.chroniclogic.com/demos/triptych.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eutils 5b8ce72259e08104b337fe28c6de5dbc user 8bc2845510e2109af75e3eeac607ec81
-_md5_=f8e37850043c49b74558caac64337947
diff --git a/games-puzzle/triptych/Manifest b/games-puzzle/triptych/Manifest
new file mode 100644
index 000000000000..18a53864776b
--- /dev/null
+++ b/games-puzzle/triptych/Manifest
@@ -0,0 +1,3 @@
+DIST triptych.tar.gz 1748316 BLAKE2B 0d66265df27f61ddee1e1777a1e749d3a8bbcebf0e2bfe64a054febb48def865b68ab59d9c25804ed725bb11d24af2bbd712cc2de88a7259db26aa6d7c3c8d1f SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa
+EBUILD triptych-1.16.ebuild 1294 BLAKE2B 6125e2c24fe8a02c6eec1b40e9cf47a240e56c4b3cc57a55a4662bd8a490149db24f2f1cfbe4fef79ca31ffb99a437422af87ff8e52faf2e411f319b8918187b SHA512 9d5bae71e7550254ede4d05d1d6bee2ba17e7126b4b7c87d9a6f5a0a4db517b01c8cfff7ce5fa117a9f28fd583f8f07b0d9d744d01027cee914e2fba158fec7e
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/triptych/metadata.xml b/games-puzzle/triptych/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/triptych/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/triptych/triptych-1.16.ebuild b/games-puzzle/triptych/triptych-1.16.ebuild
new file mode 100644
index 000000000000..e2257e17ad3f
--- /dev/null
+++ b/games-puzzle/triptych/triptych-1.16.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils user
+
+DESCRIPTION="Fast-paced Tetris-like puzzler"
+HOMEPAGE="http://www.chroniclogic.com/triptych.htm"
+SRC_URI="http://www.chroniclogic.com/demos/${PN}.tar.gz"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist mirror strip"
+
+RDEPEND=">=media-libs/libsdl-1.2[abi_x86_32,opengl,sound,video]
+ virtual/opengl[abi_x86_32]
+ x11-libs/libX11[abi_x86_32]
+ x11-libs/libXext[abi_x86_32]"
+
+QA_PREBUILT="opt/${PN}/${PN}
+ opt/${PN}/setup"
+
+S="${WORKDIR}/${PN}"
+
+DIR="/opt/${PN}"
+WRITABLE=( "${EROOT}${DIR}"/{hwconfig.cfg,${PN}.{clr,cnt,scr}} )
+
+pkg_setup() {
+ enewgroup gamestat 36
+}
+
+src_prepare() {
+ default
+ rm -v *.dll || die
+}
+
+src_install() {
+ local EXES=( ${PN} setup )
+
+ insinto "${DIR}"
+ doins -r .
+
+ exeinto "${DIR}"
+ doexe "${EXES[@]}"
+
+ fowners root:gamestat "${EXES[@]/#/${DIR}/}" || die
+ fperms g+s "${EXES[@]/#/${DIR}/}" || die
+
+ make_wrapper ${PN} ./${PN} "${DIR}"
+ make_wrapper ${PN}-setup ./setup "${DIR}"
+}
+
+pkg_postinst() {
+ touch "${WRITABLE[@]}" || die
+ chown root:gamestat "${WRITABLE[@]}" || die
+ chmod 0664 "${WRITABLE[@]}" || die
+}
+
+pkg_prerm() {
+ [[ -z ${REPLACED_BY_VERSION} ]] &&
+ rm -v "${WRITABLE[@]}"
+}
diff --git a/games-puzzle/twindistress-1.1.0 b/games-puzzle/twindistress-1.1.0
deleted file mode 100644
index 548b095cbfaf..000000000000
--- a/games-puzzle/twindistress-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[png]
-DESCRIPTION=Match and remove all of the blocks before time runs out
-EAPI=5
-HOMEPAGE=http://twind.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[png] games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/twind/twind-1.1.0.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e5753c2aaa1124a7dd1bf5db060b5651
diff --git a/games-puzzle/twindistress/Manifest b/games-puzzle/twindistress/Manifest
new file mode 100644
index 000000000000..1eb8b6364ce8
--- /dev/null
+++ b/games-puzzle/twindistress/Manifest
@@ -0,0 +1,5 @@
+AUX twindistress-1.1.0-ldflags.patch 372 BLAKE2B 7966bd989fefdc13bf433f33ebcbada98723990d7779f6674a8ded1952ffcaf522b0c9df1795773f25e511fe22a8c9b33f31563cb0261e9a3eaaae040829d497 SHA512 5c19ffcfe2e9a451e95ac4d03da20cf54bf46ddc7bd369cc9e6c49a3215f8c39f50632d9e60167389859156c4df35ed7b813e1beb7a884c8ec0198f56a8d9f56
+AUX twindistress-1.1.0-warnings.patch 3342 BLAKE2B 3c96cb1a4f9c8073f493798ff653a7172294ceac58a283f08f12183cae498e3d2ef3f1bb091a7d18ade256d1ab7652baf4f3d9b743422382652292cf458c9566 SHA512 20bb973c6dea47436333f9449c7b924c38744e74b8eed6646062e4a48c74156cba8fd17150f5a4f8dc19de68ee1c394eee8aa0f2f867a72bddbbb32278e9c304
+DIST twind-1.1.0.tar.gz 2837845 BLAKE2B 2c5d0eff1fba42be02aeece2552f343ecfbba9e14484f78d3ef1acc08f313cb3bd9cfc7c4bc2033697bd3ae7792853d1c1206dc3b8e374215eb7d89365dae02b SHA512 f1b3be3e5706ce244dd291b6fba2160605593e51b60344521025daf882509e164aa5c201c8d696e56a64d6f3525d16ecd3fd78cc1b86f39f401d4137b615fe8f
+EBUILD twindistress-1.1.0.ebuild 1379 BLAKE2B 00dc5e4866c8dec94aad7a148819cfa9b4a3c2492afa3c533172cf897778fb012056c4f0c930022a882150135ebf1bc2c7b5da0df74edd58bcd5929b52d8ec06 SHA512 48ceef2f202934a39dd5920f5e20dd0db6b538a69173a07641a55e3102bdde4cf4ad0732344dec423efea875b650ff82f181d260da34def12d9798902dd1b215
+MISC metadata.xml 328 BLAKE2B c47ffd007164600a4f8e9ecabd1c8b29c65513a0fff46d5a4b2e2978ac8922263d3d10e6c5303e9a60e3645bb8ad030b561b1aaf5dfd5d69f4bb97998db024e7 SHA512 a7244b86047c6854bbec72296e625cc10aefa30a2e901dbc2f15083ab1532dc7b3e5fe91ae344fe8b4f0d1019b6f4c91def98cbeffb8fe4a044cc34cd9b03e38
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..b3a48cd60dea
--- /dev/null
+++ b/games-puzzle/twindistress/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">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..cdc296985750
--- /dev/null
+++ b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~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-1.1.0-r1 b/games-puzzle/wakkabox-1.1.0-r1
deleted file mode 100644
index 7fe04fd3fc43..000000000000
--- a/games-puzzle/wakkabox-1.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libsdl-1.0.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A simple block-pushing game
-EAPI=6
-HOMEPAGE=http://kenn.frap.net/wakkabox/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.0.1
-SLOT=0
-SRC_URI=http://kenn.frap.net/wakkabox/wakkabox-1.1.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f1b7249ac8506af28067b012f338d2bb
diff --git a/games-puzzle/wakkabox/Manifest b/games-puzzle/wakkabox/Manifest
new file mode 100644
index 000000000000..83dc8213be69
--- /dev/null
+++ b/games-puzzle/wakkabox/Manifest
@@ -0,0 +1,4 @@
+AUX wakkabox-1.1.0-gentoo.patch 1768 BLAKE2B 57fc63581b1fecaf579fc70cee8a693c4c55a27c19afe85442e3a36b5d7fcf693dba91ff4cf52ab5f21813f15250abc3352930c333636780f0ff9c478b255c32 SHA512 28c261d77372ffad9815dc6d40118595d7896bafb352237ce708f028ac50ae0530d5a61f75ece36c35ec7f041da9979c9cfa37c19dae1e83ef9ddb34ffa4bf94
+DIST wakkabox-1.1.0.tar.gz 158231 BLAKE2B f756cf98135591dbae60f00a4e85f4286204f0206196b032c2ac547ae5f1259a4b228f673aed047a8848a6500abaccc0ea69f8eb47e1950309fadc9738e684da SHA512 a97fcf382c3703fa59d6c2159397cb795b698d2a28253a7e60690b24b3d72b4950b9a7c569600bac0dc637b9d9a52577a45944036518cf5e79c601b377a092be
+EBUILD wakkabox-1.1.0-r1.ebuild 613 BLAKE2B ac2beb4615cbb105771f47ad5a719acb72dab76cf9a440422fb2aa86392c1c745f7e3476050055b3234e283feef0daa5a718b4c9235adffbf8a78bfbc8307c21 SHA512 98d132cf9f39b470f20accdaa35fefb3b558776bc362e923b350cfa78c82b7914876b877e64f9b72bfccd4f35be507d3f01ab944a3274dd5557ab6e6c49bd800
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..ad82efaeab94
--- /dev/null
+++ b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
@@ -0,0 +1,53 @@
+--- a/configure.ac.old 2015-02-26 23:25:34.146334845 +0100
++++ b/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 )
+--- a/configure.ac.old 2015-02-26 23:33:25.801552821 +0100
++++ b/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
+
+--- a/wakkabox.c.old 2015-02-26 23:43:26.146386413 +0100
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/wakkabox/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..a04dd8404b70
--- /dev/null
+++ b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop
+
+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="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.0.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}"/${P}-gentoo.patch
+ rm aclocal.m4
+ eautoreconf
+}
+
+src_install() {
+ default
+ newicon bigblock.bmp ${PN}.bmp
+ make_desktop_entry ${PN} "Wakkabox" /usr/share/pixmaps/${PN}.bmp
+}
diff --git a/games-puzzle/wizznic-369-r1 b/games-puzzle/wizznic-369-r1
deleted file mode 100644
index f4af6dd98cea..000000000000
--- a/games-puzzle/wizznic-369-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
-DESCRIPTION=Block-clearing puzzle game
-EAPI=6
-HOMEPAGE=http://wizznic.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wizznic/Wizznic_src_build_369.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=1b30b1885ab03355271e7807c9717595
diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
new file mode 100644
index 000000000000..2aa86cf8fdde
--- /dev/null
+++ b/games-puzzle/wizznic/Manifest
@@ -0,0 +1,3 @@
+DIST Wizznic_src_build_369.tar.bz2 38118227 BLAKE2B 2d48a53ab715a25b7f1b2c4e8c01935084cd44a99e1a6ded6c421f507f55961e8ebe5df6ea2b912c1be8ee8a82285376673114f3af0c1df9ec0ae1042e2f6145 SHA512 61c6ced873403bbd14e8c376321ae0c92a7333bb59409615de1e1305da3e4b3cb023af36e002d732877fd1371a322796df3e4050e5afe699e03f01039d7f7ead
+EBUILD wizznic-369-r1.ebuild 1028 BLAKE2B d8c5b4150ce087542cab468dcacf1e3788be43132a1c23427011b67128e77d27fc25a44ccc50610f941da6b18d1d4f9da90d8d3e4c4d4e11fdfb26eee9a451c6 SHA512 a5154526ffd4a6074c8274874f9168fbfa8c9fdf332badf4ef3652902d57ac829f10fb752a221f1805071abd3f45f99b01ba5275b22240ab99a50b458a986054
+MISC metadata.xml 330 BLAKE2B d5c884b078e412a6a8b74af3337c2e21226fca735a3c9400adf0335ab1f0251f911c0c2014ca6975e1bdb45683395056ab323d1f615decfcc3fb748797349cc3 SHA512 3cce7ff11dff9f3552a3e073a0ceb96d1032e9c87347554fb74b2a313a2f0a24774fe94debd1caef26cc0d57e051ff0fd616203f0e0bdae425bc1af834010580
diff --git a/games-puzzle/wizznic/metadata.xml b/games-puzzle/wizznic/metadata.xml
new file mode 100644
index 000000000000..6b1e64c0e478
--- /dev/null
+++ b/games-puzzle/wizznic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">wizznic</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/wizznic/wizznic-369-r1.ebuild b/games-puzzle/wizznic/wizznic-369-r1.ebuild
new file mode 100644
index 000000000000..ca391dbb54d0
--- /dev/null
+++ b/games-puzzle/wizznic/wizznic-369-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+DESCRIPTION="Block-clearing puzzle game"
+HOMEPAGE="http://wizznic.org/"
+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,opengl,video]
+ media-libs/sdl-image[png]
+ media-libs/sdl-mixer[vorbis]
+ virtual/opengl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Wizznic_src_build_${PV}"
+
+src_prepare() {
+ default
+ sed \
+ -e '/^\(CC\|LD\|STRIP\)/d' \
+ -e 's/(LD)/(CC)/g' \
+ -e '/CFLAGS.*=/d' \
+ Makefile.linux > Makefile || die
+}
+
+src_compile() {
+ emake \
+ DATADIR="/usr/share/${PN}/" \
+ BINDIR="/usr/bin" \
+ STRIP=true
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ DATADIR="/usr/share/${PN}/" \
+ BINDIR="/usr/bin" \
+ 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!"
+}
diff --git a/games-puzzle/wmpuzzle-0.5.2-r1 b/games-puzzle/wmpuzzle-0.5.2-r1
deleted file mode 100644
index c920d38f88ef..000000000000
--- a/games-puzzle/wmpuzzle-0.5.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm >=sys-apps/sed-4
-DESCRIPTION=a 4x4 puzzle on a 64x64 mini window
-EAPI=6
-HOMEPAGE=https://people.debian.org/~godisch/wmpuzzle/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
-SLOT=0
-SRC_URI=https://people.debian.org/~godisch/wmpuzzle/wmpuzzle-0.5.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1546ed5cefcd7b1e6c728908cb4138fc
diff --git a/games-puzzle/wmpuzzle/Manifest b/games-puzzle/wmpuzzle/Manifest
new file mode 100644
index 000000000000..4c6f1e1baeab
--- /dev/null
+++ b/games-puzzle/wmpuzzle/Manifest
@@ -0,0 +1,3 @@
+DIST wmpuzzle-0.5.2.tar.gz 87373 BLAKE2B c2187fce6fbfe4f68b969da605755f379d14d47a478c6ca43da25dcb607939cf63552e108073d7031ef0dfc2d5455aade5d2f8617cbadad62587ffcaef95ed1f SHA512 7d171d307e3829005dff4d718161655785e87129b07917d494bb498eff904adafc7c6f83e71f996759ee9e365fe70c67858a5ec9d2647fe573e0a1505126f6c0
+EBUILD wmpuzzle-0.5.2-r1.ebuild 706 BLAKE2B 38a8b2de1a1c1486edac11055710a776c89af5ad317fe4684095a01bba3c36d5b980cd077f86a03546069b980c7cdd329b4ab0d5a05f74e1494e27780bdece4b SHA512 8984449e55fb1872657e7aa53f53c3e41449e199ff481f5cc900e1a2219f45c0d467dc24ba723fc6c802da7e65be7d17801d59c74ea9d18dd5510947d43a78f1
+MISC metadata.xml 441 BLAKE2B 32c3a0ed8a9f2fd02246c333adea24fad083490055a0a8beaa4ec743c0efe07286d2bf8cb4318a7c4424a7c4a079d2bec9ae04908e352c35b40099f5c7d8371f SHA512 12d6a5472ef0f13f5703f22b584bdb75364db3018f0d280b18d2813f741d2820aa1daf3dec24e64e88c1df27822695680a269169ef682ebd95af26d130401714
diff --git a/games-puzzle/wmpuzzle/metadata.xml b/games-puzzle/wmpuzzle/metadata.xml
new file mode 100644
index 000000000000..7e50655eda28
--- /dev/null
+++ b/games-puzzle/wmpuzzle/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="freecode">wmpuzzle</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..314b27ac091a
--- /dev/null
+++ b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils
+
+DESCRIPTION="a 4x4 puzzle on a 64x64 mini window"
+HOMEPAGE="https://people.debian.org/~godisch/wmpuzzle/"
+SRC_URI="https://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}"
+
+S=${WORKDIR}/${P}/src
+
+src_install() {
+ dobin ${PN}
+
+ dodoc ../{CHANGES,README}
+ newicon -s 48 numbers.xpm ${PN}.xpm
+ doman ${PN}.6
+ make_desktop_entry ${PN}
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-puzzle/world-of-goo-1.41-r2 b/games-puzzle/world-of-goo-1.41-r2
deleted file mode 100644
index 139174cc6d5e..000000000000
--- a/games-puzzle/world-of-goo-1.41-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DESCRIPTION=A puzzle game with a strong emphasis on physics
-EAPI=6
-HOMEPAGE=http://2dboy.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=2dboy-EULA
-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
-RESTRICT=fetch bindist strip
-SLOT=0
-SRC_URI=WorldOfGooSetup.1.41.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d36f9def39ebffb63a55d3f5deb8fdc
diff --git a/games-puzzle/world-of-goo-demo-1.41-r2 b/games-puzzle/world-of-goo-demo-1.41-r2
deleted file mode 100644
index caedc87a33c7..000000000000
--- a/games-puzzle/world-of-goo-demo-1.41-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install nofetch
-DESCRIPTION=A puzzle game with a strong emphasis on physics
-EAPI=6
-HOMEPAGE=http://2dboy.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=2dboy-EULA
-RDEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-mixer[vorbis] sys-libs/glibc virtual/opengl virtual/glu >=sys-devel/gcc-3.4
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=WorldOfGooDemo.1.41.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=13a42cddadb3853aa16c93d2d76b375c
diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
new file mode 100644
index 000000000000..881e359439be
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo/Manifest
@@ -0,0 +1,3 @@
+DIST WorldOfGooDemo.1.41.tar.gz 34729052 BLAKE2B 02700d337d3aa1daa436bd418131c7c01565244aab303eb239b59b0e437f1e40441b1879de48ade44e6b1c0842c043b4ef40e07809539db9fcacb37204c2092c SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a
+EBUILD world-of-goo-demo-1.41-r2.ebuild 1387 BLAKE2B 19d73315026e60bf1f64a926d3c27cc11e588f9f351ce0e5660e6f4790ca32ddf33bb4abbcdbb86cd808343172be204e8f34ca60d4319175699c92c48ed97b50 SHA512 1a46f38c0ca78ccb05df9468c75bb9bab3b81ec51de3b72efda63da1220e4d4b17de069ed13065a0822d3891ab2da13c9d91788be3ad759c3ffc085f1d8392b6
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
new file mode 100644
index 000000000000..6e16ab61c1cd
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+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="/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}*
+
+ 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
+ HTML_DOCS="readme.html" einstalldocs
+}
diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
new file mode 100644
index 000000000000..9e80b891e04d
--- /dev/null
+++ b/games-puzzle/world-of-goo/Manifest
@@ -0,0 +1,3 @@
+DIST WorldOfGooSetup.1.41.tar.gz 66428181 BLAKE2B 476c05f0b3f78fa952728b9f7b5b95942e7f3e57dde4842144ccaa28c9ad2d2c264b1a2277ba5a1f3edf25cb812c72a0380b0d26b2bc99dd9a77116badcf5477 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396
+EBUILD world-of-goo-1.41-r2.ebuild 1472 BLAKE2B 4464e577d888be78e0fdabc8a9026724ad3f249bb2b90b7e4d9369e9b84a051be4725b6d488f4cf880b56f44681e5115f64e7dcc7b56782bf1e9e1044d0b2877 SHA512 ee612026cb24862f5ebba0e69a5089dcbabc5a4dae3f9efdf04b65188e708cb06e779c91c67a3accdf1a9a3c36b75547ea7f491dbb9d02724a6c84171f725fe7
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo/metadata.xml b/games-puzzle/world-of-goo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/world-of-goo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
new file mode 100644
index 000000000000..51f7f12ff569
--- /dev/null
+++ b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils # eutils for make_wrapper()
+
+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"
+RESTRICT="fetch bindist 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"
+
+S="${WORKDIR}/${MY_PN}"
+dir="/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 your DISTDIR directory."
+ else
+ elog "Download ${A} from ${HOMEPAGE}"
+ elog "and place it in your DISTDIR directory."
+ fi
+}
+
+src_install() {
+ exeinto "${dir}"
+ doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)}
+
+ 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
+ docinto html
+ dodoc readme.html
+}
diff --git a/games-puzzle/xblockout-1.1.6-r1 b/games-puzzle/xblockout-1.1.6-r1
deleted file mode 100644
index 4bb9bd96ad54..000000000000
--- a/games-puzzle/xblockout-1.1.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=X Window block dropping game in 3 Dimension
-EAPI=6
-HOMEPAGE=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-1.1.6.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a53a5d54fdb6f05464d0137f8d246aa2
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
new file mode 100644
index 000000000000..668a714270f9
--- /dev/null
+++ b/games-puzzle/xblockout/Manifest
@@ -0,0 +1,4 @@
+AUX xblockout-1.1.6-font.patch 1535 BLAKE2B 5ae0fffb0d04c69123bb0c1098bcbaf2053551530d9f7f6f001ae693d4826148d16f4793009c83b286a7c9df8669e507145e39f2c7aa6bf4638ddc1e97bab15b SHA512 f74245e8d97859fa692c82f69657a77d31e84f249b5d29e23b16f072d596e85a51800f4af4578ba194151a6d0c5b577bad7a40a95d0477f31d2ae8147bec585d
+DIST xbl-1.1.6.tar.gz 136504 BLAKE2B 253c4a950def66abaef3547596b569542ea0dcd180fa5e81a7cb581d9dc23b2038b39c1059ddd36cfc89275ef3fb2a25d174ada71ab1818e408818613559a33e SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0
+EBUILD xblockout-1.1.6-r1.ebuild 1216 BLAKE2B 1fbed71ba49c6a5851d9934faec162692cd77250d9bf61e42cb663685b56df055ced6c7f3d0fdc776c7e8ce4595ee396a435b063f6488f1c2c848906bbab36b2 SHA512 ddc6e41fbe580d99d48dbe69407720b5dd50fdaca6ad9fe149b5d8c141373b880654f2a7dac98e1e143adaa15845eddfde52349b87128613b647253048dc7134
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..1e007494e93e
--- /dev/null
+++ b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
@@ -0,0 +1,46 @@
+--- a/initmenu.c.old 2008-10-27 23:23:43.000000000 +0100
++++ b/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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/xblockout/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..71a44a6d8c39
--- /dev/null
+++ b/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools desktop flag-o-matic
+
+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 ~x86"
+IUSE=""
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/xbl-${PV}"
+
+src_prepare() {
+ default
+ eapply "${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"
+
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_compile() {
+ emake \
+ USE_SETGID= \
+ SCOREDIR="/usr/share/${PN}" \
+ RESOURCEDIR="/usr/share/${PN}" \
+ LDOPTIONS="${LDFLAGS}"
+}
+
+src_install() {
+ newbin bl xbl
+
+ insinto /usr/share/${PN}
+ newins Xbl.ad Xbl
+
+ newman xbl.man xbl.6
+ dodoc README xbl-README
+ HTML_DOCS="*.html *.gif" einstalldocs
+
+ newicon xbl-game.gif ${PN}.gif
+ make_desktop_entry xbl XBlockOut /usr/share/pixmaps/${PN}.gif
+}
diff --git a/games-puzzle/xbomb-2.2b b/games-puzzle/xbomb-2.2b
deleted file mode 100644
index 2f7368638edb..000000000000
--- a/games-puzzle/xbomb-2.2b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libXaw
-DESCRIPTION=Minesweeper clone with hexagonal, rectangular and triangular grid
-EAPI=5
-HOMEPAGE=http://www.gedanken.org.uk/software/xbomb/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/libXaw games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.gedanken.org.uk/software/xbomb/download/xbomb-2.2b.tgz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af32cb52e8d92475e8b6d15fd12c5459
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
new file mode 100644
index 000000000000..bc88916ffec3
--- /dev/null
+++ b/games-puzzle/xbomb/Manifest
@@ -0,0 +1,5 @@
+AUX xbomb-2.2b-DESTDIR.patch 871 BLAKE2B 4a6841b33ce4cbfdf17507d8fe5001d82fa4de026693eb898b915c22b9779bf83e279a3add9fdba67ae8614cd42df5fc81f686016437184e7d529290fd2ce2fd SHA512 98135eb5927b4bd92bc1a6ac6fb86bf8c1f7387949c1ac419e3f78cc84184e1c8b2b8b6fb5d23089b6fdd8a7a8dca05733821180d1316d30edc53f487a16e4c8
+AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B 2b22fe367177a8551fc692e97de539be366da981c79f31646bfc8dc5cf98bafdc916d9d89af3e44773e1a4c54bb35700cee1d093dee0233a639a6a6c4849b814 SHA512 21c7d9c57ec972ae49dd20a94041378a53dcd310685c8c3755571243d51b0b0e1664b30c0ce9013ad289d8589e7e219bafdcbcc31503ccc25052f2c3dbc2df82
+DIST xbomb-2.2b.tgz 24774 BLAKE2B 77a447af42ecd47654b826d884e7c31e98e0bdfb06d1574401064fe79dc42c961fc95a96dd6509871d78589e06eb54f975a292a5371c16520e125b75aae8b637 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1
+EBUILD xbomb-2.2b.ebuild 1001 BLAKE2B 0d0a6b3342161c22217f9cf868f8854002aa13bf7666f2e78b45ea02908a4cf6fe03b5594d303f0b9a8667045e2bffdf3447649032ee0afe08bb1278af44d15c SHA512 05d114f256b1a641714848d96df47faeaa64396e670a95d376ca32eea4b0c2f59d6246454a23bf301aa010938bde8af758fe3c90a3f6b2ee4a354bd72fe65e6a
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
new file mode 100644
index 000000000000..2ee8edd4ec91
--- /dev/null
+++ b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
@@ -0,0 +1,34 @@
+*** xbomb-2.1/Makefile 1996-01-20 16:02:46.000000000 -0500
+--- xbomb-2.1.new/Makefile
+***************
+*** 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.2b-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
new file mode 100644
index 000000000000..a320b0900c53
--- /dev/null
+++ b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.old
++++ Makefile
+@@ -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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/xbomb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b.ebuild
new file mode 100644
index 000000000000..488c4de4bd50
--- /dev/null
+++ b/games-puzzle/xbomb/xbomb-2.2b.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
+HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
+SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~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 '/^CC=/d' \
+ -e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
+ -e "s:/usr/bin:${GAMES_BINDIR}:" \
+ Makefile || die
+ sed -i \
+ -e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \
+ hiscore.c || die
+}
+
+src_install() {
+ default
+ 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
+ make_desktop_entry xbomb XBomb
+ prepgamesdirs
+}
diff --git a/games-puzzle/xlogical-1.0.7 b/games-puzzle/xlogical-1.0.7
deleted file mode 100644
index 6aceda07f538..000000000000
--- a/games-puzzle/xlogical-1.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] alt_gfx? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=SDL logical clone
-EAPI=5
-HOMEPAGE=http://changeling.ixionstudios.com/xlogical/
-IUSE=alt_gfx
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] games-misc/games-envd
-SLOT=0
-SRC_URI=http://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-7.tar.bz2 alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=718fa8c0171fb160d415ea4000fac010
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
new file mode 100644
index 000000000000..342d46e88b80
--- /dev/null
+++ b/games-puzzle/xlogical/Manifest
@@ -0,0 +1,6 @@
+AUX xlogical-1.0.7-gcc41.patch 1121 BLAKE2B 6e1f94c128cfc771deca86da18eb924e11b611e54c4150ed39cb53aeda46257de21ff6bdfd9d1688dd6aa559900089d457107ea78eb347466792c353aacbb602 SHA512 eb98b351ae14f9c3f4f5783ef48633957c21ddb3debd7ba00e9c651be395cb11a30b6109bd26fef12845111ff320c71ef2b43bee6ec1b8748ac6ac34dd8cb87b
+AUX xlogical-1.0.7-gcc43.patch 915 BLAKE2B c99de173bbd18bec630a8c3605ad77a6d56d3e4a4bb44fab011bb6f10a6140a4d843c7768557728deddb1edddbc6abc66445f1797bf8ca5d6b108f29598374ad SHA512 59cc10ec999aff4c8f5630e534ea834ff9a8b2d27e45752abdc46df812841e40de27ca406a45278f28a3a609c021c7753a6980edfaffd3c79b1bb7cf97336209
+DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d
+DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42
+EBUILD xlogical-1.0.7.ebuild 1458 BLAKE2B 8b2e9ff71f5bfca2863c622d446d5345bf702d3b4596be2344048b105442fe32e6b1b0892b47254b295464a2d4b6eadfa5e1f4de60ee803a6000fa3bf60eee29 SHA512 9ab4b8547c0afc8264c875906b8d6db776691534fe3ba49770ee5d86083885f1fc55737a25eb6f4e86b58cca8e6f910edc7b0b01c062f21e104ee91d28034d11
+MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee
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..e2b7cea129a5
--- /dev/null
+++ b/games-puzzle/xlogical/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+<longdescription lang="en">
+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..ea6857857a7d
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-1.22-r1 b/games-puzzle/xpired-1.22-r1
deleted file mode 100644
index 44d7e3ee73bd..000000000000
--- a/games-puzzle/xpired-1.22-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
-DESCRIPTION=A Sokoban-styled puzzle game with lots more action
-EAPI=6
-HOMEPAGE=http://xpired.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
-SLOT=0
-SRC_URI=mirror://sourceforge/xpired/xpired-1.22-linux_source.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097
-_md5_=ea1131c8817277602d817515c4d45821
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
new file mode 100644
index 000000000000..613f64a1d90e
--- /dev/null
+++ b/games-puzzle/xpired/Manifest
@@ -0,0 +1,4 @@
+AUX xpired-1.22-ldflags.patch 868 BLAKE2B 8230de4bfae81985ed37abb2c3810df680c64957411c0fa77c83d60581a373f2c85674bcbb5d4fd6070108981d76f6f2802fc5b191cdd8aa606f3f21df48d791 SHA512 81987d60466c459a98ac03b8f4bdf8da7c6004a716a83051b58ec35657ab3a93672305ff9a8edcf9e056784919c9ea235f81c71176bf6d4b75d5dabc72b1b7f9
+DIST xpired-1.22-linux_source.tar.gz 478593 BLAKE2B 54ee871017e39bd599a1e5e13df282d309d4ef9c91c7bf1e6eab31cd83d5f2bb4d31d9c08df091796d9f61f55eb0d54e9745b8162f9e9116eeac98d7c49b0f9d SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10
+EBUILD xpired-1.22-r1.ebuild 867 BLAKE2B 7b8889364640262e543f705428f4032bd8e0906f7e59bc0027b9de59cfaa2fd55584159e659bb5a5f6be24ed5e800e764ef15118eb0fdafffed14dd0f09a2225 SHA512 f656f9466e29e94ea267c5f7e996d6732d7076fe7fb1779a2be0551eac0f49b57950bcdf13240872ee871cf9b9655542002c6b3742058abc3f3f70adb28bb719
+MISC metadata.xml 329 BLAKE2B 7c524c47d197b0205ef4fb908c0546932d08eedaf250445b796b7da70d100dd72bdbd82b6ef1cc551622046af5c0ee6d7b53db64bd6cfc14389a7d739f44d9d8 SHA512 457c612953cc30db620e0315c75ecb20619ee537692e0a871d0c60e8cedaa547bc9e50eb922bf995eb68bde526c641e901d3bfc9d88a097263f5bd90c68f257e
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..bcec96319239
--- /dev/null
+++ b/games-puzzle/xpired/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">xpired</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/xpired/xpired-1.22-r1.ebuild b/games-puzzle/xpired/xpired-1.22-r1.ebuild
new file mode 100644
index 000000000000..8ea6b7243bf8
--- /dev/null
+++ b/games-puzzle/xpired/xpired-1.22-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop
+
+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 ~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 \
+ SHARE_PREFIX=/usr/share/xpired
+}
+
+src_install() {
+ emake \
+ PREFIX="${D}/usr" \
+ SHARE_PREFIX="${D}/usr/share/${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"
+
+ einstalldocs
+}
diff --git a/games-puzzle/xtris-1.15-r1 b/games-puzzle/xtris-1.15-r1
deleted file mode 100644
index da282142112d..000000000000
--- a/games-puzzle/xtris-1.15-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11
-DESCRIPTION=A networked Tetris-like game
-EAPI=5
-HOMEPAGE=http://www.iagora.com/~espel/xtris/xtris.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.iagora.com/~espel/xtris/xtris-1.15.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6fc9261a1dd1675b7307c1a12bc8a65a
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
new file mode 100644
index 000000000000..38c01d834c8a
--- /dev/null
+++ b/games-puzzle/xtris/Manifest
@@ -0,0 +1,4 @@
+AUX xtris.xpm 1403 BLAKE2B dc765e15dfc0cc49837cfbadfa3fe0ad33aef0e88921e906e89f9af8f778c700508b5a451d835d77bca64094d5a0b6e7f1bce941f6a42b6bf00e089fea7167b7 SHA512 1956a02d844b517df41a5cc82e236a04ec9609849c4d7b097af5bbb4b03c1e16bc8d6f0491c6cb1c8920bec578beab07381b15cee468079c5e474c80c07d30a3
+DIST xtris-1.15.tar.gz 52130 BLAKE2B 3f39f4208b678be85064fd08cbaabc7a170f559e115d59a8ba50524520b106b6fba5b7a4af7424154032d6b83365bfbb932a3424b6ac03ab32aac49c7afbdb67 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791
+EBUILD xtris-1.15-r1.ebuild 751 BLAKE2B be3f924189ee3375f3e5939821f1274369cfe64cbab77a83d212e201c7a4a7967ec0c024b3016b77d551419d86d6a4514ec33a3352693e03cd5ca9e30fbcefd3 SHA512 891464e2e0e152eaf7461452be8591a68ec3daa6b5b68da3778fdf534bccb183f75d3c048127dadc3cf318ee960e68fb2c6d44b770e132e6a7861aab275f3fd2
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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..78274e0fa550
--- /dev/null
+++ b/games-puzzle/xtris/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/xtris/xtris-1.15-r1.ebuild b/games-puzzle/xtris/xtris-1.15-r1.ebuild
new file mode 100644
index 000000000000..1c863a9b1d17
--- /dev/null
+++ b/games-puzzle/xtris/xtris-1.15-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit desktop toolchain-funcs
+
+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 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ emake \
+ CC=$(tc-getCC) \
+ BINDIR=/usr/bin \
+ MANDIR=/usr/share/man \
+ CFLAGS="${CFLAGS}" \
+ EXTRALIBS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin xtris xtserv xtbot
+ doicon "${FILESDIR}"/${PN}.xpm
+ make_desktop_entry ${PN} xtris ${PN}
+ doman xtris.6 xtserv.6 xtbot.6
+ dodoc ChangeLog PROTOCOL README
+}
diff --git a/games-puzzle/xwelltris-1.0.1 b/games-puzzle/xwelltris-1.0.1
deleted file mode 100644
index e7965ff8bb89..000000000000
--- a/games-puzzle/xwelltris-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif]
-DESCRIPTION=2.5D tetris like game
-EAPI=5
-HOMEPAGE=http://xnc.jinr.ru/xwelltris/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] games-misc/games-envd
-SLOT=0
-SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1d06beb0fa232ed7b760c7d6376c816
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
new file mode 100644
index 000000000000..08340532ade4
--- /dev/null
+++ b/games-puzzle/xwelltris/Manifest
@@ -0,0 +1,3 @@
+DIST xwelltris-1.0.1.src.tar.gz 422822 BLAKE2B c6eda0d294e79c5715bcaa593776ecfb0cdc734386fc4e9a6825dd090340c2744a251ad1e753421865151928608e4aebdd5050b0091a0799b7d1da5a0b3bdd60 SHA512 6b1080c6e6d1b579c441d1f42bb6454dafed62a63790d5798e83cf137db7ff2ddc07db7e89b34402a5249770697cc3f8ad5e6222266142c7b43f6936828f2536
+EBUILD xwelltris-1.0.1.ebuild 974 BLAKE2B b76648e2ae47cd20b40c8b76f5a64b40afa8c6733ecdd9c165a5a835e324610e73d838c4e781fcda77a0c1acdca82247864ff6d52ca6984833a212c9967ee12e SHA512 cfc4027ef6409246fcf2d477e6a0653f470c24cb74f2409cf3c43470eabc91f1db4e5f1a711538814a04a2587eabd92f3ad8590c922b622987596640dc975e52
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xwelltris/metadata.xml b/games-puzzle/xwelltris/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-puzzle/xwelltris/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
new file mode 100644
index 000000000000..eb2e02cbf21d
--- /dev/null
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]
+ media-libs/sdl-image[gif]"
+RDEPEND=${DEPEND}
+
+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-0.12.2 b/games-puzzle/xye-0.12.2
deleted file mode 100644
index c2829486d95a..000000000000
--- a/games-puzzle/xye-0.12.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Free version of the classic game Kye
-EAPI=6
-HOMEPAGE=http://xye.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png]
-SLOT=0
-SRC_URI=mirror://sourceforge/xye/xye-0.12.2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=252cb7f9f27948aa128d256557dbf586
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
new file mode 100644
index 000000000000..73ecb2a9d92c
--- /dev/null
+++ b/games-puzzle/xye/Manifest
@@ -0,0 +1,6 @@
+AUX xye-0.12.2-fix-buildsystem.patch 1020 BLAKE2B 6408b6df99db5ca103183a7cee8905f7cc1c851d7e2f00e60334b806517841eab0896028e0a178fcfdf42e0bd672a8594c47caae2ac629d915ceff9af883dab6 SHA512 d4b08db4eb5ee4b3e1e98e9faeda87aafe17ae444cb0a8400c9206c2871b56801040bddeffb13dfed0170094d48ffac593209b2ad69896f8993521d0b0929cf1
+AUX xye-0.12.2-fix-c++14.patch 502 BLAKE2B e3116515757af9e84d5bac340947df1e88e768058a3dfb65e0894388ad8e0fa98f63e6c16314e35b288fff8639d8f46972999c031e077d3417218c09bc9c00a7 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af
+AUX xye-0.12.2-fix-desktop-file.patch 414 BLAKE2B 3d4f87e6db2144407eaf5161d73184d23eabd4742dbc1f68e59d8932257491eb429d68d12d910ee311fdbafecd4c118a6ad9f9b3b225157384035868ced3ee48 SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e
+DIST xye-0.12.2.tar.gz 2860290 BLAKE2B 426cd4afb84c0de8bdbafe9b63d0da2f686593449b4577ae0eb77e38364bcac166cb9bf4a3a41f7d15a0a1745bc9574f959e0429998c00ad78a6fe40c49093f1 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
+EBUILD xye-0.12.2.ebuild 932 BLAKE2B c77382cd8764e3425d8c257e9f36f3d91af9b8df27ef71c9bfff3102c739c7e1e907d7fff57da861025d704afac45086be9b90d4ab45b45ac6078f98e013ae65 SHA512 9b0c88bc789e73608ff3fb297c04a83cb1eca221130a3ca53148f170b187ac7f87b86181233535e8955ef0f944b5db5e7660f424d501ff608328fe83ba3322d7
+MISC metadata.xml 326 BLAKE2B 8f368cb2e89ca46600917931c95285943f8ededa8a3c1c6fe1602a11c68a00f53429be467d28a49cf9a0989cb6b6f0cfa70ded461f2b6f9adeb86e8c05a49e52 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch
new file mode 100644
index 000000000000..c96d42e34681
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch
@@ -0,0 +1,45 @@
+Fix build system to respect correct paths
+and install files in correct paths.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,13 +4,11 @@
+
+
+ bin_PROGRAMS = xye
+-xye_LDFLAGS =
+
++doc_DATA = NEWS ChangeLog AUTHORS
++html_DATA = ReadMe.html
+
+-docedir = $(datadir)/@PACKAGE@
+-doce_DATA = ReadMe.html NEWS ChangeLog AUTHORS
+-
+-levelsdir= $(datadir)/@PACKAGE@/levels
++levelsdir= $(datadir)/$(PACKAGE)/levels
+ levels_DATA = levels/5levels.xye \
+ levels/levels.xye \
+ levels/logo.xye \
+@@ -25,12 +23,10 @@
+ levels/xyester.xye \
+ levels/SuperJustin.xye
+
+-resdir= $(datadir)/@PACKAGE@/res
++resdir= $(datadir)/$(PACKAGE)/res
+ res_DATA = res/default.xml \
+ res/xye.png \
+ res/xye_luminosity.png \
+-res/DejaVuSans.ttf \
+-res/DejaVuSans-Bold.ttf \
+ res/fon.bmp \
+ res/fon_bold.bmp \
+ res/clean40.xml \
+@@ -103,7 +99,7 @@
+ src/skins.cpp \
+ src/skins.h
+
+-EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA} ${doce_DATA}
++EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA}
+
+ DEFS=@data_path_flag@
+
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch
new file mode 100644
index 000000000000..f2083b871a82
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch
@@ -0,0 +1,14 @@
+Add explicit cast to silence C++14 -Wnarrowing conversion warnings.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600298
+
+--- a/src/xsb_level.cpp
++++ b/src/xsb_level.cpp
+@@ -784,7 +784,7 @@
+
+ bool FromXyeDFS(int* mem, unsigned char x, unsigned char y)
+ {
+- static const unsigned char dx[4] = {0,0,-1,1}, dy[4] = {-1,1,0,0};
++ static const unsigned char dx[4] = {0,0,(unsigned char)-1,1}, dy[4] = {(unsigned char)-1,1,0,0};
+ int &res = mem[y*XYE_HORZ+x];
+ if( res==0)
+ {
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
new file mode 100644
index 000000000000..99558ef28732
--- /dev/null
+++ b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
@@ -0,0 +1,18 @@
+Fix .desktop file to comply with FDO specifications.
+
+--- a/xye.desktop
++++ b/xye.desktop
+@@ -4,11 +4,11 @@
+ Encoding=UTF-8
+ Exec=xye
+ Type=Application
+-Categories=Application;Game;PuzzleGame
++Categories=Game
+ Name=Xye
+ GenericName=Xye
+ Comment=Solve puzzles and action challenges in order to get all the gems in the room.
+ Terminal=false
+ StartupNotify=false
+-Icon=xye.png
++Icon=xye
+ MimeType=application/xye-xml
diff --git a/games-puzzle/xye/metadata.xml b/games-puzzle/xye/metadata.xml
new file mode 100644
index 000000000000..136b7508becd
--- /dev/null
+++ b/games-puzzle/xye/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">xye</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
new file mode 100644
index 000000000000..ed474f123243
--- /dev/null
+++ b/games-puzzle/xye/xye-0.12.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+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=""
+
+RDEPEND="
+ media-fonts/dejavu
+ media-libs/libsdl[video]
+ media-libs/sdl-ttf
+ media-libs/sdl-image[png]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch
+ "${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch
+ "${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch
+)
+
+src_prepare() {
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ # create symlinks for previously bundled fonts
+ dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf
+ dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf
+}
diff --git a/games-puzzle/zaz-1.0.0-r1 b/games-puzzle/zaz-1.0.0-r1
deleted file mode 100644
index f984cb2715f0..000000000000
--- a/games-puzzle/zaz-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=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 virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A puzzle game where the player has to arrange balls in triplets
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/zaz/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 GPL-3+ CC-BY-SA-3.0 OFL
-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
-SLOT=0
-SRC_URI=mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=94619645d32bc3a694562f2fde294d4b
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
new file mode 100644
index 000000000000..a1d94c298b34
--- /dev/null
+++ b/games-puzzle/zaz/Manifest
@@ -0,0 +1,4 @@
+AUX zaz-1.0.0-build.patch 402 BLAKE2B 1f34e5961fee645ba6c55239d0795f7988bc2b3e0ee1da2ca3033f68d145d94ecc3894072bb8ac38802b6fd5cc3d8011ae5bde545dafd3b4133d73381b95a1f1 SHA512 4c7b8659407295b1a2003ecfe74f57dad73964666920a1f25fab87518fc6fb4f74285f051bf5df81c205faea5054908fb6da8e427d79ed4cd91f82212be2daa6
+DIST zaz-1.0.0.tar.bz2 25170073 BLAKE2B 6502b880a024dec356e7a1f8dfd29f7353d5de07e08a2de7480db32fec5af17adb9210e4f0b3c17f2b27a6977ae3647d7458d5d21dacff66c2085801fda45985 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb
+EBUILD zaz-1.0.0-r1.ebuild 1104 BLAKE2B b3a625b95df5abc7de588d49b78da79da8fa5df4272026e115fa79f6c611c458cf8887afe0d40073bdde16c5e20ececde1ea819e9b5ca3b86cac9ec82965f3f6 SHA512 6cd2843a7fda0ec2ff34c6618ba924ab30fd3ad0bf84bd6c095f50857a7e7a2805e1a648f2c0add6fb77d96905bdfc6b2fecd6ef0334f031efde3757feb898ec
+MISC metadata.xml 326 BLAKE2B 962f166dc4d93ffdf146a76d3e45bb96284a47bb845755e1f7450d2de5ad662abb1a2d63c21ad4e23e5e8cc16a8a2d9fa36503049262205666168c5486d86ff6 SHA512 c96c9c7a3ff21d49bcaf2418c5c21e2f83070d2d148d8a8faaeb790ca3dbc522ecab9d28a1df884e5e47543fb8067ce538e6ba62c04da8f43e6f6241cb0134ba
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..58fcbb5f8ac8
--- /dev/null
+++ b/games-puzzle/zaz/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">zaz</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..1ea20bafcd65
--- /dev/null
+++ b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
+HOMEPAGE="https://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() {
+ default
+ local x=/usr/share/gettext/po/Makefile.in.in
+ [[ -e $x ]] && cp -f $x po/ #336119
+
+ eapply "${FILESDIR}"/${P}-build.patch
+ eautoreconf
+}
+
+src_configure() {
+ append-libs -lvorbis
+ append-cflags $(pkg-config sdl --cflags)
+ append-cxxflags $(pkg-config sdl --cflags)
+ econf \
+ --with-applicationdir=/usr/share/applications \
+ --with-icondir=/usr/share/pixmaps \
+ --localedir=/usr/share/locale \
+ $(use_enable nls)
+}