gentoo auto-resync : 23:08:2023 - 21:49:58

3 files changed, 5 insertions, 259 deletions

diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 30cfbe2ab2bc..cbfd91205975 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,7 +1,5 @@
-DIST install-crossover-22.0.1.bin 334913889 BLAKE2B e30c14b14adb0db4bb0b8e840aed89f82f59fc918ba697f8cdd86eea330b60d81020ec9ad498a511858de6fae10d74fcf572753295536cbbb98e067496029bb4 SHA512 825f1eeb10efcbf3bff0e4e6f91c709d3bbecdb5635839b580c79ff77e54333db4a84e9e6abfd08a0ea4e57729c4489e149366d5a5c7da6773a5a0d413905d48
-DIST install-crossover-22.1.0.bin 335571332 BLAKE2B 72ea09886a927eadaf6dead1d711723990e27cb845d514007d3433c9924e289ff3465a4dfdc02458e20cbcdba598ba65cea37453a0c16e3b13d790480bcaf9d3 SHA512 4de0eda5bbb68d8a5adde652c1254325a8a454eb1d2f7a84289b6d90373d7534b0821b706db08cef92c74b4286b6cceae0fc8033acccd276af5734579bad7fed
 DIST install-crossover-22.1.1.bin 335606941 BLAKE2B 3c5eada7190283f348348ef4d3b044db8e24e0dc3588d847854feb712d39bc9013e4f958a80c3f46e84b32f6b5c7d419ef6ab4fa1e946d308ba546140fb95504 SHA512 54bb40941baea184aa824c371a2eb73cdda26fa7c0765e242384e2c29a78f6b600c7455640b9888fd28ad482bf14f53a0308cbd55d9453f76d6eeb75cf0abfc7
-EBUILD crossover-bin-22.0.1-r1.ebuild 7225 BLAKE2B b59960542fc734a229ad86928d467e57a3dc1b434b6478f2c2bff9ce99bd5e7d34ef85eb77cfe72510a6ca0f3e7e986843ecb900e43047ef7416b01928482f82 SHA512 a06b29287d32142b42e6061176bff67f6b1220c8c3f8afb8eff3e91c9ac778f455b166ac83748506dbf07ce046d7e637f178ae35ad92c675f0af7aa78b7d37da
-EBUILD crossover-bin-22.1.0.ebuild 7185 BLAKE2B 627c6a19fd865d883de8803ec4a69c270455857861d1f19495fb871d01480fc4160c6a21ec50094f9f18e069518bc975382417e5eca307ac98de52e15ec862ad SHA512 fe114e9e40bec844991bf3e3b5679f3388c19fff361c892e1949f5c73e8b04e0d4725b915f31327def6fec525179560dd50c52f0271280c700bab85cd7491e6a
+DIST install-crossover-23.0.0.bin 340426479 BLAKE2B eb78fd03475e88a021d8ca3c46358e0092863a8d123fa00ebebef30774c16a5350d489b8b0fe158fbdeb2daf60c2dd5b9ca1b3db855d94901561cfcad09a1ac5 SHA512 29c4303e43a857451d7954fc86337cf007e5d32fbcbed4a65066b464e1caf5aad4dd58bc4e65b1c77bb70903f7b7e541b5c1b7df2b44f60d1235aeb558deda1e
 EBUILD crossover-bin-22.1.1.ebuild 6557 BLAKE2B 391fa6ba87db9a8a0593e26c6f1cd2333f84ac051a84be6d40595c5d2ae7586535bf8d49fd0977aa1aadce41e6bfbb983bc8839ac34a54b6cef42b710a9bef7c SHA512 bf995495c1ad7b3208deba0c0f5aa1a33451a3b257bc9aa705377da48b423370e76357474703aa774ff47e30d6f9fc8bc5b5b6857400c7a31da7407ec2162f6c
