gentoo resync : 14.05.2020

4 files changed, 242 insertions, 5 deletions

diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 4f13999c3cc1..38440d6a4a32 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -21,6 +21,7 @@ DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf2
 DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281
 DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8
 DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855
+DIST install-crossover-19.0.1.bin 227349999 BLAKE2B 3f43c9ad1bc6e2ca77404eb69894b34fab04002c41b33551a01272201e15b5523049d7e7abe87c741f5913f18a45714ff2b83fda6c375dff68c7648d5e7c26bb SHA512 aedf2d3a071facf15a4aec9280a10c99229825fd3e5412e3949a0e1d85c235625a04d4453e7b8e182659f7500c864bab168c225f51cb0a839b08a96ef36596dd
 EBUILD crossover-bin-12.5.0-r2.ebuild 3874 BLAKE2B e8617f6fc4da436e9dfc5c4429210c0fc49879d1b50ce22325ad86259c859f3a4ef8bfe71fae6a73d3cc37a6981809d1fd0a98790f74aa1dc039c6f44b681485 SHA512 0fd826845aef6878a00be0733b778b18aaa4813125d6d652e4e508e8399bc2554c7d3ba2420e47b72aec3df8f0821c64260aed65d26923fc568441c2bfbe10ad
 EBUILD crossover-bin-12.5.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
 EBUILD crossover-bin-13.0.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08
@@ -44,5 +45,6 @@ EBUILD crossover-bin-17.5.0.ebuild 4767 BLAKE2B 371b22e6af826da7eb67f12949aa4fbc
 EBUILD crossover-bin-17.5.1.ebuild 5315 BLAKE2B 55b93a199734ddc6ef85069d1889ac92202e39a8293bc4f018dd3ffe8c2ee94b5deb207fe81206f619c1fdc34be5a7be5d43b1759d7b351ae248bf3c61bd6851 SHA512 47e7090c299d605bf52c8ef2614e6ac7e6c50c667455e84ba74a904d160354d5d4017350bb6be717a3850d65319841e258e5b9a3c86927001f3996aaf7223ca9
 EBUILD crossover-bin-18.0.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
 EBUILD crossover-bin-18.1.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9
-EBUILD crossover-bin-18.5.0-r1.ebuild 5656 BLAKE2B ee68dc397661ba5d7d4cdc516ab01a62e38fa8ddf85431ee90f4d7b80e247ad62225e5fdf0798ca6c1da7e8bfacaf3f46a95a2c8d0a9d0244eff61f36c620b0f SHA512 dfd44614a23ccf3ce360361a07e3de32aedbb03cf5756cee81c4c07569d66a146ed7cf4b23df1821726326fe2cd6d77605370bbcd9b29bf24a3be632eafb4cd3
-MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096
+EBUILD crossover-bin-18.5.0-r1.ebuild 5800 BLAKE2B ff3272e3f8c8054b57c3c88a6ec94580d3e5d539d2035fbca88858f16db866b9eaaaf620cab2c7350e9be5c2996aff18035b018be40c5e4e29ad5c172cc42108 SHA512 daf4a588a52fe2ff28b3aa510aacc533f1b7be47ea22f489ba95be16b82e829ccb4356c38a3f0cc9f74a0bb79653929f34c15dd4b825b1f7d7acdb35b3c2d3cb
+EBUILD crossover-bin-19.0.1-r1.ebuild 7728 BLAKE2B aaf5ffbc0e41f9e4bdb6fc329223cd8c0f78abc012a1ba163fb09096a875c7634859fe563dcccd33f68315dc8c76d048854a0aa913a4ee42a114fb5dc4177075 SHA512 11fa2f78352abac1ddcc91952e73c91fa427fe2ccf72dd601a66afe1dd4e42e8766df3cbc0b64e36a0911f2be152663d3785df88e101fe18b15e13e7af1234ab
+MISC metadata.xml 570 BLAKE2B 3939d88434eae718567a9a63f3eeb936c601e75543c0e35231e3b7035e50c2a259338c115ac7fe905e9709903c2fe3332d0bf0cf8fd69da5b08a685ec8950cce SHA512 485431a76b4622cdfb7c7c61c02b2d71783ba9866e03d3c8a92c092c81dbd9b1f32bb27b2ff6a152bdafa51b2e32da0fa496a3d79f2a8d9a64ee5237fac9aa54
diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
index e103a45516a4..ccf4360c42cf 100644
--- a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crosso
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms ldap +mp3 +nls +openal +opencl +opengl +pcap +png scanner +ssl +v4l +vulkan"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RESTRICT="bindist test"
 
