gentoo auto-resync : 28:10:2022 - 03:58:39

4 files changed, 0 insertions, 255 deletions

diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 52b250aba42f..aa0bc2077413 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -4,19 +4,15 @@ AUX pcsx2-1.7.0-crcs.patch 1456 BLAKE2B e4dc096bf863d5067816b2755ba84a6f7e6d9163
 AUX pcsx2-1.7.3329-lto.patch 516 BLAKE2B 84af170687a279a2f78188cff30ecc7ad68c11f4d5300b20fb06ac745770869c2c70f7ff43a069d225520ae56fe9d960706dc53f03890caeb46ce0efddea312e SHA512 c94a7b4c52ac9a4a7918f275dc7083b63c0a3992aa86d7ca424a229400893b1234381a3111249e3d5e88de9486e784d0a7e8977bbf853b215e2f6a4fc8bcb822
 AUX pcsx2-1.7.3329-musl.patch 292 BLAKE2B 02717d90a08caddc6c0df32137fc73fc4426f9df1b123cfc7dee051e918b23d1659278d7ab14823d7208b487486deed949ab2e3c93046980e5dbd7369cd4accf SHA512 5a28effab686c38e8d12d53244074736595a3f2cf6b4ac9997289b695642094e50d20558427c4108c5b0fd782ca4a91401099ab5c04778d30b4cba31aae29923
 AUX pcsx2-1.7.3329-qt6.patch 371 BLAKE2B 15a8e221ee4b6f19c5956269908e9d3bad6a8fbccdddadd3d5941057f163c064a1e3d81daff1a90c689fe1d4bb1e645081be9dae2aa63a88caa9b2b83b13cebf SHA512 65f3f241ccda684cee1d382a973ffbda09b290a4878f7c0b3aed279b2fa5aa1f188b7a5bf26a584d2aa4ed12aa9c1c5e15ecebb2c2bb6ae83a7622deba26bdd4
-AUX pcsx2-1.7.3329-unbundle.patch 1493 BLAKE2B 9d37c36773d594bfc045ecf50680a422e597c96ce76e934a4ed7cc91c6ee2a1f3bb162eeb04a4437fbd5be1e064dff295702b4bcb1352a0064ba7fa697114175 SHA512 b142b2fa1aaf68437f47bd33d30e474543fea05794c67321b3b19746d95ceb7f02196ff8518bb2cc85fd52d43a4233955a31842edf38e9560e3f32204d2fd9d4
-AUX pcsx2-1.7.3329-wx-vs-sdl.patch 350 BLAKE2B 17e54fd9150ad7d8d3545e474b5579ae8b8e1df1b38b510931dee73e566903b6f9397d2dec537f6d6425d61a966f71169f84a863c0e0a82203ce21ab3f514fef SHA512 9240e808886b746d74828405a931c6dc4d093f3ab22619b2a5d349f737a241c2b7545771931a4b77385d6cb6583124a01ba24faf74f43914fdc62c6f33dd39b1
 AUX pcsx2-1.7.3351-unbundle.patch 1276 BLAKE2B 26af7e54f63bed99075f8155d237092d536b9ef420032d766ef4e41b7953c329f70d2040ae6a99142e0bc307fa9a534bd5db4e363e4e64a4291dc7a5760149b9 SHA512 7068a214cae03579e83ce14a5b953807a4f536be93946e15b58a33ede2497a128508ac2727fd1f602444906bc1497182a3740a1613d39300c403e387adbaa332
 AUX pcsx2-1.7.3468-cubeb-automagic.patch 1635 BLAKE2B 90581edb3ed95fb011ecbd446e529b48544a0c8090e7e40b4aba6fb153a73e53f8399a61ee1d9fce180ac2ee44185cf7dac1972e62dc43648496774a7a8cfca9 SHA512 d2b92cc6530c706e0219b6eab5c8b52a3e93bcc16269400afbcbb3ca23edf07f511fd4116b02e77f89eb7083b9bb64f8bec85950d9d7e98ffdbbe351d4c70387
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
-DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
 DIST pcsx2-1.7.3468.tar.gz 19926257 BLAKE2B d276d7640c46c6fbad28c87b46e367c6dbfc8b3f6732f34dce49736772224dada6b4d5bc5947db2fe757b465e0d9fc0821eaf6f79987daf6df1734c8c9d34c52 SHA512 e96c1d8e733e3df8666e4eb7ebf3be47c7c65d948b4d4fc0818f90af60dfe15e928a5f93bfe0791444b3529f9b0a3789853c2b53845437507f97eda0c2bc2646
 DIST pcsx2-fast_float-32d21dcecb.tar.gz 76108 BLAKE2B 7a4e8e3bb67387c03912e5f7035ba3fab1aeaa119b36ebdeb14c45069b3270270a8b87de2774ec325d8ed2ef0604a3d3762432d42f1e026a213990ac39341e10 SHA512 2cbdc5b05ab7c19e20b4e34959b90d1fa866d4ba239ec0a4c434cd33bddfb1cb6f1da467b0a525f5a4887c9b1860e975fe074aca0d9e211f0fc7bc6402d3601e
 DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
 DIST pcsx2-rcheevos-31f8788fe0.tar.gz 522855 BLAKE2B 39533199f6b1e0cd821d817ff57101ccad0049f5144b856f1e796c83d81fcee059caa944a0fb14a0e95e51da43a6bc003cd6891ca85c2b9a959b4c42d8ca0a84 SHA512 cb0e8bf4d222f3ef127d20a9d6738e6c39d7cff48a0da8fe19fcc43669433b7e53cc63ab332e8f0cd935b6a33eddef3e741ee862a82bd4f29a02df1d9a42ec45
 DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
 EBUILD pcsx2-1.6.0-r3.ebuild 2647 BLAKE2B 7d7a0e595d3d8297f3ae0049b3c376f404eeb5a6f477486076e5ac2b72dae6065c97b845f715f4e7e52af158b9dfbe6bbc5cf4f10d051838eafe44553f76efd3 SHA512 18b6131c6ff0b292f4dde4a54b4a5c698a403860ab332e01f181e18931e5ac14cc131ce140de563125f63eeb8b3523b51c6df4f4ecf2086a00e000d4e3d0289b
