diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild copy from sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild copy to sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild --- a/sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild,v 1.4 2008/10/28 00:25:05 ranger Exp $ @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/ LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" IUSE="nls elibc_FreeBSD" RDEPEND="~sys-libs/${PN}-libs-${PV} @@ -19,13 +19,21 @@ 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}" epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766 epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch - epatch "${FILESDIR}" + epatch "${FILESDIR}"/${PN}-1.41.3-tst_csum.patch # blargh ... trick e2fsprogs into using e2fsprogs-libs rm -rf doc sed -i -r \ @@ -79,6 +87,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