@@ -52,7 +52,6 @@ RDEPEND="${DEPEND}
 		>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
 		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
 	')
-	dev-util/desktop-file-utils
 	!app-emulation/crossover-office-pro-bin
 	!app-emulation/crossover-office-bin
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
@@ -70,13 +69,17 @@ RDEPEND="${DEPEND}
 		virtual/glu[abi_x86_32(-)]
 		virtual/opengl[abi_x86_32(-)]
 	)
+	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
 	png? ( media-libs/libpng:0[abi_x86_32(-)] )
 	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
-	ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+	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-util/desktop-file-utils
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/freetype:2[abi_x86_32(-)]
 	media-libs/mesa[abi_x86_32(-)]
+	media-libs/tiff:0[abi_x86_32(-)]
 	sys-auth/nss-mdns[abi_x86_32(-)]
 	sys-apps/util-linux[abi_x86_32(-)]
 	sys-libs/ncurses-compat:5[abi_x86_32(-)]
diff --git a/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild
new file mode 100644
index 000000000000..e3e7f205d8a6
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support"
+HOMEPAGE="https://www.codeweavers.com/products/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+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}
+
+RESTRICT="bindist test"
+
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="
+	opt/cxoffice/lib/.*
+	opt/cxoffice/lib64/.*
+	opt/cxoffice/bin/cxburner
+	opt/cxoffice/bin/cxntlm_auth
+	opt/cxoffice/bin/wineserver
+	opt/cxoffice/bin/wineserver32
+	opt/cxoffice/bin/wineserver64
+	opt/cxoffice/bin/wine64-preloader
+	opt/cxoffice/bin/unrar
+	opt/cxoffice/bin/wine-preloader
+	opt/cxoffice/bin/cxdiag
+	opt/cxoffice/bin/cxdiag64
+	opt/cxoffice/bin/cxgettext
+	opt/cxoffice/bin/wineloader
+	opt/cxoffice/bin/wineloader64
+"
+QA_TEXTRELS="
+	opt/cxoffice/lib/wine/*
+	opt/cxoffice/lib/libwine.so*
+"
+
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	app-arch/unzip
+	dev-lang/perl
+	dev-util/bbe
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	!prefix? ( sys-libs/glibc )
+	!app-emulation/crossover-office-pro-bin
+	!app-emulation/crossover-office-bin
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[abi_x86_32(-)]
+		jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
+		media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
+	)
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	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[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
+	dev-libs/gobject-introspection
+	dev-util/desktop-file-utils
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-),osmesa?]
+	media-libs/tiff:0[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+"
+
+pkg_nofetch() {
+	einfo "Please visit ${HOMEPAGE}"
+	einfo "and place ${A} into your DISTDIR directory"
+}
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-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"
+
+	# Remove unnecessary files, license.txt file kept as it's used by
+	# multiple files (apart of the menu to show the license)
+	rm -r guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}/opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+		|| die "Could not remove uninstall menus"
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-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}:/:" \
+		"${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
+	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"
+	fi
+}
+
+pkg_postinst() {
+	einfo "${P} is open source software with the exception of the GUI."
+	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
+}
diff --git a/app-emulation/crossover-bin/metadata.xml b/app-emulation/crossover-bin/metadata.xml
index fadaa124e17a..7be1d14b856a 100644
--- a/app-emulation/crossover-bin/metadata.xml
+++ b/app-emulation/crossover-bin/metadata.xml
@@ -7,6 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="capi">Enable ISDN support via CAPI</flag>
+		<flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag>
 		<flag name="opencl">Enable OpenCL support</flag>
+		<flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
+		<flag name="vulkan">Enable Vulkan drivers</flag>
 	</use>
 </pkgmetadata>