games-engines/exult: fixes to compilation

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/games-engines/exult/exult-9999.ebuild b/games-engines/exult/exult-9999.ebuild
index 4efc34a2e5dd14ee494e69cb052058d3ee24890c..3463a5baa5aa5b4f1b5f9bf7ae1a2da6e0e6dc20 100644 (file)
--- 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 c1a873a06ee8767bbd376385c88b942a43ddc7f0..a676c5e60d97fe209f1e58051a653f99bf64d4da 100644 (file)
--- 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>