Version bump. Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

2 files changed, 23 insertions, 25 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 70db39370b32..5bb959145186 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.284 2014/07/18 02:11:00 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.285 2014/07/20 10:44:40 polynomial-c Exp $
+
+*e2fsprogs-1.42.11 (20 Jul 2014)
+
+  20 Jul 2014; Lars Wendler <polynomial-c@gentoo.org> -e2fsprogs-1.42.9.ebuild,
+  +e2fsprogs-1.42.11.ebuild:
+  Version bump. Removed old.
 
   18 Jul 2014; Matt Turner <mattst88@gentoo.org> e2fsprogs-1.42.10.ebuild:
   alpha stable, bug 516114.
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.9.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
index e2c3abd93626..355f9bd55bf5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.9.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
@@ -1,23 +1,24 @@
 # 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.9.ebuild,v 1.2 2014/01/18 05:15:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.1 2014/07/20 10:44:40 polynomial-c Exp $
 
-EAPI=3
+EAPI=4
 
 case ${PV} in
 *_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
 *)      UP_PV=${PV} ;;
 esac
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+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"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+	elibc_mintlib? ( https://498412.bugs.gentoo.org/attachment.cgi?id=368058 -> ${PN}-1.42.9-mint-r1.patch )"
 
 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 ~ppc-macos ~x86-macos ~m68k-mint"
+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}
@@ -41,11 +42,10 @@ pkg_setup() {
 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
+		epatch "${DISTDIR}"/${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 \
@@ -59,6 +59,7 @@ src_prepare() {
 
 	# Avoid rebuild
 	touch lib/ss/ss_err.h
+	eautoreconf
 }
 
 src_configure() {
@@ -68,20 +69,11 @@ src_configure() {
 	# 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-is-static-only || echo --enable-elf-shlibs) \
 		$(tc-has-tls || echo --disable-tls) \
 		--without-included-gettext \
 		$(use_enable nls) \
@@ -99,12 +91,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
+	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 fsck_ext2fs || die
+		emake V=1 fsck_ext2fs
 	fi
 }
 
@@ -123,11 +115,11 @@ src_install() {
 		STRIP=: \
 		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
 		DESTDIR="${D}" \
-		install install-libs || die
+		install install-libs
 	dodoc README RELEASE-NOTES
 
 	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf || die
+	doins "${FILESDIR}"/e2fsck.conf
 
 	# Move shared libraries to /lib/, install static libraries to
 	# /usr/lib/, and install linker scripts to /usr/lib/.
@@ -138,8 +130,8 @@ src_install() {
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
 		into /
-		dosbin "${S}"/fsck_ext2fs || die
-		doman "${FILESDIR}"/fsck_ext2fs.8 || die
+		dosbin "${S}"/fsck_ext2fs
+		doman "${FILESDIR}"/fsck_ext2fs.8
 
 		# filefrag is linux only
 		rm \