From 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 21 Jan 2018 19:03:35 +0000
Subject: gentoo resync : 21.01.2018

---
 .../wine-vanilla/wine-vanilla-9999.ebuild          | 38 ++++++++++++++++------
 1 file changed, 28 insertions(+), 10 deletions(-)

(limited to 'app-emulation/wine-vanilla/wine-vanilla-9999.ebuild')

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 4e3940a00299..d1fca61ea408 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() {
-- 
cgit v1.2.3