gentoo auto-resync : 21:07:2024 - 12:30:10

5 files changed, 8 insertions, 25 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 728f46bcfb51..6f899abb3110 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 02186e44e87e..2e62ad635fa2 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,9 +1,9 @@
 DIST install-crossover-22.1.1.bin 335606941 BLAKE2B 3c5eada7190283f348348ef4d3b044db8e24e0dc3588d847854feb712d39bc9013e4f958a80c3f46e84b32f6b5c7d419ef6ab4fa1e946d308ba546140fb95504 SHA512 54bb40941baea184aa824c371a2eb73cdda26fa7c0765e242384e2c29a78f6b600c7455640b9888fd28ad482bf14f53a0308cbd55d9453f76d6eeb75cf0abfc7
-DIST install-crossover-23.0.0.bin 340426479 BLAKE2B eb78fd03475e88a021d8ca3c46358e0092863a8d123fa00ebebef30774c16a5350d489b8b0fe158fbdeb2daf60c2dd5b9ca1b3db855d94901561cfcad09a1ac5 SHA512 29c4303e43a857451d7954fc86337cf007e5d32fbcbed4a65066b464e1caf5aad4dd58bc4e65b1c77bb70903f7b7e541b5c1b7df2b44f60d1235aeb558deda1e
 DIST install-crossover-23.6.0.bin 333783609 BLAKE2B d24ef036530d2b8ce916ecb6adb6f5599d9beedb374a27a0009d14ff601685e8a4b23424a3a08e2ce613b3e77ea9893ce1b6caa07448aca365feea86f23fe320 SHA512 203c8966e71b91d98676b5e15646f790c2b4db3db3dbb8539a8ffe29b335f301535f5d7c80bf954c5e79b56668707ae960c396204f59e4079c455f12e663a445
 DIST install-crossover-24.0.0.bin 320724952 BLAKE2B a95028fda5c53889f09e567742fc881aaefc8c3c618b4de0f30cb53604bfa1a25097d56d8e025a509a9cce7aecde48b35ab7c8d87ba04761a8b42b717d1cf3b4 SHA512 93f3a4415ff29de98b38a488213d7f00b64f6fe70ae3a7555b911d5423163a678941ab859117172bf716b658eb8aecb1b6b430aed3233c1c55fd51893e8de046
+DIST install-crossover-24.0.4.bin 320804800 BLAKE2B 83aa750117d69836bfbad0fde42b2bfa1a8705a5f640f53fd7195de3a3bb0b876d71df95ecafd2e9c0784ba5a4d745d4f4bf627438bf6df47fc3fe1d8c33d277 SHA512 cde22177104fd37963342983f7c01f7eb12e7ee7037ccc3756e96023d7d2f3770f4d110f68471e9e2450cf6e6580d47a6a9c81bbb03ac25932dce8f0ad5c5cd5
 EBUILD crossover-bin-22.1.1.ebuild 6566 BLAKE2B bc3f53098b6222d648f9a35c79897410b601f2abb5385e9e5bd764e0edff13395cfd606264fa73d17acf562227a92ea46efd419f43848bbcc0d7ddcfae051f20 SHA512 9f9e602824ce5c4e668f16759f8ee4716bdc1894ccf0e7a3b68253f21c132785eb5ffc9d85949b971d65decbf0ef4104a99297d76fb5ad7ff555f2fc61889abc
-EBUILD crossover-bin-23.0.0.ebuild 6483 BLAKE2B 423c9f597754ce2b2a59718e05a14699ead71336aacda3912f4ee78b7df03d163e623602b1f3261a313f2a8b0c67383dc0ec7d49912fb71d9bbb0308d14e8c46 SHA512 9907209babf243bf1bf9c2257772bb760557d492ad988bd541fec8a18479a3308b5378ffe75ddde6b56a2c7466ca312e4b030c64b173f2e28371482e62eed461
 EBUILD crossover-bin-23.6.0.ebuild 6307 BLAKE2B 30d5657eed1171b239a19e6faf9773c1f76800b5c5eb4814043516696bb2356fb47cfe21be49a386141ec4a39a4df457df4e43954ffae8e9b11a6d0db48f7690 SHA512 ee6ed46f86eccab611db8770576bd9ea2f050140742f6cbf9b1a1e46cb690c836c3004f7461a5c55b648175aff576a20eadb5f44cf31fc1f31afbb373ba25b68
 EBUILD crossover-bin-24.0.0.ebuild 5794 BLAKE2B 510d08ed56a3fdd7fae42657112493255a5c0405caaec5a9636ee52c6fc577c136b42cfda90a5ed8ba58eefd2e3cb5f9022c7d9fbbaa3280bbea13c89dd8c3d0 SHA512 ae336d042b2a29ac0046f1c02343ddc954a16bf953cb36b448b72f927d3c07737e5b29099f3ef7ca39e0d5f9bad7194828d25ad57b76f593fd5d771fae1087c8
