gentoo auto-resync : 11:08:2023 - 03:33:50

5 files changed, 24 insertions, 6 deletions

diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 86f539445229..e326797085db 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,5 +1,6 @@
 AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e3703c50669ba9abf088dac0dd7aa8d6e59fcdd6656f5ad6955e4ef87c25d6f4082d83af71a09b2928934222b25847b8b2b5089f SHA512 43fc5c50c33e09f028c2369a660499fbb6c240931c6b7d44c4e838deee1df0390706967b375d36ee8eea339e86a5af1c7a49a76d884860c045c3476d8c8d2a5f
 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce
+AUX wine-staging-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.11.tar.xz 29236492 BLAKE2B db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5 SHA512 f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769
 DIST wine-8.12.tar.xz 29276732 BLAKE2B c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869 SHA512 6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b
@@ -11,6 +12,6 @@ DIST wine-staging-8.13.tar.gz 9785058 BLAKE2B 6c797cd50276009cc23619447a70ac972b
 EBUILD wine-staging-8.0.ebuild 11924 BLAKE2B 0e4562181251cd9844b940bb43dfa010e1867417086102b67be02492d1f28a579cd6b4c075de2cd00ccac65d2e69b451f95f17ba5559f581e57cbf8869a37bea SHA512 404a62047ff77551065f9109ad43c301f65744f07b33fbbfdd8cfe3a172a92956ab4d313ab2ddef1e1bfd00b39f3f4fd92dc308783ee1c6e5f221beabd28d5f4
 EBUILD wine-staging-8.11-r1.ebuild 12235 BLAKE2B f4b5947c95e11e2bfcb20c4c52e859501a8ceff4369ac52af4ab41829530c8ad98b07000e01285e6b53665a08c30828f294e743261526faeffa7022b44aefc4b SHA512 b9b009b867264879549a6d8bce9ef3da3b64bfbe61536ca3a6e17a547047ef3bcf448b7b9efc6524c1c6b02b77d0009ad8d6c18e2d52b851f80575f3f504f536
 EBUILD wine-staging-8.12.ebuild 12235 BLAKE2B f4b5947c95e11e2bfcb20c4c52e859501a8ceff4369ac52af4ab41829530c8ad98b07000e01285e6b53665a08c30828f294e743261526faeffa7022b44aefc4b SHA512 b9b009b867264879549a6d8bce9ef3da3b64bfbe61536ca3a6e17a547047ef3bcf448b7b9efc6524c1c6b02b77d0009ad8d6c18e2d52b851f80575f3f504f536
