Build xtests directory only during make check, finally should fix bug #194275.

(Portage version: 2.1.3.19)

4 files changed, 28 insertions, 3 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 08b29190f935..f0b0b4d1b31f 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.178 2007/11/10 22:02:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.179 2007/11/11 13:31:11 flameeyes Exp $
+
+  11 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-0.99.8.1-xtests.patch, pam-0.99.8.1-r1.ebuild,
+  pam-0.99.9.0.ebuild:
+  Build xtests directory only during make check, finally should fix bug #194275.
 
   10 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.99.8.1-r1.ebuild,
   pam-0.99.9.0.ebuild:
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.8.1-xtests.patch b/sys-libs/pam/files/Linux-PAM-0.99.8.1-xtests.patch
new file mode 100644
index 000000000000..2cd3e950db6d
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-0.99.8.1-xtests.patch
@@ -0,0 +1,18 @@
+This patch makes sure that the xtests programs don't get build when running
+'make all', as they might fail to build (for instance if GLIBC 2.3 is used).
+
+Note that the tests are not executed by default at make check because they
+are anyway broken.
+Index: Linux-PAM-0.99.9.0/xtests/Makefile.am
+===================================================================
+--- Linux-PAM-0.99.9.0.orig/xtests/Makefile.am
++++ Linux-PAM-0.99.9.0/xtests/Makefile.am
+@@ -29,7 +29,7 @@ XTESTS = tst-pam_dispatch1 tst-pam_dispa
+ 	tst-pam_access4 tst-pam_limits1 tst-pam_succeed_if1 \
+ 	tst-pam_group1
+ 
+-noinst_PROGRAMS = $(XTESTS)
++check_PROGRAMS = $(XTESTS)
+ 
+ xtests: $(XTESTS) run-xtests.sh
+ 	"$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS}
diff --git a/sys-libs/pam/pam-0.99.8.1-r1.ebuild b/sys-libs/pam/pam-0.99.8.1-r1.ebuild
index 9184f45c3d0c..e461a45fd950 100644
--- a/sys-libs/pam/pam-0.99.8.1-r1.ebuild
+++ b/sys-libs/pam/pam-0.99.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.1-r1.ebuild,v 1.11 2007/11/10 22:02:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.8.1-r1.ebuild,v 1.12 2007/11/11 13:31:11 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -103,6 +103,7 @@ src_unpack() {
 
 	epatch "${DISTDIR}/${MY_P}-ldflags-to-libadd.patch.bz2"
 	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
+	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
 
 	AT_M4DIR="m4" eautoreconf
 
diff --git a/sys-libs/pam/pam-0.99.9.0.ebuild b/sys-libs/pam/pam-0.99.9.0.ebuild
index 7a43f1916c65..1788a7d522ed 100644
--- a/sys-libs/pam/pam-0.99.9.0.ebuild
+++ b/sys-libs/pam/pam-0.99.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.9.0.ebuild,v 1.3 2007/11/10 22:02:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.9.0.ebuild,v 1.4 2007/11/11 13:31:11 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -101,6 +101,7 @@ src_unpack() {
 	done
 
 	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
+	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
 
 	AT_M4DIR="m4" eautoreconf