6 files changed, 29 insertions, 29 deletions
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 6fda6fe7963d..9e9b81a2bf02 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
index 767b0f668257..55569314e770 100644
--- a/games-engines/exult/Manifest
+++ b/games-engines/exult/Manifest
@@ -1,2 +1,2 @@
-EBUILD exult-9999.ebuild 1167 BLAKE2B 5d5ed418167d01d9456957bf87b3e7e54f4a565477b58c502c90ce92a3624f43ddba6af4a5cce484cf2432ba6c8f1eabaeed9c06c04daf60cba78cccd0307f5d SHA512 04cc291b2ffbb30abe155e529d375ed2447b8e2b714e9d1792169c6d486f47eece512c22d5ac03d5c70bc557fd68c6acf5715e54718df0ae04cb2e90f380ff78
-MISC metadata.xml 328 BLAKE2B b895ccfad252cbbeb8fe092b4416086fd43420976392111a9ee7b0f714ee22e32d64b651f7e2370466b32c840b1eb0de8702a6714b9718e6bc90fa4524b84ed0 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e
+EBUILD exult-9999.ebuild 1287 BLAKE2B 6185596314e1d416197f6b9416ab9c217bbcfdbdc131e3f7d9b771ee2dc7c2c79f6ff5b0ab232def81fa78e412ec085b1f0f74b577d4cd05e6ba64e64988c6d8 SHA512 a6716dbb375f4153bf109e7e8742e93b4802213040d288726b092087e487332140c5c7a273da4d52bc452fe80e7d9b1f31b55982921fd824d4311809c224c608
+MISC metadata.xml 451 BLAKE2B 60126c876c87417af2a8f3b28e30dd3a16ec6afb9bc3119a82de8846364c056091e754f35ba7db90acd2ab29a041463e4a0aae098e527d334ae7aaa72dfb362d SHA512 5ac44e7312b3dca5e663a98d0c67e2f8ee82df786121e21c1b1fbef541b2a83197f622048d8d977e61fe4e4dda43ea6c9b61f8cd1d9b78dbf9beb90ede8e77f2
diff --git a/games-engines/exult/exult-9999.ebuild b/games-engines/exult/exult-9999.ebuild
index 4efc34a2e5dd..3463a5baa5aa 100644
--- a/games-engines/exult/exult-9999.ebuild
+++ b/games-engines/exult/exult-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,18 +11,18 @@ EGIT_REPO_URI="https://github.com/exult/exult"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="timidity zlib"
+IUSE="+sdl2 timidity zlib"
 
 DEPEND="
 	>=media-libs/libpng-1.2.43-r2:0
 	games-misc/exult-sound
-	media-libs/libsdl[sound,video,X]
+	media-libs/libvorbis
+	sdl2? ( media-libs/libsdl2[sound,video,X] )
+	!sdl2? ( media-libs/libsdl[sound,video,X] )
 	timidity? ( >=media-sound/timidity++-2 )
 	zlib? ( sys-libs/zlib )
 "
