9 files changed, 28 insertions, 29 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 789ef814d99e..5df43b6533d6 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index adc336ae6040..8023a591ef72 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,11 +1,11 @@
-AUX 10.1.0-Werror.patch 660 BLAKE2B a2877e473e2206259cf260b22d638643ae0e1a595f79bc69c401b9e5107445764868782e3cd4d8626f9a9d62fd748b7242530d89881678c12ac49230804cab41 SHA512 3bfbc1e5c064318b36b01e656ce6296726b31632222f8cebe96cac6acf011e1237380cdad71d01a0493c1382d0e3fc471e2a4e0ed0b902e70cf29e1d8a88633f
-AUX 11.3.5-icu.patch 840 BLAKE2B 7f49ef8e2f93bf813cd88504d708b66132678e6686f862e0c6b3fe4626386d8e6de0fc4fe1b5d860652873903cc3faabfe75c6d04becab2f0cd318cc4624206d SHA512 29f80dc1d918a8462484a405f827f02a6367270d5143c22c2a01e905350649fb1054bce696835cc98300ab3a4e53436665d47d74a12a69178c230fb22dd81d41
-AUX 12.4.5-xmlsec1-pc.patch 2132 BLAKE2B 59d6be7d7228eb7054dacfe63c0a54727ff6dde4d2fbc3ad6035b2e65371b44c67120160e39a603558656f5a0897fcd38b67c4e3e699550b3931a67e3999e309 SHA512 b62aae032e928b93c2d0342157c826d4d423d9219d73b6d5165dade7a550c2dff0083086bfc80f48c06077a0fc0323f0db25bbc092000ccfa03b8993d6ade99e
+AUX open-vm-tools-12.4.5-Werror.patch 590 BLAKE2B d36a3fcda6e26e0e0ff0f0a412062478c1e88beb00384c2b241a5010ab35acde0f6689220b21080fad7dc19ad87df1a0dc83373fa5dfe6d1f17b1d6f2b32c960 SHA512 febe133b81a6116651ff7d3b8cfdd3e70c4fd78c62c7668ef136b08532c7b4e16f7cd3b5188bff1cf22f76b314c9c333cfd0eb89ef2cc3596f1df99df8f31f8a
+AUX open-vm-tools-12.4.5-icu.patch 770 BLAKE2B 7cac9b54c1397f3df91a812d1d6228a1ab8168d61958966e65ed6985fde0484c0adea5a2143b31882ace66e7637cf5bfbfa4c34ac5f69c5292eb96eb4516b021 SHA512 1b3521dff553293c80937ef56c91d45b74675a947c2c4995c098f34dffb6950f14721567fbc5abf367d725db7d0fe4cb6b9f1dcb37c20708c3705fabd726ac3d
+AUX open-vm-tools-12.4.5-xmlsec1-pc.patch 1992 BLAKE2B d0010929e0c8d5b282e267d0fb6f2783feef7b97b30ef8bc429eca0b70fe4c6aede7da118062fc2f90935689b3440e8b569a11c619c2cd865d9e2ae0ec1ae11d SHA512 950944318935a5676b1dc7fc4cf41e1bcda6d1d02ab5a4bf984dc04c67a3f6b8dd6a62ae341bc24e334ad5af24859cab5b8674ae30e3c57e66ab53ad729ba705
 AUX open-vm-tools.confd 88 BLAKE2B d82267674328d1e38cc850df238b8cc6c566588883d81e59f308ddd070fde6e4f9ae4950c9d68ac6daf2ed33e1a45f323d8f954430559b03697f1a25f1e7ef6a SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be
 AUX open-vm-tools.initd 1225 BLAKE2B 279f572bfb07c40f0612c39989ba0048c640b5bdfdb06e624d8af974cd9fdff42ab0b4bb6ad79e19dedf3cd89fd90d61f7d549b9c8a8a6406129a5eab5e60cbc SHA512 a612dd69e671cd32b028caeefa8123243e46ed6ffe5f6f7cbd1f805ec10088dbe994d4ecb2346a7f6d094e913e70e87fa17fa195702a0825cc3af319d350d34d
 AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002ed64b3205f0b4ad05d4d92ae059a1b451cfa043488d15dd31dd8c152342895cd296052757c854124b SHA512 de3265980076f87ab8e0b459b2b6d60dbcf6e8453bd26200d9e05938246add8d320681c7faa3c290c8851c9a3949c62ddfe524b7e1581daf508115f340111881
 AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505
 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3
 DIST open-vm-tools-12.4.5-23787635.tar.gz 4356612 BLAKE2B 59fab76bc740d6c8e8b76f8c2379f751a62a4d4c01add9520acafbd5601d9490c7fb7d5a3631d1198c811be33b1bd7c7b381de2f9a8f703ceec21aab6331797a SHA512 dd90622a0f1c773ed217040788a1bdbfba1e60256d4e5159a2557155f6ac642ab71488044860e417cdd853aad77a6495b98e8fd02f9755be90cc1dc71c840a3c
