gentoo auto-resync : 14:10:2023 - 06:19:37

4 files changed, 16 insertions, 56 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a545a9bc20ef..e2ff0a99bcab 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 3a4d231350df..8b672ee2bc1b 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -9,11 +9,9 @@ DIST wine-staging-8.0.tar.gz 9529620 BLAKE2B c9540195ea885d9f1e980232b0af471e92c
 DIST wine-staging-8.15.tar.gz 9856164 BLAKE2B 9313c88a436cd73e5b1b0cc44d0c781babcd870cdf89c4111ef1eef6012362123c244360bb7ae39b65317b39f3dfffd0530dd5674507bc0c1824d9d2efeabd3e SHA512 23d956dd9a5d5b8cb4efd5dcb5a0fd5926539b7e45d230920e20a84d27ecd6e4b1cc8285d328a0be622f66c48d453b577a4eeb096f8a866760da81cc47410a2a
 DIST wine-staging-8.16.tar.gz 9865735 BLAKE2B 83848d86b55961e3f84013bac2c5280dd6a281470ee09cd7f7cfccb1b91f5e62d73e0214bdeb2cfcfb255f387fe8de3b90e50b2e5e96c165f315fd6eb81aea58 SHA512 3748c9e41aa4c50e10f2dc7301d059bfeb614adc859bacad3b1d7ff00fa72a8ee65fd527c6ce2c065523002df353b82f17ff601b4cbbc4f7b84b1197ece3d9e2
 DIST wine-staging-8.17.1.tar.gz 9569937 BLAKE2B 8db9aa679d18b8a6da6d287e0b4ad717ab76bc809e14a8117d1b2fddf91d232c4face730f327884ae294f295b5f7d5ca9a113361389c7b5c0889e71775c0d795 SHA512 ae015251c5dd1bf23be038362ec2acbf351836a9bd9e7c2ef2d005fa36b75de18919ecba99b43b881e2fa63edc99b07ad1665a25b9efb486a986cf06d51083a6
-DIST wine-staging-8.17.tar.gz 9570270 BLAKE2B f031961be2d42a3e29c63a5c085ec4d56ffead908f6433791aaff47a3fcd55bca17c5f526618da698c7c312693d2dae703e17ec5c658afea8613bd2c49a634af SHA512 699d3caec080686986a3b66a6c905d4542a3f06a12def3f30ad9d97484c9a0c2ba00ab81ae75a8ec83eaad0ef8029fcc702ac2c1f0a46c60118b9e451afe7613
 EBUILD wine-staging-8.0.ebuild 12655 BLAKE2B 41692e9bafd318d2238d6006a1cbbff199203171a0ed0645fce829daba6127fae26cd9db9284fb57a1876f952578962300b694e27d53448cdb9cb819665a2c51 SHA512 584d5f97c803e8f6961e877946be5a5902a624bf198be9caab021204d33ebbb8f5a411061041f96738b94d8724b8d0af0d9b2e4eb0f81cecdeb14528e311cbe6
 EBUILD wine-staging-8.15.ebuild 14566 BLAKE2B 042a66fcf463c6e1101de29605fc91dc2c371eb309a7280398535a0ba24521a840ffd4d73468018a3b53baa383380fe439f299be957f80ec9e28533d4830b899 SHA512 225f8429f2492a087fae3025456b2f68ec5c800abf691149d8f1dc904ee1ff3c396478f1ade0763db3fa9e7a34304d1cc02845d72e89825ad12132b676c18d43
 EBUILD wine-staging-8.16.ebuild 14566 BLAKE2B 042a66fcf463c6e1101de29605fc91dc2c371eb309a7280398535a0ba24521a840ffd4d73468018a3b53baa383380fe439f299be957f80ec9e28533d4830b899 SHA512 225f8429f2492a087fae3025456b2f68ec5c800abf691149d8f1dc904ee1ff3c396478f1ade0763db3fa9e7a34304d1cc02845d72e89825ad12132b676c18d43
 EBUILD wine-staging-8.17.1.ebuild 14566 BLAKE2B 042a66fcf463c6e1101de29605fc91dc2c371eb309a7280398535a0ba24521a840ffd4d73468018a3b53baa383380fe439f299be957f80ec9e28533d4830b899 SHA512 225f8429f2492a087fae3025456b2f68ec5c800abf691149d8f1dc904ee1ff3c396478f1ade0763db3fa9e7a34304d1cc02845d72e89825ad12132b676c18d43
