gentoo resync : 27.03.2021

3 files changed, 40 insertions, 9 deletions

diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 8f62e8251503..597e2b87235e 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,4 +1,5 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
+AUX check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch 887 BLAKE2B 7e3828af77a430ef366b2d7855c1fb5f909c9e8b13273e2d89b34711c95e5b930f95d39b21438e115b208f8eb1f4637aec0eb4ab0e6efb293174d9ddbd2946a2 SHA512 eae3e3b2d3f7f59c94af3c39797490247df827450999edadd363d99c373a465aeec913e90656e94d04215268742fb79d049a32bb3910b16b64175f1177de43f8
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
-EBUILD check-0.15.2.ebuild 1575 BLAKE2B 331471902e21335448ae4a5990fe77aebde2c1227cb5886fdc768a25cb9dff239b2d985adfa49265de8b16a416de3ebf04ca0e583a73ffa24723c779e9b3b9d7 SHA512 c024b7e069776b72ecadb07d619d9553ea35e366320ba90d63d2374879eb0699a8a4660073750fd9d1f716744d0b4c6bb81c752e9d46ae33240b5b7a0b77f183
+EBUILD check-0.15.2-r1.ebuild 1508 BLAKE2B b90bebd7e0176acd2c518b620667150eae6cf8879d2d2fc9f7621660ceb2868e51a7b01f563ec77adc49e968450e30aee7c8f970adb42fa329f492b9b5cdcd9d SHA512 a470c03eb155773df82692d9590e779eef9cc7372ad6ec9cbdef5fdb5a168572affae9493adc6562dc2f719c7f9f9523815b84be299686cf635e7772648fba25
 MISC metadata.xml 488 BLAKE2B 1cd690b0e4398779744c8a2efedabaa5e3355061032d88ebb2c23d1defdcc619e5924ba6d7ff6ad4e857e25923563b2f3ff0f1aa4dd449f5899b1a9b9d2008fb SHA512 6373c637eaec3cd674bb38bc8108fcda5715818b52b351b101d852f1a29630c5382e88a4759b7e6b8d3bb220b1b6b57eb4b4d9b525519dbec8d9f99b2e5e7365
diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild
index 884e1dffe112..cdad4dc1aee8 100644
--- a/dev-libs/check/check-0.15.2.ebuild
+++ b/dev-libs/check/check-0.15.2-r1.ebuild
@@ -25,14 +25,14 @@ DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 BDEPEND="doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/check-0.14.0-r2-disable-automagic-dep.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix wrong libdir, probably caused by multilib
-	sed -i "s|\${libdir}|/usr/$(get_libdir)|g" check.pc.in || die "sed .pc failed."
-}
+PATCHES=(
+	"${FILESDIR}"/check-0.14.0-r2-disable-automagic-dep.patch
+	"${FILESDIR}"/${P}-Fix-pkgconfig-file-s-libdir-value.patch
+)
+
+#src_prepare() {
+#	cmake_src_prepare
+#}
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch b/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch
new file mode 100644
index 000000000000..195fcfb77599
--- /dev/null
+++ b/dev-libs/check/files/check-0.15.2-Fix-pkgconfig-file-s-libdir-value.patch
@@ -0,0 +1,30 @@
+From a6de6b02e6f8b971149c477eeca04de7d0fa5d3c Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Wed, 10 Mar 2021 17:00:33 -0500
+Subject: [PATCH] Fix pkgconfig file's libdir value
+
+And make a similar fix for includedir while we're here.
+
+Bug: https://bugs.gentoo.org/729642
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23311d8..9d3ac07 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -439,8 +439,8 @@ if(NOT THIS_IS_SUBPROJECT)
+   set(prefix_save "${PREFIX}")
+   set(prefix "${CMAKE_INSTALL_PREFIX}")
+   set(exec_prefix "\${prefix}")
+-  set(libdir "\${exec_prefix}/lib")
+-  set(includedir "\${prefix}/include")
++  set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
++  set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+   set(VERSION "${PROJECT_VERSION}")
+ 
+   if (HAVE_SUBUNIT)
+-- 
+2.26.2
+