6 files changed, 84 insertions, 138 deletions
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 32be9c193605..4823414d4c79 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,9 +1,7 @@
 AUX check-0.12.0-fp.patch 1727 BLAKE2B 8643aa3b1ebaece72c9bb6bad52077f554baea2d51b27bcc310c409c054630c5dee7a0d1159c929d08524fc1bd2fa6e596a9098684d5353c111bb5a09e519798 SHA512 f4d6066d194f19ed46c0fe773fdf3d80b833df2d6e84d90d409c43577ee871f400c0a6cd4cae115d64109232384e924d4d8f4fee5ff3b856f1e921cc9b38c384
 AUX check-0.14-xfail-tests.patch 310 BLAKE2B a4b3e9a58ca841cffffa0754ef429db19cf92ddcac1f214ac13d655af505c6e660aa0ea865c3e7fedf993f6ef77c5504301a4d7ad7017e2aba5f6d3785208f73 SHA512 1be74226886d47acae417e5b871459bd96d768115c97576a142bccb8e50ea1b0ccc69b6068cc44743a8e9bfa3341739402342697cde32686ae6cfb4fd413ee18
-DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
-DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
+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
-EBUILD check-0.10.0-r1.ebuild 1761 BLAKE2B 1889f3a4e094cb47427656b61316c40a13d7a3fa955d4ccd4ccd6bff18b3506060978810e207435b2624386425f4eb8e20a50000e906f3701790ba881bac8f38 SHA512 4a8d61fe93a71d1b96e36ef198a75e9618447ef00f83b08b1ef73193e4949c2005842fad0fee5d4a6035736a6c28b17a459b0b827dc65cc614399e73a7181ce9
-EBUILD check-0.12.0.ebuild 1752 BLAKE2B d07bbaacefe842f7645d4c02a139807d6da55eb0e1d8d6ea2047600d4c2a34643b3fdd73681b16b4b4bfe07537d680aab5856df538d24e715d1f6898df801a19 SHA512 6ea8c75a193147f7e6251206ccad634bd514d8e225e0d0b5c99cf8cdd86ae9e1561f5487a2ce1d8c4a2a142e72888f73a1b19d0afb2c341bf8824db64f818eb0
-EBUILD check-0.14.0.ebuild 1565 BLAKE2B 8ddb5bd5873146ef0d6eb9cfe54d0e2d362c6e60be36befa7a0f91be0c53b110d3dc1a88c6738ac5c3a83fc09593b20097ea22f7cb72b0830443a01f5df67ebe SHA512 47f8b8e3244b743737526722d586eacb014b0c3f4470307131cf6057a0bc8e31034dc9e50400dd55cb301fa5c55511356c536bb01348edc2d6006b756e005d2c
+EBUILD check-0.14.0-r2.ebuild 1507 BLAKE2B 6e79772ad622928a1b2f74c806d6ac51a99f5edf5f08f4d2d48c99198600afa5593267b9ba8b1fcfb57c98aac9ef7c0c55821640ff12b16bc01779196d32e74f SHA512 921f8cf57391d0ffa80344e24391bec74a21f3c5316b7a0bf2528062d30d6a86f76ecb6ecd221e21a3550c462317752197fdeba4b301deb41d00c5882b2ae0db
+EBUILD check-0.14.0.ebuild 1554 BLAKE2B 3bbb3e62ce8f784fe940d402af3136ab906006d5880abb03e51a2154d7816be353b7cdde134de5fb04b0f059aebeabcb072d3ebfb0e67a778c0e2c509221e791 SHA512 d53a839fd83aa14817159b917e291d99f1b76127147fcb9249757d8629b4ff698460e455051e86e08a349bc9e318beb651f6090073188f19dcd44be7591002d8
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
deleted file mode 100644
index 5ebd3f07b8cb..000000000000
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-inherit autotools autotools-multilib
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://sourceforge.net/projects/check/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-RDEPEND="
-	subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-
-DEPEND="
-	${RDEPEND}
-	sys-apps/texinfo
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# See multilib_src_test(), disable sleep()-based tests because they
-	# just take a long time doing pretty much nothing.
-	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
-}
-
-src_prepare() {
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \
-		|| die 'failed to unset docdir in Makefile.am'
-
-	# fix out-of-sourcedir build having inconsistent check.h files, for
-	# example breaks USE=subunit.
-	rm src/check.h || die 'failed to remove src/check.h'
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable subunit)
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	autotools-multilib_src_configure
-}
-
-multilib_src_test() {
-	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
-	elog "entire testsuite for dev-libs/check, ensure that"
-	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
-	default_src_test
-}
-
-src_install() {
-	autotools-multilib_src_install
-	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO
-
-	rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \
-		die 'failed to remove COPYING files'
-}
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
deleted file mode 100644
index 5650c9493137..000000000000
--- a/dev-libs/check/check-0.12.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-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}-github.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-RDEPEND="
-	subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Fix test failures due to varying floating point behavior across platforms
-	# (#648920), patch from Fedora.
-	"${FILESDIR}/${PN}-0.12.0-fp.patch"
-)
-
-pkg_setup() {
-	# See multilib_src_test(), disable sleep()-based tests because they
-	# just take a long time doing pretty much nothing.
-	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \
-		|| die 'failed to unset docdir in Makefile.am'
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(use_enable subunit)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-
-	rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \
-		die 'failed to remove COPYING files'
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-multilib_src_test() {
-	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
-	elog "entire testsuite for dev-libs/check, ensure that"
-	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
-	default_src_test
-}
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild b/dev-libs/check/check-0.14.0-r2.ebuild
new file mode 100644
index 000000000000..9f06143d72fd
--- /dev/null
+++ b/dev-libs/check/check-0.14.0-r2.ebuild
@@ -0,0 +1,57 @@
+# 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.14.0.ebuild b/dev-libs/check/check-0.14.0.ebuild
index 8f03514f7580..40aa0e80af0f 100644
--- a/dev-libs/check/check-0.14.0.ebuild
+++ b/dev-libs/check/check-0.14.0.ebuild
@@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sh ~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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs subunit test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/check/files/check-0.14.0-r2-disable-automagic-dep.patch b/dev-libs/check/files/check-0.14.0-r2-disable-automagic-dep.patch
new file mode 100644
index 000000000000..0843413ee2e9
--- /dev/null
+++ b/dev-libs/check/files/check-0.14.0-r2-disable-automagic-dep.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt	2020-03-21 09:42:30.411037664 +0200
++++ b/CMakeLists.txt	2020-03-21 09:49:12.358161439 +0200
+@@ -365,15 +365,16 @@
+   ADD_DEFINITIONS(-DHAVE_LIBRT=1)
+ endif (HAVE_LIBRT)
+
+-check_library_exists(subunit subunit_test_start "" HAVE_SUBUNIT)
+-if (HAVE_SUBUNIT)
++option(CHECK_ENABLE_SUBUNIT "Enable subunit support" ON)
++if (CHECK_ENABLE_SUBUNIT)
+   set(SUBUNIT "subunit")
+   set(ENABLE_SUBUNIT 1)
++  set(HAVE_SUBUNIT 1)
+   add_definitions(-DENABLE_SUBUNIT=1)
+-else(HAVE_SUBUNIT)
++else(CHECK_ENABLE_SUBUNIT)
+   set(ENABLE_SUBUNIT 0)
+   add_definitions(-DENABLE_SUBUNIT=0)
+-endif (HAVE_SUBUNIT)
++endif (CHECK_ENABLE_SUBUNIT)
+
+ ###############################################################################
+ # Generate "config.h" from "cmake/config.h.in"