gentoo resync : 25.08.2020

5 files changed, 44 insertions, 36 deletions

diff --git a/app-emulation/gallium-nine-standalone/Manifest b/app-emulation/gallium-nine-standalone/Manifest
index 7054e84f1449..11b3154f3c7b 100644
--- a/app-emulation/gallium-nine-standalone/Manifest
+++ b/app-emulation/gallium-nine-standalone/Manifest
@@ -1,6 +1,6 @@
 AUX 0.3-nine-dll-path.patch 414 BLAKE2B a1747c90521f2fec6ba70ea77c2b7a2adafd705e04a46ea14fe983859f00c0aa33ec73dc24a03805579b84b57a2528857994943bb999e2f38c6f652404fd661e SHA512 423a7ebd8284c475d226109e0af9d867753b75ff1d1a9100d948c91e71dbc76bd8d8973e4ecf3fdb8fab5555da6339484459c623f028f7091e9d010395f24970
-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 2771 BLAKE2B c9578cb82b0320c1c1a7c47a6d7e2e540c1ecb75ab407a6e816bc9ef15fcdb80e6d52508ae322fb7dd3d8402fda4f15400d9d81f9208b87f539ed9efe51d4bd3 SHA512 91d7ee72c8e9360a6f145ed0190ef459a84a904f42509a516bef6869cc888a60439caa96c27a0a87433ac9d553f331df5cfb147a69070a54716c1f89a189e882
-EBUILD gallium-nine-standalone-9999.ebuild 2771 BLAKE2B c9578cb82b0320c1c1a7c47a6d7e2e540c1ecb75ab407a6e816bc9ef15fcdb80e6d52508ae322fb7dd3d8402fda4f15400d9d81f9208b87f539ed9efe51d4bd3 SHA512 91d7ee72c8e9360a6f145ed0190ef459a84a904f42509a516bef6869cc888a60439caa96c27a0a87433ac9d553f331df5cfb147a69070a54716c1f89a189e882
+AUX 0.7-cross-files.patch 924 BLAKE2B f272fe2034d2b17db3ac19e93a5f121970dcc3a0a76bb9ceb0f38bf63632f379f83c86dff70677ece94965658c029d0761ad55133fe58fb576305fdcaee2f3b5 SHA512 94ad1b8806be083c1fae89f3601c2881f696538266c8c4159c4dfb3507737fd03c6cbac08d07bfd8a4d965011b28298e14dbdc5c51fba9ba6ba952d74171012c
+DIST gallium-nine-standalone-0.7.tar.gz 67699 BLAKE2B 85520de46e0e821f63d89691e322c3001ae853a0058a5077b484da6a1596a7ed03d2e2b7dc2686661fd21d34b33e10f4549437ce5790f18e1e6cc77c894e9d1e SHA512 9007564347bb6677f3d4eff83f744d39487c09b543489f02dcf7606917ecd9b72decf8176d9daecb6039b8998e97f737d9f7a71a5052f4d5c73f2e99e92af43c
+EBUILD gallium-nine-standalone-0.7.ebuild 2872 BLAKE2B 26287c4c3284ac76bc75052682796b9dde89e8d5628c1f28fe76eb4a31d02c1771cc33d92dbbd35c0316d36824fef79cb1ab5140349e6420d666f24caddcbfca SHA512 b6697499f1c807f378bbf16d8cfbfd576729e7aca85332cd9af448f547a898dab965ff5b21ae5e8db4a5a75d0f9013e1fd295ac342ee81ea83998afd0d855233
+EBUILD gallium-nine-standalone-9999.ebuild 2872 BLAKE2B 26287c4c3284ac76bc75052682796b9dde89e8d5628c1f28fe76eb4a31d02c1771cc33d92dbbd35c0316d36824fef79cb1ab5140349e6420d666f24caddcbfca SHA512 b6697499f1c807f378bbf16d8cfbfd576729e7aca85332cd9af448f547a898dab965ff5b21ae5e8db4a5a75d0f9013e1fd295ac342ee81ea83998afd0d855233
 MISC metadata.xml 774 BLAKE2B 8b793ed6e079a800628ed7e59786bc82dd191c05367ef5e1600f903f3ebfd32c9ab0034a1dba1701ec104348cf1b9a8b437b63300e607a65ee92b1887be4800f SHA512 9453d7d767ba7f788291c6980a86388a0f952b893a474aa17e249c4f3b9b77b864108230fdc8f8b94e74eb45443f608a8d9ecde10cbc121234c9b91f59e7b752
