gentoo resync : 16.09.2020

4 files changed, 8 insertions, 64 deletions

diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 580c5a336ab4..95bc0a926c30 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,8 +1,6 @@
 AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
-DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
 DIST check-0.15.0.tar.gz 306428 BLAKE2B fea2a169b86248a6657f890469f41cd699dd95efb91e311ccf188548a6c8c28568decf0b5f03b08aed31e14c69d50707b418e1e71c6db7e1b7938ee36aa19cd8 SHA512 efde93977a38520b3b83a9e2f678d07b916fc27e41cf839a663900c4153d645fe4274ec3b7e2dabf475457f909f61734632c97b7257c49f5853fd11d920b0c84
 DIST check-0.15.2.tar.gz 306136 BLAKE2B e93755b58ddfea7ecc013e5449806611baedb91b362e573d4e3b6f716feeb0012cceec80f7109e44b2808deb980300c4f7825919b97878b160a1bf884357bde3 SHA512 cf81ca63142f33779df2e3542e049b9034d30bc502a663a4379bbfe85c7ee8fd80ce382583e781651d99fe830895122dab5b6793f87425b571c3927f0ba3b60e
-EBUILD check-0.14.0-r2.ebuild 1498 BLAKE2B f9c8ceaf6000ce5c0878bf85a2a88f3098d40f6c77c7f928f81fd91624bd9293fc447f94498e5e475b3f699d115b80b5705169ab99560b15fa779c924be81a14 SHA512 815f57a1c3474e680dbd55b1d514daea2626fea087aef056b5d0547cce11ba9815f6ff4ef5e36d4e9b1b8264191d3ba30b40d29b882446c09ea6e90c1b91b100
-EBUILD check-0.15.0.ebuild 1500 BLAKE2B 28fe049b5786c3941f4971668e928557a4316e311eba1f1e10912288a5835d8cceea7f9d1fa5ec0f820a3ac48c6ae3d25b5218cf450ac3271b1e456e789afb71 SHA512 c35153703669b1abc6f9ec8aef1a320fca5c599d8a5ba48a423bf3e225f6a623360730292c29e6fd377e5ddf7740eebd763fcabc72df73281131c918202319f5
-EBUILD check-0.15.2.ebuild 1507 BLAKE2B 8e46aa33a062e1f98734c5e7181e594484d59921e57fce8e3acadaabc5dfc6a8b23fba210a27c85c51e17ec2493659786796b5e3b776ffef5486c449fc793721 SHA512 c3193e289ae1d6ad1d9563f052a5ceb7fd582b30f312b7e6f00e5af2d444e83eb73f6660f2a69358fb626d144e8533d5310f63ec59f939e9daa2f409f38979e4
+EBUILD check-0.15.0.ebuild 1498 BLAKE2B f3e01f34d5ae27733a0e281cfb3f95a6f44617cef468dc62bdb00b9db72a9dd555ab3c7adf016edffa962031c9994150f1c1b4ba0f00e96d0f68b3bc33e480ce SHA512 fb817b17ec6039b0b1d52d36454ebd5ca8f6fd590084ad41f168f1300b899197b6e8ff231f9f175bf162eb0d7b576ab62a2458b97c2b6f78c45cb1aaa1fc1c15
+EBUILD check-0.15.2.ebuild 1580 BLAKE2B c63410b5a9af557a974cc1e13363e5288281e4194b4acf2564ab8f1d2e91d6beca749344c8416ce7bd25e8c095bf67993d1e5cead6dacbaba17c77defad6e80e SHA512 00711d106c35f653d5415952a629432c54731792ed95e090069ecc41f29959d4ed2989acd08dfffe7b0604925a6c5ca0b320e49679ed0c81ec0cb19de4723174
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild b/dev-libs/check/check-0.14.0-r2.ebuild
deleted file mode 100644
index 565a288bac27..000000000000
--- a/dev-libs/check/check-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc subunit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
-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."
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test ON OFF)
-		-DCHECK_ENABLE_SUBUNIT=$(usex subunit ON OFF)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-
-	if use doc && multilib_is_native_abi; then
-		cd "${S}"/doc/ || die "Failed to switch directories."
-		doxygen "." || die "Failed to run doxygen to generate docs."
-	fi
-}
-
-multilib_src_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/check/check-0.15.0.ebuild b/dev-libs/check/check-0.15.0.ebuild
index 328072dc9820..16d464eda35f 100644
--- a/dev-libs/check/check-0.15.0.ebuild
+++ b/dev-libs/check/check-0.15.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc subunit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/check/check-0.15.2.ebuild b/dev-libs/check/check-0.15.2.ebuild
index d882baeb2af9..bcc597697139 100644
--- a/dev-libs/check/check-0.15.2.ebuild
+++ b/dev-libs/check/check-0.15.2.ebuild
@@ -12,10 +12,13 @@ SRC_URI="https://github.com/libcheck/check/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc subunit test"
 
-RESTRICT="!test? ( test )"
+# Tests seem to timeout on ppc* systems, #736661
+RESTRICT="ppc? ( test )
+	ppc64? ( test )
+	!test? ( test )"
 
 RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}