gentoo resync : 02.09.2020

5 files changed, 56 insertions, 9 deletions

diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index e6a765a285f9..316fe5d0c439 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,5 +1,7 @@
+AUX statifier-1.7.4-clang.patch 344 BLAKE2B 6e5d2f48fa20c34c999cf898f943e9e6113324b7a75cfd58da4978e2cd7ef8cfc3d610b4e70e3fe90a5f548f8c8c3b289ff0b331c0f403c4191fadeed8315704 SHA512 bb15602f245a94c7d29128a3c45aa650ea6165e1b072808d14a2f0187398bab89448f41cd5bf52d8e7a04d8c6f89730b914f437c09a9829123989999bfede377
 AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
+AUX statifier-1.7.4-musl.patch 673 BLAKE2B 1b1d46c44ae7675dd757219a40d0f255455308c27a0515c32ebdc629cbb6e1777e4a7d673c51cba42b7b82b4608ed1e69ab3d2aa7bda93b4171c0e9670e608db SHA512 285ed4d06080188b45a10c3e5da83c7e28e198cbe2f20dc84befa4d4b83850278c4f8e444898f6c419b8e13e41140875eb1e7960d9633a03b396a716c53bd03e
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4-r1.ebuild 1121 BLAKE2B 65e776a2db0b4fceb22d8c74924b917be7e014cab3283abd547bf828d06c0ce58056a23857a67f965cec652438c192e0155e527f9dd832f5d721d4a244649c7d SHA512 560cfa83d8ae2586fec125c759f2a81055cbd464749d305a435b563f5b1ab258370d10056dc2415a8f22604ace32ba9c45f65235f3dd1bd7b11791502f99c832
-EBUILD statifier-1.7.4.ebuild 1125 BLAKE2B b0b81af822f90d001cc7509a74334e8149bcc26d0f106d84aaa2ca27d5d79b033da1813d60bb37119c604eaf0f007f6c2a6c3553fedcadaacb53fbc49be116eb SHA512 9a8749dfce5361eb7771e0f330b300c1ce56f08ff6cd93abf1457a2ddcb81b3016c14c54df0fdb602f20b72c97d7f799ae496043024ddae347f3af43da19923e
+EBUILD statifier-1.7.4-r1.ebuild 1162 BLAKE2B 98ecff2983258fb635c773247fa50ac120bde4890f2e1e25d9552ceb7204c03ceedb5352c2e8818b0b51f438cbfe98a5da9b854c1fc713d927fe5ea2061ebd21 SHA512 22acc206a52fbc15c519beb60e913a7d77d2a7526570b6161eedab8cc354e6d0352058c1fdc5a277962213de4ed84d61a15475d4279bd301fd978611ed2fc4b4
+EBUILD statifier-1.7.4.ebuild 1159 BLAKE2B fced9ac949c3f45db5a114c082724d94ad524c1272f9f0ec16b34f116a9d839fa656c6e41efcffed0d8af43484931ccd12d2ec15ff58d4ccea7372950f359b35 SHA512 17b53d41ffa6dc4d7ee6706b5b0f93ad713db6d88b51292a5d39800b3f68a8e3ab308c43b8e85a4edd9dc37cd1c74114a859ea7c70ed37603dd27024d4157280
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/dev-util/statifier/files/statifier-1.7.4-clang.patch b/dev-util/statifier/files/statifier-1.7.4-clang.patch
new file mode 100644
index 000000000000..39905eca57f8
--- /dev/null
+++ b/dev-util/statifier/files/statifier-1.7.4-clang.patch
@@ -0,0 +1,14 @@
+--- a/src/end.S
++++ b/src/end.S
+@@ -39,6 +39,10 @@
+ 	 * to the register_size boundary but to 16 boundary.
+   	 * Also as gcc's man say, that 16 is maximum alignment. So, i use it.
+ 	 */
+-	.org . + ((16 - (. % 16 )) % 16)
++#if defined(__clang__)
++# define E(BASE, X)
++#else
++# define E(BASE, X)	.org . + ((16 - (. % 16 )) % 16)
++#endif
+ data:
+ 
diff --git a/dev-util/statifier/files/statifier-1.7.4-musl.patch b/dev-util/statifier/files/statifier-1.7.4-musl.patch
new file mode 100644
index 000000000000..919f354127b3
--- /dev/null
+++ b/dev-util/statifier/files/statifier-1.7.4-musl.patch
@@ -0,0 +1,28 @@
+--- a/src/my_gdb/my_ptrace.c
++++ b/src/my_gdb/my_ptrace.c
+@@ -13,8 +13,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++typedef int statifier_ptrace_req_t;
++
+ long my_ptrace(
+-	enum __ptrace_request request,
++	statifier_ptrace_req_t request,
+ 	pid_t                 pid,
+ 	void                 *addr,
+ 	void                 *data,
+--- a/src/my_gdb/my_ptrace.h
++++ b/src/my_gdb/my_ptrace.h
+@@ -15,8 +15,10 @@
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
+ 
++typedef int statifier_ptrace_req_t;
++
+ long my_ptrace(
+-	enum __ptrace_request request,
++	statifier_ptrace_req_t request,
+ 	pid_t                 pid,
+ 	void                 *addr,
+ 	void                 *data,
diff --git a/dev-util/statifier/statifier-1.7.4-r1.ebuild b/dev-util/statifier/statifier-1.7.4-r1.ebuild
index 046c0699da96..5bdd7e9ca4e7 100644
--- a/dev-util/statifier/statifier-1.7.4-r1.ebuild
+++ b/dev-util/statifier/statifier-1.7.4-r1.ebuild
@@ -22,8 +22,9 @@ RDEPEND="
 "
 
 PATCHES=(
-	# Respect users CFLAGS and LDFLAGS
+	"${FILESDIR}"/${PN}-1.7.4-clang.patch
 	"${FILESDIR}"/${PN}-1.7.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.7.4-musl.patch
 )
 
 src_prepare() {
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
index b4021f0a1cf3..7ade05bbc42a 100644
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ b/dev-util/statifier/statifier-1.7.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
@@ -14,15 +14,17 @@ SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
 KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
 
-RDEPEND="app-shells/bash
+RDEPEND="
+	app-shells/bash
 	sys-apps/coreutils
-	virtual/awk"
+	virtual/awk
+"
 
 PATCHES=(
-	# Respect users CFLAGS and LDFLAGS
+	"${FILESDIR}"/${PN}-1.7.4-clang.patch
 	"${FILESDIR}"/${PN}-1.7.4-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.7.4-musl.patch
 )
 
 src_prepare() {