From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F069138334 for ; Sat, 29 Dec 2018 12:16:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6E2EE09B0; Sat, 29 Dec 2018 12:16:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 82953E09B0 for ; Sat, 29 Dec 2018 12:16:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 51141335CD5 for ; Sat, 29 Dec 2018 12:16:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65D844FD for ; Sat, 29 Dec 2018 12:16:08 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1546085752.87fdf8119b682d2e3c57830270b60b7a823fd27a.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild games-emulation/dosbox/dosbox-9999.ebuild X-VCS-Directories: games-emulation/dosbox/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 87fdf8119b682d2e3c57830270b60b7a823fd27a X-VCS-Branch: master Date: Sat, 29 Dec 2018 12:16:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1fb4754b-0fe8-4cd0-aa6b-b26a8dc342d1 X-Archives-Hash: 357987794ede59df4ceedcf7e31e243f commit: 87fdf8119b682d2e3c57830270b60b7a823fd27a Author: James Le Cuirot gentoo org> AuthorDate: Sat Dec 29 12:07:13 2018 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Dec 29 12:15:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87fdf811 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 gentoo.org> games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 5 +++-- games-emulation/dosbox/dosbox-9999.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild index 14138bcda6d..e10196bb2d2 100644 --- 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 c8d3998bd01..4c6bd555931 100644 --- 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