old

6 files changed, 8 insertions, 682 deletions

diff --git a/sys-fs/dmg2img/Manifest b/sys-fs/dmg2img/Manifest
index e623a6916d17..cc49682467a6 100644
--- a/sys-fs/dmg2img/Manifest
+++ b/sys-fs/dmg2img/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST dmg2img-1.6.1.tar.gz 38025 RMD160 fe9afa6b92ac743166e704a6c49183247f3b3c58 SHA1 92d27819a79757b2d847b7c7b872431e02c37704 SHA256 55e65c1e47bf78f09fb061b2db4f41c515c0cbaa932e3ff3b40bd2d981946ad2
 DIST dmg2img-1.6.tar.gz 38003 RMD160 e3228a3adc535929df04b8a234f31a360dfe328f SHA1 af69b436993c14a22ede905fe3061d0f9676c7b9 SHA256 c9a8253772eeccc18f3e92f72c7969a034cf2a7856f6a709b601e5a8e5188c48
+EBUILD dmg2img-1.6.1.ebuild 848 RMD160 606b69f23e3d094cb558ae02d15c2ab7fbd84d3e SHA1 94c0fb5873a359f1eb3b94aa4d118a94de847c9a SHA256 fc28c860e0b860b462783126bf6e3d382fd65db9a5bdeed91829c884fa941bad
 EBUILD dmg2img-1.6.ebuild 849 RMD160 cb1937a23561713a6e8191814620bf20163323a4 SHA1 cf14da24f4600966ac58cf3c855a02e5bbac189d SHA256 ab4405f55a8f29a228325ee36b0246b37810b381ef6212cf6027c441ed801e3b