-EBUILD wine-staging-8.17.ebuild 14566 BLAKE2B 042a66fcf463c6e1101de29605fc91dc2c371eb309a7280398535a0ba24521a840ffd4d73468018a3b53baa383380fe439f299be957f80ec9e28533d4830b899 SHA512 225f8429f2492a087fae3025456b2f68ec5c800abf691149d8f1dc904ee1ff3c396478f1ade0763db3fa9e7a34304d1cc02845d72e89825ad12132b676c18d43
 EBUILD wine-staging-9999.ebuild 14566 BLAKE2B 042a66fcf463c6e1101de29605fc91dc2c371eb309a7280398535a0ba24521a840ffd4d73468018a3b53baa383380fe439f299be957f80ec9e28533d4830b899 SHA512 225f8429f2492a087fae3025456b2f68ec5c800abf691149d8f1dc904ee1ff3c396478f1ade0763db3fa9e7a34304d1cc02845d72e89825ad12132b676c18d43
 MISC metadata.xml 2538 BLAKE2B cb657e04ad7f26b088f03f862a7e7ccbc4eb6592de17ec8022b5e4b306bd10f7daae7f6de113b142a9cf713a91cab9fbd0650cca4591adc13e4a77280f9812e3 SHA512 a87687fb1a0d2f639626f4a90e7fb78bd31926c53460af3cc80c93e9974f189b545c830278157893f5e48a54b20e5b49b2d1e996ccb5520a47f319b7048999a7
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index d92bd50d0b3b..c5ec33abab73 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -7,10 +7,12 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c0063
 DIST wine-8.15.tar.xz 29427600 BLAKE2B 9a1bb0de4048e32f78e3630e9e33dc99a117d4fcb4e61285e3fb298de9f1742a7d9c52f0d02dd407ce5c62768d7fecf51947165fbc8e62cf076519caea13a2db SHA512 d450dfe868ac7c7cb26ccc5e6d492c1311395c5f8b150610f5b1e78451d303b63b67c7e0ad48d6a66ae5265c5bc16da970544cf12195d8635cc3fc96c4a26cad
 DIST wine-8.16.tar.xz 29457688 BLAKE2B 497cefed7990b2c6ae28022276d83e4fb7265cfa99a3c3b88eab56566f125d631cf9310d149a9d4fa05934fa1f26ac2138ec366b16c6d2585f199e3be8ce3beb SHA512 0ba83beacd842e53173c07c30fa4ee57424af0d00b9f168b8bd310c40ea06e26dfc09f4a1991b788a8c4bd2b6eeb439e60b0deff6249424a00fa2940c95662b6
 DIST wine-8.17.tar.xz 29559704 BLAKE2B dea71eaecf0ce3abff2ff9fd3ac65a8df0d606b718c176548976ae4c34228b269b3637efd23ef3ea5035df6b4df34b1e74a1f0b236a3b2864a914d6fc688d44e SHA512 3826e20494a919ef1972d91c9391a3ae916d52b55e62e8fb7fc2c9c3ae6a7b363b40d8388cb4b9b3e45bae134a2de46e8158f8eaec7948216d9cd8ef32ab627f
+DIST wine-8.18.tar.xz 29844232 BLAKE2B 0d3062bba451bbf0b7dec4a48a5fc658c6d281db5c57c2b9ad416ac2e7dcb947336bdd42b5b2062fc614b691b6419b7795decd24a7b0474bec7aaff1027b3632 SHA512 0f8e6b5c6709930bc7f774d92cd025976f6442c3785a224b5988a37152f3a875150b228f12442e9b9c0d9e7884568aca26159df86d48f2550a630625fef3c8b9
 EBUILD wine-vanilla-7.0.2.ebuild 11699 BLAKE2B 2ae56704eadeeaef77d78bcf0a0c6d6e5d8741a85d8eea6b5e430e86068a652a14d71dee4230cf501bc65fcd9a2faeccd5fb4f983eb261badbf9d76edc587f9e SHA512 553e98d5a8035f29621f90cd29407f72bf29014b5bb851e24aff66cf5c8ab8e7f9baa1bbd24a50c91e871e8dd40a12e3392ed2abceb4fc201a71f427f5c7450a
 EBUILD wine-vanilla-8.0.2.ebuild 11788 BLAKE2B 6b2a4576263eabbe50275c42e435f4a22d8e69f81bbfe828bb100dfa4b7fd0509c0f0eda6ab1910b557b5e6d9cbdf93a3a1a2cad454b9b9853d746a9281c3bff SHA512 71e15b3bd1ccd6f6cb14478e9130145465c97f97c02a63fb6190df4538b4c2c503e6cd9fb567b414e68824406a50930faeae75d0ecb2849486bbfc299d2a9086
 EBUILD wine-vanilla-8.15.ebuild 13499 BLAKE2B 2293614d6104c1d8b255ca0dd9895c36edfc43ff181ad54c73a9f141772b5819cefcc907163f1fbdf316392f32deab71cea1205ce723ceafafb28276d060cea2 SHA512 8ea7cb73adff5dbaf8821d333600373f7bc8c4fa8aa77e05182522f89409ea1c590c01d5496cd55761292e744a04c9fe381edde8677637e4738cb3a152c33b3c
 EBUILD wine-vanilla-8.16.ebuild 13499 BLAKE2B 2293614d6104c1d8b255ca0dd9895c36edfc43ff181ad54c73a9f141772b5819cefcc907163f1fbdf316392f32deab71cea1205ce723ceafafb28276d060cea2 SHA512 8ea7cb73adff5dbaf8821d333600373f7bc8c4fa8aa77e05182522f89409ea1c590c01d5496cd55761292e744a04c9fe381edde8677637e4738cb3a152c33b3c
 EBUILD wine-vanilla-8.17.ebuild 13499 BLAKE2B 2293614d6104c1d8b255ca0dd9895c36edfc43ff181ad54c73a9f141772b5819cefcc907163f1fbdf316392f32deab71cea1205ce723ceafafb28276d060cea2 SHA512 8ea7cb73adff5dbaf8821d333600373f7bc8c4fa8aa77e05182522f89409ea1c590c01d5496cd55761292e744a04c9fe381edde8677637e4738cb3a152c33b3c
+EBUILD wine-vanilla-8.18.ebuild 13499 BLAKE2B 2293614d6104c1d8b255ca0dd9895c36edfc43ff181ad54c73a9f141772b5819cefcc907163f1fbdf316392f32deab71cea1205ce723ceafafb28276d060cea2 SHA512 8ea7cb73adff5dbaf8821d333600373f7bc8c4fa8aa77e05182522f89409ea1c590c01d5496cd55761292e744a04c9fe381edde8677637e4738cb3a152c33b3c
 EBUILD wine-vanilla-9999.ebuild 13499 BLAKE2B 2293614d6104c1d8b255ca0dd9895c36edfc43ff181ad54c73a9f141772b5819cefcc907163f1fbdf316392f32deab71cea1205ce723ceafafb28276d060cea2 SHA512 8ea7cb73adff5dbaf8821d333600373f7bc8c4fa8aa77e05182522f89409ea1c590c01d5496cd55761292e744a04c9fe381edde8677637e4738cb3a152c33b3c
 MISC metadata.xml 2605 BLAKE2B 11bdcd81e6e4620229177026a6eea5bbbff4f2f8c92deabd08d096bd1ffab0bea06f950fe4631f227bb31dcf22e9d41456803a3924c0cf934c5d7b28aa7f0308 SHA512 e96b8ab85a6b124ae154b514b8dd9385158b999f7ffbd0a1e04d9bbb52288cd07b81a2fe989431ac214fc0ae37445e2c819b6593d31001fa54b0aa6f48561e8a
