games-emulation/dosbox: Fix libpng and zlib dependencies

libpng needs a SLOT operator. zlib was missing and appears to always
be used, despite configure.ac suggesting it is only a transitive
dependency of libpng.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index 14138bcda6d64601c9b318b52798067a1d1c7b6f..e10196bb2d21523b530cbac9ed3f01a207a45442 100644 (file)
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
@@ -23,10 +23,11 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
        opengl? ( virtual/glu virtual/opengl )
        debug? ( sys-libs/ncurses:0 )
        X? ( x11-libs/libX11 )
-       media-libs/libpng:0
+       media-libs/libpng:0=
        media-libs/libsdl[joystick,opengl?,video,X?]
        media-libs/sdl-net
-       media-libs/sdl-sound"
+       media-libs/sdl-sound
+       sys-libs/zlib"
 DEPEND="${RDEPEND}
        app-arch/unzip"
 

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index c8d3998bd01a0734927520707d1f9e588c84c01b..4c6bd555931fc4d400aaed5e7f8f36cf84511bda 100644 (file)
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -28,10 +28,11 @@ DEPEND="alsa? ( media-libs/alsa-lib )
        opengl? ( virtual/glu virtual/opengl )
        debug? ( sys-libs/ncurses:0 )
        X? ( x11-libs/libX11 )
-       media-libs/libpng:0
+       media-libs/libpng:0=
        media-libs/libsdl[joystick,opengl?,video,X]
        media-libs/sdl-net
-       media-libs/sdl-sound"
+       media-libs/sdl-sound
+       sys-libs/zlib"
 RDEPEND=${DEPEND}
 
 if [[ ${PV} = 9999 ]]; then