+EBUILD crossover-bin-24.0.4.ebuild 5784 BLAKE2B 24134389d10b9b819cdff6e55e59d37a48184ebaa0036218259afccf0a5e0311b0cb6317bf5eadc7acc9f2c15aa97287c5547086b850c0f3138a5781b97ccfcf SHA512 a7ea9d2db26c2b5f7c30798eb27ef8d6e4964ce43066d469a432aa582c06b10bcef77ab55193309767ae16a46e3dea54c7d092e0063c85c790df3ebe5813e24a
 MISC metadata.xml 470 BLAKE2B e6ce60679497552604b5210df3d42428dbbf024965e6acb8354c8b9be75896eceb94a6ba5bab305c92e575d22e87dcf90d532be27f992a76341ea89d79f24148 SHA512 46a827986ea3a4aa6cca106b7a3dc90d23c701d6a4bd5a439b3864c706462fb601d946bb5def7e853b2b0978c1c99a56ec37076178ef5eeb834330e1e77d97dd
diff --git a/app-emulation/crossover-bin/crossover-bin-23.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-24.0.4.ebuild
index 5639acd7f096..810998d9d967 100644
--- a/app-emulation/crossover-bin/crossover-bin-23.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-24.0.4.ebuild
@@ -10,24 +10,23 @@ 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"
 
+S="${WORKDIR}"
+
 LICENSE="CROSSOVER-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
+IUSE="+capi +cups doc +gphoto2 +gstreamer +jpeg +lcms +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="bindist test"
 QA_PREBUILT="*"
-S="${WORKDIR}"
 
-DEPEND=""
 BDEPEND="${PYTHON_DEPS}
 	app-alternatives/cpio
 	app-arch/unzip
 	dev-lang/perl
 	dev-util/bbe
 "
-
 RDEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
@@ -40,7 +39,6 @@ RDEPEND="${DEPEND}
 	cups? ( net-print/cups[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(-)]
@@ -89,6 +87,7 @@ RDEPEND="${DEPEND}
 	x11-libs/gtk+:3[introspection]
 	x11-libs/pango[introspection]
 	x11-libs/vte:2.91[introspection]
+	sys-apps/pcsc-lite[abi_x86_32(-)]
 	sys-libs/libxcrypt[compat]
 "
 
@@ -167,22 +166,6 @@ src_install() {
 		"${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
diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest
index 7a88264fcff9..e46b3766305c 100644
--- a/app-emulation/punes/Manifest
+++ b/app-emulation/punes/Manifest
@@ -1,4 +1,4 @@
 AUX punes-0.111-FULLSCREEN_RESFREQ-fix.patch 985 BLAKE2B b68b81b68eabcab5af17a2a9852eb542f4b81866de94552fd0d12b45b72effaf7bb197bf87e083126dd30a0d757774fbdcbe579c73087e5214968c8c7d240ada SHA512 70a868177c62fc9f03332995104cc72dedef83d75524f53c3c057ac3ccbc8c0e667d33e5eee9a53a8bbe63e5bffbe7335e27c7e361b988b7ce91cbbc5b00551a
 DIST punes-0.111.tar.gz 57538299 BLAKE2B a900fe2bc9117e6739e58a43e457bfa466053d5a96ae5ad1333d7e0bc11eafb2408a96dc7e35ddf1a3cee50cafe99549a43d2abb629b106bbb1082878a845cc6 SHA512 6388cdf2b303e217adfe43b1b3b1ef66a75b6adfdb0363b213c47fc129b5815f3e96814ee25a3637147dc184203cef0438930c280f0c6249085ecac1220b435c
-EBUILD punes-0.111.ebuild 1278 BLAKE2B 8e691c404eb60562ace44fe9162258e62dbe786e651e7926305da14c6cdfefef9671d8816a2cf767660d5d748ad9d1d3742f56286c7cd222db53d13679390b46 SHA512 9cadbd208979488347ad552274afc79a65eaa62bbaf9e626e83a5b89153188c5b0e7e98b840b0259d468e40ed12d1d2f1db3d7a2a5871d565f563a7962f43de1
+EBUILD punes-0.111.ebuild 1277 BLAKE2B 1907cfcfe82be3469eecb941c7ab720a14d05a1380b449fac1a7f3f6e55f3fe7e7ae3b87ff5660e2508380032f2607f3b13488ac02ab52bf404d1ccd823d5ea0 SHA512 75a8e5876df8e677bc3b818462aaf621abccf0a9bae025d92556acef14579a25b3c3a66d33c7077c0d6808a69ca034c93b505ae22792937cf3a6a7d6ebae40c2
 MISC metadata.xml 560 BLAKE2B ea221c8fefa3fc3e9f8942ae7cfd642384cde9ec10949bc148e17727e0633f718140fa15675a3268674c80e6b55177ff5573460abd687bc76420673f76aecc8a SHA512 7676ca51eb1d02c6564dfd9ef47975f349856ae9536e3f1d9771bf4c56a2aebe86622461ae50b5989c56fffa1cfa92fc6185f1d62d933c4db5016acc4c280a8f
diff --git a/app-emulation/punes/punes-0.111.ebuild b/app-emulation/punes/punes-0.111.ebuild
index 03071411bec5..f37c4e0a94c3 100644
--- a/app-emulation/punes/punes-0.111.ebuild
+++ b/app-emulation/punes/punes-0.111.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/puNES-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X cg ffmpeg qt6"
 
 RDEPEND="