-EBUILD pcsx2-1.7.3329.ebuild 5684 BLAKE2B af44f3fe3968440f88f2506f4e23d1361f2ab5a556d0095b55dc9fe883ab1fe75de5736c22b6e5855c1d49a4e0c2eb783666b0c21f825cecc0381aecdc0d51f1 SHA512 af6169cfa2f69125abce4d08a9bcf5c1919611fdda8a00ffcf66f61bcf06f4c3dc531bdfb5042d4b605eccac11214e1904aba8626b1987b3a69ab71807ff9ac1
 EBUILD pcsx2-1.7.3468.ebuild 7180 BLAKE2B f8ea7f06b934f87f2ee869ae08167078e7eaca8b9601e34d7ed586aec4ab0ce10790db81b3c6d2620be7c9606f25eefed6505c51b9d8a5621639347c73d83d00 SHA512 2cf088951ea0f2f542c0ce158bccf462f2cdd7d2f8150e4135fffa8ecfaf1ee7895eb739cb6e283b058bded6de605b89bc9aabd8112965c0b73b1357e5c2e81a
 EBUILD pcsx2-9999.ebuild 7180 BLAKE2B f8ea7f06b934f87f2ee869ae08167078e7eaca8b9601e34d7ed586aec4ab0ce10790db81b3c6d2620be7c9606f25eefed6505c51b9d8a5621639347c73d83d00 SHA512 2cf088951ea0f2f542c0ce158bccf462f2cdd7d2f8150e4135fffa8ecfaf1ee7895eb739cb6e283b058bded6de605b89bc9aabd8112965c0b73b1357e5c2e81a
 MISC metadata.xml 805 BLAKE2B eb7ce944f7dc5b1889cc2b59f389eafabe9d5e44c4a730fa1352b0a00aec0f97d607204c440a9ce014e02f5b1a73c6ccd294074e7ce41f563c6c3643614ac9f6 SHA512 e8d939f76830204283557319961b4e3aab557e1c3e36fbfc98d4605b0728adb42d0731a05da998eb099f6b0df837eef7616cddb1e62b006979fb9262c172d961
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
deleted file mode 100644
index 450329522183..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Adjust to unbundle a few extras.
-
-zstd changes only needed because of https://bugs.gentoo.org/872254
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,3 +54,4 @@
- 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
--	add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL)
-+	find_package(GTest REQUIRED)
-+	alias_library(gtest_main GTest::gtest_main)
- 	add_subdirectory(tests/ctest)
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -177,3 +177,3 @@
- set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
--if(ENABLE_TESTS)
-+if(0)
- 	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
-@@ -210,7 +210,4 @@
- find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0)
--find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
--if (${zstd_TYPE} STREQUAL System)
--	alias_library(Zstd::Zstd zstd::libzstd_shared)
--	alias_library(pcsx2-zstd zstd::libzstd_shared)
--endif()
-+pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
-+alias_library(Zstd::Zstd PkgConfig::zstd)
- find_optional_system_library(libzip 3rdparty/libzip 1.8.0)
-@@ -243,3 +240,4 @@
- add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL)
--add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
-+pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
-+alias_library(chdr-static PkgConfig::chdr)
- 
-@@ -269,5 +267,3 @@
- if(CUBEB_API)
--	add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL)
--	target_compile_options(cubeb PRIVATE "-w")
--	target_compile_options(speex PRIVATE "-w")
-+	find_package(cubeb REQUIRED)
- endif()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
deleted file mode 100644
index d00f9553993d..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-This check is unnecessary, bit dodgy (ldd+grep), and requires -DSDL2_API=1
-/only/ if wxGTK was built with USE=sdl or else get a cmake unused options
-warning. Test code also fails with -Werror=strict-prototypes (clang16).
---- a/cmake/SearchForStuff.cmake
-+++ b/cmake/SearchForStuff.cmake
-@@ -191,3 +191,2 @@
- if(NOT PCSX2_CORE)
--	WX_vs_SDL()
- endif()
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
deleted file mode 100644
index 6dd06cea5dcb..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps flag-o-matic wxwidgets
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
-else
-	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
-	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
-	SRC_URI="
-		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		vulkan? (
-			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
-			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-		)"
-	KEYWORDS="-* ~amd64"
-fi
-
-DESCRIPTION="PlayStation 2 emulator"
-HOMEPAGE="https://pcsx2.net/"
-
-LICENSE="
-	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+
-	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
-REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/xz-utils
-	app-arch/zstd:=
-	dev-cpp/rapidyaml:=
-	dev-libs/libaio
-	dev-libs/libchdr
-	>=dev-libs/libfmt-7.1.3:=
-	dev-libs/libzip:=[zstd]
-	media-libs/cubeb
-	media-libs/harfbuzz
-	media-libs/libglvnd
-	media-libs/libpng:=
-	media-libs/libsamplerate
-	>=media-libs/libsdl2-2.0.22[haptic,joystick]
-	media-libs/libsoundtouch:=
-	net-libs/libpcap
-	sys-libs/zlib:=
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXrandr
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets]
-		dev-qt/qtsvg:6
-		net-misc/curl
-	)
-	!qt6? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3[wayland?]
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		pulseaudio? ( media-libs/libpulse )
-	)
-	vulkan? ( media-libs/vulkan-loader )
-	wayland? ( dev-libs/wayland )"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	test? ( dev-cpp/gtest )"
-BDEPEND="
-	dev-lang/perl
-	qt6? ( dev-qt/qttools[linguist] )
-	!qt6? ( sys-devel/gettext )"
-
-FILECAPS=(
-	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
-	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
-	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
-	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
-	"${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
-	"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		local EGIT_SUBMODULES=()
-		if use vulkan; then
-			EGIT_SUBMODULES+=(
-				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
-				3rdparty/vulkan-headers # to keep in sync with glslang
-			)
-		fi
-		git-r3_src_unpack
-	else
-		default
-		if use vulkan; then
-			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
-			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
-			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
-	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
-		-i pcsx2/Frontend/CommonHost.cpp || die
-
-	# pulseaudio is only used for usb-mic and without qt6, not for audio output
-	{ use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
-
-	# GS tests currently fail to build with qt6
-	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
-
-	if [[ ${PV} != 9999 ]]; then
-		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
-			-i cmake/Pcsx2Utils.cmake || die
-
-		# delete all 3rdparty/* except known-used ones in non-live
-		local keep=(
-			cpuinfo glad imgui include jpgd lzma simpleini xbyak
-			$(usev vulkan 'glslang vulkan-headers')
-		)
-		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
-			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
-	fi
-}
-
-src_configure() {
-	use qt6 || setup-wxwidgets
-
-	# for bundled glslang (bug #858374)
-	use vulkan && append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=no
-		-DDISABLE_BUILD_DATE=yes
-		-DDISABLE_PCSX2_WRAPPER=yes
-		-DDISABLE_SETCAP=yes
-		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=yes
-		-DQT_BUILD=$(usex qt6)
-		-DUSE_SYSTEM_LIBS=yes
-		-DUSE_VTUNE=no
-		-DUSE_VULKAN=$(usex vulkan)
-		-DWAYLAND_API=$(usex wayland)
-		-DXDG_STD=yes
-
-		# sse4.1 is the bare minimum required, -m is required at build time
-		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
-		# https://github.com/PCSX2/pcsx2/pull/4329
-		-DARCH_FLAG=-msse4.1
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	local replacing_old
-	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
-	then
-		replacing_old=
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
-		elog "it is recommended to backup your save states and memory cards before use."
-		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
-	fi
-
-	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
-		[[ -v replacing_old ]] && elog
-		elog "${PN}-1.7.x is a development branch using a nightly release model"
-		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
-		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
-		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
-		elog "roughly every months."
-		elog
-		elog "Please report an issue if feel a picked nightly release needs to be"
-		elog "updated ahead of time or masked (notably for handling regressions)."
-	fi
-}