Readd 1.42.10 because of bug #548950.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 147 insertions, 15 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 679e8ba71e6a..9738518adc62 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.308 2015/05/19 09:18:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.309 2015/05/21 13:22:07 blueness Exp $
+
+*e2fsprogs-1.42.10 (21 May 2015)
+
+  21 May 2015; Anthony G. Basile <blueness@gentoo.org>
+  +e2fsprogs-1.42.10.ebuild:
+  Readd 1.42.10 because of bug #548950.
 
 *e2fsprogs-1.42.13 (19 May 2015)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index bb4b4c0a6768..a82334e228ec 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -12,28 +12,30 @@ AUX e2fsprogs-1.42.13-fix-build-cflags.patch 309 SHA256 30a05a96ba28c599324b9a94
 AUX fsck_ext2fs.8 3806 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0 SHA512 eacd1968267f320587e01f75a66ceaa5a9b899f368686df893b6335c25ce8f304ebb5852df6f1b22a125642720ab110fc3b0878bc3560c628e8beb3a4583ef08 WHIRLPOOL e8343c2ae959075b043998894486fa5a33d36e339e511ae22102b60c2c482900d73f3322dd2b8daf91b5009b3da0639aa192d3ff1183d31db748a1143af97a94
 AUX fsck_ext2fs.c 2797 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 SHA512 525c88a3dd9178ef2dca056db9226a2bebf537b9a333cce32f2ef82d6d7a6a56a59dfc2ebf9aa3e891d9690fde13588cf619f89d6b806405810de5dcfcf08040 WHIRLPOOL d71a13f80694a39ae2faf4fafaaf0ce342a0963ca2fb5b4bce279c9a9816139fedeefb5a3c565b6c6829a237e39b7e4dcab54aacea8b72fc3f1ab0122c667ab0
 DIST e2fsprogs-1.41.7.tar.gz 4425159 SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c SHA512 c17c5f23feb7747941e7f019f197cca1cd4a84c067ad27d1a578ae213c7d7274aa79f3a64c7d69515f3f94db80df01ca71d4af83e9ea84c578a7257205395f7c WHIRLPOOL f760d7e658a1c78835ca470d077c7076a21f727f7d0a2411f5428363d12b7cd1676e2f221be9d9d1f5843c25320f7ef2f896ea47c9d4dc91190e0bc7df89ef36
+DIST e2fsprogs-1.42.10.tar.gz 6126111 SHA256 7b6e85c666d8fdd6062c75ba953de0e5481673bebef5f40f749a52a46476e29f SHA512 9ac99152722af3a9de03cdbb49a3095df59c488978da825527c99c86959a6ef8edd4953a03beba491fd281cb2fc3e917504682e36c3bc7208463812788807826 WHIRLPOOL ecebefeccbb8b68ca816d02a272a882c69daeec70e8ee8260e2c021ce307509225d91da11397627cfd28258a6dcc58dbd3a6e628eb3de3882bdeafb9c99a8e4a
 DIST e2fsprogs-1.42.12.tar.gz 6381695 SHA256 e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c SHA512 a4b03470ed8f3e6c353250d80807070b8d5529ce219f7ec3076af89bd7cd674fbd443aab4d07dccff74606c9f620e349da32b451e3896a0635f6c700419f7cbf WHIRLPOOL 15f85fe969b174a99f06d875afafc83cc3e85cde0d8f1d833cb045c30259b3bfa9293ee84eeb793d9c60ece2cba4ca6bacbb8c861f11f3b56bd863ca1a2296f2
 DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4157 SHA256 8bf16f0634e1fa357fc2235f22c619328c10f8d37ba22d75889ab6a1309c5a14 SHA512 cad0f30208422b49221dca0c8c31287f011b2f7a992efa265a53220f6304e0f81f5214ca03e3b885963462f5618257662f68c73b342fe9bfe4d2c27aff1722b6 WHIRLPOOL 8ea704eb90382e405092fb03564b9a947be0139d4dd09974d1838e1525c5cb5ecb976a3789c6a73eb83f3c817731ee7d5fa9d8435024109580307749a1cbc83a
