gentoo resync : 12.03.2021

2 files changed, 22 insertions, 31 deletions

diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index eb1452a01820..fb1a0cddfbd3 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,7 +1,7 @@
-DIST install-crossover-19.0.1.bin 227349999 BLAKE2B 3f43c9ad1bc6e2ca77404eb69894b34fab04002c41b33551a01272201e15b5523049d7e7abe87c741f5913f18a45714ff2b83fda6c375dff68c7648d5e7c26bb SHA512 aedf2d3a071facf15a4aec9280a10c99229825fd3e5412e3949a0e1d85c235625a04d4453e7b8e182659f7500c864bab168c225f51cb0a839b08a96ef36596dd
 DIST install-crossover-19.0.2.bin 227350041 BLAKE2B aeb5424ac02e05662cb4baca2caf0978296bf24184cd40e62fb351dd8420f20707d6c8c0ec683f61b63eee896b58ee923853179c8e933faf3a38384605f4c962 SHA512 6f2cf7c5f64744121b12e2d3f58742df957fbb12c95e15eaf752c0ef56094305265f3ac78b74acecbe1032f6cd42427beb70aae434b29640e7051630d9977903
 DIST install-crossover-20.0.2.bin 221393525 BLAKE2B c74db640952002364729c8884234e5fb369a00315d0cfd99276a4294e19953417e1ecc1c60887b3de45bd617570825279d278e69112eddd06d188c890435bcff SHA512 b8d10ef499833cb6158eec22cc635f3e4ecd0a5ebdd9b86df79e23d7f4e4ae1f6a7a2f36d9116e4ba17fd86adfa20bcd19cce66eaa1427fb8ed9667593e5422b
-EBUILD crossover-bin-19.0.1-r1.ebuild 7726 BLAKE2B 3a55558f49f39b4be5b12ceba075db440acf0fa29eb6bd22a46d58e5f5c9cb052eef93554231b81d49a18d08d635d38fb5d50bace85b26084b4893af4818cccf SHA512 6a19b275c249f7aa478fea15c4259a5cfc2781c25dddefd531df2e82ba4e6be4eb92d3f33bb30eed1a291fc84f4d483a7c3f6a3b2075dd2b2f0bd5bc91bf2e64
+DIST install-crossover-20.0.4.bin 221436226 BLAKE2B 486494455759d92f8e7e5d35968a603e41a0674cb0752e7d5ba4893d33e77b3e31fea2ebe75d471e2478e7f3cce9be2f712840f1f50bfe790fec5ec936b804a5 SHA512 78252d29f8a72a8742d57a65a60d09a81a70a98517b67468dac96af94ee8af7a313f164af6717f9a9c657095e66466809e08584c7a0fde3bd58c27ff00f41067
 EBUILD crossover-bin-19.0.2.ebuild 7234 BLAKE2B 61666e4d1e3dcc81147c347a02a72498cfe1353f0e76200ae65f9b7e6cad5d105ab2c3b18c444abd8dc02461dc457ad160bd3092c82f8654b149355078e2a6be SHA512 43bba4659f10f3219d522c11cc0ad2aa36d8da02ad8df8cc8abfbf402b1ca6465e3024e8f87fe58d5a016eb73b4e87840078072a1e422ef98ab9e036a45a1896
 EBUILD crossover-bin-20.0.2-r1.ebuild 7571 BLAKE2B 0c215fca2810d2adedac3ae3d2676e676cd793a95bbb39ec968aaeda1ff6234669863663a774859948a69557bb6153a02bf28ac43ba6f18b70f9f705c7188d92 SHA512 7673f71bd38b04a6dd8933c4a7e3777ba399a9a5102e7bc64da2e33ae0c3d9b76a8439b4290a8f2f2324bfb53cb5bc36390cce33b80629f0c23b5d32e335a36c