-EBUILD open-vm-tools-12.4.5.ebuild 3216 BLAKE2B 0593145e689fa8c42480771d11372a3cf2de0488a68879191303a7dfa427a441fda6ecb65a518a1402cf91fbac7ffbfff51a4cc38d22a48ef750919f8cca67b8 SHA512 3193c226837765b9e8fcae43137c0c666cc0d3f0c65349c2d951858f07b48cb52b5b366d5acf2d678be2983ded9f47f7c01ed8df54fc2dbb3db4f07c1cfcc4d6
+EBUILD open-vm-tools-12.4.5.ebuild 3202 BLAKE2B e3255d547d4736a387af18cdb2d6f42ac6a8b52879c7e0b24d64329f0b221eca226cebdd0f68daa3fe2c5fd19db98558aad5e754c61339bce10c5db7c1f8acd6 SHA512 8424e0ef55e6944372e848e1e15f619ee176c9e861bf91b4f2a9d2b5469ee80198ebae5e8d369c09d918df2b2d5bb6c708e3e52fcb852ba97e251c76d8162f03
 MISC metadata.xml 1153 BLAKE2B ee86cf0478cb11314cee973b0df974c915e79bf8e5ed42907b91cd3ee867ed7441fac261b759341ab0f4214f1665b8f2b6a4a88ceea4d6b463eaf87040cd6fdf SHA512 c5b0ae47bcf9f1e2dac7238772d9a70235deb8d15bb9c0dc702b1f8f2b922070651b6010b6a83fa4fe8406e7a7a844e53dc85615fdc8c73e1e3763add12f6b6c
diff --git a/app-emulation/open-vm-tools/files/10.1.0-Werror.patch b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-Werror.patch
index b79865e62db6..2593ddb80e5f 100644
--- a/app-emulation/open-vm-tools/files/10.1.0-Werror.patch
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-Werror.patch
@@ -4,13 +4,13 @@ Date: Sat, 26 Nov 2016 11:54:33 -0500
 Subject: [PATCH] build: drop -Werror
 
 ---
- open-vm-tools/configure.ac | 1 -
+ configure.ac | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
+diff --git a/configure.ac b/configure.ac
 index 8d4604e8..4d925f22 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -1137,7 +1137,6 @@ AC_C_VOLATILE
  
  ### General flags / actions
diff --git a/app-emulation/open-vm-tools/files/11.3.5-icu.patch b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-icu.patch
index d51c0cc60a37..ff2731de9481 100644
--- a/app-emulation/open-vm-tools/files/11.3.5-icu.patch
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-icu.patch
@@ -4,13 +4,13 @@ Date: Sat, 25 Sep 2021 21:14:25 -0400
 Subject: [PATCH] lib/unicode: add ICU_LIBS to LDADD
 
 ---
