From: Chris Reffett <creffett@gentoo.org>
Date: Tue, 25 Oct 2016 00:42:52 +0000 (-0400)
Subject: app-text/sword: Add patch for building with GCC 6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ea26c138a5a7b151457852959532d6ddac9f0945;p=gentoo.git

app-text/sword: Add patch for building with GCC 6

Gentoo-Bug: 593818

Package-Manager: portage-2.3.2
---

diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch b/app-text/sword/files/sword-1.7.4-gcc6.patch
new file mode 100644
index 000000000000..54c79671235e
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-gcc6.patch
@@ -0,0 +1,22 @@
+--- sword-1.7.4/configure.ac.old	2016-09-21 18:04:55.029088352 -0400
++++ sword-1.7.4/configure.ac	2016-09-21 18:05:37.870349308 -0400
+@@ -197,7 +197,7 @@
+ fi
+ 
+ 
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+ 
+ if test x$enable_warnings = xyes; then
+   AM_CFLAGS="$AM_CFLAGS -Werror"
+--- sword-1.7.4/configure.old	2016-09-21 18:05:05.900008373 -0400
++++ sword-1.7.4/configure	2016-09-21 18:06:03.822112657 -0400
+@@ -16793,7 +16793,7 @@
+ fi
+ 
+ 
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+ 
+ if test x$enable_warnings = xyes; then
+   AM_CFLAGS="$AM_CFLAGS -Werror"
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4.ebuild
index 1567283b4ed6..3943b6faa6ec 100644
--- a/app-text/sword/sword-1.7.4.ebuild
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -39,6 +39,7 @@ src_prepare() {
 	[Install]
 	DataPath=${EPREFIX}/usr/share/${PN}/
 	EOF
+	epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
 }
 
 src_configure() {