-MISC ChangeLog 735 RMD160 a12dc41079e94f51f592ae5c88ff6234f2d50384 SHA1 7cdbcb3fb032bbdb5c952c86eb8c7b6f674007e5 SHA256 3a2b1fded1219bfc052d941d94edd7ecfa772c7465819550321bc785fb205615
-MISC metadata.xml 444 RMD160 159e9958ec36c55d63014ef625c686beb37ed0f0 SHA1 994733e267b95b030965040c90df5376b9973a50 SHA256 3eb90c5684327bbbdaa5b7987a1b6053ba4030d13f579fa9d0cbb72d8214ee52
+MISC ChangeLog 894 RMD160 0f4f996ba449824e35ee0bb5ad0d67b359c5d134 SHA1 a1c3ac5759d52bb965ed954a528201dd0e0ecc7f SHA256 9851d119d0eebf0ff1f287ade5881385d5f2b8fb94e3cfd09fcd8dec575f618b
+MISC metadata.xml 443 RMD160 b0e0bc52d162421d09365fccbcd0d715bd6a528b SHA1 e94a7d2e1c1602e07023a47655f04782bb1650bd SHA256 99ab8e70976a97b066101a8a7b0ee1ea0a736d7c2e1a5de4bcf63dc592e56c17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkqlWswACgkQiqiDRvmkBmLydgCePlZhnzcOfs3o+vOTL6AWWZD5
-VUUAn3oAXzvCbc/vLjep8ZYvezvqp/MC
-=i2C0
+iEYEARECAAYFAkuTEKMACgkQcsIHjyDViGS0VQCffcyErVGIir0kllmwk3kOf04i
+itUAn3ArJnh/iB8JgFgQJddzyK7soSdY
+=0kbI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild
deleted file mode 100644
index 3d377f6252f0..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.3-r1.ebuild,v 1.10 2009/12/01 04:47:34 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Standard EXT2 and EXT3 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}
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/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.2-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${P}-tune2fs-opt.patch #253162
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \
-		Makefile.in || die "remove subdirs"
-	touch lib/ss/ss_err.h
-}
-
-src_compile() {
-	# Keep the package from doing silly things
-	addwrite /var/cache/fonts
-	export LDCONFIG=:
-	export CC=$(tc-getCC)
-	export STRIP=:
-
-	# 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
-
-	econf \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--enable-${libtype}-shlibs \
-		--with-ldopts="${LDFLAGS}" \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		$(use_enable userland_GNU fsck) \
-		|| die
-	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() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install-libs || die
-	dodoc README RELEASE-NOTES
-
-	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
-	# and install linker scripts to /usr/lib/.
-	dodir /$(get_libdir)
-	local lib slib
-	for lib in "${D}"/usr/$(get_libdir)/*.a ; do
-		slib=${lib##*/}
-		mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}"
-		gen_usr_ldscript ${slib%.a}$(get_libname)
-	done
-
-	# move 'useless' stuff to /usr/
-	dosbin "${D}"/sbin/mklost+found
-	rm -f "${D}"/sbin/mklost+found
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# these manpages are already provided by FreeBSD libc
-		# and filefrag is linux only
-		rm -f \
-			"${D}"/sbin/filefrag \
-			"${D}"/usr/share/man/man8/filefrag.8 \
-			"${D}"/bin/uuidgen \
-			"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
-			"${D}"/usr/share/man/man1/uuidgen.1 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.6-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.6-r1.ebuild
deleted file mode 100644
index b8cd0aabb780..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.6-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.6-r1.ebuild,v 1.2 2009/12/01 04:47:34 vapier 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}
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/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.5-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS|UUID)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss|uuid)::g' \
-		Makefile.in || die "remove subdirs"
-	# stupid configure script clobbers CC for us
-	sed -i \
-		-e '/if test -z "$CC" ; then CC=cc; fi/d' \
-		configure || die "touching configure"
-
-	# we want to build the blkid/findfs binaries, but not the libs
-	sed -i \
-		-e '/BLKID_CMT=/s:BLKID_CMT:LIBBLKID_CMT:g' \
-		configure || die "touching configure for blkid"
-	sed -i \
-		-e '/BLKID_LIB_SUBDIR/s:@BLKID_CMT@:@LIBBLKID_CMT@:g' \
-		Makefile.in || die "remove blkid subdir better"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_compile() {
-	# Keep the package from doing silly things
-	addwrite /var/cache/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 \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--enable-${libtype}-shlibs \
-		--with-ldopts="${LDFLAGS}" \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		$(use_enable userland_GNU fsck) \
-		--disable-libblkid \
-		|| die
-	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() {
-	emake STRIP=: DESTDIR="${D}" install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
-	# and install linker scripts to /usr/lib/.
-	set -- "${D}"/usr/$(get_libdir)/*.a
-	set -- ${@/*\/lib}
-	gen_usr_ldscript -a "${@/.a}"
-
-	# move 'useless' stuff to /usr/
-	dosbin "${D}"/sbin/mklost+found
-	rm -f "${D}"/sbin/mklost+found
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# these manpages are already provided by FreeBSD libc
-		# and filefrag is linux only
-		rm -f \
-			"${D}"/sbin/filefrag \
-			"${D}"/usr/share/man/man8/filefrag.8 \
-			"${D}"/bin/uuidgen \
-			"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
-			"${D}"/usr/share/man/man1/uuidgen.1 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.6.ebuild
deleted file mode 100644
index 210ccd398059..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.6.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.6.ebuild,v 1.4 2009/12/01 04:47:34 vapier 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}
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/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.5-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS|UUID)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss|uuid)::g' \
-		Makefile.in || die "remove subdirs"
-	# stupid configure script clobbers CC for us
-	sed -i '/if test -z "$CC" ; then CC=cc; fi/d' configure
-	touch lib/ss/ss_err.h
-}
-
-src_compile() {
-	# Keep the package from doing silly things
-	addwrite /var/cache/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 \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--enable-${libtype}-shlibs \
-		--with-ldopts="${LDFLAGS}" \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		$(use_enable userland_GNU fsck) \
-		--disable-libblkid \
-		|| die
-	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() {
-	emake STRIP=: DESTDIR="${D}" install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
-	# and install linker scripts to /usr/lib/.
-	set -- "${D}"/usr/$(get_libdir)/*.a
-	set -- ${@/*\/lib}
-	gen_usr_ldscript -a "${@/.a}"
-
-	# move 'useless' stuff to /usr/
-	dosbin "${D}"/sbin/mklost+found
-	rm -f "${D}"/sbin/mklost+found
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# these manpages are already provided by FreeBSD libc
-		# and filefrag is linux only
-		rm -f \
-			"${D}"/sbin/filefrag \
-			"${D}"/usr/share/man/man8/filefrag.8 \
-			"${D}"/bin/uuidgen \
-			"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
-			"${D}"/usr/share/man/man1/uuidgen.1 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.7.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.7.ebuild
deleted file mode 100644
index 43fbe5e1d1d2..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.7.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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.7.ebuild,v 1.2 2009/12/01 04:47:34 vapier 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}
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/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.5-makefile.patch
-	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS|UUID)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss|uuid)::g' \
-		Makefile.in || die "remove subdirs"
-	# stupid configure script clobbers CC for us
-	sed -i \
-		-e '/if test -z "$CC" ; then CC=cc; fi/d' \
-		configure || die "touching configure"
-
-	# we want to build the blkid/findfs binaries, but not the libs
-	sed -i \
-		-e '/BLKID_CMT=/s:BLKID_CMT:LIBBLKID_CMT:g' \
-		configure || die "touching configure for blkid"
-	sed -i \
-		-e '/BLKID_LIB_SUBDIR/s:@BLKID_CMT@:@LIBBLKID_CMT@:g' \
-		Makefile.in || die "remove blkid subdir better"
-
-	# Avoid rebuild
-	touch lib/ss/ss_err.h
-}
-
-src_compile() {
-	# Keep the package from doing silly things
-	addwrite /var/cache/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 \
-		--with-ldopts="${LDFLAGS}" \
-		$(tc-has-tls || echo --disable-tls) \
-		--without-included-gettext \
-		$(use_enable nls) \
-		$(use_enable userland_GNU fsck) \
-		--disable-libblkid \
-		--disable-libuuid \
-		|| die
-	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() {
-	emake STRIP=: DESTDIR="${D}" install install-libs || die
-	dodoc README RELEASE-NOTES
-
-	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
-	# and install linker scripts to /usr/lib/.
-	set -- "${D}"/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
-
-		# these manpages are already provided by FreeBSD libc
-		# and filefrag is linux only
-		rm -f \
-			"${D}"/usr/sbin/filefrag \
-			"${D}"/usr/share/man/man8/filefrag.8 \
-			"${D}"/usr/bin/uuidgen \
-			"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
-			"${D}"/usr/share/man/man1/uuidgen.1 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild
deleted file mode 100644
index 69d618d5b424..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.8.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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.8.ebuild,v 1.6 2009/12/01 04:47:34 vapier 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 )
-	dev-util/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"
-	# stupid configure script clobbers CC for us
-	sed -i \
-		-e '/if test -z "$CC" ; then CC=cc; fi/d' \
-		configure || die "touching configure"
-
-	# 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 \
-		--with-ldopts="${LDFLAGS}" \
-		$(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
-
-	# 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
-}