gentoo resync : 16.01.2021

3 files changed, 32 insertions, 9 deletions

diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index a94b6ff2bc75..dbe8c108acaa 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -3,9 +3,10 @@ AUX ldap-scripts/edquota_editor 1243 BLAKE2B fbaf521aeda741ce3d2aabaa60609d914b6
 AUX ldap-scripts/quota.schema 552 BLAKE2B d9becd7bd0f66ba8a603e3b442bdd36748c059da8da9da0f8065e0bdd2dfa8c624787f860843d07e38caf301ccfc9b9d2dac2e978a68304abc037f375b4c647c SHA512 9e08e51834458885a046395002bb19a463533bc0e1fc23f1fda98c41ee48c0f122e284f4a520d6f6ef44d66142395c10f91e18076e0a54e57dd198f7da268748
 AUX ldap-scripts/setSystemQuotas.pl 3930 BLAKE2B 728956edd5f3e35939a068c92c5d94606d9b62943a6131502f235647a5251c3737a5307555dcaf98114946b8e9318a8f7c683d7bd066195d24c6542b95462fbd SHA512 8ecdd09500a849c4572411e904dc78ff967ed71f819969e0a27e697ca6607ca17906318784ccf1aca4fe066666dd2a21d800ce6f224478d0751db1a5c276a6ad
 AUX ldap-scripts/setquota-ldap.pl 6039 BLAKE2B 9603c6f7aaf842563af9c1b9a5680be126ead114e0e0bc19d123c9440604b4941e6d9353e62408155180edd39076d634c5150334f3fbffb649af7dc04eeb9bef SHA512 f046c45b09b8afa88d11b4d55e35877c1c7e6c8e87f41f4c2dfcb063a2bd972cf584f88fdea2b42442cb44e460a48f3c9b12c3f5f3a99f759bbdb4ca95ab8e5b
+AUX quota-4.06-musl-cdefs.patch 510 BLAKE2B 1cf413700066e7e9563637dc2258f28dfc10888677c4f2ea95684865815dcb97d34d0df5e14cfcc27b6c687bb7da51d2893fcf663ae83538100433370329e76e SHA512 f5d0b77e1b86b797997f3d05ebaafab81ffccc5f477ce457ab082ae54b7210291a5d5c1d4f0b53e32260bb6d73c74639f7f57470cb8b75bb9208c755eed66b6c
 AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8
 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529
 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
 DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
-EBUILD quota-4.06.ebuild 1570 BLAKE2B 5276d003194a7ca90a8f4377cc335b8f1b67f4c4ba2e006ad4f4fe4686eb8ff5fa93583ec63f95864910b109e16c49f69af4570989ab74ff242925398919404a SHA512 630945920d11e0f217291bff7539ec1ac88494d5e422811913dedad82004b01ae0dabfae3df462551ea512ebcdee2cb034382dea8ed55f09c7697782d4b02375
+EBUILD quota-4.06.ebuild 1618 BLAKE2B 089b7603e91519948a2c5f73364caaaf276a820ed12f49422b186dd9398619c4f2a6180479e0582b6870c974118c83c04e334f4125699aa79ff304a9556898d1 SHA512 77ea9dff644703a8b213cd6ecd82129bbd11df32ef9ac288659c628d88260b1600d9207ee600ab95215a37c7fa04be33ce6c7b7266f8358a5d42d760a1ae6f67
 MISC metadata.xml 483 BLAKE2B a66c5218d5879916eb8d1158e838644b600c79c0285236bb622d4c71d977593c4c95c2e35f52d2be34a3990a0e6ac3a9f6461c541cdf0d704c303ec242a77656 SHA512 0fe78ffe3560e8518ee02f71b7ce3b0ef4963f8d87fd16daac911e42acf269f7f652cd5efa5a498c0e50efa9854c1ba10cd79382b82972aea682510433804614
diff --git a/sys-fs/quota/files/quota-4.06-musl-cdefs.patch b/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
new file mode 100644
index 000000000000..286fc481b6b3
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.06-musl-cdefs.patch
@@ -0,0 +1,20 @@
+https://sourceforge.net/p/linuxquota/code/ci/1959f3768a284315250acd4d17a9f5ef0b8ea189/tree/quota.h?diff=43b6e31f39edbe7de4f4feeef4d0cf6be093e021
+https://bugs.gentoo.org/713390
+--- a/quota.h
++++ b/quota.h
+@@ -1,7 +1,6 @@
+ #ifndef GUARD_QUOTA_H
+ #define GUARD_QUOTA_H
+ 
+-#include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+ 
+@@ -182,6 +181,6 @@
+ 	#endif
+ #endif
+ 
+-long quotactl __P((int, const char *, qid_t, caddr_t));
++long quotactl(int, const char *, qid_t, caddr_t);
+ 
+ #endif /* _QUOTA_ */
diff --git a/sys-fs/quota/quota-4.06.ebuild b/sys-fs/quota/quota-4.06.ebuild
index 3ca2ad3dd987..1c4cd2de9211 100644
--- a/sys-fs/quota/quota-4.06.ebuild
+++ b/sys-fs/quota/quota-4.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,21 +23,22 @@ RDEPEND="
 	)
 	rpc? (
 		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
-		net-libs/libtirpc
+		net-libs/libtirpc:=
 		net-libs/rpcsvc-proto
 	)
 	tcpd? ( sys-apps/tcp-wrappers )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-PDEPEND="
-	rpc? ( net-nds/rpcbind )
-"
+BDEPEND="nls? ( sys-devel/gettext )"
+PDEPEND="rpc? ( net-nds/rpcbind )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-cdefs.patch
+)
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -50,6 +51,7 @@ src_configure() {
 		$(use_enable rpc)
 		$(use_enable rpc rpcsetquota)
 	)
+
 	econf "${myeconfargs[@]}"
 }