diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-15 00:14:05 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-15 00:14:05 +0100 |
commit | 06a2593561b5f8054db8d68aa94b4338d2dd2bf6 (patch) | |
tree | 13e45c8f587efc7cf3385303b3a90c5c2a53755c /app-emulation/wine-vanilla | |
parent | 85dc262ae9ec9413f8172a2a8442d6d9134d02f4 (diff) |
gentoo auto-resync : 15:08:2023 - 00:14:05
Diffstat (limited to 'app-emulation/wine-vanilla')
8 files changed, 85 insertions, 67 deletions
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index b34fd3ce0744..00f918ff180b 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -8,11 +8,11 @@ DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c0063 DIST wine-8.11.tar.xz 29236492 BLAKE2B db97b9abde6e1f4c854b449d27bdbafbc91bd75b835d84da401777c6ae2f4f623f2130f470d2e9a3aaf7e737f75d143a07191d38b409c06596373bece3df23c5 SHA512 f3e37f51f0a13aacbd41b017fc3d35e197614b03c00f5b9959c0fabc4e89975b5c3f411b38329e45ce6f9d2a2d82952b95e0907fbe2d6ae35cc4bec293825769 DIST wine-8.12.tar.xz 29276732 BLAKE2B c1bf0d32eaf17f06b47dd7ffc495db4874f72ffec7cfca9edd9b2b9def8ab16db2583349950c3af447d85d476aa013914554f990d5f42d5bc8243b9effbaf869 SHA512 6b9eab7ca1ed5a13202b1250d8d95f6bd8ee5176f0c39b5358aedaf28f7f23543f4a73bf0782c3b4e50936813fc2a459582b5d294569c976ace784fbd9e0af1b DIST wine-8.13.tar.xz 29379824 BLAKE2B fa07edba8e45ef17813e63f793ca18cd05fd421b803d416421ec0fb7aeb4223ae44376a7e75a195e91c30259f27b48c3ed4ab0b613cbb9464b824f51e85ea240 SHA512 952c670635f91879cf6908343a04c0f41ae54e213123242e24fc282f9705fbe3b800dc1de454b6cfb1ebb89431b0e6eb3df3b094c1d9f4e69835d0f1b8f4fcb5 -EBUILD wine-vanilla-7.0.2.ebuild 11395 BLAKE2B 55b32e16305fafc176a5f90d36ff4a8cddaa9e54eabfb199fd151a8a3ea789ffee5fe6e5ed6569bfa69c27c37df0c2d63b99bb6f9512b700b377cb708e566642 SHA512 0bfabc3f901d6a2dec9e91ca088be681a59be66dbf37efe0ca6212fedd5b7f522d6b26d153424f521f0cf311a852fa2101f669adabb305b10a4ada740f708fb1 -EBUILD wine-vanilla-8.0.1.ebuild 11412 BLAKE2B 6af1317397277df169dd7991b0a7138c2b2aebb84816db06b8715e5afc8d0e01a97b937634bb01f4fc5f44e2fe2b02216f42e8330a6730ab2a73512fec466793 SHA512 16231bd5b032330846a14c5bc439baac7210f8151a3548b38eb668d2a66b7e45af865c38b730b7818839b5ac69181991e873d092476900aae8300da3baca0b90 -EBUILD wine-vanilla-8.0.2.ebuild 11485 BLAKE2B e705cafdbf8172a829a1a5db8efd19eb03c20e174161c89c862e07ff449e409fd3c940b78f1ff082ae4257bf029d78404d3edfa449127a98cd087f18543b85f0 SHA512 9482194a8c034f38b4028c721263d28dcd5681cccb5188aafa5014bccaca4a3e6312b0f816823f4515fd7fa2c8d943491db25bd905d1fb0cd53220f1607795d7 -EBUILD wine-vanilla-8.11-r1.ebuild 11596 BLAKE2B 825c7db5d6ebfac7eb8e9bb7c2fd7d1dde2ddccaed284ac760b14bc3ccb6761c6246ea426e1b5d0cbe12e650674b10afc9e1635457d762e162abe3300417d4b3 SHA512 6af9d2bf6507dbe9c532b6098c336afb5dc82f4470cceef0ed6cdfe8439bf133a5d9e24310cc63f62ae6c8de14bf5ded765e913bd785a0a18edf6daf1e161416 -EBUILD wine-vanilla-8.12.ebuild 11596 BLAKE2B 825c7db5d6ebfac7eb8e9bb7c2fd7d1dde2ddccaed284ac760b14bc3ccb6761c6246ea426e1b5d0cbe12e650674b10afc9e1635457d762e162abe3300417d4b3 SHA512 6af9d2bf6507dbe9c532b6098c336afb5dc82f4470cceef0ed6cdfe8439bf133a5d9e24310cc63f62ae6c8de14bf5ded765e913bd785a0a18edf6daf1e161416 -EBUILD wine-vanilla-8.13.ebuild 12735 BLAKE2B fc40b709dbe21f842bc5641452449a186f7997e040cffff5a9f940351d560c2d64f7e62a9749c89f57d4bb4678bf1c2d88b3fe040e21a616bbb1e64062a0094c SHA512 853aaf03668673525c3c4ed7462abf0864f384b8c240c888143035146208418827a65c43b788a05ade988911784f23f166e4f4f7bc569b52e4096053ccbef00f -EBUILD wine-vanilla-9999.ebuild 12735 BLAKE2B fc40b709dbe21f842bc5641452449a186f7997e040cffff5a9f940351d560c2d64f7e62a9749c89f57d4bb4678bf1c2d88b3fe040e21a616bbb1e64062a0094c SHA512 853aaf03668673525c3c4ed7462abf0864f384b8c240c888143035146208418827a65c43b788a05ade988911784f23f166e4f4f7bc569b52e4096053ccbef00f +EBUILD wine-vanilla-7.0.2.ebuild 11372 BLAKE2B 12030c975970e41ae7b2d38bc44bf3fbd55e202fcb06000bd78f54c9f7aa8b6a4d80b8420bc14c4a19ad0dee40dd5da35822947a1c2a5c9de30936ea8e53d1f7 SHA512 81d0fafbdd248291a96361deb3be37b1d3155a9458716d9b9e193e6507e2e1fdbb0ce235b84138f6a52e64139884d47f4f3aef09f160ccd3e5050d3032fced63 +EBUILD wine-vanilla-8.0.1.ebuild 11389 BLAKE2B 223772e62296358f408c4286c3b605c3253f8d84845b2059b6498480ef621313710a37dd6d298db173dea0fdcbe096d041d20b4814c7eecc5d0ff8d106c3c497 SHA512 f65bdba562631939dba9697a1b3755466e8a03fd63685799ae2d0fb3d9f02c7d23faafe84a8ffbe8ce33492af00e79240aa386f94d719819e675d620fbea6cd8 +EBUILD wine-vanilla-8.0.2.ebuild 11462 BLAKE2B 7a01bbb647ead8117d3424047e3ec79a736bfa085f76c29c21f7687f6d109482ee773da6b1b3a90edd320b4ded32a89074ee76771c9002f70fb180682bd3c64d SHA512 7a469c56eddf3da4eb18c3fe774fb1df680ddc20ca441104d3f2ce3baed3321551fd71a76c1c1c50d4ad30bd6e74bd01b786b9bf14c8834c353a83bc0d83f76e +EBUILD wine-vanilla-8.11-r1.ebuild 11573 BLAKE2B 34c0c1902afa8abc012d1fdb318f00918a541f6535bbbad27bd8bc68db94bda14b4a4ad316608ad377686794399948a4ef815b14d873608282d79aa891e31410 SHA512 b0f84f8b5556c49d82e49405448f829697101a6bc78376f52ee1a5d75fbb6ade096604d02b2068c28caa2d64606e0c70a463e30f5faa749c7d8afbcd78f284e9 +EBUILD wine-vanilla-8.12.ebuild 11573 BLAKE2B 34c0c1902afa8abc012d1fdb318f00918a541f6535bbbad27bd8bc68db94bda14b4a4ad316608ad377686794399948a4ef815b14d873608282d79aa891e31410 SHA512 b0f84f8b5556c49d82e49405448f829697101a6bc78376f52ee1a5d75fbb6ade096604d02b2068c28caa2d64606e0c70a463e30f5faa749c7d8afbcd78f284e9 +EBUILD wine-vanilla-8.13.ebuild 13252 BLAKE2B c90d3f2d86a3a2bda38e950f1c5c0810f0beb089f898fd4b06b90aced2ee19ac4b327b21e5f4664f8d9e3cef46067246ff278d5e3abedf79b8ace351dd3b98d0 SHA512 c9090bcf822864b1885333bb084a86b0da09f0d027ec8c7118b351cbb14714ff61ba99621097bc729887a5d901dabf75225514400d3beb3e14080162f204b26b +EBUILD wine-vanilla-9999.ebuild 13252 BLAKE2B c90d3f2d86a3a2bda38e950f1c5c0810f0beb089f898fd4b06b90aced2ee19ac4b327b21e5f4664f8d9e3cef46067246ff278d5e3abedf79b8ace351dd3b98d0 SHA512 c9090bcf822864b1885333bb084a86b0da09f0d027ec8c7118b351cbb14714ff61ba99621097bc729887a5d901dabf75225514400d3beb3e14080162f204b26b MISC metadata.xml 2605 BLAKE2B 11bdcd81e6e4620229177026a6eea5bbbff4f2f8c92deabd08d096bd1ffab0bea06f950fe4631f227bb31dcf22e9d41456803a3924c0cf934c5d7b28aa7f0308 SHA512 e96b8ab85a6b124ae154b514b8dd9385158b999f7ffbd0a1e04d9bbb52288cd07b81a2fe989431ac214fc0ae37445e2c819b6593d31001fa54b0aa6f48561e8a diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild index 3ce352533b56..d8a883dc6e14 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild @@ -174,12 +174,12 @@ src_prepare() { if tc-is-clang; then if use mingw; then # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite USE=mingw, - # drop as a quick fix for now which hopefully should be safe + # if used without --target *-windows, then gets used in install + # phase despite USE=mingw, drop as a quick fix for now sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die else - # known broken due to bug #912237, require mingw for now - die "building ${PN} with clang requires USE=mingw to be enabled" + # ./configure will fail, abort early + die "building ${PN} with clang is only supported with USE=mingw" fi fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild index 364fb01af774..ed19030553fe 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild @@ -172,12 +172,12 @@ src_prepare() { if tc-is-clang; then if use mingw; then # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite USE=mingw, - # drop as a quick fix for now which hopefully should be safe + # if used without --target *-windows, then gets used in install + # phase despite USE=mingw, drop as a quick fix for now sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die else - # known broken due to bug #912237, require mingw for now - die "building ${PN} with clang requires USE=mingw to be enabled" + # ./configure will fail, abort early + die "building ${PN} with clang is only supported with USE=mingw" fi fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild index b95ead30f8be..47bb63ce2f1b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -172,12 +172,12 @@ src_prepare() { if tc-is-clang; then if use mingw; then # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite USE=mingw, - # drop as a quick fix for now which hopefully should be safe + # if used without --target *-windows, then gets used in install + # phase despite USE=mingw, drop as a quick fix for now sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die else - # known broken due to bug #912237, require mingw for now - die "building ${PN} with clang requires USE=mingw to be enabled" + # ./configure will fail, abort early + die "building ${PN} with clang is only supported with USE=mingw" fi fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild index 5221f7e79d76..51ab700e53b0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild @@ -176,12 +176,12 @@ src_prepare() { if tc-is-clang; then if use mingw; then # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite USE=mingw, - # drop as a quick fix for now which hopefully should be safe + # if used without --target *-windows, then gets used in install + # phase despite USE=mingw, drop as a quick fix for now sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die else - # known broken due to bug #912237, require mingw for now - die "building ${PN} with clang requires USE=mingw to be enabled" + # ./configure will fail, abort early + die "building ${PN} with clang is only supported with USE=mingw" fi fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild index 5221f7e79d76..51ab700e53b0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild @@ -176,12 +176,12 @@ src_prepare() { if tc-is-clang; then if use mingw; then # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite USE=mingw, - # drop as a quick fix for now which hopefully should be safe + # if used without --target *-windows, then gets used in install + # phase despite USE=mingw, drop as a quick fix for now sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die else - # known broken due to bug #912237, require mingw for now - die "building ${PN} with clang requires USE=mingw to be enabled" + # ./configure will fail, abort early + die "building ${PN} with clang is only supported with USE=mingw" fi fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild index c6b837670cbb..1aaebe5aa269 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild @@ -189,12 +189,16 @@ src_prepare() { if tc-is-clang; then if use mingw; then # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite USE=mingw, - # drop as a quick fix for now which hopefully should be safe + # if used without --target *-windows, then gets used in install + # phase despite USE=mingw, drop as a quick fix for now sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die else - # known broken due to bug #912237, require mingw for now - die "building ${PN} with clang requires USE=mingw to be enabled" + # fails in ./configure unless --enable-archs is passed, allow to + # bypass with EXTRA_ECONF but is currently considered unsupported + # (by Gentoo) as additional work is needed for (proper) support + # note: also fails w/ :17, but unsure if safe to drop w/o mingw + [[ ${EXTRA_ECONF} == *--enable-archs* ]] || + die "building ${PN} with clang is only supported with USE=mingw" fi fi @@ -344,22 +348,27 @@ src_install() { use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - if use wow64; then - # compat symlinks, albeit ideally no one should call "wine64" - dosym wine ${WINE_PREFIX}/bin/wine64 - dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader - elif use abi_x86_64 && use !abi_x86_32; then - # if no 32bit support it instead only installs "wine64" which may - # come as unexpected, so provide "wine" alongside its man page - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done + # Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64, + # -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where + # one or the other could be missing and that is unexpected for users + # and some tools like winetricks) + if use abi_x86_64; then + if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then + dosym wine64 ${WINE_PREFIX}/bin/wine + dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader + + # also install wine(1) man pages (incl. translations) + local man + for man in ../build64/loader/wine.*man; do + : "${man##*/wine}" + : "${_%.*}" + insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 + newins ${man} wine.1 + done + elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then + dosym wine ${WINE_PREFIX}/bin/wine64 + dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader + fi fi use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index c6b837670cbb..1aaebe5aa269 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -189,12 +189,16 @@ src_prepare() { if tc-is-clang; then if use mingw; then # -mabi=ms was ignored by <clang:16 then turned error in :17 - # and it still gets used in install phase despite USE=mingw, - # drop as a quick fix for now which hopefully should be safe + # if used without --target *-windows, then gets used in install + # phase despite USE=mingw, drop as a quick fix for now sed -i '/MSVCRTFLAGS=/s/-mabi=ms//' configure.ac || die else - # known broken due to bug #912237, require mingw for now - die "building ${PN} with clang requires USE=mingw to be enabled" + # fails in ./configure unless --enable-archs is passed, allow to + # bypass with EXTRA_ECONF but is currently considered unsupported + # (by Gentoo) as additional work is needed for (proper) support + # note: also fails w/ :17, but unsure if safe to drop w/o mingw + [[ ${EXTRA_ECONF} == *--enable-archs* ]] || + die "building ${PN} with clang is only supported with USE=mingw" fi fi @@ -344,22 +348,27 @@ src_install() { use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last - if use wow64; then - # compat symlinks, albeit ideally no one should call "wine64" - dosym wine ${WINE_PREFIX}/bin/wine64 - dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader - elif use abi_x86_64 && use !abi_x86_32; then - # if no 32bit support it instead only installs "wine64" which may - # come as unexpected, so provide "wine" alongside its man page - dosym wine64 ${WINE_PREFIX}/bin/wine - dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader - local man - for man in ../build64/loader/wine.*man; do - : "${man##*/wine}" - : "${_%.*}" - insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 - newins ${man} wine.1 - done + # Ensure both wine64 and wine are available if USE=abi_x86_64 (wow64, + # -abi_x86_32, and/or EXTRA_ECONF could cause varying scenarios where + # one or the other could be missing and that is unexpected for users + # and some tools like winetricks) + if use abi_x86_64; then + if [[ -e ${ED}${WINE_PREFIX}/bin/wine64 && ! -e ${ED}${WINE_PREFIX}/bin/wine ]]; then + dosym wine64 ${WINE_PREFIX}/bin/wine + dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader + + # also install wine(1) man pages (incl. translations) + local man + for man in ../build64/loader/wine.*man; do + : "${man##*/wine}" + : "${_%.*}" + insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1 + newins ${man} wine.1 + done + elif [[ ! -e ${ED}${WINE_PREFIX}/bin/wine64 && -e ${ED}${WINE_PREFIX}/bin/wine ]]; then + dosym wine ${WINE_PREFIX}/bin/wine64 + dosym wine-preloader ${WINE_PREFIX}/bin/wine64-preloader + fi fi use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \ |