Version bump, as requested by Laurent Bachelier in bug #476670. Stability & safety fixes, including the patch for bug #467986 being applied upstream.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 164 insertions, 17 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 51d0fe71d448..42b861dd8259 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.269 2013/05/20 17:42:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.270 2013/10/08 12:57:33 chainsaw Exp $
+
+*e2fsprogs-1.42.8 (08 Oct 2013)
+
+  08 Oct 2013; Tony Vroon <chainsaw@gentoo.org> +e2fsprogs-1.42.8.ebuild:
+  Version bump, as requested by Laurent Bachelier in bug #476670. Stability &
+  safety fixes, including the patch for bug #467986 being applied upstream.
 
   20 May 2013; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.7.ebuild:
   Stable for s390, wrt bug #467008
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0fc465445127..8e1c3792d73c 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch 1251 SHA256 01dc8bf59f6d5f435abd4b26dda92897abc338f452a80de33600594d25586013 SHA512 fae120ce7bb4897d9726f6d50ae550a8826e2313296eb9ba480df7264f755976b5b8adf2472287b6e367e3320329c6981d3902afff6b9aa32cf9fab779d5edb3 WHIRLPOOL d542a6b763074fbdcf6586b7463c3144c851eb027c3a649e360ec038aa1f87194f0cdd746ba17f7ec5edd85002def0e9d3b6794de26c5e18e04192f57bbd4a66
 AUX e2fsck.conf 138 SHA256 c2864aa7c5c5bf27227909bdb9af395fc07294d1f93d372ef10c79309d7aec08 SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef WHIRLPOOL b05c69b375411efe850a993a244e26513d6e4a8c1cfb3ea91617a283c819a47f2200a459849285a0e60288e86869d624aeee0589f4a6b9243572c500671f3b31
@@ -31,6 +31,7 @@ DIST e2fsprogs-1.42.4.tar.gz 5873284 SHA256 3946f347842a7b892b23476e231da21e572f
 DIST e2fsprogs-1.42.5.tar.gz 5918892 SHA256 76edaad8eb7464356e1317d60eb19952728091dad358f1f939239874cc1871ce SHA512 536fa81071c828ae62b2238a33fa7a60d0a731ef7f4b51022e99d50cf4946509b4dd8d94b5c200759c69895879ac985587b40010af4282ff5196193c9926274f WHIRLPOOL a8a2c5869ea9db8df8a5942c42c4d9a4994a58e589d8831598cfa66db2e440b56aa535516bbe8a2a585309d2abd8f4c27f72e77ea647f46ad7d3825207b932ae
 DIST e2fsprogs-1.42.6.tar.gz 5920183 SHA256 726b5919edeaee5b077d7a5b602284f1453ea31cf499efa433af26c679b667a5 SHA512 365178e2fc7cbb0e85da23dcfdc33c43c225640573e3d44c135193391985fe0c1263bac1f074ddba9668859d4522dbff1c6584bc8d380d2879c1e3d8c6f04acb WHIRLPOOL 0c2a775104b1accc1ee7d501d402411bcb7fffd96f1bdd8323dcee404c9fdcfee1d4e70525fcd86e2b1b48ca2d085dc1e9b85e0d99aa9478c4c5adad67a661c8
 DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c