+EBUILD crossover-bin-23.0.0.ebuild 6474 BLAKE2B ee3003da8d69d174dacb005414a5ee20087579758569d97a2c9292bd843298b228b245dcd2e3c391ed95d3ca22d4bf7c5e0d47ccbe7d5d981742530cf48972e1 SHA512 231fc5135aa114e92393bcc8a9ba77e59f772328a3fda374b9915dea9ec247a34915a3b0a85da2a5c6905bc7144f6a191ec2efc8f5faf90c56604dd683d2830b
 MISC metadata.xml 521 BLAKE2B d905a83647a79bac613621810d653bfda34f1b61fabdd359a5c893f2736054cb1f0f5087675d31837fab25a7ddca85397804e596d5dfabbc4c531c0abbdb8378 SHA512 9cbabfcde35394ac6a144c5fbcb0ffb1e0d0035622748df2e8fd574022e1740dcbb9bf511036b58aaa12fb21bee8ee8ae2a9eb126e2cf85142538ac72694d20a
diff --git a/app-emulation/crossover-bin/crossover-bin-22.0.1-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-22.0.1-r1.ebuild
deleted file mode 100644
index 0d0d09029eb3..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-22.0.1-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/cabextract
-	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/vkd3d-compiler
-	opt/cxoffice/bin/wineloader
-	opt/cxoffice/bin/wineloader64
-"
-QA_TEXTRELS="
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/lib/wine/*
-	opt/cxoffice/lib/libwine.so*
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	app-arch/cpio
-	app-arch/unzip
-	dev-lang/perl
-	dev-util/bbe
-"
-
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	!prefix? ( sys-libs/glibc )
-	capi? ( net-libs/libcapi[abi_x86_32(-)] )
-	cups? ( net-print/cups[abi_x86_32(-)] )
-	gsm? ( media-sound/gsm[abi_x86_32(-)] )
-	jpeg? ( media-libs/libjpeg-turbo: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.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-compat:1.1.1
-		=dev-libs/openssl-1.1.1*
-	)
-	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-compat:4[abi_x86_32(-)] media-libs/tiff:0/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(-)]
-	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]
-	x11-libs/vte:2.91[introspection]
-	|| (
-		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
-	)
-"
-
-src_unpack() {
-	# self unpacking zip archive; unzip warns about the exe stuff
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	default
-
-	# 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() {
-	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" || die
-
-	# 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"
-
-	# 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
-	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"
-
-	# Drop Uninstall menus
-	rm "${ED}/usr/share/applications/"*"Uninstall"* \
-		|| die "Could not remove uninstall menus"
-
-	# Fix PATHs
-	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
-	#
-	# 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/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/{i386,x86_64}-unix/wldap32.so
-	fi
-
-	# Remove libs that link to opencl
-	if ! use opencl; then
-		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/opencl.so || die
-	fi
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-22.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-23.0.0.ebuild
index 0ad42d954e15..d5bb861a2bbf 100644
--- a/app-emulation/crossover-bin/crossover-bin-22.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-23.0.0.ebuild
@@ -13,37 +13,11 @@ 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 +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
+IUSE="+capi +cups doc +gphoto2 +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/cabextract
-	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/vkd3d-compiler
-	opt/cxoffice/bin/wineloader
-	opt/cxoffice/bin/wineloader64
-"
-QA_TEXTRELS="
-	opt/cxoffice/bin/wineserver32
-	opt/cxoffice/lib/wine/*
-	opt/cxoffice/lib/libwine.so*
-"
-
+QA_PREBUILT="*"
 S="${WORKDIR}"
 
 DEPEND=""
@@ -64,7 +38,6 @@ RDEPEND="${DEPEND}
 	!prefix? ( sys-libs/glibc )
 	capi? ( net-libs/libcapi[abi_x86_32(-)] )
 	cups? ( net-print/cups[abi_x86_32(-)] )
-	gsm? ( media-sound/gsm[abi_x86_32(-)] )
 	jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] )
 	lcms? ( media-libs/lcms:2 )
 	ldap? ( net-nds/openldap[abi_x86_32(-)] )
@@ -90,10 +63,7 @@ RDEPEND="${DEPEND}
 	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
 	dev-libs/glib:2
 	dev-libs/gobject-introspection
-	|| (
-		dev-libs/openssl-compat:1.1.1
-		=dev-libs/openssl-1.1.1*
-	)
+	dev-libs/openssl-compat:1.1.1
 	dev-util/desktop-file-utils
 	media-libs/alsa-lib[abi_x86_32(-)]
 	media-libs/freetype:2[abi_x86_32(-)]