Fix testsuite due to missing sub-directory in tests dir (check_fstab, c.f see gitweb on upstream), Stable for amd64 per bug #281208.

(Portage version: 2.2_rc41/cvs/Linux x86_64)

3 files changed, 64 insertions, 8 deletions

diff --git a/sys-apps/pmount/ChangeLog b/sys-apps/pmount/ChangeLog
index ded73ffc44d4..68c19b1f838d 100644
--- a/sys-apps/pmount/ChangeLog
+++ b/sys-apps/pmount/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pmount
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.65 2009/04/22 22:44:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/ChangeLog,v 1.66 2009/09/23 20:23:26 mrpouet Exp $
+
+  23 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  pmount-0.9.19.ebuild, +files/pmount-0.9.19-testsuite-missing-dir.patch:
+  Fix testsuite due to missing sub-directory in tests dir (check_fstab, c.f
+  see gitweb on upstream), Stable for amd64 per bug #281208.
 
   22 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> pmount-0.9.19.ebuild:
   Fix install with USE="-hal", bug #266827.
diff --git a/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
new file mode 100644
index 000000000000..93d0555f0f3d
--- /dev/null
+++ b/sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch
@@ -0,0 +1,43 @@
+From d3f14cfd82cae939d9c487e9cb1a2973dc9b9a4f Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Wed, 23 Sep 2009 19:37:55 +0200
+Subject: [PATCH] Fix testsuite due to missing sub-directory (see gitweb on upstream)
+
+---
+ tests/check_fstab/a     |    1 +
+ tests/check_fstab/d     |    1 +
+ tests/check_fstab/fstab |    6 ++++++
+ 3 files changed, 8 insertions(+), 0 deletions(-)
+ create mode 100644 tests/check_fstab/a
+ create mode 100644 tests/check_fstab/d
+ create mode 100644 tests/check_fstab/fstab
+
+diff --git a/tests/check_fstab/a b/tests/check_fstab/a
+new file mode 100644
+index 0000000..d16d1c5
+--- /dev/null
++++ tests/check_fstab/a
+@@ -0,0 +1 @@
++This file is a 'dummy device file' for the fstab check
+diff --git a/tests/check_fstab/d b/tests/check_fstab/d
+new file mode 100644
+index 0000000..d16d1c5
+--- /dev/null
++++ tests/check_fstab/d
+@@ -0,0 +1 @@
++This file is a 'dummy device file' for the fstab check
+diff --git a/tests/check_fstab/fstab b/tests/check_fstab/fstab
+new file mode 100644
+index 0000000..8ba6f6c
+--- /dev/null
++++ tests/check_fstab/fstab
+@@ -0,0 +1,6 @@
++# A dummy fstab file for 
++
++# <file system> <mount point>   	<type>  <options>       <dump>  <pass>
++check_fstab/a	/test1           	ext3    defaults        0       0
++check_fstab/e	/test2           	ext3    defaults        0       0
++
+-- 
+1.6.5.rc1
+
diff --git a/sys-apps/pmount/pmount-0.9.19.ebuild b/sys-apps/pmount/pmount-0.9.19.ebuild
index f74a66fd9bc0..5ab947882384 100644
--- a/sys-apps/pmount/pmount-0.9.19.ebuild
+++ b/sys-apps/pmount/pmount-0.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.19.ebuild,v 1.3 2009/04/22 22:44:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pmount/pmount-0.9.19.ebuild,v 1.4 2009/09/23 20:23:26 mrpouet Exp $
 
 EAPI="2"
 
@@ -12,18 +12,17 @@ SRC_URI="http://alioth.debian.org/frs/download.php/2867/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="crypt hal"
 
 RDEPEND="hal? ( >=sys-apps/dbus-0.33 >=sys-apps/hal-0.5.2 )
 	crypt? ( >=sys-fs/cryptsetup-1.0.5 )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40"
-
-# FIXME: Testsuite fails.
-RESTRICT="test"
-
-PATCHES=("${FILESDIR}/${P}-ext4-support.patch")
+PATCHES=(
+	"${FILESDIR}/${P}-ext4-support.patch"
+	"${FILESDIR}/${P}-testsuite-missing-dir.patch"
+)
 
 pkg_setup() {
 	enewgroup plugdev
@@ -33,6 +32,15 @@ src_configure() {
 	econf $(use_enable hal)
 }
 
+src_test() {
+	local testdir=${S}/tests/check_fstab
+
+	ln -s $testdir/a $testdir/b && ln -s $testdir/d $testdir/c && \
+		ln -s $testdir/c $testdir/e \
+		|| die "Unable to create fake symlinks required for testsuite"
+	emake check || die "testsuite failed"
+}
+
 src_install () {
 	# Must be run SETUID+SETGID, bug #250106
 	exeinto /usr/bin