+DIST e2fsprogs-1.42.8.tar.gz 5990116 SHA256 b984aaf1fe888d6a4cf8c2e8d397207879599b5368f1d33232c1ec9d68d00c97 SHA512 69447105cbfec6099a8b7686d7cb8f4727d8c7c3f438acd0ec065ece70c225ce2c5e72e22ba16d88ef6dac81112b7571083d0cadd2fd1c82415c959ae632e61c WHIRLPOOL fa4b4ea66c41778364ef29589ce76951b22b22fa704b47904d754584966082c3520d9bba93271a4e393018d5f724379a771f189b70b995a10e301ce86b452b07
 DIST e2fsprogs-1.42.tar.gz 5709827 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46 SHA512 4db3d59187ff31d4d8e1f2b355fcba5dd2e60343f759b41a02545bb3aedc50ab079e21bf15240208442a1f6192e420ef391ccb9f20690f5f19d37b6fdb6f15c5 WHIRLPOOL d01a58e2c3cb653694f13033fc22256823ab4d0b9f39f626652d29b804b7e7d33efd76a3c640dd8c15e45e619d0c977611ef0271cfe78363b677f5efae6d501a
 EBUILD e2fsprogs-1.41.12-r1.ebuild 4301 SHA256 c521fff426f2e36a898023bfdb3b93425f1acb3a4fddcd06f3330afe6c4896b3 SHA512 aca89df269e8601779b67c0853b9885addf143d05cfad3524d0ef9c90db42aa3f1f8e4b04862ad77de57868fc26b392f00cecc26a3a4a6af8269e2ada2552e97 WHIRLPOOL bb12236cb8d6483f0817eee7198c9fbcb93484287fa49bc0f878726b9797c2d719093992a9e03d340922d7850e4ca1e6af73b5f276e0eb462679373e41a95630
 EBUILD e2fsprogs-1.41.12.ebuild 3899 SHA256 c3d88a35d192cb544a41959f6fd9061bee699e0285775adf77a060d2b664f92a SHA512 e828b606c70c92c9706777ab02bad24b79599129395c4e3b098b38210c82254611f1cfebaadb0903163b71614c031d6fe6589ae007ba19a6428a27a850bcb54e WHIRLPOOL ee175a7a95eba313563cc9a9f1368b1c850f6f2631de17f02a06415d03bcf0bd87d1c13d69b547e96e2d04b5cfe169776e7233c78c103ef07948a58b84766001
@@ -42,23 +43,14 @@ EBUILD e2fsprogs-1.42.4.ebuild 4329 SHA256 f9840190bdf5fd375a75032936629ac8bbe37
 EBUILD e2fsprogs-1.42.5.ebuild 4327 SHA256 49c96b22e90e135da3df1f53a1fa645db6535fe0bac81a5094b275ddc9497fec SHA512 fc24fe21824977515276b1f3bcb9b43e2b55f8e728e8b583ef596e84ff8b053601d341dddc434290dfa707ddd5602df1489e88e541a5384d7f77f80e89cb1287 WHIRLPOOL 9d9046025e25b1cfb5717e0e06a998458e27e3d4d8150c623ef23470e942a6bbbf2fc054227736fbc8e7868cb7254dcbe6035ce121b15c51ffd00c340ccbd827
 EBUILD e2fsprogs-1.42.6.ebuild 4282 SHA256 83377430341860f723ee9268df9f4cc700d14c32cb86b1e7d7188992e1105a94 SHA512 1e44fe9d158204224acadd21b4d405d35ac9410b56d2cbee10e7b0b5670e31a625168b9c4d0dcd55e1af9bdeb6128719d2acdfc365f0e58db94c49823c454ce1 WHIRLPOOL 316a8b4d15b55529881a495fc6f921dcb0841e8e3b5691c583eb35fe3ab7ea4c9564842601731734a09ab0ccac7da30d4389ed1723504415ceef705c8be9feb3
 EBUILD e2fsprogs-1.42.7.ebuild 4344 SHA256 571bc0b822ccfbea6391752d75a42f4d90672591c3b6e54b876a9d6b5e677ac9 SHA512 ed4868b7115374bb898b636fc935190fee6b0c55e4077f588eaca85db007d06079a626ac44a47f2068928c45c9ce7b38e21d02bdbe86d3a44e19d33a62811f8e WHIRLPOOL 483a549738a46b7eb422cb5f9faac6e72037702ef54bf0cba713b7ffadacb2cf76bde76ee930b63eaef77bbe3510b0b3db0b76bf8660a16fb0cb07232ac36d34
