Removed old versions and files

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

19 files changed, 17 insertions, 1699 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 91383cb162e2..811fe3b49a42 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-fs/e2fsprogs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.271 2013/12/31 19:09:50 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.272 2014/01/04 18:23:38 polynomial-c Exp $
+
+  04 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -e2fsprogs-1.41.12.ebuild, -e2fsprogs-1.41.12-r1.ebuild,
+  -e2fsprogs-1.41.14.ebuild, -e2fsprogs-1.42.ebuild, -e2fsprogs-1.42.1.ebuild,
+  -e2fsprogs-1.42.3.ebuild, -e2fsprogs-1.42.4.ebuild, -e2fsprogs-1.42.5.ebuild,
+  -e2fsprogs-1.42.6.ebuild, -files/e2fsprogs-1.41.7-mint-blkid.patch,
+  -files/e2fsprogs-1.41.12-getpagesize.patch,
+  -files/e2fsprogs-1.42.1-libext2fs-config.patch,
+  -files/e2fsprogs-1.42.1-libext2fs-gettimeofday.patch,
+  -files/e2fsprogs-1.42.3-quota-time.patch,
+  -files/e2fsprogs-1.42.3-quotactl.patch,
+  -files/e2fsprogs-1.42.5-ldflags.patch,
+  -files/e2fsprogs-1.42-no-fallocate.patch,
+  -files/e2fsprogs-1.42-no-quota.patch:
+  Removed old versions and files.
 
 *e2fsprogs-1.42.9 (31 Dec 2013)
 
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild
deleted file mode 100644
index e5c86591ec97..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12-r1.ebuild,v 1.6 2012/05/04 19:09:17 jdhore Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	# use symlinks rather than hardlinks
-	sed -i \
-		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
-		{e2fsck,misc}/Makefile.in || die
-	epatch "${FILESDIR}"/${P}-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	sed -i \
-		-e '/^#define _XOPEN/i#define _GNU_SOURCE' \
-		misc/mke2fs.c || die # needs open64() prototype
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	set -- "${ED}"/usr/$(get_libdir)/*.a
-	set -- ${@/*\/lib}
-	gen_usr_ldscript -a "${@/.a}"
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild
deleted file mode 100644
index ed6435dd5491..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.12.ebuild,v 1.10 2012/05/04 19:09:17 jdhore Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-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}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	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.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	# use symlinks rather than hardlinks
-	sed -i \
-		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
-		{e2fsck,misc}/Makefile.in || die
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	sed -i \
-		-e '/^#define _XOPEN/i#define _GNU_SOURCE' \
-		misc/mke2fs.c || die # needs open64() prototype
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_compile() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=bsd;;
-		*)         libtype=elf;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix=/ \
-		--enable-${libtype}-shlibs \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	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() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# make sure symlinks are relative, not absolute, for cross-compiling
-	cd "${D}"/usr/$(get_libdir)
-	local x l
-	for x in lib* ; do
-		l=$(readlink "${x}")
-		[[ ${l} == /* ]] || continue
-		rm -f "${x}"
-		ln -s "../..${l}" "${x}"
-	done
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# filefrag is linux only
-		rm \
-			"${D}"/usr/sbin/filefrag \
-			"${D}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild
deleted file mode 100644
index 21681cf3f588..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.14.ebuild,v 1.8 2012/05/04 19:09:17 jdhore Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	# use symlinks rather than hardlinks
-	sed -i \
-		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
-		{e2fsck,misc}/Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	sed -i \
-		-e '/^#define _XOPEN/i#define _GNU_SOURCE' \
-		misc/mke2fs.c || die # needs open64() prototype
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	set -- "${ED}"/usr/$(get_libdir)/*.a
-	set -- ${@/*\/lib}
-	gen_usr_ldscript -a "${@/.a}"
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
deleted file mode 100644
index b2457563597d..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.1.ebuild,v 1.5 2012/05/04 19:09:17 jdhore Exp $
-
-EAPI=3
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.42-no-quota.patch
-	epatch "${FILESDIR}"/${PN}-1.42-no-fallocate.patch #406609
-	epatch "${FILESDIR}"/${PN}-1.42.1-libext2fs-gettimeofday.patch
-	epatch "${FILESDIR}"/${PN}-1.42.1-libext2fs-config.patch
-	# use symlinks rather than hardlinks
-	sed -i \
-		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
-		{e2fsck,misc}/Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	QUOTA_CMT='#' \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.3.ebuild
deleted file mode 100644
index b37c5ce60ab6..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.3.ebuild,v 1.1 2012/05/22 19:45:49 vapier Exp $
-
-EAPI=3
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.42.3-quotactl.patch
-	epatch "${FILESDIR}"/${PN}-1.42.3-quota-time.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		--enable-symlink-install \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild
deleted file mode 100644
index 790920538a7d..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild,v 1.1 2012/06/14 00:58:29 vapier Exp $
-
-EAPI=3
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		--enable-symlink-install \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild
deleted file mode 100644
index 6820b834d9cc..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.5.ebuild,v 1.2 2012/08/04 19:39:32 vapier Exp $
-
-EAPI=3
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.42.5-ldflags.patch #429756
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		--enable-symlink-install \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild
deleted file mode 100644
index 7fb1025fb50d..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.6.ebuild,v 1.2 2013/02/22 15:43:21 zmedico Exp $
-
-EAPI=3
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		--enable-symlink-install \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
deleted file mode 100644
index dd683e1bb76c..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.ebuild,v 1.12 2012/05/04 19:09:17 jdhore Exp $
-
-EAPI=3
-
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
-IUSE="nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-S=${WORKDIR}/${P%_pre*}
-
-pkg_setup() {
-	if [[ ! -e ${EROOT}/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" > "${EROOT}"/etc/mtab
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
-	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-getpagesize.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.42-no-quota.patch
-	epatch "${FILESDIR}"/${PN}-1.42-no-fallocate.patch #406609
-	# use symlinks rather than hardlinks
-	sed -i \
-		-e 's:$(LN) -f $(DESTDIR).*/:$(LN_S) -f :' \
-		{e2fsck,misc}/Makefile.in || die
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
-	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
-	fi
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS=${T}/fonts
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
-	ac_cv_path_LDCONFIG=: \
-	QUOTA_CMT='#' \
-	econf \
-		--with-root-prefix="${EPREFIX}/" \
-		${libtype} \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		--disable-libblkid \
-		--disable-libuuid \
-		--disable-quota \
-		--disable-fsck \
-		--disable-uuidd
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake fsck_ext2fs || die
-	fi
-}
-
-pkg_preinst() {
-	if [[ -r ${EROOT}/etc/mtab ]] ; then
-		if [[ $(<"${EROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
-			rm -f "${EROOT}"/etc/mtab
-		fi
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch
deleted file mode 100644
index 5b042d3690e7..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.12-getpagesize.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 81c81f5421cb9b85e793c591595a0a4d6ee04e99 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 4 Dec 2010 17:10:53 -0500
-Subject: [PATCH] libext2fs: change getpagesize to sysconf
-
-Newer versions of glibc no longer export the getpagesize() prototype when
-using recent versions of POSIX (_XOPEN_SOURCE).  So building tdb.c gives
-use implicit function declaration warnings.  Fix the issue by using the
-portable sysconf() function which returns the same answer.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/ext2fs/tdb.c |    6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
-index 0c82a24..43c5d44 100644
---- a/lib/ext2fs/tdb.c
-+++ b/lib/ext2fs/tdb.c
-@@ -111,10 +111,6 @@ typedef int bool;
- #define u32 unsigned
- #endif
- 
--#ifndef HAVE_GETPAGESIZE
--#define getpagesize() 0x2000
--#endif
--
- typedef u32 tdb_len_t;
- typedef u32 tdb_off_t;
- 
-@@ -3838,7 +3834,7 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
- 	tdb->hash_fn = hash_fn ? hash_fn : default_tdb_hash;
- 
- 	/* cache the page size */
--	tdb->page_size = getpagesize();
-+	tdb->page_size = sysconf(_SC_PAGESIZE);
- 	if (tdb->page_size <= 0) {
- 		tdb->page_size = 0x2000;
- 	}
--- 
-1.7.3.1
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.7-mint-blkid.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.7-mint-blkid.patch
deleted file mode 100644
index 2464ba0ee577..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.7-mint-blkid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-http://bugs.gentoo.org/276055
-
-<alanh@fairlite.co.uk>:
-The configure test program links against libblkid to test. This works
-fine on shared library systems as libblkid automatically depends on
-libuuid. But on static systems it needs explicit linking.
-
-
---- configure.in
-+++ configure.in
-@@ -398,8 +398,8 @@
- 	fi
- 
- 	AC_CHECK_LIB(blkid, blkid_get_cache,
--		[LIBBLKID=`$PKG_CONFIG --libs blkid`;
--		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
-+		[LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
-+		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`],
- 		[AC_MSG_ERROR([external blkid library not found])],
- 		[$LIBBLKID])
- 	BLKID_CMT=#
---- configure
-+++ configure
-@@ -4565,7 +4565,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lblkid $LIBBLKID $LIBS"
-+LIBS="-lblkid -luuid $LIBBLKID $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -4625,8 +4625,8 @@
- { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_get_cache" >&5
- $as_echo "$ac_cv_lib_blkid_blkid_get_cache" >&6; }
- if test "x$ac_cv_lib_blkid_blkid_get_cache" = x""yes; then
--  LIBBLKID=`$PKG_CONFIG --libs blkid`;
--		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`
-+  LIBBLKID=`$PKG_CONFIG --libs blkid --libs uuid`;
-+		 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid --libs uuid`
- else
-   { { $as_echo "$as_me:$LINENO: error: external blkid library not found" >&5
- $as_echo "$as_me: error: external blkid library not found" >&2;}
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch
deleted file mode 100644
index 17594e47e87e..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-fallocate.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/406609
-
-From 1a36d2ead2f45a21f74ccc332a534c1b788d6029 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 5 Mar 2012 00:35:21 -0500
-Subject: [PATCH] libext2fs: check for fallocate symbol before using it
-
-If we have newer kernel headers which define FALLOC_FL_PUNCH_HOLE, but we
-are on an older glibc which lacks fallocate, we end up trying to use the
-func anyways.  Check the ifdef that autoconf already set up for us.
-
-Reported-by: Ortwin Glueck <odi@odi.ch>
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/ext2fs/unix_io.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
-index 9f0613a..da3f8fd 100644
---- a/lib/ext2fs/unix_io.c
-+++ b/lib/ext2fs/unix_io.c
-@@ -905,7 +905,7 @@ static errcode_t unix_discard(io_channel channel, unsigned long long block,
- 		goto unimplemented;
- #endif
- 	} else {
--#ifdef FALLOC_FL_PUNCH_HOLE
-+#if defined(HAVE_FALLOCATE) && defined(FALLOC_FL_PUNCH_HOLE)
- 		/*
- 		 * If we are not on block device, try to use punch hole
- 		 * to reclaim free space.
--- 
-1.7.8.4
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch
deleted file mode 100644
index 775b820dac21..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42-no-quota.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-quota was meant to be turned off in the 1.42 release as it's half
-baked, but the commit to disable didn't really work either.
-
---- a/lib/quota/Makefile.in
-+++ b/lib/quota/Makefile.in
-@@ -76,7 +76,8 @@
- 		$(DESTDIR)$(includedir)/quota $(DESTDIR)$(man3dir) \
- 		$(DESTDIR)$(libdir)/pkgconfig
- 
--install:: all installdirs
-+install::
-+disabled:: all installdirs
- 	$(E) "	INSTALL_DATA $(libdir)/libquota.a"
- 	$(Q) $(INSTALL_DATA) libquota.a $(DESTDIR)$(libdir)/libquota.a
- 	-$(Q) $(RANLIB) $(DESTDIR)$(libdir)/libquota.a
---- a/configure
-+++ b/configure
-@@ -5224,11 +5224,11 @@
- 
- fi
- 
--LIBQUOTA='$(LIB)/libquota'$LIB_EXT
-+LIBQUOTA=
- DEPLIBQUOTA=$LIBQUOTA
--STATIC_LIBQUOTA='$(LIB)/libquota'$STATIC_LIB_EXT
-+STATIC_LIBQUOTA=
- DEPSTATIC_LIBQUOTA=$STATIC_LIBQUOTA
--PROFILED_LIBQUOTA='$(LIB)/libquota'$PROFILED_LIB_EXT
-+PROFILED_LIBQUOTA=
- DEPPROFILED_LIBQUOTA=$PROFILED_LIBQUOTA
- 
- 
---- a/lib/quota/mkquota.h
-+++ b/lib/quota/mkquota.h
-@@ -60,4 +60,17 @@
- int quota_file_exists(ext2_filsys fs, int qtype, int fmt);
- void quota_set_sb_inum(ext2_filsys fs, ext2_ino_t ino, int qtype);
- 
-+#define quota_init_context(a, ...)
-+#define quota_data_inodes(a, ...)
-+#define quota_data_add(a, ...)
-+#define quota_data_sub(a, ...)
-+#define quota_write_inode(a, ...)
-+#define quota_update_inode(a, ...) 0
-+#define quota_compute_usage(a, ...)
-+#define quota_release_context(a, ...)
-+#define quota_remove_inode(a, ...)
-+#define quota_is_on(a, ...)
-+#define quota_file_exists(a, ...) -1
-+#define quota_set_sb_inum(a, ...)
-+
- #endif  /* __QUOTA_QUOTAIO_H__ */
---- a/lib/quota/quotaio.h
-+++ b/lib/quota/quotaio.h
-@@ -167,4 +167,7 @@
- const char *quota_get_qf_path(const char *mntpt, int qtype, int fmt,
- 			      char *path_buf, size_t path_buf_size);
- 
-+#define quota_get_qf_name(a, ...)
-+#define quota_get_qf_path(a, ...)
-+
- #endif /* GUARD_QUOTAIO_H */
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.1-libext2fs-config.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.1-libext2fs-config.patch
deleted file mode 100644
index 2afc83263270..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.1-libext2fs-config.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c699110b4b08e7fdee24d2b895403f15dad1502c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 24 Feb 2012 12:08:43 -0500
-Subject: [PATCH] libext2fs: include config.h for HAVE_xxx defines
-
-We check HAVE_UNISTD_H but haven't included config.h yet, so we end up
-hitting warnings about missing prototypes for close/read/etc... funcs.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/ext2fs/mmp.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/lib/ext2fs/mmp.c b/lib/ext2fs/mmp.c
-index b27d9a4..49a11da 100644
---- a/lib/ext2fs/mmp.c
-+++ b/lib/ext2fs/mmp.c
-@@ -13,6 +13,8 @@
- #define _GNU_SOURCE
- #endif
- 
-+#include "config.h"
-+
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
--- 
-1.7.8.4
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.1-libext2fs-gettimeofday.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.1-libext2fs-gettimeofday.patch
deleted file mode 100644
index 4eeb0b578858..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.1-libext2fs-gettimeofday.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 19a60067bedc4083af035fc2ef531d7114c5eed4 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 24 Feb 2012 12:07:21 -0500
-Subject: [PATCH] libext2fs: include sys/time.h for gettimeofday()
-
-Building on my glibc-2.15 system hits a warning:
-	gen_bitmap64.c: In function 'ext2fs_alloc_generic_bmap':
-	gen_bitmap64.c:127:2: warning: implicit declaration of function
-		'gettimeofday' [-Wimplicit-function-declaration]
-
-Include sys/time.h if it's available for the prototype.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/ext2fs/gen_bitmap64.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/lib/ext2fs/gen_bitmap64.c b/lib/ext2fs/gen_bitmap64.c
-index bf1a76b..fa8d7b7 100644
---- a/lib/ext2fs/gen_bitmap64.c
-+++ b/lib/ext2fs/gen_bitmap64.c
-@@ -25,6 +25,9 @@
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
- 
- #include "ext2_fs.h"
- #include "ext2fsP.h"
--- 
-1.7.8.4
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch
deleted file mode 100644
index 1797105dc0f5..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 90202c13466fcde28fd56d349a3380d68dbda5f2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 22 May 2012 15:05:18 -0400
-Subject: [PATCH] libquota: add missing time.h include
-
-This code uses time() but doesn't include time.h leading to:
-quotaio.c:89:2: warning: implicit declaration of function 'time'
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/quota/quotaio.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/lib/quota/quotaio.c b/lib/quota/quotaio.c
-index 481d5f5..6e917f0 100644
---- a/lib/quota/quotaio.c
-+++ b/lib/quota/quotaio.c
-@@ -11,6 +11,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/file.h>
--- 
-1.7.8.6
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch
deleted file mode 100644
index 52fb6d2cd0f5..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f06c5004f410d0a0a9ed706dad194aabf1be0077 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 22 May 2012 15:02:42 -0400
-Subject: [PATCH] libquota: add a quotactl prototype
-
-The commit 0df8a27bbaf51b55c0e8c3a533ef4c2ff9d79c9f removed the system
-quota.h include, but in doing so, added the problem:
-mkquota.c:55:2: warning: implicit declaration of function 'quotactl'
-
-Since we're maintaining a copy of quota.h, add a proper func prototype.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/quota/quota.h |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/lib/quota/quota.h b/lib/quota/quota.h
-index a943ec6..3eaec1d 100644
---- a/lib/quota/quota.h
-+++ b/lib/quota/quota.h
-@@ -152,4 +152,9 @@ enum {
- };
- #define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)
- 
-+#ifdef HAVE_QUOTACTL
-+extern int quotactl(int __cmd, const char *__special, int __id,
-+		    caddr_t __addr);
-+#endif
-+
- #endif /* _QUOTA_ */
--- 
-1.7.8.6
-
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch
deleted file mode 100644
index d84d54a2e88b..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.5-ldflags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/429756
-https://sourceforge.net/tracker/?func=detail&aid=3542572&group_id=2406&atid=102406
-
-From 949c2c19e969185c69f0960549a559ed22afdd24 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 4 Aug 2012 15:12:29 -0400
-Subject: [PATCH] Revert "Link shared libraries with local libraries instead
- of system ones"
-
-This reverts commit a7c17431b9fbf767235d614cfe2e4f22ee0d6771.
----
- lib/Makefile.elf-lib     |    4 ++--
- lib/Makefile.solaris-lib |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
-index c66281c..c24636c 100644
---- a/lib/Makefile.elf-lib
-+++ b/lib/Makefile.elf-lib
-@@ -24,8 +24,8 @@ image:		$(ELF_LIB)
- 
- $(ELF_LIB): $(OBJS)
- 	$(E) "	GEN_ELF_SOLIB $(ELF_LIB)"
--	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \
--		$(LDFLAGS) -Wl,-soname,$(ELF_SONAME) $(OBJS))
-+	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
-+		-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
- 	$(Q) $(MV) elfshared/$(ELF_LIB) .
- 	$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
- 	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
-diff --git a/lib/Makefile.solaris-lib b/lib/Makefile.solaris-lib
-index 66f2b4c..92bdbe2 100644
---- a/lib/Makefile.solaris-lib
-+++ b/lib/Makefile.solaris-lib
-@@ -24,8 +24,8 @@ image:		$(ELF_LIB)
- 
- $(ELF_LIB): $(OBJS)
- 	$(E) "	GEN_ELF_SOLIB $(ELF_LIB)"
--	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \
--		$(LDFLAGS) -Wl,-h,$(ELF_SONAME) $(OBJS))
-+	$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
-+		-Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
- 	$(Q) $(MV) elfshared/$(ELF_LIB) .
- 	$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
- 	$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
--- 
-1.7.9.7
-