Version bump

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 158 insertions, 15 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 617aa309b515..e955fad9bcc1 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.295 2014/08/23 15:33:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.296 2014/09/05 18:40:53 polynomial-c Exp $
+
+*e2fsprogs-1.42.12 (05 Sep 2014)
+
+  05 Sep 2014; Lars Wendler <polynomial-c@gentoo.org>
+  +e2fsprogs-1.42.12.ebuild:
+  Version bump.
 
   23 Aug 2014; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-1.42.10.ebuild:
   Stable for ia64, wrt bug #512012
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index e15326143091..32832d16f72a 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -19,28 +19,30 @@ AUX fsck_ext2fs.c 2797 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e
 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.11.tar.gz 6353078 SHA256 4bd8a770b6925c3f4ec5dce82c55774e4566cd6f3ffb5805177e3c92c8910b76 SHA512 633e686d5bc8d8d195c4522bfa206ef751ba6ab01117338523998caadfecba7fbc47ecb231d0d5518b0deef2fd587c021ad2d8fdb0eeede1ab6c90e28a709615 WHIRLPOOL 4aa1566bbba25e6d3bfb04333f2651ed199f20300a9ab34b6cfe12bdaf4db4a08df1ec95b631b6eda03cda33f87b9c489495a4f4f521daedd7bb1b2fdaf60aae
+DIST e2fsprogs-1.42.12.tar.gz 6381695 SHA256 e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c SHA512 a4b03470ed8f3e6c353250d80807070b8d5529ce219f7ec3076af89bd7cd674fbd443aab4d07dccff74606c9f620e349da32b451e3896a0635f6c700419f7cbf WHIRLPOOL 15f85fe969b174a99f06d875afafc83cc3e85cde0d8f1d833cb045c30259b3bfa9293ee84eeb793d9c60ece2cba4ca6bacbb8c861f11f3b56bd863ca1a2296f2
 DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 SHA512 954dbb832c2614d20cfaa5233033b469f16bf96612cf25074a66da79a5b3abf5eb1b340781e351bde06daf13bbbf5db4643774858aa494b8a8394ea742b6f07b WHIRLPOOL dd48dd13acb485eb8b8646bf4198e45e3ad8e8c6bd53b8186011a1cd2ee4a8ae7db75b6de982fd0d2f9d252f480645bd882cc95d76e614bd8bc10a36755d679c
 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 3751 SHA256 c937cd8edcc153dc144f3708b64637683bd87d7683f7d403a4651cb0979f94ac SHA512 6694d99c1a0081860ff5ac7a7d90893dc8b585714d7c4b014b95b680a47b35b4f08898f96447c1908b78f90388f4c9bd7f657a2d5e8849cdb00c7977b506662d WHIRLPOOL 0c8769365d0cea5a79c6648f34da8843abc1014e6994d8dbe72c763452856cf7dc625b59da84d1d5d590def1bbe6904a14db097063e1dd0e4be94df7396231bd
 EBUILD e2fsprogs-1.42.11.ebuild 3927 SHA256 ba3c218b98ade04c4d98dd74a457c811e2431ccf812af6810354adac1f6c9c42 SHA512 03e339cb7def10323b7d0b9d82ef53ccf78afc09ccab71112b613acfc32e077aed8d31c0c8f1bc18a4aadfc1c894ec1431b72ffa62928b96bfcd7917fb7d65dc WHIRLPOOL 68e9cc8039d15940867b961ee8ba1f6b9afdf005d4f6ef27a902ef1b44205d7270431bf77f384604a8be3631db079b7be7ad98d1b7b72f1b1676f66fe1f06a27
+EBUILD e2fsprogs-1.42.12.ebuild 3880 SHA256 5ead8a73dc11b3081502c81c41b40a433ffc428e8fc589a5e4db51f71c957ca8 SHA512 3d6021a0f3d6a5abd41d9639edc0de83888ae23aee22074c9a8a615bb8e4695c0039344e5f88aaaaa7e57c9400258fae329bebebb268db936542b67fddff05b9 WHIRLPOOL 3fd5467cc9115a8500ac66e3a25ee56fc5185a6d0d5ce0ee11475aa2df17e8c2f3c19c2e21f64cf5aee186958fc3dca6477bf78d13c03977157d624fe7bc7fdc
 EBUILD e2fsprogs-1.42.7.ebuild 4352 SHA256 3a94e1adf66909468588c7c9ad908abc5dbf7e0c70f8da277e7b1f0066c69d9d SHA512 97df9b66620fde3242968e507da4e9d05ceb878abe7d01291d7198eec481c8e7a60869dde11b595d0d392bd5184e9b336fd1f831aaa563452ea9a98ebe6e4a8e WHIRLPOOL af0744c81d58e4392011266776839d9def671cdd8943ab74cd2e99f2f551a3924d0cf4b50d4163d7ce592582269128b3945516e8cb3551473220849dfc73e471
