Add support for ext4 #156697.

Package-Manager: portage-2.1.2_rc4-r2

4 files changed, 158 insertions, 9 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 458580c18283..90e1ed6cbde7 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.92 2006/12/10 00:39:19 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.93 2006/12/30 00:40:04 vapier Exp $
+
+*e2fsprogs-1.39-r1 (30 Dec 2006)
+
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.39-r1.ebuild:
+  Add support for ext4 #156697.
 
   10 Dec 2006; Timothy Redaelli <drizzt@gentoo.org> e2fsprogs-1.39.ebuild:
   Add ~x86-fbsd keyword
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 7551d2a5f6d3..bec90bc9f933 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -30,14 +30,19 @@ MD5 29853daadd9ea0d27abcc57e46d48e25 files/e2fsprogs-1.39-parse-types.patch 1117
 RMD160 5858224739c494ae2e31507b217594cd1bf0440f files/e2fsprogs-1.39-parse-types.patch 1117
 SHA256 f5741d617739d3e04e516bb0c22f385bdc01f598d181c50247f30cb4442d4fdd files/e2fsprogs-1.39-parse-types.patch 1117
 DIST e2fsprogs-1.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
+DIST ext4-e2fsprogs-1.39.patch.tar 716800 RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 SHA1 fce15f60164a6c067c0d5a50cf00d4716e9a4f92 SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e
+EBUILD e2fsprogs-1.39-r1.ebuild 4308 RMD160 e17ba4c4f2876c77cb9b07dd69f48ac759eedb27 SHA1 114772bbed65e56f10e1313b5861c67286670708 SHA256 4aac8f8dc06fc676dc8e3a50c8a209c5a69705adca612be73bba91096c60c88f
+MD5 048f749d57d360d09ff6a01922a8a358 e2fsprogs-1.39-r1.ebuild 4308
+RMD160 e17ba4c4f2876c77cb9b07dd69f48ac759eedb27 e2fsprogs-1.39-r1.ebuild 4308
+SHA256 4aac8f8dc06fc676dc8e3a50c8a209c5a69705adca612be73bba91096c60c88f e2fsprogs-1.39-r1.ebuild 4308
 EBUILD e2fsprogs-1.39.ebuild 4141 RMD160 5f90fae381443c034a41780c60022ed222b24dad SHA1 32a2e489712a128c26d56cf996d3d3fcaaa03f4d SHA256 1e74cf68c3505cb180fe4f84c04108132612df0d12827a2de3664d1615c95102
 MD5 ade8d4226efba62853b80a0f638f7d23 e2fsprogs-1.39.ebuild 4141
 RMD160 5f90fae381443c034a41780c60022ed222b24dad e2fsprogs-1.39.ebuild 4141
 SHA256 1e74cf68c3505cb180fe4f84c04108132612df0d12827a2de3664d1615c95102 e2fsprogs-1.39.ebuild 4141
-MISC ChangeLog 15275 RMD160 7fa42c223dc9b89a94261904e97819b833bd09fb SHA1 c74f71e53eabda32df1f0537a626a4419ef23ac8 SHA256 4141f44b036af35b5941bdcfd7eca7b483aaad9490f46bce9f078916585536e6
-MD5 44bc5319b37101433b56dfdbaafcbaac ChangeLog 15275
-RMD160 7fa42c223dc9b89a94261904e97819b833bd09fb ChangeLog 15275
-SHA256 4141f44b036af35b5941bdcfd7eca7b483aaad9490f46bce9f078916585536e6 ChangeLog 15275
+MISC ChangeLog 15419 RMD160 349bad608661333171980c4646e6fe6a7c913f9e SHA1 0d1d869de06b5f6a04a8d01d49ef2498e5706c44 SHA256 dba08ef71e21d944667fff908db85df74afb12adb965a820715f744c74530de7
+MD5 3cb6a3fbfb308d1934818e0c0346d72f ChangeLog 15419
+RMD160 349bad608661333171980c4646e6fe6a7c913f9e ChangeLog 15419
+SHA256 dba08ef71e21d944667fff908db85df74afb12adb965a820715f744c74530de7 ChangeLog 15419
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -45,10 +50,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 fc00317ae73d9c2807fd61dff454474c files/digest-e2fsprogs-1.39 247
 RMD160 7fc0216dd2eb0963650054e763b94a26a3214c6a files/digest-e2fsprogs-1.39 247
 SHA256 7f2869196368e8285912d8cc8ebe8d2ad3f08d07abad83f1011f753f3f824762 files/digest-e2fsprogs-1.39 247
