Change build-cflags patch to apply to configure since it is super tiny and the other modifications in src_prepare expect to patch the generated autotools #549926 by Patrick McLean.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

6 files changed, 22 insertions, 21 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index e2ddf709e3bb..99b1c28db782 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.142 2015/05/25 10:14:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.143 2015/05/25 10:21:48 vapier Exp $
+
+  25 May 2015; Mike Frysinger <vapier@gentoo.org> e2fsprogs-libs-1.42.10.ebuild,
+  e2fsprogs-libs-1.42.12.ebuild, e2fsprogs-libs-1.42.13.ebuild,
+  files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch,
+  files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch:
+  Change build-cflags patch to apply to configure since it is super tiny and the
+  other modifications in src_prepare expect to patch the generated autotools
+  #549926 by Patrick McLean.
 
   25 May 2015; Mike Frysinger <vapier@gentoo.org> e2fsprogs-libs-1.42.10.ebuild,
   e2fsprogs-libs-1.42.12.ebuild, e2fsprogs-libs-1.42.13.ebuild,
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
index e3f9e2ad73dd..9abf779ad481 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild,v 1.16 2015/05/25 10:14:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.10.ebuild,v 1.17 2015/05/25 10:21:48 vapier Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit autotools toolchain-funcs eutils multilib-minimal
+inherit toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -36,7 +36,6 @@ src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
 	epatch "${FILESDIR}"/${P}-fix-build-cflags.patch #516854
-	eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
index 31c70ae0ff4a..44244f61af71 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild,v 1.10 2015/05/25 10:14:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.12.ebuild,v 1.11 2015/05/25 10:21:48 vapier Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit autotools toolchain-funcs eutils multilib-minimal
+inherit toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -36,9 +36,6 @@ src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
 	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch #516854
-	# Not everyone has gettext installed (like USE=-nls).
-	echo 'm4_ifndef([AM_GNU_GETTEXT],[m4_define([AM_GNU_GETTEXT])])' >> acinclude.m4
-	eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
index 027c5e3d0620..67f523fb9de4 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild,v 1.2 2015/05/25 10:14:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.13.ebuild,v 1.3 2015/05/25 10:21:48 vapier Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit autotools toolchain-funcs eutils multilib-minimal
+inherit toolchain-funcs eutils multilib-minimal
 
 DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -36,9 +36,6 @@ src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
 	epatch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-	# Not everyone has gettext installed (like USE=-nls).
-	echo 'm4_ifndef([AM_GNU_GETTEXT],[m4_define([AM_GNU_GETTEXT])])' >> acinclude.m4
-	eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
index b57d5ff6768d..69e6f358d9e1 100644
--- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.10-fix-build-cflags.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/516854
 
---- a/e2fsprogs-libs-1.42.10/configure.in
-+++ b/e2fsprogs-libs-1.42.10/configure.in
+--- a/e2fsprogs-libs-1.42.10/configure
++++ b/e2fsprogs-libs-1.42.10/configure
 @@ -1328,7 +1328,7 @@
     BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
     BUILD_LDFLAGS="$LDFLAGS"
@@ -10,4 +10,4 @@ https://bugs.gentoo.org/516854
 +   BUILD_CFLAGS="$INCLUDES"
     BUILD_LDFLAGS=
  fi
- AC_SUBST(BUILD_CFLAGS)
+ 
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch
index eef65059dd44..a87f0c697eab 100644
--- a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.13-fix-build-cflags.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/516854
 
---- e2fsprogs-libs-1.42.13/configure.in
-+++ e2fsprogs-libs-1.42.13/configure.in
+--- e2fsprogs-libs-1.42.13/configure
++++ e2fsprogs-libs-1.42.13/configure
 @@ -1315,6 +1315,8 @@
  if test $cross_compiling = no; then
     BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
@@ -9,5 +9,5 @@ https://bugs.gentoo.org/516854
 +else
 +   BUILD_CFLAGS="$INCLUDES"
  fi
- AC_SUBST(BUILD_CFLAGS)
- AC_SUBST(BUILD_LDFLAGS)
+ 
+