-MISC ChangeLog 44055 SHA256 b9643570baddbc5a672f6adc2ebc600423f398f93d1c842b186e9b1746d460f1 SHA512 f4c26a259191b8f208f845912c753800d45a0f6bc8ae25a8021b344155c6c99941bef5a656fc3769f75fc76c6520e17e759f978ba6b4c9e6494992e167834d91 WHIRLPOOL 395c49ec4751b997f04b1f7a99275f691bd82fb75c704fe6576917924e1248c11237283e82f6c506f47fc1ec63dc3a04495e06be6e73301bb785d5d6a5356f61
+MISC ChangeLog 44198 SHA256 e450a0375acf963c426c425f6f132bb74cb8653b3cd17fca6fdc2812b9f7f01e SHA512 719b6ad4a30ee70af7fa9a42c640f7a1135e3633bcd052e5b511352d1fe9cfeb9ae88a75d1ec6d89f16f2558f10531d93bcc0dd7dbdf2ab926ea8483c21ac8fd WHIRLPOOL 30d987a5d44c8451549cb225ceb55ca0f69d29f192e980ced52487a395ca72564a355d7cf6ab01967180b0fbfa7bf6419abf63264ad8da8c6205a7c1e9963ee3
 MISC metadata.xml 267 SHA256 b88609559861f59092d42a34388b78e59a1eeae8324a6f79c94fd24598c2b5a3 SHA512 979da7eb8495724d938e6445cc7878b2b484373e750a82a48cdf11b6e46257a1c1ab1cd85b08b854789ffcea5c54120cc5aaabd2f830cce2b2d0bea9de7011ee WHIRLPOOL b671ec8a7c10856e977c7cbb5b7d55b8463f0cf86ded627d9407e1099e376d6381c1a23ec5aabae788419db3187b6737f008ea7c6f2ed714c8dce2d773b8df4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT+LRoAAoJELp701BxlEWfD0kP/0zUpxIn6JRV9zSCtZIJ+qYM
-284v3nGc/NmmE8mfct6s1R8+LLintCcf6uUBQiopwLaF96v2vStjHpbwUGD8ikG3
-/+4vahZGigcLtddcww9GpvRcVMfYQlcAgCBUvx1L/7ZAqWIiD1WbveTDfUG7UWIr
-tgxxp1p1+yZWKwVDLgKupzmo//P1LTU7MOda5aH8JOYeyN+HLKXcXlNP4CgVA13B
-FKUhoTFfMOXvCCzq96NgZenif8f4HXAFp/AqPxEVm/C9Vo68SAjVObR5MWSE/pYf
-X+Xn5dtD4BrFq9moRY04qnLRBmVir8M3ZRYcd02dFu4wOY6WOO8yg/sFC5jvkdGJ
-t0lSVLVcWmdtFl2DZ+WHOqYEAt1vArm/Xk6jzWa133djJt0IdiIgXzewWCRrWU5H
-NzY1nRHp3U7jPwKaJ74dcxB3Tl0r3KsN/eyXbhaTqoJgLTKlEXS287H3f2SJisLm
-++ifi4EwvGLbQIslqyzf4HorZ+KjE9zIxjO8n/Ei4ZzosRGD5zowpij9iF3zeAbz
-RarJE14G+a5pgp+zv/FjKtGZb04BCiYERQuq4clpqeswzB3/ClOCtQXyKfm1jjjQ
-A54UnzFSWglN722UWKqzJvz1H9lozaPs4k717Sj78KBwJfS1uSubAaVT9RdWwOOk
-ZQAcNOCtbFSYKyB/hmwk
-=tP0f
+iQIcBAEBCAAGBQJUCgO2AAoJEPiazRVxLXTF8b8P/i270EAcGJi495f5H0cbIiTV
+YTQ1PvtUfHumOU7lsN3rROhLTIrLe3MLv1ZJ+6wq6Ki6fXQhKx3Hns6f/YF0ojCj
+zUK3dW2v2twAEFpRfBgg5XcjA/QEN1EK82IO09AHcCSaCPG11/c+Bbpk+sejdl3X
+SOEN7Eg042eya7lz4/mwk8+EvhKw93L+iJIwjyvClDmdCrKJb7WvG5EzSDwPZpgj
+JKWAm0HctlYJ8kFV0+U9Vx89VLv/WvBgduQGkiwMzZ4d0+Wf5Mj4eCBkXW5F8TXQ
+oVZLgYoKKNJyGWQu0n9A45a58LaG7VJePuTpWyw2EHxRKxPtxk2ssHIWmYNo/VWG
+DevmusBdto0RzLHuny0XaLSfv2pFz+JLTaffLVZRAemAk0vwuVqxISDJu8y77d51
+uCUP8pS5s8UExR/oC7fQ74nZWues+uxAJWPZFKqBacHpGx+yg4B7JQbAohNm2wxM
++xv/vlcD8SRga+xlbyo4gf0FzLW8xJtfrf4WGoV5oB55aqzoMUrtIZqKE5npHbqd
+FcbTzTOwwMT0Uca2hVZETOCcRZJWqQE0hA6mUMwZLRLMOR8fMd60w1yTgSQAp0rI
+MxPySDTuszTI+bMh2nVwx/uBD7oVT9QzzNzjb+iGLR3ugHagwoR7Npa8uyH6tBfC
+3pPtL+h71kTmzlLSZNXZ
+=c6jl
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
new file mode 100644
index 000000000000..eb30c532af40
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild,v 1.1 2014/09/05 18:40:53 polynomial-c 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
+	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
+
+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 ~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*}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	if [[ ${CHOST} == *-mint* ]] ; then
+		epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch
+	fi
+	epatch "${FILESDIR}"/${PN}-1.42.10-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
+}
+
+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
+	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
+}