Add WIP from upstream #379573 by Sebastian Pipping.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 167 insertions, 6 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 80ad83355c89..1a9760b63bac 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.233 2011/08/29 06:13:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.234 2011/09/01 19:32:05 vapier Exp $
+
+*e2fsprogs-1.42_pre0702 (01 Sep 2011)
+
+  01 Sep 2011; Mike Frysinger <vapier@gentoo.org>
+  +e2fsprogs-1.42_pre0702.ebuild:
+  Add WIP from upstream #379573 by Sebastian Pipping.
 
   29 Aug 2011; Jeroen Roovers <jer@gentoo.org> e2fsprogs-1.41.14.ebuild:
   Stable for HPPA (bug #378039).
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ddc3a42ed29b..96d5e5806010 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch 1251 RMD160 37ccdd9081c35d0e527850a280d8aadb989a3bd0 SHA1 79944cb3a4b33529e43b7fd142f6d85d4eb9a073 SHA256 01dc8bf59f6d5f435abd4b26dda92897abc338f452a80de33600594d25586013
 AUX e2fsck.conf 138 RMD160 9e818294ac6d2facbde100768371143ec33e4e6d SHA1 bdbc4e2c823367ea203f869f496b310867ecba18 SHA256 c2864aa7c5c5bf27227909bdb9af395fc07294d1f93d372ef10c79309d7aec08
@@ -17,16 +17,18 @@ AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c002
 DIST e2fsprogs-1.41.12.tar.gz 4496194 RMD160 aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7 SHA1 62b002fe507b2ddafc24b89532e472fe4b55a14f SHA256 9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20
 DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098e27e8 SHA1 24f9364fa3d4c0d7d00cb627b819d0e51055d6c5 SHA256 3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176
 DIST e2fsprogs-1.41.7.tar.gz 4425159 RMD160 ad001d9d2b7c2e19b2f410b92446330fb5fbdf11 SHA1 0d5acf71bb81256e470d7f5ffa714f10e674172f SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c
+DIST e2fsprogs-1.42-WIP-0702.tar.gz 5544716 RMD160 a07f7031ce13bc72c44d5f2f2df74954c7cc8664 SHA1 66f0ca4a959b2a54e0e3a528aabdd176e6b906ef SHA256 dbd229ede377a6a299317a461c951575ca4a5acf2a534cffeb4ce407ff56e6a0
 EBUILD e2fsprogs-1.41.12-r1.ebuild 4303 RMD160 a1daa7568c42aa832e6feb4dc6193c25d75596da SHA1 81344ff29dd3541b0514e53034500da85480f59e SHA256 8bf1da67f59d7ef8adecaf73c31c7f7c6e41716e97b3b5f79ba023cd52eb70b3
 EBUILD e2fsprogs-1.41.12.ebuild 3900 RMD160 a275d276a051a0498055b2ee6c4833e7dfa3f79c SHA1 f0bff43ac6e5e1369ab0dbb14fcb798ffa68a7b8 SHA256 2c6fca4ab9cd9d2d8341a470c58d470af0ee82367ddc649b50d9ff4c2a6f94dd
 EBUILD e2fsprogs-1.41.14.ebuild 4301 RMD160 92a6f8985e43549818195936700fbf04cda34fdf SHA1 f6f2255c29ab56f1b256c0ad10e8af0b4c51cc0b SHA256 1bbaf2d765dc713b9f5d39f10bd595ba038b38b141e38314cdc65ca7a28e126f
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4158 RMD160 13600b8acea0bc70338d6df1eb065a353ec254bc SHA1 bf42c33a7e7a55b2628d69269d140c29cfb66f02 SHA256 24defb5da08763aaf7d239c2b404a75f2182eefcbbc9193d817f77d3e63068d5
-MISC ChangeLog 34530 RMD160 7bf13541183540779ee19d72de285542788de6fe SHA1 ef78966b14164e06b04ad74fde564513de09bfe5 SHA256 8c6ef90d0ad92984cd45159c1f706c4478aef6ec58369847f8a4fcac304b9c9c
+EBUILD e2fsprogs-1.42_pre0702.ebuild 4438 RMD160 8b11d80f2652db12dc2441f7e1ec0c7516dfb3eb SHA1 c268c2516bbe4d4ec7a2a4ab64b0d06247f8a6ac SHA256 40d943151d1cda7fb89d78a469793eea20834e98057108229994253003a1bf03
+MISC ChangeLog 34711 RMD160 9a7806e79c37fb3744487972e6e141ac169582f6 SHA1 3ae4052358946f22c6be2a6d727a8820b96eb360 SHA256 ee65ccae17fa631b914ce0b94f7c41d980d9cddb821bcd66b36c790107ac656a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5bLiIACgkQVWmRsqeSphNHyACfY6OengOGymbekM/mcZ2FghlJ
-zrUAniE/8glQtlXCv4bjSHXvnBxKNf5c
-=f8ch
+iF4EAREIAAYFAk5f3bcACgkQaC/OocHi7JYtWAD+LPm3h6ofxEISj+iR2BoirpGS
+gj+YKuSi+dpvNvrwYBIA/1D8mZlsgVdxxmNUQ3G2Um1JS+2CZvCbajs1GwAyC8c2
+=v1cB
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild
new file mode 100644
index 000000000000..900d84f4868a
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42_pre0702.ebuild,v 1.1 2011/09/01 19:32:05 vapier Exp $
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+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/${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 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"
+
+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
+	# 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
+}