- Add patch from upstream to fix check.m4 breaking packages using

AM_PATH_CHECK. (bug #179351 reported by Ed Catmur) - Fix broken pass/fail
stats in setup code.
(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r4 x86_64)

4 files changed, 154 insertions, 1 deletions

diff --git a/dev-libs/check/ChangeLog b/dev-libs/check/ChangeLog
index 5a0690719a9b..acc5a7710263 100644
--- a/dev-libs/check/ChangeLog
+++ b/dev-libs/check/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/check
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.43 2008/03/02 17:30:00 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/ChangeLog,v 1.44 2008/12/05 04:53:47 dirtyepic Exp $
+
+*check-0.9.5-r1 (05 Dec 2008)
+
+  05 Dec 2008; Ryan Hill <dirtyepic@gentoo.org>
+  +files/check-0.9.5-AM_PATH_CHECK.patch,
+  +files/check-0.9.5-setup-stats.patch, +check-0.9.5-r1.ebuild:
+  - Add patch from upstream to fix check.m4 breaking packages using
+
+  AM_PATH_CHECK. (bug #179351 reported by Ed Catmur) - Fix broken pass/fail
+  stats in setup code.
 
   02 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> check-0.9.5.ebuild:
   ~mips.
diff --git a/dev-libs/check/check-0.9.5-r1.ebuild b/dev-libs/check/check-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..f0a57e2df42b
--- /dev/null
+++ b/dev-libs/check/check-0.9.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/check/check-0.9.5-r1.ebuild,v 1.1 2008/12/05 04:53:47 dirtyepic Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A unit test framework for C"
+HOMEPAGE="http://sourceforge.net/projects/check/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	epatch "${FILESDIR}"/${P}-AM_PATH_CHECK.patch
+	epatch "${FILESDIR}"/${P}-setup-stats.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
+}
diff --git a/dev-libs/check/files/check-0.9.5-AM_PATH_CHECK.patch b/dev-libs/check/files/check-0.9.5-AM_PATH_CHECK.patch
new file mode 100644
index 000000000000..fc32a6f5d029
--- /dev/null
+++ b/dev-libs/check/files/check-0.9.5-AM_PATH_CHECK.patch
@@ -0,0 +1,26 @@
+diff -Naur check-0.9.5-orig/check.m4 check-0.9.5/check.m4
+--- check-0.9.5-orig/check.m4	2006-11-21 17:19:12.000000000 -0600
++++ check-0.9.5/check.m4	2008-12-04 21:45:13.000000000 -0600
+@@ -4,8 +4,8 @@
+ 
+ AC_DEFUN([AM_PATH_CHECK],
+ [
+-  AC_MSG_WARN([[AM_PATH_CHECK() is deprecated]])
+-  AC_MSG_WARN([[use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]])
++  AC_MSG_WARN([A@&t@M_PATH_CHECK() is deprecated])
++  AC_MSG_WARN([[use P@&t@KG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]])
+   AC_ARG_WITH([check],
+   [  --with-check=PATH       prefix where check is installed [default=auto]])
+  
+diff -Naur check-0.9.5-orig/doc/example/configure.ac check-0.9.5/doc/example/configure.ac
+--- check-0.9.5-orig/doc/example/configure.ac	2006-11-21 17:19:14.000000000 -0600
++++ check-0.9.5/doc/example/configure.ac	2008-12-04 21:45:13.000000000 -0600
+@@ -25,7 +25,7 @@
+ # CHECK_LIBS accordingly.  
+ #  AM_PATH_CHECK([MINIMUM-VERSION,
+ #                [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-AM_PATH_CHECK()
++PKG_CHECK_MODULES([check], [], [])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/dev-libs/check/files/check-0.9.5-setup-stats.patch b/dev-libs/check/files/check-0.9.5-setup-stats.patch
new file mode 100644
index 000000000000..a750be80a47f
--- /dev/null
+++ b/dev-libs/check/files/check-0.9.5-setup-stats.patch
@@ -0,0 +1,87 @@
+diff -Naurp check-0.9.5-orig/src/check_run.c check-0.9.5/src/check_run.c
+--- check-0.9.5-orig/src/check_run.c	2006-11-21 17:19:13.000000000 -0600
++++ check-0.9.5/src/check_run.c	2008-12-04 22:37:19.000000000 -0600
+@@ -163,9 +163,7 @@ void srunner_run_all (SRunner *sr, enum 
+ static void srunner_add_failure (SRunner *sr, TestResult *tr)
+ {  
+   list_add_end (sr->resultlst, tr);
+-  /* If the context is either of these, the test has run. */
+-  if ((tr->ctx == CK_CTX_TEST) || (tr->ctx == CK_CTX_TEARDOWN))
+-    sr->stats->n_checked++;
++  sr->stats->n_checked++; /* count checks during setup, test, and teardown */
+   if (tr->rtype == CK_FAILURE)
+     sr->stats->n_failed++;
+   else if (tr->rtype == CK_ERROR)
+diff -Naurp check-0.9.5-orig/tests/check_check_fixture.c check-0.9.5/tests/check_check_fixture.c
+--- check-0.9.5-orig/tests/check_check_fixture.c	2006-11-21 17:19:15.000000000 -0600
++++ check-0.9.5/tests/check_check_fixture.c	2008-12-04 22:37:21.000000000 -0600
+@@ -41,7 +41,7 @@ START_TEST(test_fixture_fail_counts)
+   nrun = srunner_ntests_run(fixture_sr);
+   nfail = srunner_ntests_failed(fixture_sr);
+ 
+-  fail_unless (nrun == 0 && nfail == 1,
++  fail_unless (nrun == 1 && nfail == 1,
+ 	       "Counts for run and fail for fixture failure not correct");
+ }
+ END_TEST
+@@ -49,7 +49,7 @@ END_TEST
+ START_TEST(test_print_counts)
+ {
+   char *srstat = sr_stat_str(fixture_sr);
+-  const char *exp = "0%: Checks: 0, Failures: 1, Errors: 0";
++  const char *exp = "0%: Checks: 1, Failures: 1, Errors: 0";
+ 
+   fail_unless(strcmp(srstat, exp) == 0,
+ 	      "SRunner stat string incorrect with setup failure");
+@@ -172,7 +172,7 @@ START_TEST(test_ch_setup_fail)
+   sr = srunner_create(s);
+   srunner_run_all(sr,CK_VERBOSE);
+ 
+-  fail_unless (srunner_ntests_run(sr) == 0,
++  fail_unless (srunner_ntests_run(sr) == 1,
+ 	       "Test run counts not correct for checked setup failure");
+   fail_unless (srunner_ntests_failed(sr) == 1,
+ 	       "Failure counts not correct for checked setup failure");
+@@ -180,7 +180,7 @@ START_TEST(test_ch_setup_fail)
+   strstat= sr_stat_str(sr);
+ 
+   fail_unless(strcmp(strstat,
+-		     "0%: Checks: 0, Failures: 1, Errors: 0") == 0,
++		     "0%: Checks: 1, Failures: 1, Errors: 0") == 0,
+ 	      "SRunner stat string incorrect with checked setup failure");
+ 
+ 
+@@ -212,7 +212,7 @@ START_TEST(test_ch_setup_fail_nofork)
+   srunner_set_fork_status(sr, CK_NOFORK);
+   srunner_run_all(sr, CK_VERBOSE);
+ 
+-  fail_unless (srunner_ntests_run(sr) == 0,
++  fail_unless (srunner_ntests_run(sr) == 1,
+ 	       "Test run counts not correct for checked setup failure");
+   fail_unless (srunner_ntests_failed(sr) == 1,
+ 	       "Failure counts not correct for checked setup failure");
+@@ -235,7 +235,7 @@ START_TEST(test_ch_setup_fail_nofork_2)
+   srunner_set_fork_status(sr, CK_NOFORK);
+   srunner_run_all(sr, CK_VERBOSE);
+ 
+-  fail_unless (srunner_ntests_run(sr) == 0,
++  fail_unless (srunner_ntests_run(sr) == 1,
+ 	       "Test run counts not correct for checked setup failure");
+   fail_unless (srunner_ntests_failed(sr) == 1,
+ 	       "Failure counts not correct for checked setup failure");
+@@ -288,13 +288,13 @@ START_TEST(test_ch_setup_sig)
+ 
+   fail_unless (srunner_ntests_failed(sr) == 1,
+ 	       "Failure counts not correct for checked setup signal");
+-  fail_unless (srunner_ntests_run(sr) == 0,
++  fail_unless (srunner_ntests_run(sr) == 1,
+ 	       "Test run counts not correct for checked setup signal");
+ 
+   strstat= sr_stat_str(sr);
+ 
+   fail_unless(strcmp(strstat,
+-		     "0%: Checks: 0, Failures: 0, Errors: 1") == 0,
++		     "0%: Checks: 1, Failures: 0, Errors: 1") == 0,
+ 	      "SRunner stat string incorrect with checked setup signal");
+ 
+