gentoo resync : 13.10.2019

5 files changed, 14 insertions, 128 deletions

diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index f3c32f6b4ff7..f759d5829362 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,8 +1,6 @@
 AUX 0.3-nine-dll-path.patch 414 BLAKE2B a1747c90521f2fec6ba70ea77c2b7a2adafd705e04a46ea14fe983859f00c0aa33ec73dc24a03805579b84b57a2528857994943bb999e2f38c6f652404fd661e SHA512 423a7ebd8284c475d226109e0af9d867753b75ff1d1a9100d948c91e71dbc76bd8d8973e4ecf3fdb8fab5555da6339484459c623f028f7091e9d010395f24970
-AUX flags.patch 928 BLAKE2B 62f7d6c3e904ad13f39f6e554fb02784b1d68bcea92208c16f0583d41dbd95c1bc52d6b58ee7b88aff54073f9afc078839759f752ee765ebb8059a81fe52dee3 SHA512 e37221abb35a4c170a38db0129a0413b54863952ed00efa36dd0b8af67850cde3949d8b81547bad8c13783ddd7a32407b6eaf33881505cdfe165a29ec9c31c19
-DIST gallium-nine-standalone-0.3.tar.gz 63887 BLAKE2B bd198617a5d3d3830bd5127b63eed2c82bff037141ae72ff9237ad5062fdbe9b6797e233eaf86e06d92153487c53389eb094b0be3b0cbdbf3fe565292a15cbb0 SHA512 80fedca58523fbf318109d2d3d5420e97d26ebf5b89b9f1965165c7a33c9dab9c62a65f14b75569b5126c549f5df91beef372d54e94dc90c608932eeb6a59829
-DIST gallium-nine-standalone-0.4.tar.gz 66820 BLAKE2B 7e7b0028f0c7e7c26fa1ee164e7e867fee39a5f315b750bfc3537e8720e9fbc625ca27fb28a58e8e521af455f8ab347d6fd6ca82786fe5ac9d76e368cd43466e SHA512 6af31e828400c6f711c76d91fb65215f4ba79c31b8d98f3e953b319593d96d1e5e78e07aca96529de37bbb89f3479a4d4db5f58e32ce7b98667284be10a9e532
-EBUILD gallium-nine-standalone-0.3.ebuild 2933 BLAKE2B 442d7846ca83823a7f0149ebfdc45ff4956089c3c474632f8db2bc2ede2d83e17cc18ace983b0c987077d5a8a5ae8ec1ed1b0208b362989d7c8ff9cb1738ad90 SHA512 03e4c024fd647581e83ebd7702a3f79d0438e533c164760cf332075ad4ade69c8baef2f2d4cebfaf7109dcaa7acb20db33d54678b3064eb9e89897b7b6881720
-EBUILD gallium-nine-standalone-0.4.ebuild 2787 BLAKE2B 18a81e313b78b1f5eb85af12620e3e40ed249470a62385ad1ccd90f53f0680803ee7cac7849dee19462f794411e0f206bb44e386fcffb56aece3f3989fad7c6f SHA512 ec186e36f80cd37e403f23d99720f356d6b1da2ec62d3da4e04e0179af0992943cc475112c92396fe82c547a5dd736ef3b0ddfe4cb509357eae2ca0672577c5f
-EBUILD gallium-nine-standalone-9999.ebuild 2787 BLAKE2B 18a81e313b78b1f5eb85af12620e3e40ed249470a62385ad1ccd90f53f0680803ee7cac7849dee19462f794411e0f206bb44e386fcffb56aece3f3989fad7c6f SHA512 ec186e36f80cd37e403f23d99720f356d6b1da2ec62d3da4e04e0179af0992943cc475112c92396fe82c547a5dd736ef3b0ddfe4cb509357eae2ca0672577c5f
+AUX 0.5-flags.patch 852 BLAKE2B 22423ccfcfcc111a52a3daf2c46f4e7e39d08f63d59c8c85ba3f8be97d972b1e251d4328e8ea8c123cbf7b403d0a94f84b97b9c16df2b1d5d14e82a44b36f2a6 SHA512 696069c9b70017be64dea6607ea67d49fa53057508cc75124161a44f0b8dc52053698612a8ba63ae2060c1dcfa80a57eb7e1546e2bf35be988871ce4e794cb90
+DIST gallium-nine-standalone-0.5.tar.gz 69056 BLAKE2B 6acfd500a31e480e2e09e751097beaa2bc94c574edd2b313adb707dc65447be1868ed190bf13549cc38eae945d421242a5d3b2c068486ad35347903e27e0bf80 SHA512 6223a851536c67d32e3a834d7a3c7b93fb59c226b127e1ee1b5a72a7cc93172173f5004ca4944a842015650ef80e8427a684109ae5a4a9e9ef838961e0767c78
+EBUILD gallium-nine-standalone-0.5.ebuild 2791 BLAKE2B d82061051d85588e32381f98a8fd067a241258a1398bf3c9083e96f966da811da520e16c6dc521fa2a763ff10adac5c2581b00baede67cb5699e9ebc46cc5921 SHA512 9444138cfe3a0081f1c9f32043818c5af488657db8a365fc8a943c2148d825ab30975063b6c4c1c1c58a12aec4dfae6120a6c91a80082e1bc33103fe601c90ff
+EBUILD gallium-nine-standalone-9999.ebuild 2791 BLAKE2B d82061051d85588e32381f98a8fd067a241258a1398bf3c9083e96f966da811da520e16c6dc521fa2a763ff10adac5c2581b00baede67cb5699e9ebc46cc5921 SHA512 9444138cfe3a0081f1c9f32043818c5af488657db8a365fc8a943c2148d825ab30975063b6c4c1c1c58a12aec4dfae6120a6c91a80082e1bc33103fe601c90ff
 MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/files/flags.patch b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
