commit: bd36424f617fe2e10fdaa6c7b24b1ba138489c7c Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Sat Jan 20 07:21:27 2018 +0000 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> CommitDate: Sat Jan 20 08:00:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd36424f
app-emulation/wine-vanilla: Sync from ::wine Add 2.0.4, 2.21, 2.22. 3.0 Fix manpage generation Closes: https://bugs.gentoo.org/617864 Closes: https://bugs.gentoo.org/643962 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-emulation/wine-vanilla/Manifest | 6 +++- .../wine-vanilla/wine-vanilla-2.0-r1.ebuild | 38 ++++++++++++++------ .../wine-vanilla/wine-vanilla-2.0.1-r1.ebuild | 38 ++++++++++++++------ .../wine-vanilla/wine-vanilla-2.0.2-r1.ebuild | 38 ++++++++++++++------ .../wine-vanilla/wine-vanilla-2.0.3.ebuild | 38 ++++++++++++++------ ...illa-2.0.3.ebuild => wine-vanilla-2.0.4.ebuild} | 40 ++++++++++++++++------ .../wine-vanilla/wine-vanilla-2.18-r2.ebuild | 38 ++++++++++++++------ .../wine-vanilla/wine-vanilla-2.19-r1.ebuild | 38 ++++++++++++++------ .../wine-vanilla/wine-vanilla-2.20.ebuild | 38 ++++++++++++++------ ...anilla-9999.ebuild => wine-vanilla-2.21.ebuild} | 38 ++++++++++++++------ ...anilla-9999.ebuild => wine-vanilla-2.22.ebuild} | 38 ++++++++++++++------ ...vanilla-9999.ebuild => wine-vanilla-3.0.ebuild} | 40 ++++++++++++++++------ .../wine-vanilla/wine-vanilla-9999.ebuild | 38 ++++++++++++++------ 13 files changed, 343 insertions(+), 123 deletions(-) diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index bd97bedd8f0..52a22896087 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -1,8 +1,12 @@ -DIST gentoo-wine-patches-20170830.tar.xz 58456 BLAKE2B 86445a6d91d9981d069ff2fb3b64a47e166c76b4721ef877c74cd60e359ee5bdbe36ebf37cf796a18e9cf42dbc69ce1496777144fc28b072f47c965173bf48b4 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 +DIST gentoo-wine-patches-20180119.tar.xz 58688 BLAKE2B e7d44906f3c81c69fd3016ac6a7e2b8e68cc82762cc0a6b469e572d9b2edfd04ce9353e151c07dac11f82b1d108517fc86862d724e83ee8c4e938d64f3f9b934 SHA512 3e605bf613dca333e501b5578d9c92a42d351a23f8d7d9d6a545a7dc043dcc4c7f52918e6ad46db63a6f00f3ace4b77055f8343176afb976e6a04590dcee64b7 DIST wine-2.0.1.tar.xz 18845444 BLAKE2B 82e692c9a216087ea3b51cba659b12a79b25b44aac2ab572b9cf6d12c29b8fa5cee3c4bb9f8e9dca526ded2c6ba1f77d2c948b783914427ec2b93409e64ccaec SHA512 b32d07443655898768383b7409c21093b60c028fef166a596dad5dfab5a329b9fce4552e612c6d182e4f67eb1f28ed497fe2ed6af55d0000d3e96a124547722d DIST wine-2.0.2.tar.xz 18854952 BLAKE2B ae55b6a31e4d36b367a84e0e5fa7bea8c39a61ecfe7def4082747df4c55d0ee5c72e132bc77b49935fee8d0faf7f4d2cddfda0c712b6042b440dda1946e682b6 SHA512 3f37080a951819304cd3475f6012f1d6b5a94879b137cdf816cac4c8fde68ddc777905e92277ec5dce96437d8c32c43d55d3750b582781a9f9774b118f1a5b90 DIST wine-2.0.3.tar.xz 18864648 BLAKE2B 0503a11e7545d5af805bfc3c2f614b6e35e39b7b532ee45dd9947e1a9a53eb788a304e744c683e42bf84f0e67e2c046ea5f839b6bbad1cf73b9996eaae5c30c1 SHA512 e20dbcb3a48ecb3526eba075d4baebab2529dfc50b7a6d5e18294704470f61db386013f457118c270274b911f9643d203110f46558d23e84e6a6c2d78e237dbb +DIST wine-2.0.4.tar.xz 18898148 BLAKE2B a21c920e1cf15e064bc6b37067a11a5568f8d1906783c200236456b73947bbd24212208ab1bcc2ca526ed40d8b2e80a2dc5d95db1a8d356a484213afb6897f59 SHA512 8fccb93e5ebe482ed81e948e3b7f87d4fe5b1f838a10f9cdcafa9561de4ef54b7d5acdc292bf28ad3aaf44be34c5ad8452ebbfc39f49f95fcbe9f9d0fcfc862c DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 DIST wine-2.18.tar.xz 19546360 BLAKE2B 711b1396160b325a3021f066cc80eda0e2eb69c46ab671c6a4d1f417d0c2439e53854d37fee8507296386d1a828484af93e833f6c08413fd2571c03477e97386 SHA512 61cc39fa3d2b0a0ab3c5d17579865e6aea76dd9513a4b3c45975a2d5c05f2b4ba952b97eef547131a014763c7f692a08df29bc2ebf7e4ac7e2616e6a7822ddb9 DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23 +DIST wine-2.21.tar.xz 19620888 BLAKE2B 26d19c5805db58b53530b80eda3ab229f7961542d398cb0e74155e5341de8b484d301c263653ae50e953588538f6782a9b2200b822ba66f091e65d259e07db8e SHA512 4e33c463debe637827ed65f1118e692832bb5374491f706f9d251b8a2956e20d2df5d90ceba218b9bc9e946de91b8ba1d96b460453f59cdd9d82f070d07e0c43 +DIST wine-2.22.tar.xz 19635032 BLAKE2B 30534fb37ee0fe7b9f20309797240e461f14bc09ef1927e2c03e16cb136b83031ff186d29cc1092600ac53ede9533d0ddad6d4312e501e97201b0c632fedaae5 SHA512 14ecc25c3012c4eb9b1d3207372d0a4187f62593f986caca3196811b8aac0a7b898ae9acd94c707e0d63b6702019cf5051a964ada606b1ff8fb034bb353116bb +DIST wine-3.0.tar.xz 19712932 BLAKE2B 4478c6781bb171ecca426d1fdc85e0d0bbe13b62b6c983933de55e2abdd0bda7a01cbf251c021824b00129ea6230d1d4e718a64b7d919bb5c07a106b8771adb6 SHA512 a51f41b66f4805e09b223528eff6670e94b9c0c0c947be647507baf9d8d9afe7c3fdc88684c2c8d3573b4739d9a086ab929a744a8594d3c8f6ceb52070f43f0a diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild index eb9712a6842..423245563fe 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0-r1.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -154,9 +154,10 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=( "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 @@ -337,6 +338,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild index 737805d2a9f..1c0dacadef0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.1-r1.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -154,9 +154,10 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=( "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 @@ -337,6 +338,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild index 737805d2a9f..1c0dacadef0 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.2-r1.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -154,9 +154,10 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 "${PATCHDIR}/patches/freetype-2.8.1-segfault.patch" #631676 "${PATCHDIR}/patches/freetype-2.8.1-drop-glyphs.patch" #631376 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=( "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 @@ -337,6 +338,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild index cf77fbf1211..2aad417a855 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -154,7 +154,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -333,6 +334,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -475,14 +501,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild similarity index 94% copy from app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild copy to app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild index cf77fbf1211..f9492b16f21 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.0.3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.0.4.ebuild @@ -20,11 +20,11 @@ if [[ ${PV} == "9999" ]] ; then else MAJOR_V=$(get_version_component_range 1) SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"; - KEYWORDS="-* amd64 x86 ~x86-fbsd" + KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -154,7 +154,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -333,6 +334,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -475,14 +501,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild index 9b7f715f1a7..d2d94ecc28a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.18-r2.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -155,7 +155,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -334,6 +335,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -477,14 +503,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild index 9b7f715f1a7..d2d94ecc28a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.19-r1.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -155,7 +155,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -334,6 +335,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -477,14 +503,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild index 4e3940a0029..d1fca61ea40 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.20.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -156,7 +156,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -335,6 +336,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild similarity index 94% copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild copy to app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild index 4e3940a0029..d1fca61ea40 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.21.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -156,7 +156,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -335,6 +336,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild similarity index 94% copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild copy to app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild index 4e3940a0029..d1fca61ea40 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-2.22.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -156,7 +156,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -335,6 +336,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild similarity index 94% copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild copy to app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild index 4e3940a0029..e4a4223882a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-3.0.ebuild @@ -19,12 +19,12 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else MAJOR_V=$(get_version_component_range 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"; + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"; KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -156,7 +156,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -335,6 +336,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() { diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 4e3940a0029..d1fca61ea40 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -24,7 +24,7 @@ else fi S="${WORKDIR}/${MY_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" @@ -156,7 +156,8 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726 "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -335,6 +336,31 @@ src_prepare() { cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + # Depends on wine-2.0-prevent-build-of-localized-manpages.patch" + # Duplicate manpages input for wine64 + local man + for man in loader/*.man.in; do + cp ${man} ${man/wine/wine64} || die + done + # Add in proper manpages to Makefile + local search_text="wine.man.in" + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + fi + local l + for l in de fr pl; do + if has ${l} ${LINGUAS-${l}}; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + if use abi_x86_64; then + sed -i "/${search_text}/i \ + "$'\\\t'"wine64.${l}.UTF-8.man.in "$'\\\\' loader/Makefile.in || die + fi + fi + done } src_configure() { @@ -479,14 +505,6 @@ multilib_src_install_all() { for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done - - # respect LINGUAS when installing man pages, #469418 - local l - for l in de fr pl; do - has ${l} ${LINGUAS-${l}} || rm -rf "${D%/}${MY_MANDIR}"/${l}* - done - - eval "${glob_state}" } pkg_postinst() {
