app-text/crf++: fix build with sys-devel/automake-1.13

Closes: https://bugs.gentoo.org/467604
Package-Manager: Portage-2.3.13, Repoman-2.3.4

diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
index e282ca87c965930eb1e767443105a33f943c83f6..3a48217d2796b3920359b495711ee2725fa6b7f3 100644 (file)
--- a/app-text/crf++/crf++-0.54.ebuild
+++ b/app-text/crf++/crf++-0.54.ebuild
@@ -22,6 +22,7 @@ src_prepare() {
                -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
                configure.in || die
 
+       epatch "${FILESDIR}"/${PN}-automake-1.13.patch
        epatch "${FILESDIR}"/${P}-c++11.patch
        # bug #365921
        epatch "${FILESDIR}/${P}-gcc46.patch"

diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 7518e894e2e90fc459f9ccf6f7468fb1ccd1aa54..63fcdca38b66e526ea1ff2ea852df52240148944 100644 (file)
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -22,6 +22,8 @@ src_prepare() {
                -e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
                configure.in || die
 
+       epatch "${FILESDIR}"/${PN}-automake-1.13.patch
+
        eautoreconf
 }
 

diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
new file mode 100644 (file)
index 0000000..afff7ed
--- /dev/null
+++ b/app-text/crf++/files/crf++-automake-1.13.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -240,6 +240,6 @@
+ AC_MSG_RESULT([yes])
+ 
+ AC_SUBST(datarootdir)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
+