From b765dc5d03b45bba1756ef66a5350d3e87deb16c Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 29 Dec 2018 12:01:55 +0000 Subject: games-emulation/dosbox: Make X11 dependency optional The x11-libs/libX11 dependency was missing although this was transitively covered by libsdl[X]. It's not really required though and DOSBox detects it somewhat automagically. If libX11 is present but libsdl was not built with X support then the build actually fails. For these reasons, we have to forcibly disable X11 using an autoconf cache variable. Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: James Le Cuirot --- games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 6 ++++-- games-emulation/dosbox/dosbox-9999.ebuild | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'games-emulation/dosbox') diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild index d9dccc1aa6aa..14138bcda6d6 100644 --- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild +++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild @@ -16,14 +16,15 @@ SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -IUSE="alsa debug glide hardened opengl" +IUSE="alsa debug glide hardened opengl X" RDEPEND="alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) + X? ( x11-libs/libX11 ) media-libs/libpng:0 - media-libs/libsdl[joystick,opengl?,video,X] + media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound" DEPEND="${RDEPEND} @@ -44,6 +45,7 @@ src_prepare() { src_configure() { use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide + ac_cv_lib_X11_main=$(usex X yes no) \ econf \ $(use_enable alsa alsa-midi) \ $(use_enable !hardened dynamic-core) \ diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild index a5bfff9c4f30..c8d3998bd01a 100644 --- a/games-emulation/dosbox/dosbox-9999.ebuild +++ b/games-emulation/dosbox/dosbox-9999.ebuild @@ -21,12 +21,13 @@ HOMEPAGE="http://dosbox.sourceforge.net/" LICENSE="GPL-2" SLOT="0" -IUSE="alsa debug glide hardened opengl" +IUSE="alsa debug glide hardened opengl X" DEPEND="alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) + X? ( x11-libs/libX11 ) media-libs/libpng:0 media-libs/libsdl[joystick,opengl?,video,X] media-libs/sdl-net @@ -50,6 +51,7 @@ src_prepare() { src_configure() { use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide + ac_cv_lib_X11_main=$(usex X yes no) \ econf \ $(use_enable alsa alsa-midi) \ $(use_enable !hardened dynamic-core) \ -- cgit v1.2.3-65-gdbad