-RDEPEND="
-	${DEPEND}
-"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${P/_/}
 DOCS=(
@@ -42,6 +42,7 @@ src_configure() {
 		--enable-mods \
 		--with-desktopdir=/usr/share/applications \
 		--with-icondir=/usr/share/pixmaps \
+		--with-sdl=$(usex sdl2 sdl2 sdl12) \
 		$(use_enable timidity timidity-midi) \
 		$(use_enable zlib zip-support)
 }
diff --git a/games-engines/exult/metadata.xml b/games-engines/exult/metadata.xml
index c1a873a06ee8..a676c5e60d97 100644
--- a/games-engines/exult/metadata.xml
+++ b/games-engines/exult/metadata.xml
@@ -7,5 +7,9 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">exult</remote-id>
+		<remote-id type="github">exult/exult</remote-id>
 	</upstream>
+	<use>
+		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
+	</use>
 </pkgmetadata>
diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
index 5d8521d34e2c..44fcb1627a6a 100644
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@@ -1,4 +1,4 @@
 AUX gargoyle-2011.1-desktopfile.patch 1265 BLAKE2B 1fcbc1eded032ef11ef357e03c614067b18c21a268b4a3bebe4516a0ed196660292b311c9769d66853ffbbf2535808d014991bd42155919b913965223a4523dc SHA512 ed31bc711b52b5d231f130956d7d07cb9080747e6d53c85b379aa413582f8e4ffe825298bc86180ec7d1eadff5e6bffc6e49b3ff7a2607f612dcf81a6c1af22e
 DIST gargoyle-2011.1-sources.zip 11291660 BLAKE2B aac47c41bd02e772c4717dfdeae8678105f72704641ea3df39105d412afe61734cc43f863b9556e38ea34287259df9f4d72ae93b3092d0372434b9f59f99483d SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f
-EBUILD gargoyle-2011.1.ebuild 3217 BLAKE2B f2d74fefa87a5e0aeb6fdea0816e591a3b23e75b455051d161a600cdfe198a502c2e0c2c95537c403e531b38848b2999479414062557ea4e7d84326d18ebab6a SHA512 62a23b3df92c9db95824d1344796a5cac16fc3d1ebd7358066b38a7c02487fdfdb7589cf17331ffc38e73d7732233e7d9ece0224138087dffc1481fca9cbbf0d
+EBUILD gargoyle-2011.1-r1.ebuild 3017 BLAKE2B 12371e41ca78403ba1452da2a2c5dbac287912b8dbcd7afe524984b8442bb4cf5701f3073f27a64c5adadccfebfaaef9e543b883026b4eae4b185cc151eac6b7 SHA512 0daa2b0ef761c935d0e7d47fd42060ebf5db4331634bba8e1812a619d8fb31cdb0f2aec197cf7d30e1bff357ccd60888ac5107c7e9644f8ddeed9520a9b1ac9e
 MISC metadata.xml 329 BLAKE2B cc77f8750b5385687d311159b8edbf296284013812d4be5fe0076468c02758dcac19c77b5e6f38c4fbdac51f1c69b34cfd39d5d19235d18ec80076ceba98e2b3 SHA512 f6b913db889e2434a76d61526ff2cf3f719322991bb26891ac0383fcb8f11cf69cfc895a7cddd35074c2dee9a5ceac0fd8c0172542401d302ec39e9cac180b2c
diff --git a/games-engines/gargoyle/gargoyle-2011.1.ebuild b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
index 640adac5fa7e..82e11b237828 100644
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
@@ -8,8 +8,8 @@
 # Since we don't compile or install any of the bundled fonts, their licenses
 # don't apply. (Fonts are installed through dependencies instead.)
 
-EAPI=5
-inherit eutils flag-o-matic multiprocessing toolchain-funcs gnome2-utils games
+EAPI=6
+inherit eutils flag-o-matic gnome2-utils multilib multiprocessing toolchain-funcs
 
 DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-	>=media-fonts/libertine-5
+	media-fonts/libertine
 	media-fonts/liberation-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
@@ -52,11 +52,10 @@ src_prepare() {
 	# Convert garglk.ini to UNIX format.
 	edos2unix garglk/garglk.ini
 
-	# The font name of Linux Libertine changed in version 5.
-	sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini || die
-
 	epatch "${FILESDIR}"/${P}-desktopfile.patch
 	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
+	append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996)
+	default
 }
 
 src_compile() {
@@ -69,7 +68,7 @@ src_compile() {
 		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
 		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
 		-sC++FLAGS="" \
-		-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \
+		-sGARGLKINI="/etc/garglk.ini" \
 		-sUSESDL=yes \
 		-sBUNDLEFONTS=no \
 		-dx \
@@ -78,15 +77,15 @@ src_compile() {
 
 src_install() {
 	DESTDIR="${D}" \
-	_BINDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_APPDIR="${GAMES_PREFIX}/libexec/${PN}" \
-	_LIBDIR="$(games_get_libdir)" \
+	_BINDIR="/usr/libexec/${PN}" \
+	_APPDIR="/usr/libexec/${PN}" \
+	_LIBDIR="/usr/$(get_libdir)" \
 	EXEMODE=755 \
 	FILEMODE=755 \
 	jam install || die
 
 	# Install config file.
-	insinto "${GAMES_SYSCONFDIR}"
+	insinto "/etc"
 	newins garglk/garglk.ini garglk.ini
 
 	# Install application entry and icon.
@@ -97,24 +96,20 @@ src_install() {
 	for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \
 		level9 magnetic nitfol scare tadsr
 	do
-		dosym "${GAMES_PREFIX}/libexec/${PN}/${terp}" \
-			"${GAMES_BINDIR}/${PN}-${terp}"
+		dosym "../libexec/${PN}/${terp}" \
+			"/usr/bin/${PN}-${terp}"
 	done
 
 	# Also symlink the main binary since it resides in libexec.
-	dosym "${GAMES_PREFIX}/libexec/${PN}/${PN}" \
-		"${GAMES_BINDIR}/${PN}"
-
-	prepgamesdirs
+	dosym "../libexec/${PN}/${PN}" \
+		"/usr/bin/${PN}"
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 }