commit: 82e4e1a2308eafa6f3cf048d131d63173ad9eaa2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sun Jul 4 02:30:29 2021 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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 }
