gentoo auto-resync : 02:11:2024 - 03:04:23

10 files changed, 53 insertions, 44 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index b7585eb1ff82..8b6ccc927375 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index b2a04673095b..4c480271034b 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -4,9 +4,10 @@ AUX pcsx2-1.7.5835-musl-header.patch 247 BLAKE2B 07fa93b782436c575ed43a47694f351
 AUX pcsx2-1.7.5835-vanilla-shaderc.patch 2637 BLAKE2B 87a0774d44ad6d9b8f5219fbb2c36f4156bbefdeb172b6cca5ac6d310ab569e1687202b97b3056220fd0d5cacd0da1dbb11dcd6912b7d53850fbd0e419d13485 SHA512 1d624fae87b92c509404b0a27218a82163568350f223dbd2d9a2021d5207b923bdf9f7e13d5c6efd89aaea6eeb021ee825dce9be0a389ba0b5ee2adfa4a48c16
 AUX pcsx2-1.7.5855-no-libbacktrace.patch 955 BLAKE2B 035da91a0a64e9960846cd8d12bf649e4c536def15ca47e8a176294fbf389550f25ebb27e8ce55d9777390c1311b3b803410f57c19980dd677ef4c7e0f8d5d40 SHA512 a68d9d09dee53abcf5abe5b6eea3d7a5871d2f43eb6f684ad73f699c7930a8e89b8dc61df96f1f7a030ad90014b29b19080c6e2dc189efca67123b8509d2a04a
 AUX pcsx2-1.7.5913-musl-cache.patch 646 BLAKE2B 531a6792eda8449827019d6332a7a53f32cab006c79784996911ec4305276e506b0fc9dfda81e4ff7d3a835aef2789e2d3d36d8632636494503f6392528ece86 SHA512 56c9d1425f327ac8df040a6237c7cbb04932aabbe7bbdb84307085b0eba07914cf046c908216c6e692d0543fb6c2b0d157d88afd79ce56448bb6cf411847aca7
-DIST pcsx2-1.7.5913.tar.gz 15669443 BLAKE2B 1b1e353b544791fb52d9e181e66fcdf0bc7039878a80279b855d05fdab4f1010f45db685d4ab6ae141f497cd72a6e007f583725345a9ef1c9a6d69dc46a77547 SHA512 a8c2e6879527d4864de97ece74aefcbe34093c169a19aafe7558aef872a449be5209209f800ca71b4d259689583f10188b8385439b769688910dc5c3b291c408
+AUX pcsx2-2.2.0-missing-header.patch 274 BLAKE2B e1a0428b8dbbdae9a2a9d7386c8797f54c2c499fe2f5ef1df49ab5308053a75a47226da17a1a43e84953ab3c053df26fd370c6b6bf078f138789abe5bcd477de SHA512 565d86bc11d92360630dea97b1ed745526a9b62c44f420db06d68cb26ef5c9145df9a3ad9ea80b00490a4291a63fe36690728f998c4c2d0d1515a72648ea0963
 DIST pcsx2-2.0.2.tar.gz 16071515 BLAKE2B 328ea302ab2a7f7c4784844005ad4091d3f0b571c80f2a122136cc152fd46d4b1db4541e53ada09fc6cd15ebf37ae494911cadbbc7c57b92b494da355f67fcef SHA512 d442b1c5f9dbd1dca23261c56d0a433771928827b1ff9ebf5bea9cf5c5013defab659e7f0b63f5ce5c6ad856461c00f6ac98498a229300f8d58b9ea0ebf21507
