[gentoo-commits] repo/gentoo:master commit in: x11-libs/wxGTK/

[David Seifert]

commit:     8fc2b29f54a92b6c66baa691ab751285be34cdb4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 11:21:57 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 11:23:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc2b29f

x11-libs/wxGTK: Allow for compiling with GCC 6

Gentoo-bug: 592436

Acked-by: Ryan Hill <rhill <AT> gentoo.org>

Package-Manager: portage-2.3.1

 x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild 
b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
index 49645e7..a9c599e 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r301.ebuild
@@ -69,13 +69,15 @@ LICENSE="wxWinLL-3
                doc?    ( wxWinFDL-3 )"
 
 S="${WORKDIR}/wxPython-src-${PV}"
+PATCHES=(
+       "${FILESDIR}"/${P}-webview-fixes.patch
+       "${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_prepare() {
-       PATCHES=( "${FILESDIR}"/${P}-webview-fixes.patch )
-
-       eapply "${PATCHES[@]}"
-       eapply_user
+       default
 
+       local f
        for f in $(find "${S}" -name configure.in); do
                mv "${f}" "${f/in/ac}" || die
        done