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 A8498139345 for ; Sun, 4 Jul 2021 04:17:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6431E0830; Sun, 4 Jul 2021 04:17:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 71DD9E0830 for ; Sun, 4 Jul 2021 04:17:31 +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 536FF342AD7 for ; Sun, 4 Jul 2021 04:17:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03DA07BB for ; Sun, 4 Jul 2021 04:17:29 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1625372177.82e4e1a2308eafa6f3cf048d131d63173ad9eaa2.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/gens/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/gens/gens-2.15.5-r2.ebuild X-VCS-Directories: games-emulation/gens/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 82e4e1a2308eafa6f3cf048d131d63173ad9eaa2 X-VCS-Branch: master Date: Sun, 4 Jul 2021 04:17:29 +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: 6d1edab9-21d2-4574-b29e-6e10f2041ac8 X-Archives-Hash: 7402244b706eacce4546b3364467e290 commit: 82e4e1a2308eafa6f3cf048d131d63173ad9eaa2 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Jul 4 02:30:29 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sun Jul 4 04:16:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e4e1a2 games-emulation/gens: refactor multilib usage, EAPI 7->8 There is little sense in having a REQUIRED_USE (via MULTILIB_COMPAT) and MULTILIB_USEDEP for a single choice. This hidden that this can't be built on amd64 no-multilib by trading NonSolvableDeps error with RequiredUseDefaults warning (now masked). Signed-off-by: Ionen Wolkens gentoo.org> games-emulation/gens/gens-2.15.5-r2.ebuild | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/games-emulation/gens/gens-2.15.5-r2.ebuild b/games-emulation/gens/gens-2.15.5-r2.ebuild index 7b8c385e9b0..b4c3edece97 100644 --- a/games-emulation/gens/gens-2.15.5-r2.ebuild +++ b/games-emulation/gens/gens-2.15.5-r2.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -MULTILIB_COMPAT=( abi_x86_32 ) +inherit desktop flag-o-matic multilib -inherit desktop flag-o-matic multilib-build - -DESCRIPTION="A Sega Genesis/CD/32X emulator" +DESCRIPTION="Sega Genesis/CD/32X emulator" HOMEPAGE="https://sourceforge.net/projects/gens/" SRC_URI="mirror://sourceforge/gens/${P}.tar.gz" @@ -16,12 +14,12 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND=" - media-libs/libsdl[${MULTILIB_USEDEP},joystick,video] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - x11-libs/gtk+:2[${MULTILIB_USEDEP}]" + media-libs/libsdl[abi_x86_32(-),joystick,video] + sys-libs/zlib:=[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + x11-libs/gtk+:2[abi_x86_32(-)]" DEPEND="${RDEPEND}" -BDEPEND=">=dev-lang/nasm-0.98" +BDEPEND="dev-lang/nasm" PATCHES=( "${FILESDIR}"/${P}-romsdir.patch @@ -43,8 +41,9 @@ src_configure() { src_install() { default + dodoc gens.txt history.txt newicon pixmaps/gens_small.png gens.png - make_desktop_entry "gens" "Gens" + make_desktop_entry gens Gens }