gentoo resync : 03.03.2021

19 files changed, 388 insertions, 252 deletions

diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 6711693da7ec..ccf072202c6a 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 2d03274ed51a..0ab84482a690 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,10 +1,7 @@
-AUX devilutionx-1.1.0-no_bundled_font.patch 1772 BLAKE2B 29c4b17ade1e742ef1dd5137b100df027381f9865f0ddf2295470a5fdcf53e1a2aaa4850f3ea43d05af81546b32ab037fbf226c302bf93fe4ab53396ab81bd27 SHA512 7f1a5ff1b5f0d9d0ea5c2374413cf80424583e46529633272ea903c794a2f5b6f091471a493772f85d13c53a5a8aaf9cf20e8fd165895eb486a7f6a487fecf44
-DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
+AUX devilutionx-1.1.0-no_bundled_font.patch 2134 BLAKE2B 90ab8f267f0a1cb337b3d5432e757931b434eb6ee3915270253daae061400c1425b004f23e3f528daa82ee591d1d7acf7013a2657c01bf387b30976828ec66c8 SHA512 2a9fa26bff1776fc7a8617dd6467b18fea94b0c2b8a651c74cf1dd9f29eff8ea09b4fa188e215264ff622a9aebb597c59299fa489f19328712ce3ec9073a1127
 DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
 DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
-EBUILD devilutionx-1.0.1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
 EBUILD devilutionx-1.0.3.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
-EBUILD devilutionx-1.1.0-r1.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
-EBUILD devilutionx-1.1.0.ebuild 1417 BLAKE2B caeb8713f216959fc44550fe5a1c78d139634b7c2a9188c2fe546247adcf0602ea7b6a4e3bf3c959d4814f4a604e18354db972bda8a23d7a0f9574fba56f21f5 SHA512 cf122f1c69585e733db8d38c8cad28bead978920c5fc3369fd3e8455ffecdffda49d8725a29a2ec3d325fb8a4331d1ec9a2317ff7b3cb12a6508c37deda79ab3
-EBUILD devilutionx-9999.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
-MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
+EBUILD devilutionx-1.1.0-r2.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
+EBUILD devilutionx-9999.ebuild 1584 BLAKE2B 31cfbd6270b2c29c5f8afb973ff1b014746f8fe2cf09a037509ff9109afa83d9a67251a31da19b02efccc807728726eb6e7f83c37052a0799cab223ab136e396 SHA512 2bfffd043da7b982126751e19b12412078118a6860bc12e447ffd4bfb57abb7d97b27dd0a8f748de6e8d17fdbcb65e3aa54035db52262947d3f74303fd6fdc56
+MISC metadata.xml 514 BLAKE2B 4727c5e4a5c51860b85e4e4eb8edb531294617a740d1d3deb246f6a35fe065f050fead6b19ceaf4580d51e692fef138a02fa18cd21f9cb749701ac7fd53fd5ee SHA512 3f67564be4d4944f8e21e759f4fce6f9f13887538b903f644f5d8549cfa8349b7827da2f7b3d46210f3f712f4c6e8041484100b901aaafa464a380e718be929e
diff --git a/games-engines/devilutionx/devilutionx-1.0.1.ebuild b/games-engines/devilutionx/devilutionx-1.0.1.ebuild
deleted file mode 100644
index b363bc7378ac..000000000000
--- a/games-engines/devilutionx/devilutionx-1.0.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Sometimes build with ninja fails.
-# Please check occasionally if we can revert back to ninja.
-# Latest known issue:
-#   https://github.com/diasurgical/devilutionX/issues/490
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake desktop
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
-else
-	SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/devilutionX-${PV}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-
-IUSE="debug lto"
-
-RDEPEND="
-	dev-libs/libsodium
-	media-fonts/sil-charis
-	media-libs/libsdl2[haptic]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed "/PROJECT_VERSION/s|@PROJECT_VERSION@|${PV}|" \
-		-i SourceS/config.h.in || die
-	sed 's/CharisSILB.ttf/CharisSIL-B.ttf/g' \
-		-i SourceX/DiabloUI/fonts.h || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DASAN="OFF"
-		-DDEBUG="$(usex debug)"
-		-DDIST="ON"
-		-DFASTER="OFF"
-		-DLTO="$(usex lto)"
-		-DUBSAN="OFF"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/${PN}"
-
-	newicon -s 32 Packaging/resources/Diablo_32.png ${PN}.png
-	newicon -s 48 Packaging/resources/Diablo_48.png ${PN}.png
-	make_desktop_entry ${PN} "Diablo devolved" "/usr/share/icons/hicolor/48x48/apps/devilutionx.png"
-}
-
-pkg_postinst() {
-	einfo "In order to play the game you need to install the file"
-	einfo "  diabdat.mpq"
-	einfo "from the original game CD into the following directory:"
-	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
-	einfo "and make sure it's writeable (chmod u+w)."
-}
diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
index 913e1f40eef5..913e1f40eef5 100644
--- a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.1.0-r2.ebuild
diff --git a/games-engines/devilutionx/devilutionx-1.1.0.ebuild b/games-engines/devilutionx/devilutionx-1.1.0.ebuild
deleted file mode 100644
index 3966e9a6b14a..000000000000
--- a/games-engines/devilutionx/devilutionx-1.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Sometimes build with ninja fails.
-# Please check occasionally if we can revert back to ninja.
-# Latest known issue:
-#
-#CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake desktop
-
-DESCRIPTION="Diablo engine for modern operating systems"
-HOMEPAGE="https://github.com/diasurgical/devilutionX"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
-else
-	SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/devilutionX-${PV}"
-fi
-
-LICENSE="public-domain"
-SLOT="0"
-
-IUSE="debug lto"
-
-RDEPEND="
-	dev-libs/libsodium
-	media-libs/libsdl2[haptic]
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DASAN="OFF"
-		-DDEBUG="$(usex debug)"
-		-DDISABLE_LTO="$(usex !lto)"
-		-DDIST="ON"
-		-DUBSAN="OFF"
-	)
-	cmake_src_configure
-
-	# Build system still doesn't reliably set release version in the build
-	sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
-}
-
-pkg_postinst() {
-	einfo "In order to play the game you need to install the file"
-	einfo "  diabdat.mpq"
-	einfo "from the original game CD into the following directory:"
-	einfo "  \${HOME}/.local/share/diasurgical/devilution/"
-}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 913e1f40eef5..5c1340040ddd 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -25,7 +25,7 @@ fi
 LICENSE="public-domain"
 SLOT="0"
 
