gentoo resync : 05.02.2020

5 files changed, 33 insertions, 11 deletions

diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 17a87b6b429e..29221a7270a7 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,8 +1,9 @@
 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
-DIST check-0.13.0.tar.gz 301386 BLAKE2B fbc79ad9f0bacd7c7461cde631a499d92e004233b5d35ba35cb0791195362e12fc21ca059e2019280cbf256215528af239de988755e0183cb6e332a5b145624e SHA512 7943021c5bc3b5ca7bc552f6fe1287e384724d69e5bb128d58256692e810b194e506fc1b65ea4fed27d065e2176e7371483e918beb48125abfe3b6f1ca68eb8f
-EBUILD check-0.10.0-r1.ebuild 1792 BLAKE2B 258840e8effd0212bda0d7851ebaf09b8685a479566e8cbb50660b00f133b4b5d129db93e4022297757bba8ff2486353e4767d6279c430bf2f9d0cbc864bb359 SHA512 b058e308c58f2988a63d0b7e4fa0c3c1cac7cb34afbaab74d1b032eb0512420bd0330c20df527e23b5211bf14a1c5212f3e2bb79feeeef89952ce430f3af0dc0
-EBUILD check-0.12.0.ebuild 1783 BLAKE2B da5d9b52a93cb886150e906f778578aaddf923467b4275bb38eb94388fd01b55a16d02ce43309259a349616b1c200b2c2708932a05145cf652ce5e94bd518cf3 SHA512 03b6274c56da34948c52843cadbb610e5eef33a67a6da2203c037d71e87719ffdd9f9f9b76098822b494617689387955b2a1c3784a417dc523a15746e846c92b
-EBUILD check-0.13.0.ebuild 1488 BLAKE2B 104a8ac09018d0f937bbde18e2de13e226a8f2d8e7ffcece5d1dceb49a98578d562aad5bd6f142701bb6cf6fd810039f1918e822dd89090dffdad0431350cd0f SHA512 4b36695b4e7b3dc38c6239924c85e60591bd43de39847ef01584274a9351ecc2a1346306f917ffbc9000d317c2c7751382f55ef2d4f96d03af047fcd2f51ee6b
+DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
+EBUILD check-0.10.0-r1.ebuild 1793 BLAKE2B a9e40976928d69c2b6ef6950846669c38af330590d3d3014cbb2ea1efa01c3f604a0ccc6d6fc831162f6b1f609d93dcb638d51722fd14cadfa44a311e941c2de SHA512 5662ad3ad6a53d95c102c0408904d2d8be495cc9f05bfe5548ae23ed30affaa0a06df070a3f22491f527ed5ddbd8d2fab209ffa359b52c50d72a26bc5c2fa53f
+EBUILD check-0.12.0.ebuild 1784 BLAKE2B d7ed2ca2f62df1d54c0eca850665cbb3dcddd99e31181fd7d9a33ceb2790f9515107573417e68eb53542feb4e12873e5bee28e29109501e0593ea2fb3317060a SHA512 20f5523647256b6a514591c5e67ca901699941a90afb032d4d0b93c44f8a0de2afae953c0f92d6b663d3e8226bcd36a969ff10d9967e6a6544f5e6ef814bbeb0
+EBUILD check-0.14.0.ebuild 1599 BLAKE2B 2a03604f1bbdd9e915e97991c8d8dcf8f5ed28108c1050aa77e9640d603fee88a1890b1acbfd64c2b11df3fbb03d2d6280d4bc5e39bcc7dc9de516772e3f64e6 SHA512 adaa122d38ddaf81261dede3a4dfeb89a0be4a90cd95f8acf47970f9feda3cbe66ce7722120ff82651363bf0d178c6b82bc5d70b686beacce80750a12f4b259b
 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
index fd4b910c3824..b19d2259d159 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+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="
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 131ec484ae50..aa0feaf8c587 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
 
 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="
diff --git a/dev-libs/check/check-0.13.0.ebuild b/dev-libs/check/check-0.14.0.ebuild
index bda5701d57b8..c1de319b23d4 100644
--- a/dev-libs/check/check-0.13.0.ebuild
+++ b/dev-libs/check/check-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,20 +9,23 @@ 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"
+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="doc static-libs subunit test"
 
-# https://github.com/libcheck/check/issues/208
-RESTRICT="test"
-#RESTRICT="!test? ( 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.12.0-fp.patch
+	"${FILESDIR}"/check-0.14-xfail-tests.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -49,6 +52,11 @@ src_compile() {
 	fi
 }
 
+multilib_src_test() {
+	# Note: test-phase takes a long time.
+	emake -k check
+}
+
 multilib_src_install_all() {
 	use doc && local HTML_DOCS=( doc/html/. )
 	default
diff --git a/dev-libs/check/files/check-0.14-xfail-tests.patch b/dev-libs/check/files/check-0.14-xfail-tests.patch
new file mode 100644
index 000000000000..ea2ffe10aa45
--- /dev/null
+++ b/dev-libs/check/files/check-0.14-xfail-tests.patch
@@ -0,0 +1,13 @@
+--- a/tests/Makefile.am	2020-02-02 09:33:17.807391927 +0200
++++ b/tests/Makefile.am.1	2020-02-02 09:34:01.267166205 +0200
+@@ -19,6 +19,10 @@
+ # XFAIL_TESTS = \
+ # 	check_thread_stress
+ 
++XFAIL_TESTS = \
++    check_check_export	\
++    check_check
++
+ noinst_PROGRAMS =		\
+ 	check_check_export	\
+ 	check_check		\