gentoo resync : 28.04.2021

4 files changed, 21 insertions, 14 deletions

diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 21a3ed4bdd72..11648292c9fd 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -4,7 +4,7 @@ AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
-EBUILD xar-1.8-r2.ebuild 1448 BLAKE2B 74478d6b433f9b3c4a2ddaf89bf516498bc8a890ce000ff67b982dad8a4c8a2ba237c7cc783d98c3e9086a3deebdf944a55bd0a1201697b9197614630d71d418 SHA512 b1be3e0775d9ee94da80f355904cea1926018a49a7c6eb95ff2c83489f42811dd3bfc83aeb0e2e8a2f92ef138c4b6ce1ede9e448764a2d5ba5b8f7499952857e
-EBUILD xar-1.8-r3.ebuild 1997 BLAKE2B 31f6ce42ea1fc579a1ceae7902e02d6203fbb0196c39f51b25e5876dd3eed88352f92996001626724afe5de978b3a8f1f718aacd602504a879d26d670ecf4f9a SHA512 067a07e7fe93b327b3b180cb57bd7db220906d80939ef90d931b100a03baf36732b88251b18d7207089f45480030362e56102fe46a090052651c69b49371869b
-EBUILD xar-1.8-r4.ebuild 2449 BLAKE2B a95924accc5c4f85e51f62fda7c67f3697c00ea8b6a8aeb761226195157c12ed1e73da18492a7f6182003b8a298117faca3606419006828222a1b8f6c2998c12 SHA512 1ab97b7555b1279f1b67901b769656a4cc009422c0edd5e07e4820f161c5edd056708f79d225c93f7b2489270da31757b809a01074f3c0f55efd5329cee6b548
+EBUILD xar-1.8-r2.ebuild 1496 BLAKE2B 737b07466392835311009bdb16f0fef85471a8ce6b395381d55477e83448a31d44f6e4fc7c6da67770339b67c79dcc53da6d0e3ea1cac115fe26cfa37789aa24 SHA512 9c7d378512c85960e83ed94089b2971f73ac9888f2357fa5ca0aff031cb3296679d2989360452dc76900c5fd92a2a3806814997d23d81981d62658abd4663d5b
+EBUILD xar-1.8-r3.ebuild 2045 BLAKE2B 183951d2e5503fac78474dee403c64087acd87e3ead8fd6d5ff0f0012eba80b37c1dd3e3a4cc0577cb77a2f3be451342eeb247c7ce21e606b34a971398aa3079 SHA512 853148a764583ebbf2f4ae492bd4880945c1584a33ae1512c2d9de33c3d39e3423c37eee48154c166ce12fa61c8afdc67364db35b597cdc7e28daecdf8dd3ca9
+EBUILD xar-1.8-r4.ebuild 2511 BLAKE2B f8ef096dd9d6f81b4b4443e65cd06168f3ae9ca4e248cbd3a44ab8a66b086dd1729ef9517600ebcf7f2e532bc83f9a72f0197b1c8532e52edba7023283d9299e SHA512 9993026f1a7013d283fd452690f555577199e1e818370123bcc174cfa055c67bc9a61f5568c303c969d9eaef0d53cb0add268553cd90645815d69db5f2464e13
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild
index 1b681345aa51..3f30d62f1a98 100644
--- a/app-arch/xar/xar-1.8-r2.ebuild
+++ b/app-arch/xar/xar-1.8-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic multilib-minimal
+inherit flag-o-matic toolchain-funcs multilib-minimal
 
 APPLE_PV=400
 DESCRIPTION="An easily extensible archive format"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
-DEPEND="
+RDEPEND="
 	!kernel_Darwin? (
 		!kernel_SunOS? ( virtual/acl )
 		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
@@ -24,7 +24,10 @@ DEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
@@ -36,7 +39,7 @@ PATCHES=(
 S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
 
 multilib_src_configure() {
-	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl)
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static
diff --git a/app-arch/xar/xar-1.8-r3.ebuild b/app-arch/xar/xar-1.8-r3.ebuild
index a93682518b97..d3b4fc4be1a4 100644
--- a/app-arch/xar/xar-1.8-r3.ebuild
+++ b/app-arch/xar/xar-1.8-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic multilib-minimal multilib
+inherit flag-o-matic toolchain-funcs multilib-minimal multilib
 
 APPLE_PV=417.1
 DESCRIPTION="An easily extensible archive format"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl kernel_Darwin"
 
-DEPEND="
+RDEPEND="
 	!kernel_Darwin? (
 		!kernel_SunOS? ( virtual/acl )
 		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
@@ -24,7 +24,10 @@ DEPEND="
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
@@ -54,7 +57,7 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	use kernel_Darwin || append-libs $(pkg-config --libs openssl)
+	use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl)
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild
index 75c3815b66cd..d73ec3eae709 100644
--- a/app-arch/xar/xar-1.8-r4.ebuild
+++ b/app-arch/xar/xar-1.8-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic multilib-minimal multilib
+inherit flag-o-matic toolchain-funcs multilib-minimal multilib
 
 APPLE_PV=417.1
 DESCRIPTION="An easily extensible archive format"
@@ -24,6 +24,7 @@ DEPEND="
 	dev-libs/libxml2[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
@@ -65,8 +66,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	append-libs $(pkg-config --libs openssl)
-	use elibc_musl && append-libs $(pkg-config --libs fts-standalone)
+	append-libs $($(tc-getPKG_CONFIG) --libs openssl)
+	use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone)
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static