diff --git a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch b/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
deleted file mode 100644
index 7c0e883d697d..000000000000
--- a/app-emulation/gallium-nine-standalone/files/0.5-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur a/tools/cross-wine32.in b/tools/cross-wine32.in
---- 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']
--c_link_args = ['-m32', '-mwindows']
-+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-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']
--c_link_args = ['-m64', '-mwindows']
-+c_args = @CFLAGS@ + ['-m64']
-+c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
- needs_exe_wrapper = true
- 
- [host_machine]
diff --git a/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
new file mode 100644
index 000000000000..fed5c0403688
--- /dev/null
+++ b/app-emulation/gallium-nine-standalone/files/0.7-cross-files.patch
@@ -0,0 +1,34 @@
+diff --git a/tools/cross-wine32.in b/tools/cross-wine32.in
+index bfbe410..0064cf8 100644
+--- a/tools/cross-wine32.in
++++ b/tools/cross-wine32.in
+@@ -5,9 +5,10 @@ strip = 'strip'
+ pkgconfig = '@PKG_CONFIG@'
+ 
+ [properties]
+-c_args = ['-m32']
+-c_link_args = ['-m32', '-mwindows']
++c_args = @CFLAGS@ + ['-m32']
++c_link_args = @LDFLAGS@ + ['-m32', '-mwindows']
+ needs_exe_wrapper = true
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+ 
+ [host_machine]
+ system = 'linux'
+diff --git a/tools/cross-wine64.in b/tools/cross-wine64.in
+index 5e19023..06b1f2a 100644
+--- a/tools/cross-wine64.in
++++ b/tools/cross-wine64.in
+@@ -5,9 +5,10 @@ strip = 'strip'
+ pkgconfig = '@PKG_CONFIG@'
+ 
+ [properties]
+-c_args = ['-m64']
+-c_link_args = ['-m64', '-mwindows']
++c_args = @CFLAGS@ + ['-m64']
++c_link_args = @LDFLAGS@ + ['-m64', '-mwindows']
+ needs_exe_wrapper = true
++pkg_config_libdir = '@PKG_CONFIG_LIBDIR@'
+ 
+ [host_machine]
+ system = 'linux'
diff --git a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
index 1cede2d14203..3e96326a2fc8 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.5.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/0.5-flags.patch
+	"${FILESDIR}"/0.7-cross-files.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
@@ -67,6 +67,7 @@ src_prepare() {
 			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
 			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
 			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
 			${file}.in > ${file} || die
 	}
 
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 1cede2d14203..3e96326a2fc8 100644
--- a/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
+++ b/app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/0.5-flags.patch
+	"${FILESDIR}"/0.7-cross-files.patch
 	"${FILESDIR}"/0.3-nine-dll-path.patch
 )
 
@@ -67,6 +67,7 @@ src_prepare() {
 			-e "s!@PKG_CONFIG@!$(tc-getPKG_CONFIG)!" \
 			-e "s!@CFLAGS@!$(_meson_env_array "${CFLAGS} '-DG9DLL=${g9dll}'")!" \
 			-e "s!@LDFLAGS@!$(_meson_env_array "${LDFLAGS}")!" \
+			-e "s!@PKG_CONFIG_LIBDIR@!${PKG_CONFIG_LIBDIR:-${ESYSROOT}/usr/$(get_libdir)/pkgconfig}!" \
 			${file}.in > ${file} || die
 	}