diff --git a/app-emulation/wine-staging/wine-staging-8.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.18.ebuild
index 7814d829f071..fb89e272b6ea 100644
--- a/app-emulation/wine-staging/wine-staging-8.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.18.ebuild
@@ -4,39 +4,34 @@
 EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools edo flag-o-matic multilib multilib-build
-inherit prefix python-any-r1 toolchain-funcs wrapper
+inherit autotools flag-o-matic multilib multilib-build
+inherit prefix toolchain-funcs wrapper
 
 WINE_GECKO=2.47.4
 WINE_MONO=8.0.0
-WINE_P=wine-$(ver_cut 1-2)
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine-staging.git"
-	WINE_EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
 else
 	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
-	SRC_URI="
-		https://dl.winehq.org/wine/source/${WINE_SDIR}/${WINE_P}.tar.xz
-		https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
-S="${WORKDIR}/${WINE_P}"
 
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
 HOMEPAGE="
-	https://wiki.winehq.org/Wine-Staging
-	https://gitlab.winehq.org/wine/wine-staging/"
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
 
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
 	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
 	llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer
-	kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl
-	pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
+	kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap
+	perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip
 	+truetype udev udisks +unwind usb v4l +vulkan wayland wow64
 	+xcomposite xinerama"
 # bug #551124 for truetype
@@ -70,6 +65,7 @@ WINE_DLOPEN_DEPEND="
 	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
@@ -128,16 +124,7 @@ DEPEND="
 	${WINE_COMMON_DEPEND}
 	sys-kernel/linux-headers
 	X? ( x11-base/xorg-proto )"
-# gitapply.sh prefers git but can fallback to patch+extras
 BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		dev-vcs/git
-		(
-			sys-apps/gawk
-			sys-apps/util-linux
-		)
-	)
 	|| (
 		sys-devel/binutils
 		sys-devel/lld
@@ -155,14 +142,13 @@ BDEPEND="
 IDEPEND=">=app-eselect/eselect-wine-2"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
-	__clear_cache # unused on amd64+x86 (bug #900334)
+	__clear_cache # unused on amd64+x86 (bug #900338)
 	res_getservers # false positive
 )
-QA_FLAGS_IGNORED="usr/lib/.*/wine/.*-unix/odbc32.so" # has no compiled objects
 QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
 	"${FILESDIR}"/${PN}-8.13-rpath.patch
 )
@@ -187,34 +173,7 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
-		git-r3_src_unpack
-
-		# hack: use subshell to preserve state (including what git-r3 unpack
-		# sets) for smart-live-rebuild as this is not the repo to look at
-		(
-			EGIT_COMMIT=$(<"${EGIT_CHECKOUT_DIR}"/staging/upstream-commit) || die
-			EGIT_REPO_URI=${WINE_EGIT_REPO_URI}
-			EGIT_CHECKOUT_DIR=${S}
-			einfo "Fetching Wine commit matching the current patchset by default (${EGIT_COMMIT})"
-			git-r3_src_unpack
-		)
-	else
-		default
-	fi
-}
-
 src_prepare() {
-	local patchinstallargs=(
-		--all
-		--no-autoconf
-		${MY_WINE_STAGING_CONF}
-	)
-
-	edo "${PYTHON}" ../${P}/staging/patchinstall.py "${patchinstallargs[@]}"
-
 	# sanity check, bumping these has a history of oversights
 	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
 		dlls/appwiz.cpl/addons.c || die)
@@ -302,6 +261,7 @@ src_configure() {
 		$(use_with wayland)
 		$(use_with xcomposite)
 		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
 	)
 
 	filter-lto # build failure