Version bump #416771 by Samuli Suominen.

(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)

4 files changed, 221 insertions, 1 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 54b020b088d9..ec0bb505f274 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.250 2012/05/04 19:09:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.251 2012/05/22 19:45:50 vapier Exp $
+
+*e2fsprogs-1.42.3 (22 May 2012)
+
+  22 May 2012; Mike Frysinger <vapier@gentoo.org> +e2fsprogs-1.42.3.ebuild,
+  +files/e2fsprogs-1.42.3-quota-time.patch,
+  +files/e2fsprogs-1.42.3-quotactl.patch:
+  Version bump #416771 by Samuli Suominen.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> e2fsprogs-1.41.7-r1.ebuild,
   e2fsprogs-1.41.12.ebuild, e2fsprogs-1.41.12-r1.ebuild,
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.3.ebuild
new file mode 100644
index 000000000000..b37c5ce60ab6
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.3.ebuild
@@ -0,0 +1,152 @@
+# 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.3.ebuild,v 1.1 2012/05/22 19:45:49 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.42.3-quotactl.patch
+	epatch "${FILESDIR}"/${PN}-1.42.3-quota-time.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
+}
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch
new file mode 100644
index 000000000000..1797105dc0f5
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch
@@ -0,0 +1,28 @@
+From 90202c13466fcde28fd56d349a3380d68dbda5f2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 22 May 2012 15:05:18 -0400
+Subject: [PATCH] libquota: add missing time.h include
+
+This code uses time() but doesn't include time.h leading to:
+quotaio.c:89:2: warning: implicit declaration of function 'time'
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/quota/quotaio.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/quota/quotaio.c b/lib/quota/quotaio.c
+index 481d5f5..6e917f0 100644
+--- a/lib/quota/quotaio.c
++++ b/lib/quota/quotaio.c
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+-- 
+1.7.8.6
+
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch
new file mode 100644
index 000000000000..52fb6d2cd0f5
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch
@@ -0,0 +1,33 @@
+From f06c5004f410d0a0a9ed706dad194aabf1be0077 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 22 May 2012 15:02:42 -0400
+Subject: [PATCH] libquota: add a quotactl prototype
+
+The commit 0df8a27bbaf51b55c0e8c3a533ef4c2ff9d79c9f removed the system
+quota.h include, but in doing so, added the problem:
+mkquota.c:55:2: warning: implicit declaration of function 'quotactl'
+
+Since we're maintaining a copy of quota.h, add a proper func prototype.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/quota/quota.h |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/lib/quota/quota.h b/lib/quota/quota.h
+index a943ec6..3eaec1d 100644
+--- a/lib/quota/quota.h
++++ b/lib/quota/quota.h
+@@ -152,4 +152,9 @@ enum {
+ };
+ #define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)
+ 
++#ifdef HAVE_QUOTACTL
++extern int quotactl(int __cmd, const char *__special, int __id,
++		    caddr_t __addr);
++#endif
++
+ #endif /* _QUOTA_ */
+-- 
+1.7.8.6
+