+EBUILD e2fsprogs-1.42.8.ebuild 4283 SHA256 3f0d179fd3579dfc089ea5805cdcf8da1b9c19097a5a1d6c398183f9a5f136ef SHA512 44e5c0bf8169b21962a7d60921564f5bf995f14d46347cc0bfb7f134706d1e0139c29c9cd28de2971aa20e0021211da62977a1f7e35cd991d7aae43487ed980d WHIRLPOOL 1a710a3bb41d53a97c544d6d0b71cf705ea0807b9be3059ca186eb4632b577ce38aac62bac53741385fe9dfb706501e5a90a6ad7616047dc9510ecfd2fca0fe9
 EBUILD e2fsprogs-1.42.ebuild 4523 SHA256 aebb33bbb1d0f0b27e83503ac1fb8dc83aea140d2af77b34aece290ea5aa33b7 SHA512 0a2e7c9bb1942a3e754dfb5645ab84a54529f7e3fddc2147ca7ac28652110bcb35f06208c40d9ae301bd0647b6e817589f5f129fdcb56c2e75134dc478d1a7ce WHIRLPOOL 42ddae6fcd1b1bfcbdfc2a261d07925ef5a18d8903f1738f5ef6e8216befe97e1d20a3351a81cfaa18a44a24d299e72d32acb3216d058337443364a62dc77348
-MISC ChangeLog 39810 SHA256 72c376b353a9f7fd228ef909f972b96f95abdacf5782bcc69788bef9ce8a7801 SHA512 beb5f79def3eedbd0353296ee178b7d59d65821e21a0d89f8093f82d939554848340ca852c4ff934162bc2cbdb059b598dda3e86ccf437b772d79df44436e82c WHIRLPOOL acaae991f87938f96d23be4ecf0f67a7f489a9e5d12edd113d2a19ecfe81128e95aff9cb140d53e97e058bcdeaa44b2481914edc2b6f4d7203944556b9664314
+MISC ChangeLog 40077 SHA256 91b6dd7c2076a6d5ab6f4c4dc64e2bdc6cd07a9c3c324b4ac2939f09f486fb05 SHA512 3162cc491463478438478c272a025328e55ef986917c7ed25595b70403d6edfe72bec16aba15a488d9545037c6176199bf554891f3eb8810531f92481fb05b88 WHIRLPOOL c6f19e14f6294b81670d6e279610e21b81677215ffe19d5b22af83a74f820669450edef1a541b3333d1c12a113ed7a185a4b5347c4bd88d74f3ec8dba560125c
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRml/sAAoJELp701BxlEWf57YP/jW2uNTP2JemuMpfdUIgfgqQ
-M5euSYEGXDroJPRVWBDOxxfDEa7CTm+87aoqtlp3PJSB9CjVc6x5Oisa3Nl2AbVR
-VVLUZcAbUjmLepFtrw84ZEZfoYZz3YxarmuXTyZzocuLP1N/BzwPAvLF5eovJRt4
-FsT67yUzK3h52fVgAKls3UaiU+BuKQiWu5cz8GTZ49YmFPJpSTlZpNaXIdVnPVu6
-Yyd7on6JYnxuK3yAS32WTtUNz/jz1IDv8fZlC4LzzMUVFGY17YST95ynCwr5sw7D
-cfLLQV7TpwELK9m302EmO9xF8DRDVWmnPBh0JFQxCNfWwJK+WOoH5NJRnG3jiHyt
-98pHnlMq3gqB1aa4/UklVLdiKPglZAyjpd3A2DsP381I1xMBvZOThSN9pnP7m+0j
-F3qt9OJ+d9Op4uAPTppLH8ghMHfhKKGoBC7XvFRxuzN4wOxe2+1o4t/E7ngsPs7S
-QaJzokogAfxdZ48qNe9j4vjJNziuvaYdfMnJbRp831vk+QLy20Rolpv22bFzAK3W
-CwA2TmiR9kwhTcQ8dK8Fz0hHiQwz5OQ8RcHjxsQ3cc997LOmugdhy8HA2S2RftVa
-AtA7kBLxiPWe/fRlz8EhCTzCIQIkRPuGrPQ7nECab2oSXiBvO5RWhUVR2gaTbaot
-ZXHJpJYOlMzv0pqjifYJ
-=9aEY
+iEYEAREIAAYFAlJUAT8ACgkQp5vW4rUFj5osNACeLq6qrKKTWZruiSdd7hZrnHay
+SVUAoLqFV9kiwr5YG0n2cSIIRyDIbCif
+=BG/t
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.8.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.8.ebuild
new file mode 100644
index 000000000000..02bc161718df
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.8.ebuild
@@ -0,0 +1,149 @@
+# 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.8.ebuild,v 1.1 2013/10/08 12:57:33 chainsaw 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
+}