-EBUILD pcsx2-1.7.5913.ebuild 5056 BLAKE2B 9f2a90e66331568f5c869c42cadb3b727ca50341b62977a7637ae4e1265b2d0d0c7c5e897d7f191b3a49aef0ea6945426f5499f6bc9565ef78d1c70128f88580 SHA512 d2956379af75f329aebeaa68ed37999188c8a510a8074404d86c7d66fd3e6b4c930e2669c9ba5c1d3407d0851ab7f1834b2676a749665578c2cee6155c13aa4e
-EBUILD pcsx2-2.0.2.ebuild 4676 BLAKE2B eab9643bc77d567250459094a4ba008daa9b9d4003c38a28f5873e179aa3a8b3c2a6ed3896c72cc049b66e67365401c303cbff14d0b873a2d48c05e94ebf4888 SHA512 00e2d5984e2b0c8b6107fdf0f9c54b91590724f03766f8303cf182a51715a522087ee1913ed9552f77bf595308f2758fa153100be3163f13fda735c7088ed297
-EBUILD pcsx2-9999.ebuild 4675 BLAKE2B 8f8b024654132c9d28ce7c748ce4fad762dcfc7307e5b77c366e88126fae2fb5cde9f6edbf03a77d28fd65b3323ad27a7b6f7cbfb1761402d518929cd3ea505a SHA512 abb36d6bb520d0a3e9001edb94d102db91bb74d7d33b87bacc316b7c4c8802ed4650990585700056f937973509e7309723137bb03eb08a9a60898d183570627b
+DIST pcsx2-2.2.0.tar.gz 17097731 BLAKE2B 8df1ed7478491444c70a0e481f4ceff5e97d7378c2fee8566f0759f2c8bb1f0f10fb17d5cb26344bbac4150b534c518971bafd984338e386f855f83182d1e755 SHA512 4f67045b38ead6f48f99c27b02924b0ec97d3b79540d62900a6b4e7c3642594e53d37a0360d51077cc1c048175c89d891d7352d7db9231d128564b1d0242b7e0
+EBUILD pcsx2-2.0.2-r1.ebuild 4675 BLAKE2B 7d12d425a16f7edd60fb883c4cd4d45fbe1a01eb4fd6fad1a56b8f7a848b79d6c8e983390d02d2d613d88c7331fa15f9b7724b2c574601d22dcc78356638a19f SHA512 284a9c8daa1e2503e2fd123b074e7d8f8e07b13de1ba50c772dbbefa1b7d71fb0bfb6aaed6b31471d4c07e90048eb99392724352b599611d43997d8ed4673c0d
+EBUILD pcsx2-2.2.0.ebuild 4758 BLAKE2B 42ff4d6702174d7c431438d36ae182b416541562dcf3259992e1ca81a1afed94d2f519704cbaea1ef483bf27fe642e98affd408e205345aa1f4df2e97be7e96c SHA512 7fc8b07e4f43c9c81e191724f015d52134127843fdd3ca2c06f205f827570df7ad451a31d7f0417a87415e4d3dcd8385a206cf9d006e6c08ed4875b66f80c2f5
+EBUILD pcsx2-9999.ebuild 4758 BLAKE2B 42ff4d6702174d7c431438d36ae182b416541562dcf3259992e1ca81a1afed94d2f519704cbaea1ef483bf27fe642e98affd408e205345aa1f4df2e97be7e96c SHA512 7fc8b07e4f43c9c81e191724f015d52134127843fdd3ca2c06f205f827570df7ad451a31d7f0417a87415e4d3dcd8385a206cf9d006e6c08ed4875b66f80c2f5
 MISC metadata.xml 668 BLAKE2B ae2b523f457cb9bcdaa31d8f6e64ab953d7e6f3d1fab0c26d133fe1f35bf2b26f74eb5ad62c360a9e182eedabbb8c7c2318754778b5b7f1ae1adf89e74fe9e14 SHA512 f3c52eb50a0ed572c84cdb559f58ed2588772ed5d0a2c60844532dae66073ae8ff078263a7bf3a9659a4473d4dfa0df4c5b4e30cc4133c8d219ca4603f9af80b
diff --git a/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch b/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch
new file mode 100644
index 000000000000..17d53c1d1ee3
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-2.2.0-missing-header.patch
@@ -0,0 +1,8 @@
+Fails to build likely(?) with >=clang-19
+SymbolGuardian.cpp:19:7: error: no member named 'unique_lock' in namespace 'std'
+--- a/pcsx2/DebugTools/SymbolGuardian.h
++++ b/pcsx2/DebugTools/SymbolGuardian.h
+@@ -6,2 +6,3 @@
+ #include <atomic>
++#include <mutex>
+ #include <thread>
diff --git a/games-emulation/pcsx2/pcsx2-2.0.2.ebuild b/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild
index 7a3de4849efb..ea9ea5061f39 100644
--- a/games-emulation/pcsx2/pcsx2-2.0.2.ebuild
+++ b/games-emulation/pcsx2/pcsx2-2.0.2-r1.ebuild
@@ -61,7 +61,7 @@ COMMON_DEPEND="
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
+	<games-emulation/pcsx2_patches-0_p20241020
 "
 DEPEND="
 	${COMMON_DEPEND}
