bumped sys-fs/e2fsprogs to latest ~ (1.41.6-r1)

3 files changed, 165 insertions, 0 deletions

diff --git a/metadata/cache/sys-fs/e2fsprogs-1.41.6-r1 b/metadata/cache/sys-fs/e2fsprogs-1.41.6-r1
new file mode 100644
index 000000000..271364d88
--- /dev/null
+++ b/metadata/cache/sys-fs/e2fsprogs-1.41.6-r1
@@ -0,0 +1,22 @@
+~sys-libs/e2fsprogs-libs-1.41.6[lib32?] nls? ( virtual/libintl ) nls? ( sys-devel/gettext[lib32?] ) sys-apps/texinfo sys-apps/abi-wrapper
+~sys-libs/e2fsprogs-libs-1.41.6[lib32?] nls? ( virtual/libintl ) sys-apps/abi-wrapper
+0
+mirror://sourceforge/e2fsprogs/e2fsprogs-1.41.6.tar.gz
+
+http://e2fsprogs.sourceforge.net/
+GPL-2 BSD
+Standard EXT2 and EXT3 filesystem utilities
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+base eutils flag-o-matic multilib multilib-native portability toolchain-funcs
+nls elibc_FreeBSD lib32
+
+
+
+2
+
+compile configure install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 3f902252f..17d5932dc 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -15,6 +15,7 @@ DIST e2fsprogs-1.41.6.tar.gz 4422395 RMD160 f2c330b3b9e1dec834411a45ee01e3d427bf
 EBUILD e2fsprogs-1.41.3-r1.ebuild 4043 RMD160 21e208318030b2c3363d3e55c35721e998930250 SHA1 483f5eff07f1bdbe8a276f9cee044776cfac1e98 SHA256 31d1f7a4062d6cfc94db1635b3199676ff3a54b7b8a6b252a7d8f00c54b11c97
 EBUILD e2fsprogs-1.41.4.ebuild 3944 RMD160 ddbfa18a649a57700e70bff556b161f3032509b7 SHA1 ff6c6ce93725812c151d18f75908af0d2c872cae SHA256 61b6479ed47f1662c6cdb6219516ddaa681caf6f99d981ce3e06f59eb5c2cc7a
 EBUILD e2fsprogs-1.41.5.ebuild 3852 RMD160 22f0a8d7e3eae15fe537675568ad92b60b6fa68a SHA1 e174c71553e7faf25113f7495fb1424ff1cf548f SHA256 ead9c9bce324bc26f69da778eb9d6cda87883f9ce1af5a5e9e1776f619a5847b
+EBUILD e2fsprogs-1.41.6-r1.ebuild 4245 RMD160 b0dee97fd1bfc9df27f823a7abf7b6a66563c5d8 SHA1 8c8068502021b8c9b2a342cd051aa1653ff6ca48 SHA256 c2067a59bf91c9a8b4e3d59fc23b58617433cc173540ac7dfe7055fe7eb698cc
 EBUILD e2fsprogs-1.41.6.ebuild 3893 RMD160 df4d55899e4a68538e8a77b5d681e45b21083223 SHA1 3878523d0012382cf398ffeeb39699c81498d7c9 SHA256 32001a1530c341cf8e25b4416b44a8720439be9dbac7ad496a3336dc0d6540fd
 MISC ChangeLog 27756 RMD160 e9fc1c5c650b03a7413f917f4a74a6b12775cca2 SHA1 3eda3420c7305670bf599d9c45e950c7537f107b SHA256 5dd5fde01458444ccf960dbfb0f1563d7d398dd52c92de5debb78deb83821ffb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.6-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.6-r1.ebuild
new file mode 100644
index 000000000..bf56bf4b9
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.6-r1.ebuild
@@ -0,0 +1,142 @@
+# 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.1 2009/06/28 17:55:59 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-native
+
+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}[lib32?]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext[lib32?] )
+	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
+}
+
+multilib-native_src_prepare_internal() {
+	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
+}
+
+multilib-native_src_configure_internal() {
+	# 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}" \
+		$(use_enable !elibc_uclibc tls) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		$(use_enable userland_GNU fsck) \
+		--disable-libblkid \
+		|| die
+}
+
+multilib-native_src_compile_internal() {
+	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
+}
+
+multilib-native_src_install_internal() {
+	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
+}