Version bump #420925 by Sergei Trofimovich.

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

3 files changed, 172 insertions, 15 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index ec0bb505f274..5702159fb605 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.251 2012/05/22 19:45:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.252 2012/06/14 00:58:29 vapier Exp $
+
+*e2fsprogs-1.42.4 (14 Jun 2012)
+
+  14 Jun 2012; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.42.4.ebuild:
+  Version bump #420925 by Sergei Trofimovich.
 
 *e2fsprogs-1.42.3 (22 May 2012)
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0df77deb2fc3..dd572ff693bb 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -25,6 +25,7 @@ DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098
 DIST e2fsprogs-1.41.7.tar.gz 4425159 RMD160 ad001d9d2b7c2e19b2f410b92446330fb5fbdf11 SHA1 0d5acf71bb81256e470d7f5ffa714f10e674172f SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c
 DIST e2fsprogs-1.42.1.tar.gz 5724307 RMD160 7c8c4a88430337cd22c107c7718f509746177e09 SHA1 c25c73de98737b5f6fb9debec36bfb6416b0ac07 SHA256 0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991
 DIST e2fsprogs-1.42.3.tar.gz 5817248 RMD160 7ca231087af843ae78b385c1b3c09755a2f881bb SHA1 0da8c787604876fe23b0f608389c3854ae1a2420 SHA256 ad6a41be876fab94c2bd5d10f7a0871a5601bbaf9cd25c551c2af11c1c8d5436
+DIST e2fsprogs-1.42.4.tar.gz 5873284 RMD160 8e9c67ed36f182c373e4adbef8deb69a7c533438 SHA1 944002c1f8f1f87e7d2d53263346b001962bc1f9 SHA256 3946f347842a7b892b23476e231da21e572f9db828cb02a38bc57beb25db905e
 DIST e2fsprogs-1.42.tar.gz 5709827 RMD160 91136a82c35f86f54f6573f9788d32da66b972cb SHA1 e69bc63bc319e4d1e4242cc278bfd442a60646e6 SHA256 55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
 EBUILD e2fsprogs-1.41.12-r1.ebuild 4301 RMD160 8a282ac38ce67a82768069d3af6e71d53fed478a SHA1 d63ad842f1209a6dc2dfebcb023f8218da91850b SHA256 c521fff426f2e36a898023bfdb3b93425f1acb3a4fddcd06f3330afe6c4896b3
 EBUILD e2fsprogs-1.41.12.ebuild 3899 RMD160 d3a7f48e76d5c15070a62c98a487bd4fc3a27323 SHA1 7eec2462f8adb82fb1f7aa3523e257ede0d0f650 SHA256 c3d88a35d192cb544a41959f6fd9061bee699e0285775adf77a060d2b664f92a
@@ -32,23 +33,24 @@ EBUILD e2fsprogs-1.41.14.ebuild 4295 RMD160 6da25a555bea29d9f0496b6a46e6ae6f2e60
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4157 RMD160 cf87a25efa2ff20f438dd31bff5ca2b32e846252 SHA1 55b3e62193be5bfdbe863f90c28584553ffa8d98 SHA256 8bf16f0634e1fa357fc2235f22c619328c10f8d37ba22d75889ab6a1309c5a14
 EBUILD e2fsprogs-1.42.1.ebuild 4677 RMD160 7f0b30a4f36d14aba3f3d6b75f3356c62d43c285 SHA1 12955cfcf222bb74ee42f7446ae92e78daa6cccc SHA256 1a0cce002b78b2cd1c93947b1cfde1b184b952e058609c0f1aacf974500c944e
 EBUILD e2fsprogs-1.42.3.ebuild 4431 RMD160 125dbafa136aac512a0a5b9116c72e400addef32 SHA1 09b8bba93cfbe207ce1d90b86c719a6faf570b87 SHA256 c7d6a2dd48218a10866f32c39a2cb7840c9846d9dafe9691c2f5c7f6e7947f9c
+EBUILD e2fsprogs-1.42.4.ebuild 4329 RMD160 05fd433ace415b19382a608c5165fc95e98fd754 SHA1 b329f53cb7807679b0fced36a1d32fb5f8bf9a92 SHA256 f9840190bdf5fd375a75032936629ac8bbe37e0ae5dbc085948d37158561c7f8
 EBUILD e2fsprogs-1.42.ebuild 4523 RMD160 ebe475eabd3fef7e8534cc27e1c35c0150771171 SHA1 cee3442d1c8cd72753c6c29fdc30103fbdeee9a0 SHA256 aebb33bbb1d0f0b27e83503ac1fb8dc83aea140d2af77b34aece290ea5aa33b7
