gentoo auto-resync : 14:10:2022 - 19:44:42

3 files changed, 23 insertions, 21 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7ad147f58cf9..81e7206aec7c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 67b70cc048ab..3623dd157467 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -4,5 +4,5 @@ DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8a
 DIST punes-0.109.tar.gz 48695769 BLAKE2B cc5a86b2f99dc3c97bc04386568fcb926d2a9c83f8c6dcaf28c022a136791ff481610ad578c996c643e0c0b107acb2be9a0fbfda0950435aad984f3506ec1983 SHA512 13cf3587c9936ff9f933d3394516d25fbd664fc2fd510af724c3bbbc6fefb12a019e8fe27cd52cd326ef8fba3721f4e1816ce5d3f3935f701081a142f04a3bc2
 DIST punes-0.109_musl.patch.xz 5520 BLAKE2B ea1c36d510303dd67b7e2005a3f099e328583c9762f74ccf9457a5f04268c44243b4fe18fc6498c176a999318f40c9a34ca2a3ed7de2d4dea953ab055901ad42 SHA512 507163d40849bbf782725f71409432a0cb4a79f5c3fccfaf78786322539a1bce0608b731a75c817b72f8a4e814d0cb21019cb23f621176042fb946754a4a9292
 EBUILD punes-0.107.ebuild 1241 BLAKE2B 5df5b93a315a152425c1bbeeb612b3a173d8682350d5b2f13740699752efeb9d96b99e57b578103e78b13edc3929344962dee8585a337fe5bc95bcdc036a39cc SHA512 149e4797185ae7d906ec4ef5ec29314eee21084829272379fdbf79d29519715d7e329174ef0485ab1a6448943e72781a2b6314b096a200ead2237e5a5138c2df
-EBUILD punes-0.109.ebuild 1368 BLAKE2B 6e9393022703926d914ad970fb11aa14d3c0917a91e1b73951422a9f021b1dcd1b9cfe6f92a6dc056690059ac8726bf145eab0b3f8e8f2de0a1807e7ebfb8c66 SHA512 d9f6c512abc4c0637fdc9e3996ffbfd95f1d1d3eea765934f9b8cc8a957bfe7b25f22d46880fab9bfd0318cdda80d1c14b04af626e19a2bb42d38c1d80a01a7e
+EBUILD punes-0.109-r1.ebuild 1568 BLAKE2B e974710b926adcabeea13e0de0c73403dc06750da606b03990d7e15f2ccb3e3518206dfd07114cf0637c53067c6f151b3959f895476c55701e39fc93cd671629 SHA512 dff1d6a40e964f0d9c7a3fde8d5981d4289458219035c0f33ed5f5653298e2af020fdc55a6a8d525330e21951eeaa072f112b8cf3414782533c67ebb4e616b20
 MISC metadata.xml 560 BLAKE2B ea221c8fefa3fc3e9f8942ae7cfd642384cde9ec10949bc148e17727e0633f718140fa15675a3268674c80e6b55177ff5573460abd687bc76420673f76aecc8a SHA512 7676ca51eb1d02c6564dfd9ef47975f349856ae9536e3f1d9771bf4c56a2aebe86622461ae50b5989c56fffa1cfa92fc6185f1d62d933c4db5016acc4c280a8f
diff --git a/app-emulation/punes/punes-0.109.ebuild b/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[@]}"
 }