From fb12f951d1a9071b4ddf774f2d570de245c2d061 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 13 Feb 2023 14:17:04 +0000 Subject: gentoo auto-resync : 13:02:2023 - 14:17:03 --- app-emulation/Manifest.gz | Bin 14814 -> 14817 bytes app-emulation/dxvk/Manifest | 2 +- app-emulation/dxvk/dxvk-2.1.ebuild | 2 +- app-emulation/wine-staging/Manifest | 2 +- .../wine-staging/wine-staging-9999.ebuild | 22 +++++++++++++-------- 5 files changed, 17 insertions(+), 11 deletions(-) (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 637d3665bd5e..efa55c2d3f12 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 01f41e72e09d..35ee49171e72 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -7,6 +7,6 @@ DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B bf6fd288f16df7adcb5ce DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121 EBUILD dxvk-1.10.3.ebuild 4386 BLAKE2B c2cd3106bd5437f1ee18f6f1977573f48eedc1258fb0de6ac5ad0a730ce348655404a931fc1f8c90254f0c6eb29cf08f89cd78529a7785db2f9dad00345a7ab7 SHA512 3828dcb3ac3b97449bf87f5a978b5baa3c06cb9141ddee96f538dfacf7201e33eda11468f3d39cbb318f92f544f8d2a8f96f923868d12e8174105293af3b1706 EBUILD dxvk-2.0.ebuild 5263 BLAKE2B 78de2ed9dc6540673f0b05d92f847670979f02adfd03dfa8df28e108b78788b7c8890e37eeca1e1ec3750604fb95e645e84ec99c593d11b39a5ef51c2f3530c0 SHA512 83ceafb6670947a56ae0ecb6ad208d0ed9b91db6a2f00ba868edeffef0064fe85e7a5b7e13d5b5cf4b69228deefccfb470e9eb7868002ed6e9a93ffb36861cd9 -EBUILD dxvk-2.1.ebuild 6061 BLAKE2B a58c90e467fdd6e263eb9369e1d862a1e2ed9085c26a0c7f59bc9a58cf81296461a3ff68053aae688b74ba19f5933c18fe516411d3609b0efb75e93db0dbf18e SHA512 53e623a745aa6e5e8f46a1b230aa53f22d3bdb56dbe941e642c1ee5b449314a417dbc3d618c02a68753b400381e201e8aa106c1eb3ddc18b234d4cad788de3b3 +EBUILD dxvk-2.1.ebuild 6059 BLAKE2B 7e37e822aed0352f7001cff7f554ec81bcdf11b93b9defb7b24ee24b590b75e625c4ddb254f5e025c133f1271b150108f26ec151f2b37dcbd636534a9d687028 SHA512 93a9b0ca7a914f384838b52cf66cd0ea9d05354035c88a241f8892ea5c2a3158099f958c3792427a68548d014fcf3d80236b4b0ee86c9dee25de126d3a5f829d EBUILD dxvk-9999.ebuild 6061 BLAKE2B a58c90e467fdd6e263eb9369e1d862a1e2ed9085c26a0c7f59bc9a58cf81296461a3ff68053aae688b74ba19f5933c18fe516411d3609b0efb75e93db0dbf18e SHA512 53e623a745aa6e5e8f46a1b230aa53f22d3bdb56dbe941e642c1ee5b449314a417dbc3d618c02a68753b400381e201e8aa106c1eb3ddc18b234d4cad788de3b3 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b diff --git a/app-emulation/dxvk/dxvk-2.1.ebuild b/app-emulation/dxvk/dxvk-2.1.ebuild index 7b1ccff1d6f4..e807643ef746 100644 --- a/app-emulation/dxvk/dxvk-2.1.ebuild +++ b/app-emulation/dxvk/dxvk-2.1.ebuild @@ -27,7 +27,7 @@ else https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.tar.bz2" - KEYWORDS="-* ~amd64 ~x86" + KEYWORDS="-* amd64 x86" fi # setup_dxvk.sh is no longer provided, fetch old until a better solution SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh" diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 5ca9ac69d5ba..b55ee5947e3d 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -13,5 +13,5 @@ EBUILD wine-staging-7.19.ebuild 11179 BLAKE2B 58982c661d242e8e165d7b1d7083284eed EBUILD wine-staging-7.22.ebuild 11281 BLAKE2B f8be09ce1670d897fcc72d92e816140be8507d92c70a2fe58fbd224e522a74749ef158173f54f09025488a0d5b1a572112410e9774eafc5f684cb8c1b567c9c5 SHA512 58acbe4ddf7045a991f156fb8d70c89fc83e8cb3733884154f263078671e02f6cdf961cdc953709e8da818ab92f8830a5a065acfd17b4f21316b004be0ca112c EBUILD wine-staging-8.0.ebuild 11313 BLAKE2B 8e6e5eeee1e58aa9da6f0424bf588d89d90434369dbb17511dfd44498a159de206b984b8af884e26cbfc5dfbf331090887c505d0e0f7e2bed1dfb8dfa78a951b SHA512 1b5c5e9bf2c799c80652629d4108d9b11d018515e7fc4b336ca3281e15e0061a1c2316106d239872d5f77c2fe640e4e5b5be1f54f42f66f917c356b934ee7ce1 EBUILD wine-staging-8.1.ebuild 11286 BLAKE2B bc764057d81f5fa4924413e191a85684f0f730fcd95dad32c62d495351dec5432ab15c8b2e37af4b457bcb37e45272c5860c82762af33a5ce8eb3bc67aca6304 SHA512 f306d4563077d9fc8d919f757508619292fcc31613a73a7b22de4bf586cf39b17cad2fdafc5e99fee1b7b2e670e08480c6ad38dc153468e7937c5681ca6c7380 -EBUILD wine-staging-9999.ebuild 11286 BLAKE2B bc764057d81f5fa4924413e191a85684f0f730fcd95dad32c62d495351dec5432ab15c8b2e37af4b457bcb37e45272c5860c82762af33a5ce8eb3bc67aca6304 SHA512 f306d4563077d9fc8d919f757508619292fcc31613a73a7b22de4bf586cf39b17cad2fdafc5e99fee1b7b2e670e08480c6ad38dc153468e7937c5681ca6c7380 +EBUILD wine-staging-9999.ebuild 11332 BLAKE2B 93c1c1442ca1154c34447ffacdbf00ed7f1c549ece8b7bb253246e9fae5cda107b462bbd8eaac3e62aaaeb72ef63d985b74ab3815f026fc543ae1c807b7771ff SHA512 d27c9a1d9e68167b58b9c1bfaf2ab515d037b74eab2a4a6c008b31f1a9917332b7e8777a7f83e39b9f62a242932ee663e012c24c2b8ab4ed56dce26522b070d9 MISC metadata.xml 2301 BLAKE2B 9b65253f5a19d8aafc6c9ccd361a0b8cdd14a600ddd51bf163603c7400b2c39bf147f7fe671e3aba68ff8f8f2874eec0b64dd73afe4dabad3667cd23ca99aee0 SHA512 885f7c8e2239733193d16b32bb29a21285ff732092ae0c095056ee311bdf9b7135200a29ede5958d668acf9777640f139ffc5ffe43b1455356ce4bc897621401 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 887f0e540454..d6afdde72ae8 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -4,7 +4,9 @@ EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper +PYTHON_COMPAT=( python3_{9..11} ) +inherit autotools edo flag-o-matic multilib multilib-build +inherit python-any-r1 toolchain-funcs wrapper WINE_GECKO=2.47.3 WINE_MONO=7.4.0 @@ -110,7 +112,16 @@ 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 + ) + ) dev-lang/perl sys-devel/binutils sys-devel/bison @@ -164,19 +175,14 @@ src_unpack() { } src_prepare() { - local staging=( - ./patchinstall.sh DESTDIR="${S}" + local patchinstallargs=( --all - --backend=eapply --no-autoconf -W winemenubuilder-Desktop_Icon_Path #652176 ${MY_WINE_STAGING_CONF} ) - # source patcher in a subshell so can use eapply as a backend - ebegin "Running ${staging[*]}" - ( cd ../${P}/patches && . "${staging[@]}" ) - eend ${?} || die "Failed to apply the patchset" + 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}' \ -- cgit v1.2.3