+EBUILD e2fsprogs-1.42.10.ebuild 3586 SHA256 8a1588ea1fd453836d23ef3df979f878e77aae805346914e857b70fb3b4b399a SHA512 7a8fd79674ab8d8fc9d69a610dcf0f558a3fc8abcd7cf4f49aefa20425e9667623d6fb31d46506ef31035244ed34aff76e6fa05c97afd68db082c592f13c0ab0 WHIRLPOOL 6817d3c57bd0883c8be2e8419ef3b4cf82896014d48390b62141ec737686ee14524d7a42b9ac4b08356429948afe7ec2f97f9c0562f857e53da3569e562c8c72
 EBUILD e2fsprogs-1.42.12.ebuild 3696 SHA256 763f10fb4c3fec629e4b43374a91fcd62b8ededfe8c043755434a2f243be1ae0 SHA512 594a4c4058b95c415b7544295c879eefe0da0a2d6afda7c28ae201ef82e6ae0e695753d824bf36eda99fdb683f60f2e6b81b2d63543fd4fd7fec0638fc79ef9d WHIRLPOOL 529d0dd117555f5a368da120a4851585357d43a4971913510f11b59057600325e280109473c67724852071c45c42a4c7ea65c383a3636f19aaa0183e2855f46e
 EBUILD e2fsprogs-1.42.13.ebuild 3714 SHA256 c369e6d806ac4528e3972b9258914049da86ec0e3cc50e07bfcf72ca4eaf1907 SHA512 6ea8cdcc06e565ca9b2a8f9e72f40de876fd47483cb0b3f196a375adef78147ffcc94d655b4977c96105f623d818c70322d89e90be3a3db73087d7a678b3c3d3 WHIRLPOOL 00f099cc97691ad59158c8f438b255028fb8fe3bca3cc4f24ce5d22278fcfe1ef3b388dd4bbcc08ba3ff4d30a9e1e268e14320331c16b6fc629633f89caec5f7
-MISC ChangeLog 46111 SHA256 bea92089dd560186000cb1bb19305521bfe866596a8958e5b1696d96868fbda3 SHA512 170c4f050d30b7fbd338b2d6e48315ea97f9e9eee6640799f55c4c55fcdecca0a3f7a8db2304e0a63c83ccb8ee312cc924a25591c8341a7f1044f6d0563e3fab WHIRLPOOL 67fb6d7b4ddb458239797585f22cc8f211531926a41a03554703fe50252ec37472553a18fadc10def763436ccac8e702a9bd294c05dab3e67332f82a1b849deb
+MISC ChangeLog 46266 SHA256 1f2b7c634762e04e3bc3057a71a2cf22de16c4f6d8c8b43eeefc720ec38a156d SHA512 e1d26d82d4b045644d8ea632cf37b16ee100fea2e2bade4de5cdb9af677982f40c882870c2d37e6fe3b7b6a4af0d3274d75bfcacfbd974383e83d09113208634 WHIRLPOOL a6654961df172ad30a89f4355814a2cd4b150f4538c5298d376072026dca1b932863c122cf76be67fa7560fb86a3a8f691b7fc83badbae8192a822e3c7c0c670
 MISC metadata.xml 267 SHA256 b88609559861f59092d42a34388b78e59a1eeae8324a6f79c94fd24598c2b5a3 SHA512 979da7eb8495724d938e6445cc7878b2b484373e750a82a48cdf11b6e46257a1c1ab1cd85b08b854789ffcea5c54120cc5aaabd2f830cce2b2d0bea9de7011ee WHIRLPOOL b671ec8a7c10856e977c7cbb5b7d55b8463f0cf86ded627d9407e1099e376d6381c1a23ec5aabae788419db3187b6737f008ea7c6f2ed714c8dce2d773b8df4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVWv/fAAoJEPiazRVxLXTF6n8P/RPiEaeXMwYkLOqT39w8XjTj