-MISC ChangeLog 37422 RMD160 c9b641f64f422d27479c21852ec6445e44017c7c SHA1 bc86e79e7cf565078156494a584701eb551725ed SHA256 57b89956ebdd05bbe3ae6f3037d4f0235ad4f3b1f67b5754d2e61298e4f82119
+MISC ChangeLog 37578 RMD160 0826841f81d9b2c1dd87e6c33bcce7c16cc4e4a4 SHA1 8772e267a23dd270eb4a053e70257fbf6700a5ff SHA256 9551727d99a81d5d8111461af2d4608ef63e1481d77f5e51d5795d46bf0747d1
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPu+02AAoJELEHsLL7fEFWcNAP/AztvNFeNF+8mAciXh/efgW8
-+4P7GOrHQES6HR3ttKxInm9fKK1XNhaP44901+laC2nHLaJBp/mVERejhLHhG/N8
-vwdceYwxg7wfjnNDG1uV5BQZgSc+m04kmAQNk31wu5e31JWz1vrrCqQEC6BmdlRn
-3dueFpcNVIoNH6khXZWmjFUULoAUtx5s3Ddo2JUp/vy7YHsWEvV/4+qbJI+5lnnb
-FYrfCtGTNb7nh9uXBexSM3CUyIv5UHZgihyTveEBzVRZmuEsAizy7PXdGVp7bS+a
-z74HIPGyWFoQ8wYANjGYW0R8sU6MvlrwyKYjThgXEjeoiVFPkqKr103E5UDmz+UY
-qi4huq0zlQctFVk/7UY53j9bhb9MPiFDrPBIJD1vuEAUD+yiKcTRUbrQa0Pa3BXK
-d9uoqW1RYb99aHHLuMNewZg3KCvsgMYxN84AxX/gJds6dWFwvf2sl8HF+40RNt3V
-k7jiLAMpDZs9Uc+jFAVe5VCN6Bd1rY5d4OX0KLgEs4N6mDq9WCXOXc7ezrRsHgCv
-6Szosd3rR4iaYgjss+7qJRlI1CFRu912iGqmNj4Ki5m7tmmtfd4pvrJMcREynM7C
-rbLG9BUt0f1H/wfXRaAKU+Lol0UtVNMQ6q9eiwfWQdx6zhVmjdmCnmsHTNDvr45B
-m6CxNe80FdQ+Av6Mtjhi
-=CC/O
+iQIcBAEBAgAGBQJP2Tc+AAoJELEHsLL7fEFWuFkQAI/Sa1CNdE+c07KtUc04M9pz
+D3/r2xGaWJms4h3GmJw4jKo443TVTW+7uGDnCl3zcdvzjAWgLaUPRyGr2SliCGPE
+WNfzYmx4E9e8TQOe3YH6h2BNgNqEhebLHmT1weTqxVkBU6cSCGxjQ6t7bLKFFJD4
+KEFwaqpLPrgy29pWdwTAsETNbzfYSDbSmuhQK0jonF2ydCoOVLXKdOg04sfy32gv
+pFjoK7/C7vgmpJbHg39meXMcKXPa1WfoHeLTVwqESh7Td5jNxdBRN7OIey/Wt5nb
+0SbQnjpZJH9gPYZX3K2b0xWz3+MO+tAFTm+v/Jjl9nHBpeBD+kGgdKzAWmMj1NDt
+TekGfdowfbCLJGcjGgg7mGhuk83Q+sb9lE98wvviikyVKjzDvrF1/o80R2u6xkp0
+nx4B3DnwKlY8qThJBm18Z4qcSx0dPf/YzxJgtOUxnub3ZVaN6I6gaKc9Jbaz0nKs
+SvaeCKNuJ81IV7FjrDktn8E/qSOu3j+/FRtwmxioW9npSrLHERVJEUy7hwUW5N39
+z0RooW5cLq1R4zbn9peo3TdQBwWqY8m52Y+Zq8bAyRhHP//NIJQMlwIJg0GkGQQB
++G5ym2kamqqDcqFS48g+r9yCPvw9ZvVBLWIeV56gu/kvKzpN7RGDVSM9cEjAQEA+
+i+DN5aHmhhPEedlmCWcp
+=smQk
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild
new file mode 100644
index 000000000000..790920538a7d
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.4.ebuild,v 1.1 2012/06/14 00:58:29 vapier 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 ~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.38-tests-locale.patch #99766
+	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
+}