diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-15 09:01:56 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-15 09:01:56 +0100 |
| commit | e8f81810baa21f490d6910e8e2d424546b72a333 (patch) | |
| tree | db79151c528a566490ffcac0d7b64484e12b4762 /app-emulation/wine-staging | |
| parent | d00821e77f72d4af4ea30158c1c6e18ffff0875b (diff) | |
gentoo resync : 15.09.2019
Diffstat (limited to 'app-emulation/wine-staging')
| -rw-r--r-- | app-emulation/wine-staging/Manifest | 6 | ||||
| -rw-r--r-- | app-emulation/wine-staging/wine-staging-4.16.ebuild (renamed from app-emulation/wine-staging/wine-staging-4.12.1.ebuild) | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index dae8d5296ff3..137e76b5c734 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,15 +1,15 @@ DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969 -DIST wine-4.12.1.tar.xz 22125544 BLAKE2B 7a3b221e2bf3af91feff529b5af3926956cbcbce020439c7aa4f464f78d8c93ed1686eabdfee080dd0946e378645667ddb19c67a6449f1b171f1660127ecc05d SHA512 5d226aa4f24c59949c88d377d8f3d38839179e473b7e5bbf029af8142dfa23fd046ca919b63c8c8fc7e1a46077a860d3dab9d2e040f0367c85c8d386707222c1 DIST wine-4.13.tar.xz 22137820 BLAKE2B 6aab4930fd176757e2594a580ba73694cf04b5411eaf26dc332a8aee5efcd1a181781d010610b22aaa6dd91b4f9161502609b8a23928d6848329d773f98c41cd SHA512 b359db3c99d10b489f7f72172b624e7b2e2b826c206e842a524d781ab5947e2b03623a115c2345fc71df22eb508936c2f7667d4c420a2fb6cdc34e3d2ba5e75b DIST wine-4.14.tar.xz 22151304 BLAKE2B 04983c21fa58091a36e681c90b92b4f014287ea7edb105bef560ed0505682dd1d3832292a0e2cc72489f0c4a2247ce9c1ec7481f80cf2baa05953e525ce00b1c SHA512 cfbcad1685abf3a3810c5f29c50e47f1340aab2276e54d8d22b9b764df5099ff7ad399a6cca200c7a622be0470992d3aee1c0c64c2e6ea90221fee6d391d911c DIST wine-4.15.tar.xz 22196108 BLAKE2B d3b28ad1bbfb7e1522a3acb120049dd3ac3fe0473d0f84529e86b5b9163401869e39f7c4c0e14795a97362722c41ea1476e4afbd1a545e5518504df2628c928a SHA512 f8290bbfd3779cb967c1cf689106fa48d1a1daeac2bd42fb91a2d4beed48e0c398ed9239437756bdbe3cd826cef59f5cd660381f637e184c47a865ff3ace91aa -DIST wine-staging-4.12.1.tar.gz 9920469 BLAKE2B e76f1efe205fea913c8ae50e290f271a07f46ae5a9fe4a521d9e96a8834ff7eb70aa0d42a6d308ca081b14628bbb85e1c638dcfe7fa732a5e25a3a20e07b0b67 SHA512 804e99567632326f5ea55fd86c4ed236da3b3636b0aaf5dbf4427694b0786326bd048fbb119b37fc66d4072dacec9ac354b804ad372cad69cbf086360eaedc38 +DIST wine-4.16.tar.xz 22205248 BLAKE2B e7f7daeb4f75a5cf38478609512317e55ead862812a409e4f094178c0b7dec2a969b0a96e83059a1bede3610d3986529f926041765cfa536b786ee53fdc27b84 SHA512 f3097b06e490356e68484239b7a2ac1cfa968818565c79386ba6c0e70a318c092af5549da8218935cbe891876fa519d361a3775d0ab5d4adc192555ae0e45d86 DIST wine-staging-4.13.tar.gz 9913015 BLAKE2B 125b96fbe2de3c6d5c302dc25f0d1ba65fa3deb00a76c30a55e9fe43ad06bc3cb7ea18f542638268c1e854effedca557e837512b54c92905b928d83b33aa6aae SHA512 a5240b3999b1ba605d16148022e57a4574c0e9288763a5c4a259ea06c3a7152af8b136b0e2b8a74b1a40fb6adaf5ce012695160afdd5364fa1b4c7a903fd82b1 DIST wine-staging-4.14.tar.gz 9910499 BLAKE2B 2e9d2983156a3f309e740503825ff0ebb2461ffc785147e9853122e7d64269409f7e73fea0b5a0fac149a4fb7d27a11cdc8ba0759ca9fc0fb0492d8d3884c503 SHA512 481a50f4ba3f1c445bd5b9754d7b27bdcd0bc386930e3597051a0962778288f8d4649e9f4e8bc188738c6896821a198f3af15b47e9db719f52d0b3db16a407f0 DIST wine-staging-4.15.tar.gz 9904734 BLAKE2B 163d6f51a6fe649c8c107b013aafa5c5729bb93cafe94446cde966138c18d5aed2e950ce9a71ae4c719efb358406af079efb21cc8546d97e2b7146a5cae27a56 SHA512 0c34695c1d39773fb34a58f0cdb91d427945615e7b76b8a7222bc84fda8df08125832297b75aca55e69511b6b3686df70dade84bcc7cc9324f30c042146761b0 -EBUILD wine-staging-4.12.1.ebuild 20352 BLAKE2B 9a66ac87c5e8d7cb023ebf07cd9e717218e80110f91470612f6360f03a1c28eea272a5148e4e56480544ebc7b9d2d4f056b239745cca69011d994f562a336898 SHA512 ad4d0bb599d01b0e867a1d373be6c4db817e5956f3b6d3134e77f96a9f3697a2f664a28030d8c2cc559a21a879b53a23d4b7d2c29d3f717b9ebff5db2b0931b6 +DIST wine-staging-4.16.tar.gz 9905714 BLAKE2B fe72d1123c7f418dc9702b113679de7d21a8f20b2bed5e9b2f7a2b411ca28b407e0d2d134dee19ee06414df7a3ccfaa784d5689e3dc79043544d17c6768e6a17 SHA512 8782e4aecb34443404b1ac02c6b1ba91887ad12f07c7960601f879b034937d5ee6f1c1493437e765804beed6e68fa20383f7c02a09534526cc5f4bb857048faf EBUILD wine-staging-4.13.ebuild 20202 BLAKE2B 3a396d740c0fbef5461274b043c1d80f14d8d5d4cf0f46cd36b9761c06dfe09d5946e98d1378c2b1ad4561d37a04c33057ebd5bc7305d40261cfd040dddc94b6 SHA512 ea7fcca738893b74b4d6fc4d61e0ecb2c81a00c9a71e2ab8e5d5667b37f2860897a0cc89360446610e5420ce348fe8eed246497c0b965865e47f4e4c3db050e4 EBUILD wine-staging-4.14.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf EBUILD wine-staging-4.15.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf +EBUILD wine-staging-4.16.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf EBUILD wine-staging-9999.ebuild 20302 BLAKE2B d0c68ad8015af573691ead5df63ee89db9e9175c97c575c9bdd2623208f572d7bbd4615490fc6b03ca6d06ff4bd63807804c1d4da2bcdad84698568310f427bf SHA512 f425b2184519c56c49a93fc7ba47c14221a50fe4461c99a256581e5a7c6966b471fcd28981d25c4a54470e2a4fa0a96eccc7e2929e397d94367421da8f01bddf MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77 diff --git a/app-emulation/wine-staging/wine-staging-4.12.1.ebuild b/app-emulation/wine-staging/wine-staging-4.16.ebuild index 0804c00c2432..52c20dca7b4a 100644 --- a/app-emulation/wine-staging/wine-staging-4.12.1.ebuild +++ b/app-emulation/wine-staging/wine-staging-4.16.ebuild @@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND} !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.9.0 ) + mono? ( app-emulation/wine-mono:4.9.2 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -356,7 +356,6 @@ src_prepare() { local STAGING_EXCLUDE="" use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" - use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho" # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches ebegin "Running Wine-Staging patch installer" @@ -436,7 +435,7 @@ multilib_src_configure() { --libexecdir="${MY_LIBEXECDIR}" --localstatedir="${MY_LOCALSTATEDIR}" --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine + --sysconfdir="${EPREFIX}/etc/wine" $(use_with alsa) $(use_with capi) $(use_with lcms cms) @@ -556,6 +555,9 @@ multilib_src_install_all() { use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + # Avoid double prefix from dosym and make_wrapper + MY_PREFIX=${MY_PREFIX#${EPREFIX}} + if use abi_x86_64 && ! use abi_x86_32; then dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader @@ -566,7 +568,7 @@ multilib_src_install_all() { # Make wrappers for binaries for handling multiple variants # Note: wrappers instead of symlinks because some are shell which use basename local b - for b in "${D%/}${MY_PREFIX}"/bin/*; do + for b in "${ED%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done eshopts_pop |