diff options
author | Romain Perier <mrpouet@gentoo.org> | 2009-09-23 20:23:27 +0000 |
---|---|---|
committer | Romain Perier <mrpouet@gentoo.org> | 2009-09-23 20:23:27 +0000 |
commit | ef1e24b2edb0c3f3e2b90af6001eac77a646a082 (patch) | |
tree | 333bba65d72ea50b12b2dbcfa65c49d864c01cb3 /sys-apps/pmount | |
parent | Remove virtual/libc (diff) | |
download | historical-ef1e24b2edb0c3f3e2b90af6001eac77a646a082.tar.gz historical-ef1e24b2edb0c3f3e2b90af6001eac77a646a082.tar.bz2 historical-ef1e24b2edb0c3f3e2b90af6001eac77a646a082.zip |
Fix testsuite due to missing sub-directory in tests dir (check_fstab, c.f see gitweb on upstream), Stable for amd64 per bug #281208.
Package-Manager: portage-2.2_rc41/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/pmount')
-rw-r--r-- | sys-apps/pmount/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/pmount/Manifest | 15 | ||||
-rw-r--r-- | sys-apps/pmount/files/pmount-0.9.19-testsuite-missing-dir.patch | 43 | ||||
-rw-r--r-- | sys-apps/pmount/pmount-0.9.19.ebuild | 22 |
4 files changed, 67 insertions, 20 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/Manifest b/sys-apps/pmount/Manifest index 2b90fc366367..00f3a5f9e50b 100644 --- a/sys-apps/pmount/Manifest +++ b/sys-apps/pmount/Manifest @@ -1,8 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX pmount-0.9.13-no_close.patch 456 RMD160 324aeac41b435a89937abb936cf16c45511905a9 SHA1 60d73c5d05e0c58d4bfdd3f977e0c8a15fb03ab8 SHA256 33962c5f3cf9d29e65c21f72b2c2a479b10bb635c158a70be49085e286a4dec6 AUX pmount-0.9.19-ext4-support.patch 648 RMD160 6af3cd12e82cba7e1751971074c016f969bd267d SHA1 61c481d4e52453ada7f74e10258b28b916d28ba3 SHA256 c0677faa9beb7256a9cd204fbe08287a0df324a2402c3528d12eeb8ae7b650e2 +AUX pmount-0.9.19-testsuite-missing-dir.patch 1354 RMD160 8e88ab0d83738ae33dc1bc5257d13090c4c265ff SHA1 cb0404219754d7397d5017aa6c1b7db3a6c5437e SHA256 cbb513b5cfb8d12685e5967359ab4f99b78a144df255f4e6a3ce70686f8b7b10 DIST pmount-0.9.16.tar.gz 434647 RMD160 38d328b3fd0ff1e5f89ad2b99fa0495a68c06eed SHA1 d8d033e852d923dec71eaefaf2324819ad81fae3 SHA256 c44afd4498b3577bbf44ceb430e29c9b8997a8f5e4038757bcb077d58c1bc7d4 DIST pmount-0.9.17.tar.gz 450608 RMD160 df833bd60dd6cfd4d6059c0382b2e7b9a39bd073 SHA1 8fd1129772647e5e096eb362f26238d662c02c5f SHA256 2632d931b5732eb1d0de7a2e2d92c75d64412438958ee96dceb4443e4fc2a62f DIST pmount-0.9.18.tar.gz 436009 RMD160 50fce01a4dadc83d9760787a5c5fda296448e786 SHA1 a01963f08ba85f551b43bb1f96b07252b33895ff SHA256 b216936e6e011b58fefee8e3f80d01008cb078b7fe2a5632b2ce98bc7bcb05c2 @@ -10,13 +8,6 @@ DIST pmount-0.9.19.tar.gz 439507 RMD160 90aaf063fbf5303e1dfec615eade200c7485d4dd EBUILD pmount-0.9.16.ebuild 1624 RMD160 ab3d6598dd247ee8e9043a15fa629b40004481bb SHA1 71a4f3c37373bbb95c7336619956b5487f2bc1dc SHA256 1709311b8e2c527333138406946d0f3b9fd879bd5b942aa145cc9c1c41957bb7 EBUILD pmount-0.9.17.ebuild 1641 RMD160 74f35daa7f98687bf21fb01b0d5f310c85d6e3d3 SHA1 8f5e0355c6b160bac3dd8d2a1b8da117d2886725 SHA256 06f196da8412252eba2308f0f2b95b83e526c2f15ce1ec08148e9d9fa8c3f5ec EBUILD pmount-0.9.18.ebuild 1641 RMD160 f4bea5add985358655369cff2bbf3a3c278331ba SHA1 0f46d358429a70b008c192449cf1a590ec56ba0d SHA256 27891e64c88dff6b236ea60c9ba09307f507e8828bc24cafa1e5b776fff0a974 -EBUILD pmount-0.9.19.ebuild 1731 RMD160 49b6f1031cec6cf4fe919e9f1b638aeb54ebb9f7 SHA1 0d542aefaeabaed4f30990dc290ac3ce706ecbf7 SHA256 cd7c79dd05c27fdca71bbeaabd2761cda05e1c85570ebdad1b6a2484b2239d43 -MISC ChangeLog 8281 RMD160 99c2fdf2029b282d58160534fbb841b310c3476c SHA1 6621d9ffdc5a040b623ef26c053c9dd7ed5d3275 SHA256 3d63fc92e6f437f634fa3166963ce5301d937ca7b95903ed26651492d4707c38 +EBUILD pmount-0.9.19.ebuild 1997 RMD160 66980993280afc1cb1d4eb5de7d7395619824225 SHA1 f35d56d8023d5abecc63ae3eacb78a811fa4633b SHA256 628e1e8723377d8f2ea2d708a3b024dbf62d7d298202378f49a8409ff31bd484 +MISC ChangeLog 8547 RMD160 bdb27e68a0d9c1fbae39336c50dc5f82a7f60e93 SHA1 159d35ad5a42def5c28b08f369fd98ac994759cf SHA256 53392b3fd8d018ee364fb7c1bc747c4b9dee6b53b5aeaab1b49a4266a5b3987c MISC metadata.xml 164 RMD160 7d567afe05ca87a772eedf19f5b1fd1e2a9798a7 SHA1 e7b1ab05868d9feb1fa1677c052836fd7dd6a171 SHA256 66cdaff449660e99dfaee8d19b47413fc8ced6d5a1eccd3c842a48e9d9668d48 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAknvnb4ACgkQ1fmVwcYIWAZHRQCg0hbM5apys5B00PnNraQu9K6Y -6tQAn2fE2YpcnEGC6i1hmWICutIglBA2 -=ybMJ ------END PGP SIGNATURE----- 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 |