-IUSE="debug lto"
+IUSE="debug +hellfire lto"
 
 RDEPEND="
 	dev-libs/libsodium
@@ -50,11 +50,15 @@ src_configure() {
 		-DDISABLE_LTO="$(usex !lto)"
 		-DDIST="ON"
 		-DUBSAN="OFF"
+		-DHELLFIRE="$(usex hellfire)"
 	)
 	cmake_src_configure
 
-	# Build system still doesn't reliably set release version in the build
-	sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
+	if [[ "${PV}" != 9999 ]] ; then
+		# Build system still doesn't reliably set release version
+		sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" \
+			|| die
+	fi
 }
 
 pkg_postinst() {
diff --git a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
index 7944a8221d2d..69131b562c8c 100644
--- a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
+++ b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
@@ -38,6 +38,17 @@ https://bugs.gentoo.org/704508
  

      # -G DEB

      set(CPACK_PACKAGE_CONTACT "anders@jenbo.dk")

+--- devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
++++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
+@@ -69,7 +69,7 @@
+ #ifdef __linux__

+ 	if (!FileExists(ttf_font_path))

+ 	{

+-		ttf_font_path = "/usr/share/fonts/truetype/" TTF_FONT_NAME;

++		ttf_font_path = "/usr/share/fonts/" TTF_FONT_NAME;

+ 	}

+ #endif

+ 	font = TTF_OpenFont(ttf_font_path, 17);

 --- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
 +++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
 @@ -11,7 +11,7 @@
@@ -45,7 +56,7 @@ https://bugs.gentoo.org/704508
  

  #ifndef TTF_FONT_NAME

 -#define TTF_FONT_NAME "CharisSILB.ttf"

-+#define TTF_FONT_NAME "CharisSIL-B.ttf"

++#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"

  #endif

  

  namespace dvl {

diff --git a/games-engines/devilutionx/metadata.xml b/games-engines/devilutionx/metadata.xml
index 6f7209b5d36d..cb26cf9fd006 100644
--- a/games-engines/devilutionx/metadata.xml
+++ b/games-engines/devilutionx/metadata.xml
@@ -6,6 +6,7 @@
     <name>Lars Wendler</name>
   </maintainer>
   <use>
+    <flag name="hellfire">Enable support for Diablo Hellfire Expansion</flag>
     <flag name="lto">Build with link time optimization enabled</flag>
   </use>
   <upstream>
diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index 44fcb1627a6a..ba384f5fd5aa 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,4 +1,8 @@
 AUX gargoyle-2011.1-desktopfile.patch 1265 BLAKE2B 1fcbc1eded032ef11ef357e03c614067b18c21a268b4a3bebe4516a0ed196660292b311c9769d66853ffbbf2535808d014991bd42155919b913965223a4523dc SHA512 ed31bc711b52b5d231f130956d7d07cb9080747e6d53c85b379aa413582f8e4ffe825298bc86180ec7d1eadff5e6bffc6e49b3ff7a2607f612dcf81a6c1af22e
+AUX gargoyle-2019.1.1-QA-desktop.patch 575 BLAKE2B cce93727f67123cfe2b51003f11e1e61eff08cf3444aa7e07c174b332f5b060bc88f32ddc592ba9011ac19d8db264c883bbc0d559a8eb0107190c8ec1323cd24 SHA512 95a796e74edc7e40fe93359c069423c34129b4f21077d8af009eb9ba87427aeea92717fc20530ad3c2df657241f9e6a703c860c3c20d9025a4cb374a932ddb44
+AUX gargoyle-2019.1.1-fno-common.patch 4214 BLAKE2B b7ad557f850ef719dd946a33f8878307d6480fea4858cb4638e3ae3074730af157d8dca8ad744c19e22ad144d319bb3bc4f48adeecb08bb3e8455f8ad1130b86 SHA512 57edc11c3403930009ccfa7d583b1553bcc1f4cd5f9d5ae455c48dc24d9bf9b0328d4cb0dad59b1791fcd9d5dfadfe94fdad6af6d514abfd50de8e054edc5b36
 DIST gargoyle-2011.1-sources.zip 11291660 BLAKE2B aac47c41bd02e772c4717dfdeae8678105f72704641ea3df39105d412afe61734cc43f863b9556e38ea34287259df9f4d72ae93b3092d0372434b9f59f99483d SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f
+DIST gargoyle-2019.1.1.tar.gz 14700448 BLAKE2B b5e6d43349d01fe3484abc7779cfe3f1e94c3f6d647d338f8acbfe97d160da53b6297273e67f84eb0409623bbb4c0d8e3008d42b16a800d756be71a02538969a SHA512 0d1f2724bd6227142eb67c146557a992a6d62af172398c9961511ce5c080e517d1e12ca9bc6be27c1893e404026256257bf3a04cb05923723c0886f111adc4e3
 EBUILD gargoyle-2011.1-r1.ebuild 3017 BLAKE2B 12371e41ca78403ba1452da2a2c5dbac287912b8dbcd7afe524984b8442bb4cf5701f3073f27a64c5adadccfebfaaef9e543b883026b4eae4b185cc151eac6b7 SHA512 0daa2b0ef761c935d0e7d47fd42060ebf5db4331634bba8e1812a619d8fb31cdb0f2aec197cf7d30e1bff357ccd60888ac5107c7e9644f8ddeed9520a9b1ac9e
-MISC metadata.xml 329 BLAKE2B cc77f8750b5385687d311159b8edbf296284013812d4be5fe0076468c02758dcac19c77b5e6f38c4fbdac51f1c69b34cfd39d5d19235d18ec80076ceba98e2b3 SHA512 f6b913db889e2434a76d61526ff2cf3f719322991bb26891ac0383fcb8f11cf69cfc895a7cddd35074c2dee9a5ceac0fd8c0172542401d302ec39e9cac180b2c
+EBUILD gargoyle-2019.1.1.ebuild 2989 BLAKE2B 7712b3e50dacac2367255255c397efa8464926c11818d0107ccca1a508b5e5d042876d9c8d2b5945a72a5e4f991aec3489691a43a3e3177c2b6204cfe7062c93 SHA512 1e99de443969ce19b920a88d0804678413ff100b7e10b87820e11e342d9eb4ca8d4450c0f7b26c3ac78e311f485e7df927e1860117245a5ecf2f511890141366
+MISC metadata.xml 331 BLAKE2B d9f9a1a7d19b6e1a3dba3dffa81ac1c2518a4d942eaf65dc782f7dc7b0082adb67323ad4a07eb51bfe4f87f8f0ead0e1881d8b52dcd674979fb02b3e3c95fcb1 SHA512 3ef20c56a0d8d2faa87531fe4049f045840a629e3994fa4b90f6ba2c30629747a64fa372fc37ab77df74656823cc3e09ba809c6cc0c1e7c96ace482c75daf712
diff --git a/games-engines/gargoyle/files/gargoyle-2019.1.1-QA-desktop.patch b/games-engines/gargoyle/files/gargoyle-2019.1.1-QA-desktop.patch
new file mode 100644
index 000000000000..be4667e3908e
--- /dev/null
+++ b/games-engines/gargoyle/files/gargoyle-2019.1.1-QA-desktop.patch
@@ -0,0 +1,11 @@
+--- a/garglk/gargoyle.desktop
++++ b/garglk/gargoyle.desktop
+@@ -4,7 +4,7 @@ Type=Application
+ Name=Gargoyle
+ GenericName=Interactive Fiction interpreter
+ Comment=Interactive Fiction multi-interpreter that supports all major IF formats
+-Icon=gargoyle-house.png
++Icon=gargoyle-house
+ Exec=gargoyle
+ Categories=Game;
+ MimeType=application/x-adrift;application/x-advsys;application/x-agt;application/x-alan;application/x-blorb;application/x-glulx;application/x-hugo;application/x-level9;application/x-magscroll;application/x-tads;application/x-t3vm-image;application/x-zmachine;
diff --git a/games-engines/gargoyle/files/gargoyle-2019.1.1-fno-common.patch b/games-engines/gargoyle/files/gargoyle-2019.1.1-fno-common.patch
new file mode 100644
index 000000000000..50870a03e371
--- /dev/null
+++ b/games-engines/gargoyle/files/gargoyle-2019.1.1-fno-common.patch
@@ -0,0 +1,168 @@
+Author: Chris Spiegel <cspiegel@gmail.com>
+Taken from: https://sources.debian.org/patches/gargoyle-free/2019.1.1-2/gcc-10.patch/
+--- a/garglk/launcher.c
++++ b/garglk/launcher.c
+@@ -48,10 +48,10 @@
+ #define ID_GLUL (giblorb_make_id('G','L','U','L'))
+ 
+ #define MaxBuffer 1024
+-char tmp[MaxBuffer];
+-char terp[MaxBuffer];
+-char exe[MaxBuffer];
+-char flags[MaxBuffer];
++static char tmp[MaxBuffer];
++static char terp[MaxBuffer];
++static char exe[MaxBuffer];
++static char flags[MaxBuffer];
+ 
+ int runblorb(char *path, char *game)
+ {
+--- a/garglk/launchgtk.c
++++ b/garglk/launchgtk.c
+@@ -41,9 +41,9 @@ static const char * AppName = "Gargoyle " VERSION;
+ static const char * LaunchingTemplate = "%s/%s";
+ static const char * DirSeparator = "/";
+ 
+-char dir[MaxBuffer];
+-char buf[MaxBuffer];
+-char tmp[MaxBuffer];
++static char dir[MaxBuffer];
++static char buf[MaxBuffer];
++static char tmp[MaxBuffer];
+ 
+ struct filter
+ {
+--- a/garglk/launchmac.m
++++ b/garglk/launchmac.m
+@@ -40,13 +40,13 @@
+ static const char * LaunchingTemplate = "%s/%s";
+ static const char * DirSeparator = "/";
+ 
+-char dir[MaxBuffer];
+-char buf[MaxBuffer];
+-char tmp[MaxBuffer];
+-char etc[MaxBuffer];
++static char dir[MaxBuffer];
++static char buf[MaxBuffer];
++static char tmp[MaxBuffer];
++static char etc[MaxBuffer];
+ 
+ enum FILEFILTERS { FILTER_SAVE, FILTER_TEXT, FILTER_ALL };
+-char *winfilters[] =
++static char *winfilters[] =
+ {
+     "sav",
+     "txt",
+--- a/garglk/launchwin.c
++++ b/garglk/launchwin.c
+@@ -33,11 +33,11 @@ static const char * AppName = "Gargoyle " VERSION;
+ static const char * LaunchingTemplate = "\"%s\\%s.exe\" %s \"%s\"";
+ static const char * DirSeparator = "\\";
+ 
+-char dir[MaxBuffer];
+-char buf[MaxBuffer];
+-char tmp[MaxBuffer];
++static char dir[MaxBuffer];
++static char buf[MaxBuffer];
++static char tmp[MaxBuffer];
+ 
+-char filterlist[] =
++static char filterlist[] =
+ "All Games\0*.taf;*.agx;*.d$$;*.acd;*.a3c;*.asl;*.cas;*.ulx;*.hex;*.jacl;*.j2;*.gam;*.t3;*.z?;*.l9;*.sna;*.mag;*.dat;*.saga;*.blb;*.glb;*.zlb;*.blorb;*.gblorb;*.zblorb\0"
+ "Adrift Games (*.taf)\0*.taf\0"
+ "AdvSys Games (*.dat)\0*.dat\0"
+@@ -65,7 +65,7 @@ void winmsg(const char *msg)
+     MessageBox(NULL, msg, AppName, MB_ICONERROR);
+ }
+ 
+-int urldecode(char *decoded, unsigned int maxlen, const char *encoded)
++static int urldecode(char *decoded, unsigned int maxlen, const char *encoded)
+ {
+     unsigned int i;
+     int convert, ascii;
+
+--- a/terps/alan2/glkio.h
++++ b/terps/alan2/glkio.h
+@@ -11,8 +11,8 @@
+ 
+ #include "glk.h"
+ 
+-winid_t glkMainWin;
+-winid_t glkStatusWin;
++extern winid_t glkMainWin;
++extern winid_t glkStatusWin;
+ 
+ /* NB: this header must be included in any file which calls printf() */
+ 
+--- a/terps/alan2/main.c
++++ b/terps/alan2/main.c
+@@ -43,6 +43,9 @@
+ 
+ /* PUBLIC DATA */
+ 
++winid_t glkMainWin;
++winid_t glkStatusWin;
++
+ /* The Amachine memory */
+ Aword *memory;
+ static AcdHdr dummyHeader;	/* Dummy to use until memory allocated */
+--- a/terps/alan3/glkio.h
++++ b/terps/alan3/glkio.h
+@@ -11,8 +11,8 @@
+ 
+ #include "glk.h"
+ 
+-winid_t glkMainWin;
+-winid_t glkStatusWin;
++static winid_t glkMainWin;
++static winid_t glkStatusWin;
+ 
+ /* NB: this header must be included in any file which calls printf() */
+ 
+--- a/terps/alan3/output.h
++++ b/terps/alan3/output.h
+@@ -22,9 +22,9 @@ extern bool capitalize;
+ /* Log file */
+ #ifdef HAVE_GLK
+ #include "glk.h"
+-strid_t logFile;
++extern strid_t logFile;
+ #else
+-FILE *logFile;
++extern FILE *logFile;
+ #endif
+ 
+ 
+--- a/terps/alan3/term.h
++++ b/terps/alan3/term.h
+@@ -10,7 +10,7 @@
+ 
+ 
+ /* DATA */
+-bool onStatusLine;
++extern bool onStatusLine;
+ 
+ 
+ /* FUNCTIONS */
+--- a/terps/jacl/glk_startup.c
++++ b/terps/jacl/glk_startup.c
+@@ -31,7 +31,7 @@ extern short int	release;
+ glkunix_startup_t *arguments;
+ 
+ /* THE STREAM FOR OPENING UP THE ARCHIVE CONTAINING GRAPHICS AND SOUND */
+-strid_t				blorb_stream;
++extern strid_t				blorb_stream;
+ 
+ /* PROTOTYPE FOR NEEDED UTILITY FUNCTION */
+ void create_paths();
+--- a/terps/jacl/parser.c
++++ b/terps/jacl/parser.c
+@@ -62,7 +62,7 @@ char							*from_word;
+ 
+ int								object_expected = FALSE;
+ 
+-char							default_function[84];
++extern char							default_function[84];
+ char							object_name[84];
+ 
+ char				            base_function[84];
diff --git a/games-engines/gargoyle/gargoyle-2019.1.1.ebuild b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
new file mode 100644
index 000000000000..167f28407813
--- /dev/null
+++ b/games-engines/gargoyle/gargoyle-2019.1.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
+# interpreters are licensed under GPLv2, BSD or MIT license, except:
+#   - glulxe: custom license, see "terps/glulxle/README"
+#   - hugo: custom license, see "licenses/HUGO License.txt"
+# Since we don't compile or install any of the bundled fonts, their licenses
+# don't apply. (Fonts are installed through dependencies instead.)
+
+EAPI=7
+
+inherit desktop edos2unix flag-o-matic multiprocessing toolchain-funcs xdg
+
+DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
+HOMEPAGE="http://ccxvii.net/gargoyle/"
+SRC_URI="https://github.com/garglk/garglk/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT Hugo Glulxe"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-fonts/libertine
+	media-fonts/liberation-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	media-libs/sdl-mixer
+	media-libs/sdl-sound[modplug,mp3,vorbis]
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-util/ftjam
+	virtual/pkgconfig"
+
+S="${WORKDIR}/garglk-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-QA-desktop.patch
+)
+
+src_prepare() {
+	default
+	# Substitute custom CFLAGS/LDFLAGS.
+	sed -i -e \
+		"/^\s*OPTIM = / {
+			s/ \(-O.*\)\? ;/ ;/
+			a LINKFLAGS = ${LDFLAGS} ;
+			a SHRLINKFLAGS = ${LDFLAGS} ;
+		}" Jamrules || die
+
+	# Don't link against libraries used indirectly through SDL_sound.
+	sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules || die
+
+	# Convert garglk.ini to UNIX format.
+	edos2unix garglk/garglk.ini
+
+	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
+	append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996)
+}
+
+src_compile() {
+	# build system messes up flags and toolchain completely
+	# append flags to compiler commands to have consistent behavior
+	jam \
+		-sAR="$(tc-getAR) cru" \
+		-sCC="$(tc-getCC) ${CFLAGS}" \
+		-sCCFLAGS="" \
+		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
+		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
+		-sC++FLAGS="" \
+		-sGARGLKINI="/etc/garglk.ini" \
+		-sUSESDL=yes \
+		-sBUNDLEFONTS=no \
+		-dx \
+		-j$(makeopts_jobs) || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	_BINDIR="${EPREFIX}/usr/libexec/${PN}" \
+	_APPDIR="${EPREFIX}/usr/libexec/${PN}" \
+	_LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+	EXEMODE=755 \
+	FILEMODE=755 \
+	jam install || die
+
+	# Install config file.
+	insinto /etc
+	newins garglk/garglk.ini garglk.ini
+
+	# Install application entry and icon.
+	domenu garglk/${PN}.desktop
+	doicon -s 32 garglk/${PN}-house.png
+
+	# Symlink binaries to avoid name clashes.
+	local terp
+	for terp in advsys agility alan2 alan3 bocfel frotz geas git glulxe hugo jacl \
+		level9 magnetic nitfol scare scott tadsr; do
+		dosym ../libexec/${PN}/${terp} /usr/bin/${PN}-${terp}
+	done
+
+	# Also symlink the main binary since it resides in libexec.
+	dosym ../libexec/${PN}/${PN} /usr/bin/${PN}
+}
diff --git a/games-engines/gargoyle/metadata.xml b/games-engines/gargoyle/metadata.xml
index 6842fdda8f83..23812106384b 100644
--- a/games-engines/gargoyle/metadata.xml
+++ b/games-engines/gargoyle/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">garglk</remote-id>
+		<remote-id type="github">garglk/garglk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-engines/openxcom/Manifest b/games-engines/openxcom/Manifest
index 75e24124576f..160e73e57b38 100644
--- a/games-engines/openxcom/Manifest
+++ b/games-engines/openxcom/Manifest
@@ -1,4 +1,5 @@
+AUX openxcom-9999-mandir.patch 467 BLAKE2B 3cba7cd1a0260c1c7d2e24a94cde9818c804ab0cd9296ac2a0a979faee522a18320b0e0c832eae2663da1f365cbd7f96139108db2ec601b6ae8ffa5e2392963b SHA512 193ddf2ce37d89f09fe12e3d6ad2196e4ea661784a1e82fa29d4e0359ea238996c05d0009a93a59e679a515f58914df302f31396aaf248cc37ecbbf886d016a8
 DIST openxcom-1.0.0_p20180317.tar.gz 2801430 BLAKE2B 8a3718fc99f733c145034509b596de8dd17a8bdfe1aa05b68571c66245eea45f997488e57a2811f604e0aac702e30614fcd55ecc71858f49b357afb9e8fc5de4 SHA512 57ff9a9cbbbf48b8c4f792458edf0590d7d0df9a5805eab13a4c984713311e98587afca00778e82bd66fb2f330b354ca80703b87922a92f9ae48e5bdecf68442
-EBUILD openxcom-1.0.0_p20180317.ebuild 1694 BLAKE2B f48e9dc99d832da1a0be473a17c071ee492eebb635ad56cde2bb94cdb04f9d60b043a0ca1a97c0cef8c1c42b37b5094c9b3e355257602b176a7442d924c7dc51 SHA512 b88ab84fea533615c966dcaa6eb6b58d50833b2bfdb3ab9d0cdf3afa3ea015c1ffadaf78e58ae52b84ca138c38ea52974c666ea1ccffbf1ddc75f5783185f014
-EBUILD openxcom-9999.ebuild 1572 BLAKE2B 3c949b4b4c1d130adf0a7dfcef819028d5019492243d79ad715be3f8c01f77af2405e381f8167a6ad802f3a03a5b139b23a4e808d39d04b5d2bb202a81e84ced SHA512 931ae79bc045eb233f83e521f5429958057940c5155077ddbe7a49867e8d9f72bbe79ad8c0f908d784a05ef48d63e069abf4da011d0259091add59915ab221df
+EBUILD openxcom-1.0.0_p20180317-r1.ebuild 1740 BLAKE2B 137f4c6f99bf4999230acf3909fe846213171b72dc1ed32fe78934d8609756625c5f78af3d4b304ed4502b1b82065a9dd72718c5038375c15d4e1a9b7baa4915 SHA512 4f7fb6e11cd8fe1003269a08a25a3539c8279fa05037b5f1f7dee1e6b12ea95d345ab0e28434b11baea891f5a54954a6b744f5720ce75d0f113605ad595538de
+EBUILD openxcom-9999.ebuild 1808 BLAKE2B ffdd1eab799d2cde44d1b3fda5946183ae1b04e0e50061c58bb5bf426be6ffee5f5508556f9b420090fdbabab62b7862acd69d8bf1e7e4ddd946c1d7a7ff802a SHA512 bffbb930a712f15cf26eafee394bcd0a632b2200075fcd4aceddeffe1087f13298446948626c8da48f1b18182cfcd737ce2b806a659aeb550fca103186e06c0e
 MISC metadata.xml 335 BLAKE2B c1f058cb6d2d5fb842d9c198a4d68e43457d6bb7f5bed00d5365d1418afc83a54d3d8d816a312f715abf57d942877874ed92cf716477ab912fe2480afbea32bf SHA512 6d1deba17f18970b9425af0038c24be6f0e0fea46a095d34055884d8899442bc1f0a4f72343f2cf1f66f63c5287dc0373086e111b45ee64a47b8715e2237d6cd
diff --git a/games-engines/openxcom/files/openxcom-9999-mandir.patch b/games-engines/openxcom/files/openxcom-9999-mandir.patch
new file mode 100644
index 000000000000..44d01fae9fe8
--- /dev/null
+++ b/games-engines/openxcom/files/openxcom-9999-mandir.patch
@@ -0,0 +1,9 @@
+--- a/docs/CMakeLists.txt	2021-02-27 13:15:37.168240019 +0100
++++ b/docs/CMakeLists.txt	2021-02-27 13:16:28.640486232 +0100
+@@ -38,5 +38,5 @@
+ 
+ # Only useful for make install/package under *nix OSes, but not macOS.
+ if ( UNIX AND NOT APPLE )
+-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6)
++    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openxcom.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
+ endif ()
diff --git a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild b/games-engines/openxcom/openxcom-1.0.0_p20180317-r1.ebuild
index e9113fcdbb6c..699360f3785c 100644
--- a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild
+++ b/games-engines/openxcom/openxcom-1.0.0_p20180317-r1.ebuild
@@ -1,61 +1,65 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils gnome2-utils
+EAPI=7
 
-COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564"
-DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
+inherit cmake xdg-utils
+
+DESCRIPTION="Open-source reimplementation of the popular UFO: Enemy Unknown"
 HOMEPAGE="https://openxcom.org/"
-SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"
+else
+	COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564"
+	SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/OpenXcom-${COMMIT}"
+fi
 
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc"
 
-RDEPEND=">=dev-cpp/yaml-cpp-0.5.1
+RDEPEND="
+	>=dev-cpp/yaml-cpp-0.5.1
 	media-libs/libsdl[opengl,video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[flac,mikmod,vorbis]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
-S="${WORKDIR}/OpenXcom-${COMMIT}"
 DOCS=( README.md )
 
 src_compile() {
-	use doc && cmake-utils_src_compile doxygen
-	cmake-utils_src_compile
+	cmake_src_compile
+	use doc && cmake_build doxygen
 }
 
 src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	echo
+	xdg_icon_cache_update
+
 	elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND,"
 	elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM game to"
 	elog "/usr/share/${PN}/UFO"
-	echo
+	elog
 	elog "If you want to play the TFTD mod, you need to copy ANIMS, FLOP_INT,"
 	elog "GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND, TERRAIN, UFOGRAPH, UNITS folders"
 	elog "from the original Terror from the Deep game to"
 	elog "/usr/share/${PN}/TFTD"
-	echo
+	elog
 	elog "If you need or want text in some language other than english, download:"
 	elog "https://openxcom.org/translations/latest.zip and uncompress it in"
 	elog "/usr/share/${PN}/common/Language"
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-engines/openxcom/openxcom-9999.ebuild b/games-engines/openxcom/openxcom-9999.ebuild
index 7726841e5584..511bec55bed0 100644
--- a/games-engines/openxcom/openxcom-9999.ebuild
+++ b/games-engines/openxcom/openxcom-9999.ebuild
@@ -1,59 +1,67 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils gnome2-utils git-r3
+EAPI=7
 
-DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
+inherit cmake xdg-utils
+
+DESCRIPTION="Open-source reimplementation of the popular UFO: Enemy Unknown"
 HOMEPAGE="https://openxcom.org/"
-EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"
+else
+	COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564"
+	SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/OpenXcom-${COMMIT}"
+fi
 
 LICENSE="GPL-3+ CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc"
 
-RDEPEND=">=dev-cpp/yaml-cpp-0.5.1
+RDEPEND="
+	>=dev-cpp/yaml-cpp-0.5.1
 	media-libs/libsdl[opengl,video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[flac,mikmod,vorbis]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( README.md )
 
+PATCHES=( "${FILESDIR}/${P}-mandir.patch" ) # TODO: GNUInstallDirs
+
 src_compile() {
-	use doc && cmake-utils_src_compile doxygen
-	cmake-utils_src_compile
+	cmake_src_compile
+	use doc && cmake_build doxygen
 }
 
 src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+	cmake_src_install
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	echo
+	xdg_icon_cache_update
+
 	elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND,"
 	elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM game to"
 	elog "/usr/share/${PN}/UFO"
-	echo
+	elog
 	elog "If you want to play the TFTD mod, you need to copy ANIMS, FLOP_INT,"
 	elog "GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND, TERRAIN, UFOGRAPH, UNITS folders"
 	elog "from the original Terror from the Deep game to"
 	elog "/usr/share/${PN}/TFTD"
-	echo
+	elog
 	elog "If you need or want text in some language other than english, download:"
 	elog "https://openxcom.org/translations/latest.zip and uncompress it in"
 	elog "/usr/share/${PN}/common/Language"
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-engines/solarus/Manifest b/games-engines/solarus/Manifest
index bc00ec9b7cdd..43e2927b06ef 100644
--- a/games-engines/solarus/Manifest
+++ b/games-engines/solarus/Manifest
@@ -1,4 +1,3 @@
 DIST solarus-1.3.1-src.tar.gz 2450599 BLAKE2B e8aefa36d48753b1362283c8818b6efdc82c2d6ed7612c15d5e45b035a131ec6fd5792f85e4b956afa3e1d51e0dc311d7d6fabb5750b7b8781c69169b61fe1d9 SHA512 f52a46add1432a98931db8d26496371b5ff843151c8ac0fdaf1e774be37399d9be6c401f263a65aa08b96f3eebda367b4ccb07ef6cb9740b3112b01e4763556b
-EBUILD solarus-1.3.1-r1.ebuild 1076 BLAKE2B 2859414875bbba299b01c2becde2e24bccc88b6235f077c964723b9d18157f2c3d34aeac4f52cad6a756c65551728f711c32d3c8bae11a00ec2af27c8c2a39d9 SHA512 45b0cfcab36c51aa8fb86a53c3b8472006526a29f1a990adfda71ddbd410c71f93ba87d179b23429fbf8d70fe61a0cf1d39b0a4134b2141dfea843e5a405f4d0
 EBUILD solarus-1.3.1-r100.ebuild 1092 BLAKE2B 98a582f19d24874d61346b5b4fba4265fe32f1b4eba03412f44a8a8e3a762580d2fd7681a214f950967a09944400fbacfbc5acfa3b52df85b4c5f627e3eebd63 SHA512 51f7b846920143d093609db771d20597b0532310086181d88f8cc7a8bbbc14c5b1feb9b1da2221cb3d078ebeb6be557892a651d231cdb501e87218e041c9276f
 MISC metadata.xml 418 BLAKE2B 5bf684de11834b52dc4093d84a72b6c0707707fa8e31dfdd66a58942dc94f08e8db5b39d6aa1698587af11610eca08b80fc348a023c93d09d39cd115b6c81a34 SHA512 349717aa1b9c57fc9141beb4f16b377bd3ba31002a85023fad25a8a2332b9092180c58f37ba91aef05abb46405a56580202e0b67373ea049fc0d7bc029b3d2c5
diff --git a/games-engines/solarus/solarus-1.3.1-r1.ebuild b/games-engines/solarus/solarus-1.3.1-r1.ebuild
deleted file mode 100644
index 31ce4cefa293..000000000000
--- a/games-engines/solarus/solarus-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An open-source Zelda-like 2D game engine"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc luajit"
-
-RDEPEND="
-	dev-games/physfs
-	media-libs/libmodplug
-	>=media-libs/libsdl2-2.0.1[X,joystick,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl2-image[png]
-	>=media-libs/sdl2-ttf-2.0.12
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DESTINATION="/usr/bin"
-		-DSOLARUS_USE_LUAJIT="$(usex luajit)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		cd doc || die
-		doxygen || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman solarus.6
-	use doc && dodoc -r doc/${PV%.*}/html/*
-}