index 217dcddf35b9..7c0e883d697d 100644
--- a/app-emulation/gallium-nine-standalone/files/flags.patch
+++ b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
@@ -1,27 +1,27 @@
 diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
---- a/tools/cross-wine32.in	2019-01-12 16:45:09.190471883 +0000
-+++ b/tools/cross-wine32.in	2019-01-12 16:48:22.569404982 +0000
+--- a/tools/cross-wine32.in	2019-09-25 13:25:24.000000000 +0100
++++ b/tools/cross-wine32.in	2019-09-30 23:05:00.121344967 +0100
 @@ -5,8 +5,8 @@
  pkgconfig = '@PKG_CONFIG@'
  
  [properties]
--c_args = ['-m32', '--no-gnu-unique']
+-c_args = ['-m32']
 -c_link_args = ['-m32', '-mwindows']
-+c_args = @CFLAGS@ + ['-m32', '--no-gnu-unique']
++c_args = @CFLAGS@ + ['-m32']
 +c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
  needs_exe_wrapper = true
  
  [host_machine]
 diff -Naur a/tools/cross-wine64.in b/tools/cross-wine64.in
---- a/tools/cross-wine64.in	2019-01-12 16:45:09.190471883 +0000
-+++ b/tools/cross-wine64.in	2019-01-12 16:48:19.865349306 +0000
+--- a/tools/cross-wine64.in	2019-09-25 13:25:24.000000000 +0100
++++ b/tools/cross-wine64.in	2019-09-30 23:04:57.340283350 +0100
 @@ -5,8 +5,8 @@
  pkgconfig = '@PKG_CONFIG@'
  
  [properties]
--c_args = ['-m64', '--no-gnu-unique']
+-c_args = ['-m64']
 -c_link_args = ['-m64', '-mwindows']
-+c_args = @CFLAGS@ + ['-m64', '--no-gnu-unique']
++c_args = @CFLAGS@ + ['-m64']
 +c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
  needs_exe_wrapper = true
  
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
deleted file mode 100644
index b71e44053307..000000000000
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson multilib-minimal toolchain-funcs
-
-MY_PN="wine-nine-standalone"
-DESCRIPTION="A standalone version of the WINE parts of Gallium Nine"
-HOMEPAGE="https://github.com/iXit/wine-nine-standalone"
-
-if [[ $PV = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/iXit/${MY_PN}.git"
-else
-	SRC_URI="https://github.com/iXit/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-# We don't put Wine in RDEPEND because you can also use this with
-# Steam's Proton.
-
-RDEPEND="
-	media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libxcb[${MULTILIB_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	virtual/wine[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/flags.patch
-	"${FILESDIR}"/0.3-nine-dll-path.patch
-)
-
-bits() {
-	if [[ ${ABI} = amd64 ]]; then
-		echo 64
-	else
-		echo 32
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Upstream includes a bootstrap.sh script with hardcoded CHOSTs to
-	# create the Meson cross files. We improve on that here but also
-	# inject CFLAGS and LDFLAGS, partly to simply respect these, and
-	# partly to allow d3d9-nine.dll to be loaded from a location outside
-	# WINEPREFIX. This avoids the need for the nine-install.sh script,
-	# which doesn't play well with our multi-Wine environment.
-	bootstrap_nine() {
-		local file=tools/cross-wine$(bits)
-		local g9dll=Z:${EPREFIX//\//\\}\\usr\\$(get_libdir)\\d3d9-nine.dll.so
-
-		# Yes, these ridiculous backslashes are needed!
-		g9dll=\\\\\\\\\\\"${g9dll//\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\}\\\\\\\\\\\"
-
-		sed \
-			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
-			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} -DG9DLL=${g9dll}")!" \
-			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
-			${file}.in > ${file} || die
-	}
-
-	multilib_foreach_abi bootstrap_nine
-}
-
-multilib_src_configure() {
-	# We override bindir because otherwise the 32-bit exe is overwritten
-	# by the 64-bit exe and we need both of them.
-	local emesonargs=(
-		--cross-file "${S}/tools/cross-wine$(bits)"
-		--bindir "$(get_libdir)"
-		-Ddistro-independent=false
-		-Ddri2=false
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-pkg_postinst() {
-	local bits=$(bits)
-
-	einfo "Don't remove the Z: drive from your WINEPREFIX as this relies on it."
-	einfo
-	einfo "To set up the ${bits}-bit library, launch your preferred Wine as follows:"
-	einfo "  wine${bits/32} ${EPREFIX}/usr/$(get_libdir)/ninewinecfg.exe.so"
-
-	if use abi_x86_64 && use abi_x86_32; then
-		einfo
-		einfo "To set up the 32-bit library, launch your preferred Wine as follows:"
-		einfo "  wine ${EPREFIX}/usr/$(ABI=x86 get_libdir)/ninewinecfg.exe.so"
-	fi
-}
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
index 3c025087d82e..1358e3c9e1ce 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.4.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
index 3c025087d82e..1358e3c9e1ce 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/flags.patch
+	"${FILESDIR}"/0.5-flags.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )