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, 17 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index 441bf92b70d5..2b016bde22dd 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.311 2015/05/25 10:23:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.312 2015/05/25 10:29:17 vapier Exp $
+
+  25 May 2015; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.10.ebuild,
+  e2fsprogs-1.42.12.ebuild, e2fsprogs-1.42.13.ebuild,
+  files/e2fsprogs-1.42.10-fix-build-cflags.patch,
+  files/e2fsprogs-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-1.42.10.ebuild,
   e2fsprogs-1.42.12.ebuild, e2fsprogs-1.42.13.ebuild,
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
index c5fba0bfd5e2..b994cfd0561d 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-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-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.24 2015/05/25 10:23:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.25 2015/05/25 10:29:17 vapier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -50,7 +50,6 @@ src_prepare() {
 
 	# Avoid rebuild
 	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
index d73fe4a73592..9ad06f6c7a78 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-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-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild,v 1.11 2015/05/25 10:23:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.12.ebuild,v 1.12 2015/05/25 10:29:17 vapier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -53,7 +53,6 @@ src_prepare() {
 
 	# Avoid rebuild
 	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild
index 02f2cefefa90..1f27f252afb8 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-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-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild,v 1.2 2015/05/25 10:23:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild,v 1.3 2015/05/25 10:29:17 vapier Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ case ${PV} in
 *)      UP_PV=${PV} ;;
 esac
 
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -53,7 +53,6 @@ src_prepare() {
 
 	# Avoid rebuild
 	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-	eautoreconf
 }
 
 src_configure() {
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch
index b57d5ff6768d..69e6f358d9e1 100644
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-fix-build-cflags.patch
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-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-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch
index 219c3a1ac380..dcab9a34de09 100644
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-fix-build-cflags.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/516854
 
---- e2fsprogs-1.42.13/configure.in
-+++ e2fsprogs-1.42.13/configure.in
+--- e2fsprogs-1.42.13/configure
++++ e2fsprogs-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)
+ 
+