+EBUILD crossover-bin-20.0.4.ebuild 7571 BLAKE2B 0c215fca2810d2adedac3ae3d2676e676cd793a95bbb39ec968aaeda1ff6234669863663a774859948a69557bb6153a02bf28ac43ba6f18b70f9f705c7188d92 SHA512 7673f71bd38b04a6dd8933c4a7e3777ba399a9a5102e7bc64da2e33ae0c3d9b76a8439b4290a8f2f2324bfb53cb5bc36390cce33b80629f0c23b5d32e335a36c
 MISC metadata.xml 495 BLAKE2B 09ff077822c1862d7f7d20bee57ebf1dcc48831a9539b280e8b09344e278bdc35d122debdca7cdab10d10cd546eb005a157e896670eba3206af2281dc7228f90 SHA512 da97a48eb9e984ee10581e455be37ac9adb2ab897d837f9ed91e5b368ce1800ff3468a5290fff53b3d93e7c56d6c5cb56936d0d09168c10f19356fa5729dcf0d
diff --git a/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-20.0.4.ebuild
index c993870eec79..931771d2ae57 100644
--- a/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-20.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit python-single-r1 unpacker
 
@@ -14,7 +14,7 @@ LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="bindist test"
 
@@ -22,6 +22,7 @@ QA_FLAGS_IGNORED="opt/cxoffice/.*"
 QA_PRESTRIPPED="
 	opt/cxoffice/lib/.*
 	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cabextract
 	opt/cxoffice/bin/cxburner
 	opt/cxoffice/bin/cxntlm_auth
 	opt/cxoffice/bin/wineserver
@@ -37,6 +38,7 @@ QA_PRESTRIPPED="
 	opt/cxoffice/bin/wineloader64
 "
 QA_TEXTRELS="
+	opt/cxoffice/bin/wineserver32
 	opt/cxoffice/lib/wine/*
 	opt/cxoffice/lib/libwine.so*
 "
@@ -52,6 +54,10 @@ BDEPEND="${PYTHON_DEPS}
 
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
 	!prefix? ( sys-libs/glibc )
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
@@ -81,7 +87,9 @@ RDEPEND="${DEPEND}
 	ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
 	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
 	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
+	dev-libs/glib:2
 	dev-libs/gobject-introspection
+	dev-libs/openssl
 	dev-util/desktop-file-utils
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/freetype:2[abi_x86_32(-)]
@@ -89,6 +97,7 @@ RDEPEND="${DEPEND}
 	media-libs/tiff:0[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/libunwind[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
 	sys-libs/zlib[abi_x86_32(-)]
 	x11-libs/libICE[abi_x86_32(-)]
@@ -105,6 +114,7 @@ RDEPEND="${DEPEND}
 	x11-libs/gdk-pixbuf:2[introspection]
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
+	x11-libs/vte:2.91[introspection]
 "
 
 pkg_nofetch() {
@@ -146,6 +156,8 @@ src_install() {
 	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
 		|| die "Could not install into ${ED}/opt/cxoffice"
 
+	# Disable auto-update
+	sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
 	# Install configuration file
 	insinto /opt/cxoffice/etc
 	doins share/crossover/data/cxoffice.conf
@@ -191,9 +203,12 @@ src_install() {
 		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
-		dosym "../../../usr/lib64/libpcap.so.1.9.1" "/opt/cxoffice/lib64/libpcap.so.0.8"
-		dosym "../../../usr/lib32/libpcap.so.1.9.1" "/opt/cxoffice/lib/libpcap.so.0.8"
+		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
 	fi
 }
 
@@ -202,28 +217,4 @@ pkg_postinst() {
 	einfo "Source code can be obtained from:"
 	einfo
 	einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-
-	# The check done by /opt/cxoffice/bin/cxdiag is far superior to this.
-	# However, we do this check because I noticed that we could end up with a
-	# system that doesn't have a working OpenCL according to cxdiag, yet the
-	# dependencies have been installed. This is a defensive measure to reduce
-	# user frustration. A more robust check might be worthwhile.
-	if use opencl; then
-		local b32=false
-		local b64=false
-		if [[ ! -e "${EROOT}/usr/lib32/libOpenCL.so.1" ]]; then
-			b32=true
-			ewarn "32-bit libOpenCL.so.1 missing."
-		fi
-
-		if use amd64 && [[ ! -e "${EROOT}/usr/lib64/libOpenCL.so.1" ]]; then
-			b64=true
-			ewarn "64-bit libOpenCL.so.1 missing."
-		fi
-
-		if $b32 || $b64; then
-			ewarn
-			ewarn "Set OpenCL via eselect opencl to avoid problems"
-		fi
-	fi
 }