From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 450211382C5 for ; Sat, 20 Jan 2018 06:53:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47CB1E093D; Sat, 20 Jan 2018 06:53:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1540AE093D for ; Sat, 20 Jan 2018 06:53:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F919335C44 for ; Sat, 20 Jan 2018 06:53:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC2AB1C2 for ; Sat, 20 Jan 2018 06:53:27 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1516430859.5c4479841dd58ac57f8f4ca7d5f2d4a721cfbbf0.np-hardass@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-any/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-any/Manifest app-emulation/wine-any/wine-any-2.0-r1.ebuild app-emulation/wine-any/wine-any-2.1-r1.ebuild app-emulation/wine-any/wine-any-2.10-r1.ebuild app-emulation/wine-any/wine-any-2.11-r1.ebuild app-emulation/wine-any/wine-any-2.12-r1.ebuild app-emulation/wine-any/wine-any-2.13-r1.ebuild app-emulation/wine-any/wine-any-2.14-r1.ebuild app-emulation/wine-any/wine-any-2.15-r1.ebuild app-emulation/wine-any/wine-any-2.16-r1.ebuild app-emulation/wine-any/wine-any-2.17-r1.ebuild app-emulation/wine-any/wine-any-2.18.ebuild app-emulation/wine-any/wine-any-2.19.ebuild app-emulation/wine-any/wine-any-2.2-r1.ebuild app-emulation/wine-any/wine-any-2.20.ebuild app-emulation/wine-any/wine-any-2.21.ebuild app-emulation/wine-any/wine-any-2.3-r1.ebuild app-emulation/wine-any/wine-any-2.4-r1.ebuild app-emulation/wine-any/wine-any-2.5-r1.ebuild app-emulation/wine-any/wine-any-2.6-r1.ebuild app-emulation/wine-any/wine-any-2.7-r1.ebuild app-emulation/wine-any/wine-any-2 .8-r1.ebuild app-emulation/wine-any/wine-any-2.9-r1.ebuild app-emulation/wine-any/wine-any-9999.ebuild X-VCS-Directories: app-emulation/wine-any/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: 5c4479841dd58ac57f8f4ca7d5f2d4a721cfbbf0 X-VCS-Branch: master Date: Sat, 20 Jan 2018 06:53:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b2ca2d92-cf8f-41b5-93f1-29fc88cbbdde X-Archives-Hash: f8c5606d121816fc6d46bd485e8970a4 commit: 5c4479841dd58ac57f8f4ca7d5f2d4a721cfbbf0 Author: NP-Hardass gentoo org> AuthorDate: Sat Jan 20 06:47:30 2018 +0000 Commit: NP Hardass gentoo org> CommitDate: Sat Jan 20 06:47:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=5c447984 app-emulation/wine-any: Fix manpage generation Bug: https://bugs.gentoo.org/617864 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-emulation/wine-any/Manifest | 2 +- app-emulation/wine-any/wine-any-2.0-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.1-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.10-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.11-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.12-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.13-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.14-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.15-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.16-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.17-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.18.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.19.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.2-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.20.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.21.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.3-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.4-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.5-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.6-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.7-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.8-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-2.9-r1.ebuild | 38 +++++++++++++++++++------- app-emulation/wine-any/wine-any-9999.ebuild | 38 +++++++++++++++++++------- 24 files changed, 645 insertions(+), 231 deletions(-) diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest index 9f5732c..e4c54bb 100644 --- a/app-emulation/wine-any/Manifest +++ b/app-emulation/wine-any/Manifest @@ -1,4 +1,4 @@ -DIST gentoo-wine-patches-20170830.tar.xz 58456 SHA256 fb7781d0ae360cbc3860c2d2e81527a1b903da824c01f5d5040e95aaf99a3970 SHA512 5e5159e3252b246bba0ef7fdba345db3ab1071c5b8b8b625f98eda18779d4024c5b76bdbf49ce7bd5c6b01b422807adf76820beddb2b4a6ee9e67d13052cc575 WHIRLPOOL a79be264bab3fcdeee06fef47efd28e6e1125254ac7f82300cb6ba2591ef69cd76b5fed8f778b1849a0659e680e9fc785f0273d55cb2ed95648a74dffa5e22d2 +DIST gentoo-wine-patches-20180119.tar.xz 58688 SHA256 bb8f634241e7a4ba528bb6e0db78512889c4d25773773e87d76a2452dde72360 SHA512 3e605bf613dca333e501b5578d9c92a42d351a23f8d7d9d6a545a7dc043dcc4c7f52918e6ad46db63a6f00f3ace4b77055f8343176afb976e6a04590dcee64b7 WHIRLPOOL 46dfe36cce8e46a916b5e6f49e6674d9f9612b6ebbd3fd1ba47e6ff34bc68d95a916b76d1a61b0b25ddf97840dd78dffa2d7d0239e6fc0d3cbd74cc0c1868e9a DIST wine-2.0.tar.bz2 23662707 SHA256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 WHIRLPOOL fa9f774d87dae73c7d1f3b86dc3b03ea27065eb6140f1cac13c82fe16f7ebff8f8365ed447220cf5c2788b9f4aae7c482e4f9e2e69f47e5435209e148f5dbdfe DIST wine-2.1.tar.xz 18887032 SHA256 bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e SHA512 03d678ee6e89c2804813f2827255fcf59e96ca9a45b7d8ac441cfc84f835e5e5689c70a79a41a04c631e1add7807fa4a5758acef3bd7aadfb2e92e68958c6ef6 WHIRLPOOL 063d935f1ff0922100641f2f53cdac23d2993a83182d45e028e485fd7d0a13bc5cfb77bca76550b1537b3f42fecacef7fd64785adbf6425af823f56f96973b54 DIST wine-2.10.tar.xz 19209580 SHA256 488df7ffd2e81da455bf428fc9eb784bb4273a890334500895665711bd52f179 SHA512 8807e16a571bf45d99097ad5fdfb9fe755f6dbe84010a330fed82f1d48c76b7f19589bfc0e5dde0b9e49a608fd0501db3f7e3e129e4d9d34bcae03bc51a73139 WHIRLPOOL e9a8248aac31593fbac28a3d8d4e62bfce14a7c41cc416ebfca8606518d28efd31b32196133da211f75f48bd228bd5d21fcbbc0479293e813ed99b258b37126e diff --git a/app-emulation/wine-any/wine-any-2.0-r1.ebuild b/app-emulation/wine-any/wine-any-2.0-r1.ebuild index c847a3c..29a108c 100644 --- a/app-emulation/wine-any/wine-any-2.0-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.0-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.1-r1.ebuild b/app-emulation/wine-any/wine-any-2.1-r1.ebuild index 13d0346..55f29f3 100644 --- a/app-emulation/wine-any/wine-any-2.1-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.1-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.10-r1.ebuild b/app-emulation/wine-any/wine-any-2.10-r1.ebuild index bdc1185..fb30f25 100644 --- a/app-emulation/wine-any/wine-any-2.10-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.10-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.11-r1.ebuild b/app-emulation/wine-any/wine-any-2.11-r1.ebuild index bdc1185..fb30f25 100644 --- a/app-emulation/wine-any/wine-any-2.11-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.11-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.12-r1.ebuild b/app-emulation/wine-any/wine-any-2.12-r1.ebuild index bdc1185..fb30f25 100644 --- a/app-emulation/wine-any/wine-any-2.12-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.12-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.13-r1.ebuild b/app-emulation/wine-any/wine-any-2.13-r1.ebuild index bdc1185..fb30f25 100644 --- a/app-emulation/wine-any/wine-any-2.13-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.13-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.14-r1.ebuild b/app-emulation/wine-any/wine-any-2.14-r1.ebuild index a1e9567..1d62684 100644 --- a/app-emulation/wine-any/wine-any-2.14-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.14-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.15-r1.ebuild b/app-emulation/wine-any/wine-any-2.15-r1.ebuild index a1e9567..1d62684 100644 --- a/app-emulation/wine-any/wine-any-2.15-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.15-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.16-r1.ebuild b/app-emulation/wine-any/wine-any-2.16-r1.ebuild index a1e9567..1d62684 100644 --- a/app-emulation/wine-any/wine-any-2.16-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.16-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.17-r1.ebuild b/app-emulation/wine-any/wine-any-2.17-r1.ebuild index a1e9567..1d62684 100644 --- a/app-emulation/wine-any/wine-any-2.17-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.17-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-2.18.ebuild b/app-emulation/wine-any/wine-any-2.18.ebuild index 4744fac..6334648 100644 --- a/app-emulation/wine-any/wine-any-2.18.ebuild +++ b/app-emulation/wine-any/wine-any-2.18.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,7 +190,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=() @@ -422,6 +423,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() { @@ -572,14 +598,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-any/wine-any-2.19.ebuild b/app-emulation/wine-any/wine-any-2.19.ebuild index 4744fac..6334648 100644 --- a/app-emulation/wine-any/wine-any-2.19.ebuild +++ b/app-emulation/wine-any/wine-any-2.19.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,7 +190,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=() @@ -422,6 +423,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() { @@ -572,14 +598,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-any/wine-any-2.2-r1.ebuild b/app-emulation/wine-any/wine-any-2.2-r1.ebuild index 13d0346..55f29f3 100644 --- a/app-emulation/wine-any/wine-any-2.2-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.2-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.20.ebuild b/app-emulation/wine-any/wine-any-2.20.ebuild index d8db24b..8104783 100644 --- a/app-emulation/wine-any/wine-any-2.20.ebuild +++ b/app-emulation/wine-any/wine-any-2.20.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -191,7 +191,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=() @@ -423,6 +424,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() { @@ -574,14 +600,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-any/wine-any-2.21.ebuild b/app-emulation/wine-any/wine-any-2.21.ebuild index d8db24b..8104783 100644 --- a/app-emulation/wine-any/wine-any-2.21.ebuild +++ b/app-emulation/wine-any/wine-any-2.21.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -191,7 +191,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=() @@ -423,6 +424,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() { @@ -574,14 +600,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-any/wine-any-2.3-r1.ebuild b/app-emulation/wine-any/wine-any-2.3-r1.ebuild index 13d0346..55f29f3 100644 --- a/app-emulation/wine-any/wine-any-2.3-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.3-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.4-r1.ebuild b/app-emulation/wine-any/wine-any-2.4-r1.ebuild index 7621839..460f6fc 100644 --- a/app-emulation/wine-any/wine-any-2.4-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.4-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.5-r1.ebuild b/app-emulation/wine-any/wine-any-2.5-r1.ebuild index 7621839..460f6fc 100644 --- a/app-emulation/wine-any/wine-any-2.5-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.5-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.6-r1.ebuild b/app-emulation/wine-any/wine-any-2.6-r1.ebuild index 7621839..460f6fc 100644 --- a/app-emulation/wine-any/wine-any-2.6-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.6-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.7-r1.ebuild b/app-emulation/wine-any/wine-any-2.7-r1.ebuild index 7621839..460f6fc 100644 --- a/app-emulation/wine-any/wine-any-2.7-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.7-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.8-r1.ebuild b/app-emulation/wine-any/wine-any-2.8-r1.ebuild index 7621839..460f6fc 100644 --- a/app-emulation/wine-any/wine-any-2.8-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.8-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -189,9 +189,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 @@ -425,6 +426,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() { @@ -574,14 +600,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-any/wine-any-2.9-r1.ebuild b/app-emulation/wine-any/wine-any-2.9-r1.ebuild index bdc1185..fb30f25 100644 --- a/app-emulation/wine-any/wine-any-2.9-r1.ebuild +++ b/app-emulation/wine-any/wine-any-2.9-r1.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -190,9 +190,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 @@ -426,6 +427,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() { @@ -576,14 +602,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-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild index d8db24b..8104783 100644 --- a/app-emulation/wine-any/wine-any-9999.ebuild +++ b/app-emulation/wine-any/wine-any-9999.ebuild @@ -28,7 +28,7 @@ STAGING_P="wine-staging-${PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20170830" +GWP_V="20180119" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets" @@ -191,7 +191,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=() @@ -423,6 +424,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() { @@ -574,14 +600,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() {