summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-12-30 04:19:18 +0000
committerMike Frysinger <vapier@gentoo.org>2008-12-30 04:19:18 +0000
commit1151df3eae4ab37701fa6461bf82548a332e1f60 (patch)
treeed1ee06f100f0bcf682e6b789bc83f2143cf9862
parentAdd firefox3 useflag mask for gtk-engines-qtcurve on sparc (diff)
downloadhistorical-1151df3eae4ab37701fa6461bf82548a332e1f60.tar.gz
historical-1151df3eae4ab37701fa6461bf82548a332e1f60.tar.bz2
historical-1151df3eae4ab37701fa6461bf82548a332e1f60.zip
Create temp /etc/mtab for random test failures #217719.
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64
-rw-r--r--sys-fs/e2fsprogs/ChangeLog5
-rw-r--r--sys-fs/e2fsprogs/Manifest10
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild18
3 files changed, 26 insertions, 7 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index dbf840935fa2..fe3082c92051 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/e2fsprogs
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.172 2008/12/29 18:17:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.173 2008/12/30 04:19:18 vapier Exp $
+
+ 30 Dec 2008; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.41.3.ebuild:
+ Create temp /etc/mtab for random test failures #217719.
29 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
e2fsprogs-1.41.3.ebuild:
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index d56359192e35..532b19063ab4 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -20,13 +20,13 @@ EBUILD e2fsprogs-1.40.9.ebuild 4091 RMD160 ef0e2d0f136a5fd4b5acdc4c88eb450a90771
EBUILD e2fsprogs-1.41.0.ebuild 3459 RMD160 ff88d3823e1d2c46e6d16d0e01d9511886a049bc SHA1 3eca1a1d726c612dec8cc158ea0a258a4b213f1f SHA256 0c743f36f080371d5efa634a426574a12f8d1643d01dac910751931782f5548e
EBUILD e2fsprogs-1.41.1.ebuild 3459 RMD160 c4ae79307142ef6abc23ef84bb9ffb8125863200 SHA1 8e3bf9b55b6225c9c92435287d2db9f05747b75e SHA256 2391a7ad29f9f192a8feafbdacbb327592890b610ba7af871899e3fe0b1b9b77
EBUILD e2fsprogs-1.41.2.ebuild 3448 RMD160 131348152916b981ada0b9a46bad4fea80aa0909 SHA1 953cbf1daddf23b10511bfd29bb113cb7cd236ae SHA256 625f8bc2a9c201c7df33dfa0a0371b47d22f8516d1855a20cf5855e27f4a5f6b
-EBUILD e2fsprogs-1.41.3.ebuild 3448 RMD160 da219b343183eb318bff0d95cd61238dd680d709 SHA1 98f424300d1e55b24192d0cf9a65cf6660df39fb SHA256 c74b98fa8e26ad8f50fd0ace35146ef20f59eca8ae2a5c1a30a8a97c73162717
-MISC ChangeLog 25823 RMD160 6b48d7dc019dd28af1f1b5fb48f1bdbe3fbb232f SHA1 116df521862a47d8017681940ca53749bbc66e4c SHA256 fd722a1a89a957e490dd633b8ce57c973503e0ece21aab9dd74f24082fa9943c
+EBUILD e2fsprogs-1.41.3.ebuild 3836 RMD160 aa9d4210912350482ef16abbd010ea6a96f1e230 SHA1 66655d79bd9fb9002ada22ca2a4faef785223d2d SHA256 31377f01a40f4aeab47bf56e3aaba93dcd26519677280352722974f195f8d201
+MISC ChangeLog 25953 RMD160 7c1bbe8362af0354066bb5f21d03300cb7953703 SHA1 1b16823e110cf7978ed2ca261b2a478ce26ae80e SHA256 9d0ed72a31b8beb717bc1ba3163cb61acd1b2a89b668549f18ee9364c0880e5f
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAklZNwkACgkQn/5bYzqsSmHKJwCggBSTVZ7k3f8q2onwGNDatV6E
-6pUAn2INv9vLB313r9gpu1cIN06Cp3C0
-=GWUR
+iEYEARECAAYFAklZoUwACgkQn/5bYzqsSmHRdACgvwmU0hf6TW/i+1XJrEyHmLYL
+ongAn1Os26tuXINE1aLSu8HpVZKU1vDo
+=16yt
-----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild
index 7b16a354e7ab..064ec418feca 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild,v 1.8 2008/12/29 20:45:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild,v 1.9 2008/12/30 04:19:18 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -19,6 +19,14 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
sys-apps/texinfo"
+pkg_setup() {
+ if [[ ! -e ${ROOT}/etc/mtab ]] ; then
+ # add some crap to deal with missing /etc/mtab #217719
+ ewarn "No /etc/mtab file, creating one temporarily"
+ echo "${PN} crap for src_test" > "${ROOT}"/etc/mtab
+ fi
+}
+
src_unpack() {
unpack ${A}
cd "${S}"
@@ -78,6 +86,14 @@ src_compile() {
fi
}
+pkg_preinst() {
+ if [[ -r ${ROOT}/etc/mtab ]] ; then
+ if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
+ rm -f "${ROOT}"/etc/mtab
+ fi
+ fi
+}
+
src_install() {
emake DESTDIR="${D}" install || die
emake DESTDIR="${D}" install-libs || die