x11-libs/libcompizconfig: revbump, fixes bug #602286

* backport patch to fix compilation bug
* EAPI bump

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=602286

Package-Manager: Portage-2.3.3, Repoman-2.3.1

2 files changed, 40 insertions, 2 deletions

diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
new file mode 100644
index 000000000000..498a4bfa4d12
--- /dev/null
+++ b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.8-avoid-using-templates-in-c-code.patch
@@ -0,0 +1,35 @@
+From 1e42ea0e629d6a013e6e7ad7f5d1bbfd2ea11338 Mon Sep 17 00:00:00 2001
+From: Scott Moreau <oreaus@gmail.com>
+Date: Wed, 9 Dec 2015 12:51:12 -0700
+Subject: [PATCH] Avoid using templates in C code
+
+libxslt uses templates and we cannot use templates in C code. Move the headers
+using templates outside extern "C" clause.
+---
+ src/compiz.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/compiz.cpp b/src/compiz.cpp
+index 43da02f..e5aba0f 100644
+--- a/src/compiz.cpp
++++ b/src/compiz.cpp
+@@ -23,6 +23,9 @@
+ #include <google/protobuf/io/zero_copy_stream_impl.h>
+ #endif
+ 
++#include <libxslt/transform.h>
++#include <libxslt/xsltutils.h>
++
+ extern "C"
+ {
+ #ifdef HAVE_CONFIG_H
+@@ -36,9 +39,6 @@ extern "C"
+ #include <sys/stat.h>
+ #include <errno.h>
+ 
+-#include <libxslt/transform.h>
+-#include <libxslt/xsltutils.h>
+-
+ #include <locale.h>
+ 
+ #include <compiz-core.h>
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
index ce55678d2dd9..fbc67240c0ce 100644
--- a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.8.8-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 inherit eutils
 
 DESCRIPTION="Compiz Configuration System"
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
+#602286
+PATCHES=( "${FILESDIR}/${P}-avoid-using-templates-in-c-code.patch" )
+
 src_configure() {
 	econf \
 		--enable-fast-install \