gentoo auto-resync : 04:12:2022 - 21:03:51

3 files changed, 13 insertions, 25 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5c27e9ea2c92..f8fe064e4254 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 2562a76f2c74..7512f147b9f3 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,5 +1,5 @@
-DIST install-crossover-21.2.0.bin 313966852 BLAKE2B 746b16a1e093adf344fa827e5c6b9a439e690003bf3eb30b32b9a30017f1697c21bc5c9e196736cc25e24daeed3ee3a809b20d44e0005bfd45ab542ede6c2d44 SHA512 a8ba1396e05119122dc0d813bc408fc0a2a3adc5c805ce15aea8e98a6a27d980eabafaf7a727f4cf1c30d68e456e8d82b83438e404cbf41db05d569f8832a9ec
 DIST install-crossover-22.0.0.bin 334896678 BLAKE2B 12e25c832107b2ed4466c560f949b8af8f70d2d1ac9ac5a105ba65cd77557e4a341d3a3b76539c04b2e5ce574f101fc88ec6bdbc284738785fd25aae3a605ff6 SHA512 4bb99abeb587b7ba8bfc2a4851d85fd211bad6fe2a7af496aa0859f9834a9b5432e517e89980e28b6eb412d4f50badb695edbd3e112ea2fcfbdbb29e05072859
-EBUILD crossover-bin-21.2.0-r1.ebuild 7600 BLAKE2B 71bc233016bb63a20a02b13241b5e0e5057d9f20a426ad4ca3c5c97f115991af57d2a94916306364311f7429f08717079d691ee580feb3d8bc7ab6637e5c7e0f SHA512 3f1e358e9524c32853aa31e92325a348676c589ee35bd06ac61b8ab7d1adb4d52997141597aafa8ece8204ffd4455f1d6eb8fa714f7e55de7b89a9e6f0b9ef6a
+DIST install-crossover-22.0.1.bin 334913889 BLAKE2B e30c14b14adb0db4bb0b8e840aed89f82f59fc918ba697f8cdd86eea330b60d81020ec9ad498a511858de6fae10d74fcf572753295536cbbb98e067496029bb4 SHA512 825f1eeb10efcbf3bff0e4e6f91c709d3bbecdb5635839b580c79ff77e54333db4a84e9e6abfd08a0ea4e57729c4489e149366d5a5c7da6773a5a0d413905d48
 EBUILD crossover-bin-22.0.0.ebuild 7129 BLAKE2B 837d2db97c0ae7398b5923e1089bf4528bb4158c1a474eb80c30cff088ac50cac838cddeceaef99756a813da5d1d903daaab7978f35295702e1a24ee34911a4b SHA512 dc227caf92c15efe10eb412d4748f017ba1856408a46d044fb7ac8554c5fd81d8ec60e69a5ef2e04fa9b3b00fd746194059aa02d8bfdc1063c3b3b4851c5bf64
+EBUILD crossover-bin-22.0.1.ebuild 7128 BLAKE2B 95126843dc21fc64d93034725bfa9374730158595fd6b62c225d98c17034f63bde5980396acb6ec6b95370d6768d6bcc759ebf44a5981d35c08aa438b668a841 SHA512 37a1ef85d6b179db5471672a3f798fa33ac8f2752965a24cda724928eb417ab70fc9cbcf471af744c8906a3e6f060604afa5db18b00dec6b7e8b46eb243ef5d4
 MISC metadata.xml 568 BLAKE2B d13e314ffff8e7f24a4b26a6f4981ac0d574b84f9e4b994341481064fee38f167c29829d823c4f9b64722759b94d3ef3d828d0d727d7413753038aef45457b44 SHA512 04ba11db6a19081de9df60a5bcb1412b7742ccfe6bf81cce904249d4666ccd314618776578f7de8a8b4f57f54f389d0faba06accf5a98da54443e44e4180e36c
diff --git a/app-emulation/crossover-bin/crossover-bin-21.2.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-22.0.1.ebuild
index be7f3937855d..524aa7a32a07 100644
--- a/app-emulation/crossover-bin/crossover-bin-21.2.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-22.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit python-single-r1 unpacker
 
@@ -84,12 +84,7 @@ RDEPEND="${DEPEND}
 	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
-	ssl? (
-		|| (
-			net-libs/gnutls:0/30.30[abi_x86_32(-)]
-			net-libs/gnutls:0/30[abi_x86_32(-)]
-		)
-	)
+	ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
 	dev-libs/glib:2
@@ -145,7 +140,7 @@ src_install() {
 		-e "s:xdg_install_icons(:&\"${ED}\".:" \
 		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
 		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
-		"${S}/lib/perl/CXMenuXDG.pm"
+		"${S}/lib/perl/CXMenuXDG.pm" || die
 
 	# Install crossover symlink, bug #476314
 	dosym ../cxoffice/bin/crossover /opt/bin/crossover
@@ -197,35 +192,28 @@ src_install() {
 		-e "s:${ED}::" \
 		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
 		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
-	sed -i -e "s:${ED}:/:" \
+	sed -i -e "s:${ED}::" \
 		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
 		|| die "Could not fix paths of *.desktop files"
 
 	# Workaround missing libs
-	# https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658
-	if use gphoto2; then
-		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die
-		mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die
-		bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die
-		mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die
-		fperms a+x "/opt/cxoffice/bin/cxdiag"
-	fi
+	#
 	# It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
 	# https://bugs.gentoo.org/721108
 	if use pcap; then
-		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die
-		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die
-		mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die
-		mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" >tmp || die
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" >tmp64 || die
+		mv tmp "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" || die
+		mv tmp64 "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" || die
 	fi
 
 	# Remove libs that link to openldap
 	if ! use ldap; then
-		rm "${ED}"/opt/cxoffice/lib*/wine/wldap32.dll.so || die
+		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/wldap32.so
 	fi
 
 	# Remove libs that link to opencl
 	if ! use opencl; then
-		rm "${ED}"/opt/cxoffice/lib*/wine/opencl.dll.so || die
+		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/opencl.so || die
 	fi
 }