Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
Date: Sat, 29 Dec 2018 12:16:12
Message-Id: 1546085752.87fdf8119b682d2e3c57830270b60b7a823fd27a.chewi@gentoo
1 commit: 87fdf8119b682d2e3c57830270b60b7a823fd27a
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 29 12:07:13 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 29 12:15:52 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87fdf811
7
8 games-emulation/dosbox: Fix libpng and zlib dependencies
9
10 libpng needs a SLOT operator. zlib was missing and appears to always
11 be used, despite configure.ac suggesting it is only a transitive
12 dependency of libpng.
13
14 Package-Manager: Portage-2.3.53, Repoman-2.3.12
15 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
16
17 games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 5 +++--
18 games-emulation/dosbox/dosbox-9999.ebuild | 5 +++--
19 2 files changed, 6 insertions(+), 4 deletions(-)
20
21 diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
22 index 14138bcda6d..e10196bb2d2 100644
23 --- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
24 +++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
25 @@ -23,10 +23,11 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
26 opengl? ( virtual/glu virtual/opengl )
27 debug? ( sys-libs/ncurses:0 )
28 X? ( x11-libs/libX11 )
29 - media-libs/libpng:0
30 + media-libs/libpng:0=
31 media-libs/libsdl[joystick,opengl?,video,X?]
32 media-libs/sdl-net
33 - media-libs/sdl-sound"
34 + media-libs/sdl-sound
35 + sys-libs/zlib"
36 DEPEND="${RDEPEND}
37 app-arch/unzip"
38
39
40 diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
41 index c8d3998bd01..4c6bd555931 100644
42 --- a/games-emulation/dosbox/dosbox-9999.ebuild
43 +++ b/games-emulation/dosbox/dosbox-9999.ebuild
44 @@ -28,10 +28,11 @@ DEPEND="alsa? ( media-libs/alsa-lib )
45 opengl? ( virtual/glu virtual/opengl )
46 debug? ( sys-libs/ncurses:0 )
47 X? ( x11-libs/libX11 )
48 - media-libs/libpng:0
49 + media-libs/libpng:0=
50 media-libs/libsdl[joystick,opengl?,video,X]
51 media-libs/sdl-net
52 - media-libs/sdl-sound"
53 + media-libs/sdl-sound
54 + sys-libs/zlib"
55 RDEPEND=${DEPEND}
56
57 if [[ ${PV} = 9999 ]]; then