-p5wHALBVuDzoBbF1lsIgu6FHxZJyaiczmFRSpD+z2m4PWUw4zA6gVXT2E3Zma3Ei
-xpC4ewW1Wz9wfwKhSUW4KnREacDoxMpxTzGZX2cjY6hO3HurKsbr5eocdLQB4/u4
-DoZKqeJHvI3suEUHXrNIH9Euul+B7PMYi9EIJ2WBdD9tDQDmG25LiIYsepWQaf3j
-LgrxySueFgXBbBeRStqKZhMzYZVofZxzmASZekCVh2DCXLcNluhLATKs0/wDNXb1
-e0MeTbRWuR5l8AcK9nio0onz5kv7/j0pBBZ6RtY9wql1c8iEgpmhaXawYoaHC3m6
-fHFzhxl1tjB7pqGykOOb6VlQimgEQrFXl+MQ5KmQcT2ylUW1oGJaYy2hJXQPV0Pm
-oWUG+1slq87FqYj32ETi0IdY5+pvpcnL53vQ0esrWdha2cmfh5dmgb/Shm+9oKHU
-iPekLZQY6OYBVx6DnxJZ0QH04bZvbOYPmh5Jw80zpCDzm664NqvLrx9WVd9hS6Ir
-8Wev/yF9j8fHVuQ57dGTEYW2G/Mk97CckuVBVFEVRMumtRS8R2SNImmFibxXclRc
-/uKVvSNBQ5p2VDgB5B+flupPZOXb3gBCUz9myGMRAX/MdjzivXC+oejvH4cMZ2E8
-pplxewmq7DJv3XamfbHB
-=eH+q
+iQIcBAEBCAAGBQJVXdwsAAoJEJOE+m71LUu63ysQAJzwmnyIWLwgTwWYdnsBF43j
+EaizPMwu8qAJD2o161Z70dPI1yNeHv1BeVAMP+JrEklQMpMWWyMWYJL2j66xjdm0
+FHl+qnfNwYt2VWBcYLkiNPuw7HUEsY1QK0sEtHEZVkolndoUrRkBfJTYQ/hRr76g
+tMe/xermFq+snmNYBj3WuRYky//MTVgqDCyk080hXGKNwWZYsGGE1A4/cp0WZGNv
+gR/Rm51DAIhW4cK+Or5T6G8MDPLIMIS2P14QOUqVPGMx41zcn1SFiOSBHXKzt+Bh
+Xgirc8FelYBhD6PEaIh0OTTMOw109xXX3WUImnI0pGmGsbjPvZnQxK+qRiRDCsWQ
+KLUbAgbEdYV9q6Doh2lX9BQWWVPq+dNesRk9tgIk3XfPZNn3xHuhRU8ZBnhqlCWI
+zsgKSDIAd918mC1x2lraUyjqL130qJ2EaRrrqo3FVfhtIsLcYdr/JkHTsJE6AGnj
+9754TaWIaoUe6l05f3hfmdo/AhOvPH1AJ6rQjgL4iR9AOOxAtCBRI64LBU9EDm6X
+sxq/uQejpW3R3CCbEx4/wC/0JYoAr8OB9veUSdiS52eDmfd7xiZNjMtUSz+5AGrh
+0E9v2ISQnZ+r43N9YwXpWorT9UaRFE4l4lwz60BNHWXDAa+8huGYQxhckDuNrgIx
+Q5V1vw8WTPW4B+SxUl7C
+=FEoB
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
new file mode 100644
index 000000000000..6a70eabb5957
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.23 2015/05/21 13:22:07 blueness Exp $
+
+EAPI=4
+
+case ${PV} in
+*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
+*)      UP_PV=${PV} ;;
+esac
+
+inherit autotools 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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+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*}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch
+	epatch "${FILESDIR}"/${P}-fix-build-cflags.patch
+
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	rm -rf doc
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+		-e '/^DEP(STATIC_)?LIB(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"
+	ln -s $(which mk_cmds) lib/ss/ || die
+
+	# Avoid rebuild
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+	eautoreconf
+}
+
+src_configure() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS=${T}/fonts
+
+	# needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	ac_cv_path_LDCONFIG=: \
+	econf \
+		--with-root-prefix="${EPREFIX}/" \
+		--enable-symlink-install \
+		$(tc-is-static-only || echo --enable-elf-shlibs) \
+		$(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 V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake V=1 fsck_ext2fs
+	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
+	dodoc README RELEASE-NOTES
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf
+
+	# 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
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# filefrag is linux only
+		rm \
+			"${ED}"/usr/sbin/filefrag \
+			"${ED}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}