- open-vm-tools/lib/unicode/Makefile.am | 2 ++
+ lib/unicode/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/open-vm-tools/lib/unicode/Makefile.am b/open-vm-tools/lib/unicode/Makefile.am
+diff --git a/lib/unicode/Makefile.am b/lib/unicode/Makefile.am
 index 4284c51c..40261fba 100644
---- a/open-vm-tools/lib/unicode/Makefile.am
-+++ b/open-vm-tools/lib/unicode/Makefile.am
+--- a/lib/unicode/Makefile.am
++++ b/lib/unicode/Makefile.am
 @@ -25,7 +25,9 @@ libUnicode_la_SOURCES += unicodeSimpleTypes.c
  libUnicode_la_SOURCES += unicodeSimpleOperations.c
  libUnicode_la_SOURCES += unicodeSimpleTransforms.c
diff --git a/app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-xmlsec1-pc.patch
index 9dfaad5e200c..2eed3e1f9bab 100644
--- a/app-emulation/open-vm-tools/files/12.4.5-xmlsec1-pc.patch
+++ b/app-emulation/open-vm-tools/files/open-vm-tools-12.4.5-xmlsec1-pc.patch
@@ -8,13 +8,13 @@ Subject: [PATCH 1/2] Also try using pkg-config to detect xmlsec
 The xmlsec1-config script does not help when cross-compiling. pkg-config is
 subsequently used for a version detection anyway.
 ---
- open-vm-tools/configure.ac | 2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
+diff --git a/configure.ac b/configure.ac
 index 26b2e950..d46a51e2 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -879,7 +879,7 @@ if test "$enable_vgauth" = "yes" ; then
     AC_VMW_DEFAULT_FLAGS([XMLSEC1])
     AC_VMW_CHECK_LIB([xmlsec1],
@@ -36,13 +36,13 @@ Subject: [PATCH 2/2] Respect the $PKG_CONFIG variable when checking the xmlsec
 
 This particularly helps when cross-compiling.
 ---
- open-vm-tools/configure.ac | 2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
+diff --git a/configure.ac b/configure.ac
 index d46a51e2..39b9fa9c 100644
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -884,7 +884,7 @@ if test "$enable_vgauth" = "yes" ; then
                       [],
                       [xmlsec/xmlsec.h],
diff --git a/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild b/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild
index 51cbe26ea5a4..d3827b193eee 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-12.4.5.ebuild
@@ -62,9 +62,9 @@ BDEPEND="
 	doc? ( app-text/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}"/10.1.0-Werror.patch
-	"${FILESDIR}"/11.3.5-icu.patch
-	"${FILESDIR}"/12.4.5-xmlsec1-pc.patch
+	"${FILESDIR}"/${PN}-12.4.5-Werror.patch
+	"${FILESDIR}"/${PN}-12.4.5-icu.patch
+	"${FILESDIR}"/${PN}-12.4.5-xmlsec1-pc.patch
 )
 
 pkg_setup() {
@@ -75,8 +75,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
+	default
 	eautoreconf
 }
 
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index abae86796732..45ba7d425c9c 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 270 BLAKE2B 979c3e8d2a3c1d4f30af8f2d9954434dd685abf42992abf0e6
 DIST spice-0.15.1.tar.bz2 1623290 BLAKE2B 19ddb3cac91be07a4a358ed89a5e4d1a5c406a9831b8c8a518764055354ecf6e09d129ae03ba65d876669da72f2cbf0c307261564097f60951711e9852eebb69 SHA512 362ab2f0b483911830693834515e1d331a6b929c5c63fd4522e843c42bbb7d8a52510d60f5f17d175dd2617c9621630f6a81f3ff7dce11dc28e6fb135e60fa86
 DIST spice-0.15.2.tar.bz2 1663326 BLAKE2B 00f5393ac409590b8fe0203251b811a4fe6dca16e644a30dd8165d57ff28cbef3b2f9c2a92ff7d2f6c8092bbef4f89a4e85ef9228cc8c03b0a163ffa3afaf9f6 SHA512 c8f273b9e97ef38a03b331f7d32c5f0a09d540523fe626568c845152cbd22273a92b3a08bc13fa2e061b913ad16ceb7cbddf142655cd9cdcd8eb5f646fa6aa26
 EBUILD spice-0.15.1-r1.ebuild 2565 BLAKE2B f23978280da1df296081830a626b8e0c32c835c901a128fbb206f235185e1128a0123ee1c08ea8e0239be3af9f60ed6698c97761d8da2c643f95f6b07ef11e5c SHA512 1453244358a294bd7e5166e060bdfd35eae806aa89494a801fc5bb8568f59131876d5100506f53d2d1293482f97f7ad75334d256d690ec70133079c9c951fc72
