From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6AD22158176 for ; Sat, 18 Oct 2025 15:20:29 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 54191341F45 for ; Sat, 18 Oct 2025 15:20:29 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 0097B110573; Sat, 18 Oct 2025 15:20:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id EA734110573 for ; Sat, 18 Oct 2025 15:20:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95E69341EF4 for ; Sat, 18 Oct 2025 15:20:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E5FF32B9 for ; Sat, 18 Oct 2025 15:20:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1760800587.d0795b496fda46726fcb35cd4d28f672fc82d75d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/rmg/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/rmg/rmg-9999.ebuild X-VCS-Directories: games-emulation/rmg/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d0795b496fda46726fcb35cd4d28f672fc82d75d X-VCS-Branch: master Date: Sat, 18 Oct 2025 15:20:20 +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: bc47f153-5760-44d1-b711-4ae01df82ee0 X-Archives-Hash: 5cb72969fec503e99038cfc73afff50e commit: d0795b496fda46726fcb35cd4d28f672fc82d75d Author: orbea riseup net> AuthorDate: Fri Oct 10 14:20:01 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 18 15:16:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0795b49 games-emulation/rmg: drop USE rust-plugin This plugin was rewritten in C++. Upstream-Commit: https://github.com/Rosalie241/RMG/commit/39ffbc9fc8d9bbfc3dcaa959797b43be2dbb486e Upstream-Issue: https://github.com/Rosalie241/RMG/issues/436 Signed-off-by: orbea riseup.net> Part-of: https://github.com/gentoo/gentoo/pull/44048 Signed-off-by: Sam James gentoo.org> games-emulation/rmg/rmg-9999.ebuild | 61 ++----------------------------------- 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/games-emulation/rmg/rmg-9999.ebuild b/games-emulation/rmg/rmg-9999.ebuild index 9ba52a7fe70a..9c25e1f2c751 100644 --- a/games-emulation/rmg/rmg-9999.ebuild +++ b/games-emulation/rmg/rmg-9999.ebuild @@ -3,31 +3,7 @@ EAPI=8 -CARGO_OPTIONAL=1 - -CRATES=" - cc@1.0.83 - cfg-if@1.0.0 - libc@0.2.152 - libloading@0.7.4 - libusb1-sys@0.6.4 - once_cell@1.19.0 - pkg-config@0.3.29 - proc-macro2@1.0.78 - quote@1.0.35 - rusb@0.9.3 - serde@1.0.195 - serde_derive@1.0.195 - syn@2.0.48 - toml@0.5.11 - unicode-ident@1.0.12 - vcpkg@0.2.15 - winapi-i686-pc-windows-gnu@0.4.0 - winapi-x86_64-pc-windows-gnu@0.4.0 - winapi@0.3.9 -" - -inherit cargo cmake toolchain-funcs xdg +inherit cmake toolchain-funcs xdg MY_PN="${PN^^}" MY_P="${MY_PN}-${PV}" @@ -40,7 +16,6 @@ else SRC_URI=" https://github.com//Rosalie241/${MY_PN}/archive/v${PV}/${MY_P}.tar.gz \ -> ${P}.tar.gz - rust-plugin? ( ${CARGO_CRATE_URIS} ) " S="${WORKDIR}/${MY_P}" KEYWORDS="~amd64" @@ -49,13 +24,13 @@ fi LICENSE=" BSD-2 CC0-1.0 GPL-2 GPL-3 MIT ZLIB public-domain angrylion-plugin? ( XMAME ) - rust-plugin? ( ISC Unicode-DFS-2016 ) " SLOT="0" -IUSE="angrylion-plugin dynarec netplay rust-plugin" +IUSE="angrylion-plugin dynarec netplay" DEPEND=" dev-libs/hidapi + dev-libs/libusb:1 dev-qt/qtbase:6[gui,opengl,vulkan,widgets] dev-qt/qtsvg:6 media-libs/freetype @@ -66,41 +41,13 @@ DEPEND=" sys-libs/zlib[minizip(+)] virtual/opengl netplay? ( dev-qt/qtwebsockets:6 ) - rust-plugin? ( dev-libs/libusb:1 ) " RDEPEND="${DEPEND}" BDEPEND=" virtual/pkgconfig dynarec? ( dev-lang/nasm ) - rust-plugin? ( ${RUST_DEPEND} ) " -PATCHES=( - # https://github.com/Rosalie241/RMG/issues/436 - "${FILESDIR}"/${PN}-0.8.3-rust.patch -) - -pkg_setup() { - QA_FLAGS_IGNORED="/usr/$(get_libdir)/RMG/Plugin/Input/libmupen64plus_input_gca.so" - use rust-plugin && rust_pkg_setup -} - -src_unpack() { - if [[ "${PV}" == *9999 ]] ; then - git-r3_src_unpack - if use rust-plugin; then - S="${S}"/Source/3rdParty/mupen64plus-input-gca \ - cargo_live_src_unpack - fi - else - if use rust-plugin; then - cargo_src_unpack - else - default - fi - fi -} - src_prepare() { # Remove unused 3rdParty code - https://bugs.gentoo.org/959468 rm -r "${S}"/Source/3rdParty/fmt || die @@ -123,13 +70,11 @@ src_prepare() { src_configure() { export PKG_CONFIG="$(tc-getPKG_CONFIG)" - export PKG_CONFIG_ALLOW_CROSS=1 local mycmakeargs=( -DAPPIMAGE_UPDATER=OFF -DNETPLAY=$(usex netplay) -DNO_ASM=$(usex dynarec OFF ON) - -DNO_RUST=$(usex rust-plugin OFF ON) -DPORTABLE_INSTALL=OFF -DUPDATER=OFF -DUSE_ANGRYLION=$(usex angrylion-plugin)