+MD5 b9dfcbb27ee58be28e401b8a17bccc0d files/digest-e2fsprogs-1.39-r1 515
+RMD160 7b999a2cd6bb72521fedc467433e23f7d9bde740 files/digest-e2fsprogs-1.39-r1 515
+SHA256 031d234c293c7df0edc6d603c55f54ee8880a322532f0a2c7f98877e2eae189a files/digest-e2fsprogs-1.39-r1 515
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFe1c+GDyatLGpTbYRAjXrAKCLO/d4VS4voJhTYj4iABIFiC3kigCfdU7r
-pZVgHM9uIzloTF+TxyjQs+M=
-=GA/+
+iD8DBQFFlbWj8bi6rjpTunYRArtuAKC3JksoBrfc15DXcJ9yltY4W6+gqwCgqcLU
+Gjs/nNjkg1hvisfh69mgXeU=
+=bY7K
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
new file mode 100644
index 000000000000..d3e717d04dd9
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.39-r1.ebuild,v 1.1 2006/12/30 00:40:04 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://www.bullopensource.org/ext4/patches/ext4-e2fsprogs-1.39.patch.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static"
+
+RDEPEND="~sys-libs/com_err-${PV}
+	~sys-libs/ss-${PV}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-apps/texinfo"
+
+pkg_setup() {
+	# sanity check for #125146
+	if [[ -L ${ROOT}/usr/$(get_libdir)/libcom_err.a ]] || \
+	   [[ ! -e ${ROOT}/usr/$(get_libdir)/libcom_err.a ]]
+	then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libcom_err.a
+		eerror "Your libcom_err.a is broken, please re-emerge com_err:"
+		eerror "  # emerge com_err"
+		die "Mr. T pities the fool with a broken libcom_err.a"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Fix locale issues while running tests #99766
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch
+	epatch "${FILESDIR}"/${PN}-1.38-locale.patch #131462
+	# Fix a cosmetic error in mk_cmds's help output.
+	epatch "${FILESDIR}"/e2fsprogs-1.32-mk_cmds-cosmetic.patch
+	chmod u+w po/*.po # Userpriv fix #27348
+	# Clean up makefile to suck less
+	epatch "${FILESDIR}"/e2fsprogs-1.39-makefile.patch
+	epatch "${FILESDIR}"/e2fsprogs-1.39-parse-types.patch #146903
+	# Fixes libintl handling on non-glibc #122368
+	epatch "${FILESDIR}"/${PN}-1.39-libintl.patch
+	# Add ext4 support #156697
+	epatch $(sed -e 's:^:patches/:g' patches/series)
+
+	# kernel headers use the same defines as e2fsprogs and can cause issues #48829
+	sed -i \
+		-e 's:CONFIG_JBD_DEBUG:__CONFIG_JBD_DEBUG__E2FS:g' \
+		$(grep -rl CONFIG_JBD_DEBUG *) \
+		|| die "sed jbd debug failed"
+
+	# fake out files we forked into sep packages
+	sed -i \
+		-e '/^LIB_SUBDIRS/s:lib/et::' \
+		-e '/^LIB_SUBDIRS/s:lib/ss::' \
+		Makefile.in || die "remove subdirs"
+	ln -s "${ROOT}"/usr/$(get_libdir)/libcom_err.a lib/libcom_err.a
+	ln -s "${ROOT}"/$(get_libdir)/libcom_err.so lib/libcom_err.so
+	ln -s /usr/bin/mk_cmds lib/ss/mk_cmds
+	ln -s "${ROOT}"/usr/include/ss/ss_err.h lib/ss/
+	ln -s "${ROOT}"/$(get_libdir)/libss.so lib/libss.so
+
+	# sanity check for Bug 105304
+	if [[ -z ${USERLAND} ]] ; then
+		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
+		eerror "http://bugs.gentoo.org/105304"
+		die "Aborting to prevent screwing your system"
+	fi
+}
+
+src_compile() {
+	# Keep the package from doing silly things
+	export LDCONFIG=/bin/true
+	export CC=$(tc-getCC)
+	export STRIP=/bin/true
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-elf-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !static dynamic-e2fsck) \
+		--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
+	# Parallel make sometimes fails
+	emake -j1 COMPILE_ET=compile_et || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog README RELEASE-NOTES SHLIBS
+	docinto e2fsck
+	dodoc e2fsck/ChangeLog e2fsck/CHANGES
+
+	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
+	# and install linker scripts to /usr/lib/.
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}"/$(get_libdir)/
+	dolib.a lib/*.a || die "dolib.a"
+	rm -f "${D}"/usr/$(get_libdir)/libcom_err.a #125146
+	local x
+	cd "${D}"/$(get_libdir)
+	for x in *.so ; do
+		gen_usr_ldscript ${x} || die "gen ldscript ${x}"
+	done
+
+	# move 'useless' stuff to /usr/
+	dosbin "${D}"/sbin/mklost+found
+	rm -f "${D}"/sbin/mklost+found
+
+	# these manpages are already provided by FreeBSD libc
+	use elibc_FreeBSD && \
+		rm -f "${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
+			"${D}"/usr/share/man/man1/uuidgen.1
+}
diff --git a/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r1 b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r1
new file mode 100644
index 000000000000..2580942c50b2
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/digest-e2fsprogs-1.39-r1
@@ -0,0 +1,6 @@
+MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
+RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
+SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
+MD5 9c966817dcb61a515b34497f4517ebb9 ext4-e2fsprogs-1.39.patch.tar 716800
+RMD160 5b20e7f2133e7339d22ee85d39c92cd7af920bb9 ext4-e2fsprogs-1.39.patch.tar 716800
+SHA256 0472210d002808f1505f96b1ca0e667f3cc2a6d585bca7d9a00130d6fe0ca38e ext4-e2fsprogs-1.39.patch.tar 716800