gentoo resync : 02.02.2022

3 files changed, 2 insertions, 60 deletions

diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
index c293601fde99..12715ee18ce9 100644
--- a/games-emulation/fceux/Manifest
+++ b/games-emulation/fceux/Manifest
@@ -1,8 +1,6 @@
 AUX fceux-2.2.2-warnings.patch 1174 BLAKE2B 5b2076015d005a75ab97b586bb2af022b53a8d1724ef0becac808606366f3ba2f64e97c7073bb3f152d337c248ea91cfb15df81e2d1c5f3ebaf94f0defea3ae1 SHA512 03f7ff47f18982eb5fc7b0c942313fb6328412fe64c9b07bf97a85e25eb73c926b362ce5da789ebc7dff70f9d3d11e9df9e033e5a3ddd8fdee6c712471806b97
 AUX fceux-2.4.0-desktop.patch 447 BLAKE2B c9dc55fc34d990de50a1897cc9d1fe8abb5060336ae7b227ac1b07e28ef89d15e202be790ec3f8ff0f8280a64b81ae28c98ce1a22e54f57d93b2e3bb04a24b59 SHA512 00a2af80e5dc6f5ddff8e5fc28b94bc2e249798ec44f5f0b9ed414dc8438e1937058f9bab65cbb5b2c9c6dec85af1a51e58f68405dd758db4ec293efbdaf5398
 AUX fceux-2.4.0-no-git.patch 377 BLAKE2B 8b0be40a0eba5249f73942ea774dc0a37e73ac71fe1684d01551cd96876878d53219c0744ba0e6789c3663c56e58fccc2a2a450b03207219c76e2c10b04ea679 SHA512 6c67d5b823a2b70d6982d9f911edab65c0bcf2cf5faf1ae00004201aefe99d5feae4592204c2586eaa43affff6d05f2e6e3b9274add4713073c0e1cfb519465d
-DIST fceux-2.5.0.tar.gz 21992303 BLAKE2B 2c467a92eaa53c846fdfc7c32c68bec75fdf45d5166f5fa7f1141c48f159c8dc6619f40861373ccb83718dd2d0b857c630f5101a1d29c2699adf128d4711a929 SHA512 bbff55b6f3efda8918b7dab21582d93f8c2a6396bf64a93e33f2f5f6cd345f95bcde7b958f0a663967e47e83110733c4a732dbf538afb7dbecb3147bc3090f01
-DIST fceux-2.6.0.tar.gz 22157111 BLAKE2B b65b44d82eba7aa4b51096a6a60d83095d01ee0931fe01ed523882db67eaa5d741b42ddabdbafe57b58df68949886e6b54ce7530d09704eb2c12dc30c22c623d SHA512 e79b53883918b7fd325575b07729d4b703b004de0c1408e1f5b37b87182b835ba755409303ef208ab4068f7d5c8d6887f9d4b325cca86a55860c9261539178bc
-EBUILD fceux-2.5.0.ebuild 1550 BLAKE2B 9fcb095e65c133f2738faca6d2bfa762cf44ab1c0c78612a7715b0af08b16bd403c8ae7472ccf1c70414d037c5f9af6b28f8cf7be8b53eaf4faa75aff31b88e2 SHA512 b0a1b333dcb88189d78841a96b8a8d91e7016f124cdda12468c16902280b9f962c04f2bb07a7ea473c974634cd39798cc777298340473dbaf8ddc05148744351
-EBUILD fceux-2.6.0.ebuild 1550 BLAKE2B 26ad580addd456693cf339d0e6353138ce0702a0d8058b775109ed1ea613ca23bdb9fec13bd91fad2a098918d40f9e1a7288c0a48c846b31ed07f16762efebb9 SHA512 1fcebcb6226c7f2f04ced2c7f139a20dcf73c3a14cd4c34006484994f77cb8cf3733ad7302fe9d20872c92189bb5871c24c0d1c5dd479929c89a3b6bb20ba5c3
+DIST fceux-2.6.1.tar.gz 23326768 BLAKE2B 8a0907871af229cb8017845b444a8cc4ebe65dff0799483de488e984741fc89a885a9ecd421fef3a25175cc8f0855da68001fb6ea24f8e6955b2e1a02dc3f7d2 SHA512 f086003f676054a5527e3c1b81f9abdb76669e2b3935e7625f99d99ad0b122391646e8a186ca6a2840d5f03fff908630c11481b5166325ca91c08c2e46836f8d
+EBUILD fceux-2.6.1.ebuild 1550 BLAKE2B 26ad580addd456693cf339d0e6353138ce0702a0d8058b775109ed1ea613ca23bdb9fec13bd91fad2a098918d40f9e1a7288c0a48c846b31ed07f16762efebb9 SHA512 1fcebcb6226c7f2f04ced2c7f139a20dcf73c3a14cd4c34006484994f77cb8cf3733ad7302fe9d20872c92189bb5871c24c0d1c5dd479929c89a3b6bb20ba5c3
 MISC metadata.xml 570 BLAKE2B 2a0e6410b932f5445cfcbf2878212b022310e9e059c2a05da52ab55dc1c24f52fc31a51b70c63a2c8226989dad08afcbc0002255753c757d93cf0235c6f94ec0 SHA512 db6acd8c7c1beea1c86e56fd5e2caa7489848be6513c798e186739edf7fc47dd78a126037734dad255966e80e2d257f73915fdd7e7085472b775ad98a5b3e336
diff --git a/games-emulation/fceux/fceux-2.5.0.ebuild b/games-emulation/fceux/fceux-2.5.0.ebuild
deleted file mode 100644
index 3b064ef44c9d..000000000000
--- a/games-emulation/fceux/fceux-2.5.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 )
-inherit cmake lua-single xdg
-
-DESCRIPTION="Portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="https://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg x264 x265"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-# TODO: QT6 support (disabled by default) when available in Gentoo
-RDEPEND="
-	${LUA_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5[-gles2-only]
-	dev-qt/qtwidgets:5
-	media-libs/libglvnd
-	media-libs/libsdl2[joystick,sound,threads,video]
-	sys-libs/zlib:=[minizip]
-	ffmpeg? ( media-video/ffmpeg:= )
-	x264? ( media-libs/x264:= )
-	x265? ( media-libs/x265:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.2-warnings.patch
-	"${FILESDIR}"/${PN}-2.4.0-desktop.patch
-	"${FILESDIR}"/${PN}-2.4.0-no-git.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	use x264 || sed -i '/pkg_check_modules.*X264/d' src/CMakeLists.txt || die
-	use x265 || sed -i '/pkg_check_modules.*X265/d' src/CMakeLists.txt || die
-	use ffmpeg || sed -i '/pkg_check_modules.*LIBAV/d' src/CMakeLists.txt || die
-}
-
-src_install() {
-	local DOCS=( README TODO-SDL changelog.txt documentation/. readme.md )
-	cmake_src_install
-
-	# remove unused/duplicate files
-	rm "${ED}"/usr/share/fceux/{lua5{1,.1}.dll,{fceux,taseditor}.chm} \
-		"${ED}"/usr/share/doc/${PF}/fceux{,-net-server}.6 \
-		"${ED}"/usr/share/man/man6/fceux-net-server.6 || die
-}
diff --git a/games-emulation/fceux/fceux-2.6.0.ebuild b/games-emulation/fceux/fceux-2.6.1.ebuild
index b7b998d9eb64..b7b998d9eb64 100644
--- a/games-emulation/fceux/fceux-2.6.0.ebuild
+++ b/games-emulation/fceux/fceux-2.6.1.ebuild