-EBUILD wine-staging-8.13.ebuild 13203 BLAKE2B f5add89473d80ee39b4d2b0c712f2e844a64ae3ed07fa665ce9e4d49d1956ec69880d7b80bc45814749ab8f31cc88a325e574827bbdbd9184a036cc17415554c SHA512 658a2ef4f2570f1c1a986b17bfb58ad282e869a8e7d17e20caeadca83190d5f32647602e6913920ff9d079e34c5c642d8553e411f46920e05ff9d3ee842b183e
-EBUILD wine-staging-9999.ebuild 13203 BLAKE2B f5add89473d80ee39b4d2b0c712f2e844a64ae3ed07fa665ce9e4d49d1956ec69880d7b80bc45814749ab8f31cc88a325e574827bbdbd9184a036cc17415554c SHA512 658a2ef4f2570f1c1a986b17bfb58ad282e869a8e7d17e20caeadca83190d5f32647602e6913920ff9d079e34c5c642d8553e411f46920e05ff9d3ee842b183e
-MISC metadata.xml 2534 BLAKE2B 9b25b0ade2b7b2ad5bbfa37e30c8e0a3756d8ea0a5430a8e76537e7e309987961b438022929b087c2cf262ac26ffaedfac48225ed22233ab94e5584daae4f7ce SHA512 1f07d61995be3634bb8c39861e0cd959b80a131e3f3a827dab486defff6cf75e29f36ef26be8e7747cfd6c348e9743c336fa452ae8406b238d7d3c6c15522911
+EBUILD wine-staging-8.13.ebuild 13240 BLAKE2B 771571ba19aed269fe64ffd9c59b431aee97059c68168e9b4bed03425c355892293404885f4ec62122b2bf9772c86b10af7fda2d28961c166dba2fcbdf118155 SHA512 fad252e72f69a7f151786a997bd7a87c11e9a81db4d174ceb7d7907c2f30694e4bc20729f066ea8717a097956ae5e6d4039e555e3a0f7be4b8ecd15fd310cc08
+EBUILD wine-staging-9999.ebuild 13240 BLAKE2B 771571ba19aed269fe64ffd9c59b431aee97059c68168e9b4bed03425c355892293404885f4ec62122b2bf9772c86b10af7fda2d28961c166dba2fcbdf118155 SHA512 fad252e72f69a7f151786a997bd7a87c11e9a81db4d174ceb7d7907c2f30694e4bc20729f066ea8717a097956ae5e6d4039e555e3a0f7be4b8ecd15fd310cc08
+MISC metadata.xml 2538 BLAKE2B cb657e04ad7f26b088f03f862a7e7ccbc4eb6592de17ec8022b5e4b306bd10f7daae7f6de113b142a9cf713a91cab9fbd0650cca4591adc13e4a77280f9812e3 SHA512 a87687fb1a0d2f639626f4a90e7fb78bd31926c53460af3cc80c93e9974f189b545c830278157893f5e48a54b20e5b49b2d1e996ccb5520a47f319b7048999a7
diff --git a/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch
new file mode 100644
index 000000000000..5f0d63b0ec33
--- /dev/null
+++ b/app-emulation/wine-staging/files/wine-staging-8.13-rpath.patch
@@ -0,0 +1,15 @@
+Patch Source: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/wine/rpath.patch
+Alpine Bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -784,6 +784,9 @@ case $host_os in
+                         [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"])
+         ;;
+     esac
++
++    # do this at the end because it needs double dollar for makefile
++    WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"])
+     ;;
+ esac
+ 
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index 455c48fd0a96..65b7853a79b7 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -31,7 +31,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 		<flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag>
 		<flag name="wow64">
 			Enable running 32bit applications without 32bit ELF
-			multilib by mapping to 64bit calls (experimental,
+			multilib by mapping to 64bit calls (experimental/WIP,
 			USE=abi_x86_32 is recommended for complete support)
 		</flag>
 	</use>
diff --git a/app-emulation/wine-staging/wine-staging-8.13.ebuild b/app-emulation/wine-staging/wine-staging-8.13.ebuild
index d27aaaf1b5d2..ce3852c77cc9 100644
--- a/app-emulation/wine-staging/wine-staging-8.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.13.ebuild
@@ -160,6 +160,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
 )
 
 pkg_pretend() {
@@ -414,7 +415,7 @@ pkg_postinst() {
 		ewarn "32bit support is disabled. While 64bit applications themselves will"
 		ewarn "work, be warned that it is not unusual that installers or other helpers"
 		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note that the experimental USE=wow64 can allow 32bit without multilib."
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
 	fi
 
 	eselect wine update --if-unset || die
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index d27aaaf1b5d2..ce3852c77cc9 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -160,6 +160,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
+	"${FILESDIR}"/${PN}-8.13-rpath.patch
 )
 
 pkg_pretend() {
@@ -414,7 +415,7 @@ pkg_postinst() {
 		ewarn "32bit support is disabled. While 64bit applications themselves will"
 		ewarn "work, be warned that it is not unusual that installers or other helpers"
 		ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32,"
-		ewarn "note that the experimental USE=wow64 can allow 32bit without multilib."
+		ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib."
 	fi
 
 	eselect wine update --if-unset || die