From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- app-emulation/wine-d3d9/Manifest | 14 +++---- app-emulation/wine-d3d9/metadata.xml | 4 ++ app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild | 54 ++++++++++++------------- app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild | 54 ++++++++++++------------- app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild | 54 ++++++++++++------------- app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild | 54 ++++++++++++------------- app-emulation/wine-d3d9/wine-d3d9-9999.ebuild | 54 ++++++++++++------------- 7 files changed, 146 insertions(+), 142 deletions(-) (limited to 'app-emulation/wine-d3d9') diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest index 0e11ac123d86..c790ce805799 100644 --- a/app-emulation/wine-d3d9/Manifest +++ b/app-emulation/wine-d3d9/Manifest @@ -1,4 +1,4 @@ -DIST gentoo-wine-patches-20180119.tar.xz 58688 BLAKE2B e7d44906f3c81c69fd3016ac6a7e2b8e68cc82762cc0a6b469e572d9b2edfd04ce9353e151c07dac11f82b1d108517fc86862d724e83ee8c4e938d64f3f9b934 SHA512 3e605bf613dca333e501b5578d9c92a42d351a23f8d7d9d6a545a7dc043dcc4c7f52918e6ad46db63a6f00f3ace4b77055f8343176afb976e6a04590dcee64b7 +DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2 DIST wine-2.0.tar.bz2 23662707 BLAKE2B 1d485c1359ce8a0395a9f6378c1f8be33ea2836b80390d1eb1095057a0acedd21708daab16e1851a315391b9f9b0a360879b9d98c73bcc8371c5023e9a8037f5 SHA512 b0a57ba8202d9fc396e5bfb7a7718d6bababbed8f3351e7fdc36afa37f35a871e04903757618f73427aeb71a52b2d323977d79e48f8b38d636f23fd404441186 DIST wine-2.19.tar.xz 19549464 BLAKE2B 86d130cc43d7d674d2f478365952962b2792fd585b8d074564108bc7e9f4f7690337e4758b9a24e54fe8fd60187d3a96496a5ffc454ba674b02ecdde68efd3bb SHA512 83558231bdc592b1f69cfedf6c689063df7bd9fecdfafba6fb7f6a2c7fa7783973efb85a6a49305afc18b1aa268209ee5b9c0655756e05d7550468698dfa51ae DIST wine-2.20.tar.xz 19597556 BLAKE2B 80a9886fa77e5788b143521288f7d83c92754610c9426e58c759d2c33767bd23f7d2a44a17ceeec0bfe9065264393e0aa1087a0827ea7d438ffd938ba2eb2fb5 SHA512 d8d374d1e690ce9d3964fc81054fb7f4cd56cbae6bc44ebbf80b7dc7f04524baa2bd831e0be8f00de4cb0e14c1cb71780d424f5dcb9851fcaed9fb22f5ce5d23 @@ -7,9 +7,9 @@ DIST wine-d3d9-2.0.tar.gz 48373 BLAKE2B 80370a7519141030a7e54c2ea5db410b2bf1cde8 DIST wine-d3d9-2.19.tar.gz 48818 BLAKE2B b053ee0ad798a7d8ad53b3daff1757caaa52f095435f2fb89893c7313d490a2359217a5638529e918a1446f13533a746836c1c22218cba875a1420816618408a SHA512 be43435cd53f367ca57080c08218db302a90bf85ec6e917e89375904c456b585b61fb6053f9b4366b7e844f8246cabe83460a9866f614dbb5df3edfb43b2f54a DIST wine-d3d9-2.20.tar.gz 48822 BLAKE2B b9ae137e05f672990707aa3ae88aa569a517e644579ff545b35393074ca03ac0c6aaea7494a90a4f6c4278f7397e1e5078e90383f5debeb4edfe46c8834446ff SHA512 f1fa4882514d0bbb77a7244448a9153cddd5029fca49c5221783fafc13f30888b606c6be4417ecdf85bd80a659ecf54c57ea5aedd49acb87cdc9b42d98f68dc0 DIST wine-d3d9-2.21.tar.gz 48813 BLAKE2B a83b558682f19a44f62c33c8782f4415250c537373654b36c4b1aa6e078ed09594ec1f0e5b76093d88b835786dac96047a1584aa94953256d6ca2804e08ec3df SHA512 64edab41be95adb1dc81c040b13901fbc7fd54467e1306639e3d459c41521d61ebf09e7028688166af8fd0f238063e125d8985a4fc66b185fade996ed596bb2a -EBUILD wine-d3d9-2.0-r1.ebuild 19254 BLAKE2B 747f450622806a64166c9981c7e78a5149fec575a1d3d7905b7316f1bf76db91beca6827016f5b8cd7986325950bfd2c2452cc798f37a0c2b970a46d3773fdd2 SHA512 c76f00ac09fc90d36de3982df34c30f5c28f578acbc904ba1bb8e686afe43898eb78623d23f5a54d50d55ddacc489b54c3e6a3ec51851434ba18ee71da610f79 -EBUILD wine-d3d9-2.19.ebuild 19127 BLAKE2B 88be387d562541476994aa0d7a17735d8c9970bca128ca727cb7a0961f6108614b10a7789a95b25ca164b5f2060dc282e932a14466e591247b6b5a5fbfc28049 SHA512 b2053cbe76df4fcbf418b2650a5cbb862a051180e24a025c11a7f4a140a63e2b2425cb5b10eafe066ec0bc9791ed1f0ce8742553f9b01091e9e05aef68119d83 -EBUILD wine-d3d9-2.20.ebuild 19215 BLAKE2B b46e9814316a53ae2c608c7bd87b77851b0a1d83a0027535ed71a8698db5d892bf1c079e681d10916a9f0fe2d7619ca358e35e75938918971f616dd545089a46 SHA512 1f5714ec9be3bba0fb4e8be96c36210c0a0348fdfd69e10bdb367e311af4416780d8f269d970958125f5794693786061e4280381264e17ef50b51f4488fc96ef -EBUILD wine-d3d9-2.21.ebuild 19215 BLAKE2B b46e9814316a53ae2c608c7bd87b77851b0a1d83a0027535ed71a8698db5d892bf1c079e681d10916a9f0fe2d7619ca358e35e75938918971f616dd545089a46 SHA512 1f5714ec9be3bba0fb4e8be96c36210c0a0348fdfd69e10bdb367e311af4416780d8f269d970958125f5794693786061e4280381264e17ef50b51f4488fc96ef -EBUILD wine-d3d9-9999.ebuild 19215 BLAKE2B b46e9814316a53ae2c608c7bd87b77851b0a1d83a0027535ed71a8698db5d892bf1c079e681d10916a9f0fe2d7619ca358e35e75938918971f616dd545089a46 SHA512 1f5714ec9be3bba0fb4e8be96c36210c0a0348fdfd69e10bdb367e311af4416780d8f269d970958125f5794693786061e4280381264e17ef50b51f4488fc96ef -MISC metadata.xml 2847 BLAKE2B 3812c6a1ab5c6e0afaf377d01df19779bfbf76a8dad4061f08c352e9ef7a6ef1eb7a4546f189373929930a147cdcb2d55f29473cd5cbb6de3625680b02a34a68 SHA512 aa92412a3858822c2bf82c517008a2730eb9710126b1ef336020c3085c4e36503ee921661bd88a5b20d9fa01b539fbcee617620a7c7762665592d8cd711863a0 +EBUILD wine-d3d9-2.0-r1.ebuild 19229 BLAKE2B 696516d3ab3c4f7b626099ae04c9a2e47724fbbcccbc3a33016fae3e1625ffef80ad68af0ddf96d1f822101d73abe051ea5984baf2a238b9f01276b2f86a593c SHA512 b2e4f2edf8f1052f0735e5935b616632527df2dc76bf649635bc35c8493a844a359148f76c10e46e4a6b89dcacac89253e3bcc7376bcededb9ad0cac146e55bf +EBUILD wine-d3d9-2.19.ebuild 19102 BLAKE2B 272907e0e28cc2b4441c79aaadbec99fa70f011ec48e77b802249e26024a6ad20c358673934167f67835bf57a7ef44a22cdcbdc6feff2e90745e2f9ebf145ab3 SHA512 f232a329a6ffa8e7e085fd5477ea9b5dfe20dd4f3c81f855d3a4ada0979e6a102333002523f1325c92e7ed120482075fd49c9f613a33763e4ff8ca0822911031 +EBUILD wine-d3d9-2.20.ebuild 19190 BLAKE2B 301ea69c9e7e78a53f402f21523f4ba78032437c6dfad4a6f662ffbb0298a8021414bb3fe1e2661856a76aa8451f5a8cf971ad56c3f77a43d927805bc69b8089 SHA512 598de78c9fab47fb87cc2bdf994926d4d9f15804884141d768ed6a454d12da03708ea4feef2b4b876d4b4d273ec0e9ec96532868baca3147df9ab31e516744be +EBUILD wine-d3d9-2.21.ebuild 19190 BLAKE2B 301ea69c9e7e78a53f402f21523f4ba78032437c6dfad4a6f662ffbb0298a8021414bb3fe1e2661856a76aa8451f5a8cf971ad56c3f77a43d927805bc69b8089 SHA512 598de78c9fab47fb87cc2bdf994926d4d9f15804884141d768ed6a454d12da03708ea4feef2b4b876d4b4d273ec0e9ec96532868baca3147df9ab31e516744be +EBUILD wine-d3d9-9999.ebuild 19190 BLAKE2B 301ea69c9e7e78a53f402f21523f4ba78032437c6dfad4a6f662ffbb0298a8021414bb3fe1e2661856a76aa8451f5a8cf971ad56c3f77a43d927805bc69b8089 SHA512 598de78c9fab47fb87cc2bdf994926d4d9f15804884141d768ed6a454d12da03708ea4feef2b4b876d4b4d273ec0e9ec96532868baca3147df9ab31e516744be +MISC metadata.xml 3048 BLAKE2B 827d51a456d0f97c612c123983e8549d3419731490f821357ceffb205b7ef339fa13618ccce938cda63eafceec361a0136ef7c7ebea0b3256008f4c8133818d7 SHA512 55daa64049533568a1e27d9620ee066167e36c51d27930f1db55a451a8cd5ab8425fc4457496e2c5222f2337f38b87573c46da63c805969734c4df6a1f4f02e6 diff --git a/app-emulation/wine-d3d9/metadata.xml b/app-emulation/wine-d3d9/metadata.xml index 44e32fcafe35..375e22626d8c 100644 --- a/app-emulation/wine-d3d9/metadata.xml +++ b/app-emulation/wine-d3d9/metadata.xml @@ -4,6 +4,10 @@ wine@gentoo.org Wine + + This package must be kept in sync with repo/proj/wine repository. + Any changes need to be run past the maintainer to ensure the two repositories are kept in sync. + commendsarnex@gmail.com diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild index 3f8f0715fe47..27edc48d213f 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils +inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20180119" +GWP_V="20180120" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" @@ -172,7 +172,7 @@ PATCHES=( "${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 + "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=( "${PATCHDIR}/patches/freetype-2.8.1-patch-fonts.patch" #631376 @@ -373,29 +373,30 @@ src_prepare() { 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 + # Requires wine-2.0-rearrange-manpages.patch + + # Duplicate manpages input files for wine64 + local f + for f in loader/*.man.in; do + cp ${f} ${f/wine/wine64} || die done - # Add in proper manpages to Makefile - local search_text="wine.man.in" + # Add wine64 manpages to Makefile if use abi_x86_64; then - sed -i "/${search_text}/i \ - "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + sed -i "/wine.man.in/i \ + \\\twine64.man.in \\\\" loader/Makefile.in || die + sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ +\164\2/' 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 + + rm_man_file(){ + local file="${1}" + loc=${2} + sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die + } + + while read f; do + l10n_for_each_disabled_locale_do rm_man_file "${f}" + done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) } src_configure() { @@ -530,16 +531,15 @@ multilib_src_install_all() { dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi - # Failglob for bin and man loops - local glob_state=$(shopt -p failglob) - shopt -s failglob - + # Failglob for binloops, shouldn't be necessary, but including to stay safe + eshopts_push -s failglob #615218 # Make wrappers for binaries for handling multiple variants # Note: wrappers instead of symlinks because some are shell which use basename local b for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done + eshopts_pop } pkg_postinst() { diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild index 0df97c34f88d..442642abc178 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.19.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils +inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20180119" +GWP_V="20180120" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" @@ -171,7 +171,7 @@ PATCHES=( "${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" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 + "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -370,29 +370,30 @@ src_prepare() { 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 + # Requires wine-2.0-rearrange-manpages.patch + + # Duplicate manpages input files for wine64 + local f + for f in loader/*.man.in; do + cp ${f} ${f/wine/wine64} || die done - # Add in proper manpages to Makefile - local search_text="wine.man.in" + # Add wine64 manpages to Makefile if use abi_x86_64; then - sed -i "/${search_text}/i \ - "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + sed -i "/wine.man.in/i \ + \\\twine64.man.in \\\\" loader/Makefile.in || die + sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ +\164\2/' 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 + + rm_man_file(){ + local file="${1}" + loc=${2} + sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die + } + + while read f; do + l10n_for_each_disabled_locale_do rm_man_file "${f}" + done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) } src_configure() { @@ -528,16 +529,15 @@ multilib_src_install_all() { dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi - # Failglob for bin and man loops - local glob_state=$(shopt -p failglob) - shopt -s failglob - + # Failglob for binloops, shouldn't be necessary, but including to stay safe + eshopts_push -s failglob #615218 # Make wrappers for binaries for handling multiple variants # Note: wrappers instead of symlinks because some are shell which use basename local b for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done + eshopts_pop } pkg_postinst() { diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild index 7f16ff60d600..ddbc7bcc947c 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.20.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils +inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20180119" +GWP_V="20180120" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" @@ -172,7 +172,7 @@ PATCHES=( "${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" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 + "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -371,29 +371,30 @@ src_prepare() { 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 + # Requires wine-2.0-rearrange-manpages.patch + + # Duplicate manpages input files for wine64 + local f + for f in loader/*.man.in; do + cp ${f} ${f/wine/wine64} || die done - # Add in proper manpages to Makefile - local search_text="wine.man.in" + # Add wine64 manpages to Makefile if use abi_x86_64; then - sed -i "/${search_text}/i \ - "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + sed -i "/wine.man.in/i \ + \\\twine64.man.in \\\\" loader/Makefile.in || die + sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ +\164\2/' 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 + + rm_man_file(){ + local file="${1}" + loc=${2} + sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die + } + + while read f; do + l10n_for_each_disabled_locale_do rm_man_file "${f}" + done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) } src_configure() { @@ -530,16 +531,15 @@ multilib_src_install_all() { dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi - # Failglob for bin and man loops - local glob_state=$(shopt -p failglob) - shopt -s failglob - + # Failglob for binloops, shouldn't be necessary, but including to stay safe + eshopts_push -s failglob #615218 # Make wrappers for binaries for handling multiple variants # Note: wrappers instead of symlinks because some are shell which use basename local b for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done + eshopts_pop } pkg_postinst() { diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild index 7f16ff60d600..ddbc7bcc947c 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-2.21.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils +inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20180119" +GWP_V="20180120" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" @@ -172,7 +172,7 @@ PATCHES=( "${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" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 + "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -371,29 +371,30 @@ src_prepare() { 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 + # Requires wine-2.0-rearrange-manpages.patch + + # Duplicate manpages input files for wine64 + local f + for f in loader/*.man.in; do + cp ${f} ${f/wine/wine64} || die done - # Add in proper manpages to Makefile - local search_text="wine.man.in" + # Add wine64 manpages to Makefile if use abi_x86_64; then - sed -i "/${search_text}/i \ - "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + sed -i "/wine.man.in/i \ + \\\twine64.man.in \\\\" loader/Makefile.in || die + sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ +\164\2/' 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 + + rm_man_file(){ + local file="${1}" + loc=${2} + sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die + } + + while read f; do + l10n_for_each_disabled_locale_do rm_man_file "${f}" + done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) } src_configure() { @@ -530,16 +531,15 @@ multilib_src_install_all() { dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi - # Failglob for bin and man loops - local glob_state=$(shopt -p failglob) - shopt -s failglob - + # Failglob for binloops, shouldn't be necessary, but including to stay safe + eshopts_push -s failglob #615218 # Make wrappers for binaries for handling multiple variants # Note: wrappers instead of symlinks because some are shell which use basename local b for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done + eshopts_pop } pkg_postinst() { diff --git a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild index 7f16ff60d600..ddbc7bcc947c 100644 --- a/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild +++ b/app-emulation/wine-d3d9/wine-d3d9-9999.ebuild @@ -6,7 +6,7 @@ EAPI=6 PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW" PLOCALE_BACKUP="en" -inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils +inherit autotools estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils MY_PN="${PN%%-*}" MY_P="${MY_PN}-${PV}" @@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}" D3D9_P="wine-d3d9-${PV}" D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}" -GWP_V="20180119" +GWP_V="20180120" PATCHDIR="${WORKDIR}/gentoo-wine-patches" DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset" @@ -172,7 +172,7 @@ PATCHES=( "${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" #310611 - "${PATCHDIR}/patches/${MY_PN}-2.0-prevent-build-of-localized-manpages.patch" #469418 #617864 + "${PATCHDIR}/patches/${MY_PN}-2.0-rearrange-manpages.patch" #469418 #617864 ) PATCHES_BIN=() @@ -371,29 +371,30 @@ src_prepare() { 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 + # Requires wine-2.0-rearrange-manpages.patch + + # Duplicate manpages input files for wine64 + local f + for f in loader/*.man.in; do + cp ${f} ${f/wine/wine64} || die done - # Add in proper manpages to Makefile - local search_text="wine.man.in" + # Add wine64 manpages to Makefile if use abi_x86_64; then - sed -i "/${search_text}/i \ - "$'\\\t'"wine64.man.in "$'\\\\' loader/Makefile.in || die + sed -i "/wine.man.in/i \ + \\\twine64.man.in \\\\" loader/Makefile.in || die + sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ +\164\2/' 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 + + rm_man_file(){ + local file="${1}" + loc=${2} + sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die + } + + while read f; do + l10n_for_each_disabled_locale_do rm_man_file "${f}" + done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) } src_configure() { @@ -530,16 +531,15 @@ multilib_src_install_all() { dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader fi - # Failglob for bin and man loops - local glob_state=$(shopt -p failglob) - shopt -s failglob - + # Failglob for binloops, shouldn't be necessary, but including to stay safe + eshopts_push -s failglob #615218 # Make wrappers for binaries for handling multiple variants # Note: wrappers instead of symlinks because some are shell which use basename local b for b in "${D%/}${MY_PREFIX}"/bin/*; do make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" done + eshopts_pop } pkg_postinst() { -- cgit v1.2.3