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 E7EB5138359 for ; Sun, 19 Jul 2020 11:50:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83E90E0845; Sun, 19 Jul 2020 11:50:41 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 6CE0BE0845 for ; Sun, 19 Jul 2020 11:50:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 5884134F42E for ; Sun, 19 Jul 2020 11:50:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 442142E7 for ; Sun, 19 Jul 2020 11:50:12 +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: <1595159389.22595dccc4a9a3db38fdd6acc4055463cb375a7a.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/scummvm-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild X-VCS-Directories: games-engines/scummvm-tools/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 22595dccc4a9a3db38fdd6acc4055463cb375a7a X-VCS-Branch: master Date: Sun, 19 Jul 2020 11:50:12 +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: b302e158-9777-42f9-9344-0bd6daa38537 X-Archives-Hash: 8301d75076594652ea1cc154558bdc18 commit: 22595dccc4a9a3db38fdd6acc4055463cb375a7a Author: James Le Cuirot gentoo org> AuthorDate: Sun Jul 19 11:34:07 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Jul 19 11:49:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22595dcc games-engines/scummvm-tools: EAPI 7 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: James Le Cuirot gentoo.org> .../scummvm-tools/scummvm-tools-2.1.0.ebuild | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild index b0f58bbfe2a..54cbb5e6684 100644 --- a/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild +++ b/games-engines/scummvm-tools/scummvm-tools-2.1.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 WX_GTK_VER=3.0-gtk3 inherit wxwidgets eutils flag-o-matic @@ -15,17 +15,22 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="flac iconv mad png vorbis" RESTRICT="test" # some tests require external files -RDEPEND=">=dev-libs/boost-1.32:= +RDEPEND=" + >=dev-libs/boost-1.32:= sys-libs/zlib x11-libs/wxGTK:${WX_GTK_VER} flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0= ) - vorbis? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig" + vorbis? ( media-libs/libvorbis ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + virtual/pkgconfig +" PATCHES=( "${FILESDIR}/${PN}-1.8.0-binprefix.patch" @@ -34,12 +39,13 @@ PATCHES=( src_prepare() { default - need-wxwidgets unicode rm -rf *.bat dists/win32 || die sed -ri -e '/^(CC|CXX)\b/d' Makefile || die } src_configure() { + setup-wxwidgets + # Not an autoconf script ./configure \ --prefix=/usr \