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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A470158020 for ; Fri, 14 Oct 2022 13:25:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FCF3E07D0; Fri, 14 Oct 2022 13:25:42 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4727CE07D0 for ; Fri, 14 Oct 2022 13:25:42 +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 34A05340CBB for ; Fri, 14 Oct 2022 13:25:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F58B5F6 for ; Fri, 14 Oct 2022 13:25:39 +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: <1665753926.dc2b787f4c316e5d96c836ac7eed46d01673beee.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/punes/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/punes/punes-0.109-r1.ebuild app-emulation/punes/punes-0.109.ebuild X-VCS-Directories: app-emulation/punes/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: dc2b787f4c316e5d96c836ac7eed46d01673beee X-VCS-Branch: master Date: Fri, 14 Oct 2022 13:25:39 +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: b5a3f712-d6e2-4217-bfd4-fbd33901fc3a X-Archives-Hash: 1ffddb3a1d49ba1397231de924e6ef80 commit: dc2b787f4c316e5d96c836ac7eed46d01673beee Author: Ionen Wolkens gentoo org> AuthorDate: Fri Oct 14 13:02:20 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Oct 14 13:25:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2b787f app-emulation/punes: fix double CHOST + other adjustments * add several missing deps (qtnetwork:5, udev, X11/Xrandr/xorg-proto), lack of qtnetwork:5 caused bug #877089 * move nvidia-cg-toolkit to RDEPEND, this is linking with its libraries and doesn't make sense in BDEPEND * prevent QA notices because of unused CMAKE_INSTALL* * xdg-utils -> xdg Note need to export CC="${CHOST}-gcc" to reproduce wrt #877089 Closes: https://bugs.gentoo.org/877089 Closes: https://bugs.gentoo.org/877091 Signed-off-by: Ionen Wolkens gentoo.org> .../{punes-0.109.ebuild => punes-0.109-r1.ebuild} | 42 +++++++++++----------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/app-emulation/punes/punes-0.109.ebuild b/app-emulation/punes/punes-0.109-r1.ebuild similarity index 65% rename from app-emulation/punes/punes-0.109.ebuild rename to app-emulation/punes/punes-0.109-r1.ebuild index 76d44deed992..f4591cbe10f9 100644 --- a/app-emulation/punes/punes-0.109.ebuild +++ b/app-emulation/punes/punes-0.109-r1.ebuild @@ -3,12 +3,13 @@ EAPI=8 -inherit autotools xdg-utils +inherit autotools toolchain-funcs xdg DESCRIPTION="Nintendo Entertainment System (NES) emulator" HOMEPAGE="https://github.com/punesemu/puNES" SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz" SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}_musl.patch.xz" +S="${WORKDIR}/puNES-${PV}" LICENSE="GPL-2+" SLOT="0" @@ -16,23 +17,27 @@ KEYWORDS="~amd64 ~x86" IUSE="cg ffmpeg" RDEPEND=" - ffmpeg? ( media-video/ffmpeg:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 media-libs/alsa-lib + media-libs/libglvnd[X] virtual/glu - virtual/opengl" -DEPEND="${RDEPEND}" -BDEPEND=" + virtual/udev + x11-libs/libX11 + x11-libs/libXrandr cg? ( media-gfx/nvidia-cg-toolkit ) + ffmpeg? ( media-video/ffmpeg:= )" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" dev-qt/linguist-tools:5 dev-util/cmake virtual/pkgconfig" -S="${WORKDIR}/puNES-${PV}" - PATCHES=( "${FILESDIR}"/${P}_ldflags.patch "${WORKDIR}"/${P}_musl.patch # 830471 @@ -41,6 +46,12 @@ PATCHES=( src_prepare() { default + # empty CMAKE_ARGS to avoid double CHOST (bug #877089), and also unused + # options (QA notices), use sed to avoid rebases because of the directory + sed -e '/x${DEBUG_VERSION}/i\CMAKE_ARGS=' \ + -i src/extra/lib7zip-*/configure || die + tc-export CC CXX + # src/extra/lib7zip is not autotools, but # is contained within AC_CONFIG_SUBDIRS AT_NO_RECURSIVE=1 eautoreconf @@ -49,19 +60,10 @@ src_prepare() { } src_configure() { - econf \ - $(use_with cg opengl-nvidia-cg) \ + local econfargs=( + $(use_with cg opengl-nvidia-cg) $(use_with ffmpeg) -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} + ) -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update + econf "${econfargs[@]}" }