-EBUILD spice-0.15.2.ebuild 2396 BLAKE2B 1e17cda122ed57d596ba085cef5a5801055ec200b2c04e0a2b2f78c78851d9df9edef7966d2a608afb1bea655a1ba31a7813d70d1ed6f642e770aafffe044792 SHA512 7fa1968b1817d1561d20a20989095bc8af37d6cb00c7bfebe01b305de703688c9f51d064ddd3a7612c8f29bf1240a452cf2f1f4ce1c46fba291edfe035d28860
-EBUILD spice-9999.ebuild 2400 BLAKE2B e5998db7a449ba158ba9d0351441f596cfac5dc92b98e2b146db0a553fcccf92d0fd889cd762efb6077f52de47b5db16a9f34d5b4647214a6ea5f61b48f3ba9b SHA512 4b998236d2eac736213c172357a4f79002284e2b518976f1f8d06199cfac406185683abbd8f2e0638ce2ae9734a0054a8787f4c267f0823b2e3ecabe4bcd9b91
+EBUILD spice-0.15.2.ebuild 2396 BLAKE2B e743ead2469a967ecd6b2674a90da0940de4e622196917335ccabbf63901be7fdae0dd7a1af3c908bbe8c2629b4eb09a505055c01d5eae2dba9d6c48dfb7d977 SHA512 34b2e2a89fa7695af72a097923684f3c0e97f2d216b5b3d861367c50db933dce7b6ae8e193d26dd50e20a0b89401408b70edcd4a02cd627a2d35fc01a16b11c3
+EBUILD spice-9999.ebuild 2400 BLAKE2B f40dc968f9565413b9c6c83dff681814448ca098a6e001185b8fcbe0d33f1e98ecdcf6acc7a8cd19e957a4790dae5fecaadeb61aa91e2ed99e52680f4ce243b6 SHA512 e0a97f4ac2b9e032e6ec4e8629b5ea18254505646374aaa75267c8255f48d5a7eb54a571ecba79f22b4a5d7b679945ea23e8838fd9386fb598233f226e7ceabc
 MISC metadata.xml 474 BLAKE2B 62c3e1d9f11d515950c4eb8fda479808a73ab081932fe38994854dcec491aef63e08f3943074ae9bb33eee452b25a85b6ccff8a9d16c77acdb4c85aa8d126665 SHA512 75665383947d475f99e4f75a1d3599ef51e32e7a1b56fbf8fa49aabcb335e66ed29407187a5f9730f223bcf48a38ef1408db685b8a9401a06f73afebf5a673d2
diff --git a/app-emulation/spice/spice-0.15.2.ebuild b/app-emulation/spice/spice-0.15.2.ebuild
index 69caa30dafc1..f39d4625f7a7 100644
--- a/app-emulation/spice/spice-0.15.2.ebuild
+++ b/app-emulation/spice/spice-0.15.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="SPICE server"
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 22dfed00d335..8e16f62ca590 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="SPICE server"