diff --git a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild b/games-emulation/pcsx2/pcsx2-2.2.0.ebuild
index eabda37bc8cf..9cfec05fb93f 100644
--- a/games-emulation/pcsx2/pcsx2-1.7.5913.ebuild
+++ b/games-emulation/pcsx2/pcsx2-2.2.0.ebuild
@@ -13,7 +13,7 @@ else
 		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz
 			-> ${P}.tar.gz
 	"
-	KEYWORDS="-* amd64"
+	KEYWORDS="-* ~amd64"
 fi
 
 DESCRIPTION="PlayStation 2 emulator"
@@ -61,7 +61,7 @@ COMMON_DEPEND="
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
+	>=games-emulation/pcsx2_patches-0_p20241020
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -80,9 +80,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.4667-flags.patch
 	"${FILESDIR}"/${PN}-1.7.5232-cubeb-automagic.patch
 	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
-	"${FILESDIR}"/${PN}-1.7.5855-no-libbacktrace.patch
 	"${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
 	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
+	"${FILESDIR}"/${PN}-2.2.0-missing-header.patch
 )
 
 src_prepare() {
@@ -117,8 +117,10 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
 		-DENABLE_TESTS=$(usex test)
+		-DPACKAGE_MODE=yes
+		-DUSE_BACKTRACE=no # not packaged (bug #885471)
 		-DUSE_LINKED_FFMPEG=yes
-		-DUSE_VTUNE=no
+		-DUSE_VTUNE=no # not packaged
 		-DUSE_VULKAN=$(usex vulkan)
 
 		# note that upstream hardly support native wayland, may or may not work
@@ -145,22 +147,16 @@ src_test() {
 }
 
 src_install() {
-	insinto /usr/lib/${PN}
-	doins -r "${BUILD_DIR}"/bin/.
+	cmake_src_install
 
-	fperms +x /usr/lib/${PN}/pcsx2-qt
-	dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
-
-	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^^}
+	newicon bin/resources/icons/AppIconLarge.png pcsx2-qt.png
+	make_desktop_entry pcsx2-qt PCSX2
 
 	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
-	use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
 }
 
 pkg_postinst() {
-	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
+	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/bin/pcsx2-qt
 
 	# calls aplay or gst-play/launch-1.0 as fallback
 	# https://github.com/PCSX2/pcsx2/issues/11141
@@ -169,11 +165,9 @@ pkg_postinst() {
 		media-libs/gst-plugins-base:1.0
 
 	if [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 1.7; then
-		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, and is"
-		elog "notably now a 64bit build using Qt6. Just-in-case it is recommended"
-		elog "to backup configs, save states, and memory cards before using."
+		ver_test ${REPLACING_VERSIONS##* } -lt 2.2.0
+	then
 		elog
-		elog "The executable was also renamed from 'PCSX2' to 'pcsx2'."
+		elog "Note that the 'pcsx2' executable was renamed to 'pcsx2-qt' with this version."
 	fi
 }
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 308668c6eee2..9cfec05fb93f 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -61,7 +61,7 @@ COMMON_DEPEND="
 # is missing and it is fairly small (installs a ~1.5MB patches.zip)
 RDEPEND="
 	${COMMON_DEPEND}
-	>=games-emulation/pcsx2_patches-0_p20230917
+	>=games-emulation/pcsx2_patches-0_p20241020
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -82,6 +82,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.5835-vanilla-shaderc.patch
 	"${FILESDIR}"/${PN}-1.7.5835-musl-header.patch
 	"${FILESDIR}"/${PN}-1.7.5913-musl-cache.patch
+	"${FILESDIR}"/${PN}-2.2.0-missing-header.patch
 )
 
 src_prepare() {
@@ -116,6 +117,7 @@ src_configure() {
 		-DBUILD_SHARED_LIBS=no
 		-DDISABLE_ADVANCE_SIMD=yes
 		-DENABLE_TESTS=$(usex test)
+		-DPACKAGE_MODE=yes
 		-DUSE_BACKTRACE=no # not packaged (bug #885471)
 		-DUSE_LINKED_FFMPEG=yes
 		-DUSE_VTUNE=no # not packaged
@@ -145,26 +147,27 @@ src_test() {
 }
 
 src_install() {
-	insinto /usr/lib/${PN}
-	doins -r "${BUILD_DIR}"/bin/.
+	cmake_src_install
 
-	fperms +x /usr/lib/${PN}/pcsx2-qt
-	dosym -r /usr/lib/${PN}/pcsx2-qt /usr/bin/${PN}
-
-	newicon bin/resources/icons/AppIconLarge.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^^}
+	newicon bin/resources/icons/AppIconLarge.png pcsx2-qt.png
+	make_desktop_entry pcsx2-qt PCSX2
 
 	dodoc README.md bin/docs/{Debugger.pdf,GameIndex.pdf,debugger.txt}
-
-	use !test || rm "${ED}"/usr/lib/${PN}/*_test || die
 }
 
 pkg_postinst() {
-	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/lib/${PN}/pcsx2-qt
+	fcaps -m 0755 cap_net_admin,cap_net_raw=eip usr/bin/pcsx2-qt
 
 	# calls aplay or gst-play/launch-1.0 as fallback
 	# https://github.com/PCSX2/pcsx2/issues/11141
 	optfeature "UI sound effects support" \
 		media-sound/alsa-utils \
 		media-libs/gst-plugins-base:1.0
+
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 2.2.0
+	then
+		elog
+		elog "Note that the 'pcsx2' executable was renamed to 'pcsx2-qt' with this version."
+	fi
 }
diff --git a/games-emulation/pcsx2_patches/Manifest b/games-emulation/pcsx2_patches/Manifest
index 808a531f358a..9704f2c05534 100644
--- a/games-emulation/pcsx2_patches/Manifest
+++ b/games-emulation/pcsx2_patches/Manifest
@@ -1,6 +1,6 @@
-DIST pcsx2_patches-0_p20240610.tar.gz 674606 BLAKE2B 2b05728e0a2114fba1c12a2c075854a771127b87ba430d653c2a7e2ab85b9c30d67f14034717b75fe229b1a3f8b90cae63c840dec32665cebad9ae841a084764 SHA512 8db514d0677cdaa2d6c9fddae2fd8975a8af5d222544ec12ceb97a0da54a87ebeaad09989bd36c9a0ef2ac7a370f229c813f7a769ede8027e1c4b9b3ea928b66
 DIST pcsx2_patches-0_p20240714.tar.gz 675035 BLAKE2B 6ed77089ba630bfd37f9eb7372855ed638b8c8c5a9788b6a6ddcdcfff4e1d53b03fe7160c8bd7780ea13b9bd63a4cc7a2e1ac0410f447b1e17a42598d19fe348 SHA512 15f89e40944d56b301aa33235236898532a888af4f3c0f3527e6c98eb38039f6b7623b60c0aadb2f4a7a7b1bc325cb60f84b6d16b3d3066c0e924ff040ed8e50
-EBUILD pcsx2_patches-0_p20240610.ebuild 1518 BLAKE2B 084bd0b553fe953189a455cb7aecf5112fd662846692c518124e9a72f605803ca86951eb5462df63c6d14063f8248192d231166770aaa284bcc5ec3aa7991dfc SHA512 80ec7788647092111e8d974f6586c9fe883c40a4d837e10e77b000e686cbf9845fffcde82564ee26ec4550b076d81285a7f556ff387833d63fe65438d9fc3066
-EBUILD pcsx2_patches-0_p20240714.ebuild 1639 BLAKE2B a705379bab69e1792846cce01d230352e318fe7ea009a0ae907391dbd23b0590d6b7768d6e9bff151d40f6da2e4e44cfd576cfe4469dadc600ffb335d7f6bce0 SHA512 a77420bb7e069d1c1041e129ae595b160742454d6406978f8164abadef5f4d1099594bc02717be813a06792b69288877d8fc6311360f4ebc8c22d565d83d98d1
-EBUILD pcsx2_patches-9999.ebuild 1599 BLAKE2B aa1b65fa91ed7cb51c32631425898a711f4339d2639f73dfa1048cf6f4daa321c513190988bdc391497d3d5e82e34418438fbcd7ef718b500d62a6c6c2415333 SHA512 eb0b60abfa2cb1351921b06c49056d6ba7797b2def86bdee829a5a188ea98f36698859a021c3829166a57be3f8d0895e8192c67053e95d873799c21d0c594cec
+DIST pcsx2_patches-0_p20241020.tar.gz 684434 BLAKE2B 934b0953d845cdc3e85bb99c7ec9ad8d251137d694287d487f8bfcfea048e5e572285e863b7d9e1c1650f07cd89bd69ca72259d357c92732e942aad4c975fc2f SHA512 5b4d8e545a9694966fda0aa96a1198ce0be66d163ef1d033b3ae054e01457b570f1e10b1d5f7657a54d4a6526d1f039a1a382e95531797208ea7b31b96aebbad
+EBUILD pcsx2_patches-0_p20240714.ebuild 1638 BLAKE2B 3835f4cf8ab74305ed72f25587b9016d8811c2810fd87b82ae825e917b0665040b334032c767b6dbaf519c2893aa70125199cf1e79f900934299c1df81669276 SHA512 70b503cc35f473ab3c2cd370ed71198089c20a79b925bc87707e4c0af81de0523107af2f22fe97e6cec28e3888001539441de3031c64332c204dcbf55c2c45cf
+EBUILD pcsx2_patches-0_p20241020.ebuild 1641 BLAKE2B b72ecca8060eff29efa8fe4fb7fe6ce936040591c1c18a86121c9d02a0900f83745d8e34cfa75bfc3c7803bbd8ee9a36965501eccf8e6f2ec1d00dbf95162bd7 SHA512 d9a73db662ce04d611f839de1dfbe697bd502dca2fc2accf12e2c60c31d4d6d86e38822a8686827974ab9edd1c67d71b873f28201b6f7afc927d175f515589e5
+EBUILD pcsx2_patches-9999.ebuild 1601 BLAKE2B 7c74c00cf0b638adaed95035510d730fee4642306bf521c9e20238867740daa408dbd701c5275ff9c36c8c8eee0c298aba7407a66e35c23a6a487cbc10afeec3 SHA512 a111d168cd345f538612d88945e28b63cf777c86093f4aa39f0cbbad52ece87f5807676457cd632f98b1ba622802c75094257205d1f87e55de0d6b7f5a7cb999
 MISC metadata.xml 362 BLAKE2B 3b213785f8a28bc1e2f540e27b025d4397dec5f7885fcc8f7e3fa56186b8f023ef97de5ff7b927a8c09ad1f79baee546d08b25cf865e344197a1640470f37641 SHA512 f00b1d14ba779989c235775de6f2470e18b29f2813723eae51015681af2d2c798aeddaa9657897c83b8bcb0b124ea77b34cf6370e37104fa24a968834ea5fabb
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240714.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240714.ebuild
index 714bc58117f8..abdf31ed2c23 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240714.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240714.ebuild
@@ -19,7 +19,7 @@ else
 			-> ${P}.tar.gz
 	"
 	S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Collection of game patches for use with PCSX2 (e.g. widescreen hacks)"
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240610.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20241020.ebuild
index 857b32ea21e2..db5bb273f1c2 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-0_p20240610.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-0_p20241020.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=8
 
+# note: not "required" but should typically be bumped at same
+# time as pcsx2 to match the patches.zip shipped with it
+
 PYTHON_COMPAT=( python3_{10..13} )
 inherit python-any-r1
 
@@ -10,13 +13,13 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2_patches.git"
 else
-	HASH_PCSX2_PATCHES=fcb11f6b699fd68e41977bffe53b8e8031ccb578
+	HASH_PCSX2_PATCHES=f193d7d41f63a8a6efa190b80096c0450c368c9b
 	SRC_URI="
 		https://github.com/PCSX2/pcsx2_patches/archive/${HASH_PCSX2_PATCHES}.tar.gz
 			-> ${P}.tar.gz
 	"
 	S=${WORKDIR}/${PN}-${HASH_PCSX2_PATCHES}
-	KEYWORDS="amd64"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Collection of game patches for use with PCSX2 (e.g. widescreen hacks)"
@@ -48,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/lib/pcsx2/resources
+	insinto /usr/share/PCSX2/resources
 	doins patches.zip
 
 	einstalldocs
diff --git a/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild b/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
index 56f3ee5c5a2f..750814b2aa1f 100644
--- a/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
+++ b/games-emulation/pcsx2_patches/pcsx2_patches-9999.ebuild
@@ -51,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/lib/pcsx2/resources
+	insinto /usr/share/PCSX2/resources
 	doins patches.zip
 
 	einstalldocs