gentoo resync : 16.04.2018

3 files changed, 35 insertions, 8 deletions

diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index dfad60f5014c..da92ba724895 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,5 +1,6 @@
+AUX check-0.12.0-fp.patch 1727 BLAKE2B 8643aa3b1ebaece72c9bb6bad52077f554baea2d51b27bcc310c409c054630c5dee7a0d1159c929d08524fc1bd2fa6e596a9098684d5353c111bb5a09e519798 SHA512 f4d6066d194f19ed46c0fe773fdf3d80b833df2d6e84d90d409c43577ee871f400c0a6cd4cae115d64109232384e924d4d8f4fee5ff3b856f1e921cc9b38c384
 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
 EBUILD check-0.10.0-r1.ebuild 1810 BLAKE2B 106168f6f135594653ce061d0dff535ba56d4d9de205d994d6e3dd91405496fcbc6d3c3835c3bf886a8cb29b7775fc8001024dce3e732028b9e6c5367da14d45 SHA512 9ce0cd9f3b3809823f4bdd5441351528ee04f4e470ca2b4f7f2622e5c4c22892870008fc6e9179e3d03225d709055c995e44767d5b07367d39e42bc07dbd0d56
-EBUILD check-0.12.0.ebuild 1700 BLAKE2B 837c75bcbc9291d17bf5c5aa6d868c3baa62e778320039124356a6a5d53d027797feae2c4dd6f386b5c0e6ae6da92d1f7f8454624d19eb21594fcf90c44bcdf1 SHA512 da5dcd508dbc921ffa01875788710adedc41fb2242daa1c419a74c326007e3e4b4fefc133e7b627c1bd3a8a3aefbcbf9efef91ae47181756308dd6b710b4b05e
+EBUILD check-0.12.0.ebuild 1804 BLAKE2B 9cc45e182175361cc0c7f3517ec5aa3f6cade68660e261366131ce35f4f9096ed24fe87b9de3081c1d7f65c14834e0869f602737741ec37582975b80877c1d6f SHA512 4dfa26527d3fa31add4c18a8165e1802080e8088eb8f55a2bd8d20eabbc311cd5bcbbe1f11c17d82b793a959a67d33d5ebbc0e7edfd8756698adc89a30779869
 MISC metadata.xml 363 BLAKE2B 5cdadc9ead8f98c8a417954ff38f8c32a79ee2d0b12171204239305d66e69247758ed237b45e369cb6aa40e4bd56777f74296baecee6eb571801f61e3ddf730c SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index acde41e304b1..25d0f16bf8a3 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -15,14 +15,18 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh spa
 IUSE="static-libs subunit"
 
 RDEPEND="
-	subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-
-DEPEND="
-	${RDEPEND}
+	subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
 	sys-apps/texinfo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS TODO )
+	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
diff --git a/dev-libs/check/files/check-0.12.0-fp.patch b/dev-libs/check/files/check-0.12.0-fp.patch
new file mode 100644
index 000000000000..7907df989a10
--- /dev/null
+++ b/dev-libs/check/files/check-0.12.0-fp.patch
@@ -0,0 +1,22 @@
+--- a/tests/check_check_master.c.orig	2018-01-29 20:33:55.033001412 -0700
++++ b/tests/check_check_master.c	2018-01-29 20:34:31.501879454 -0700
+@@ -214,7 +214,7 @@ static master_test_t master_tests[] = {
+   { "Simple Tests", "test_ck_assert_ldouble_ge", CK_FAILURE, CK_MSG_TEXT, "Assertion 'x >= y' failed: x == 2.5, y == 3" },
+   { "Simple Tests", "test_ck_assert_ldouble_ge_with_mod", CK_FAILURE, CK_MSG_TEXT, "Assertion '2%d >= 3%f' failed: 2%d == 0, 3%f == 1" },
+   { "Simple Tests", "test_ck_assert_ldouble_with_expr", CK_PASS, CK_MSG_TEXT, "Passed" },
+-  { "Simple Tests", "test_ck_assert_ldouble_eq_tol", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(y - x) < t' failed: x == 0.001, y == 0.002, t == 0.001" },
++  { "Simple Tests", "test_ck_assert_ldouble_eq_tol", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(y - x) < t' failed: x == 0.001, y == 0.002, t == 0.0009" },
+   { "Simple Tests", "test_ck_assert_ldouble_eq_tol_with_mod", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(2%f - 3%d) < 2%p' failed: 3%d == 1, 2%f == 0, 2%p == 0" },
+   { "Simple Tests", "test_ck_assert_ldouble_ne_tol", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(y - x) >= t' failed: x == 0.001, y == 0.002, t == 0.01" },
+   { "Simple Tests", "test_ck_assert_ldouble_ne_tol_with_mod", CK_FAILURE, CK_MSG_TEXT, "Assertion 'fabsl(3%f - 3%d) >= 3%p' failed: 3%d == 1, 3%f == 1, 3%p == 1" },
+--- a/tests/check_check_sub.c.orig	2017-10-20 06:44:10.000000000 -0600
++++ b/tests/check_check_sub.c	2018-01-29 20:33:55.034001409 -0700
+@@ -1812,7 +1812,7 @@ START_TEST(test_ck_assert_ldouble_eq_tol
+   y*=10.0l;
+   t*=10.0l;
+   ck_assert_ldouble_eq_tol(x, y, t);
+-  t/=10.0l;
++  t=0.0009l;
+   record_failure_line_num(__LINE__);
+   ck_assert_ldouble_eq_tol(x, y, t);
+ }