From d1f9874c5bbee3e6b57f66d241dd3c92bac3673f Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Fri, 2 Sep 2016 22:45:33 +0100
Subject: dev-libs/libconcord: Move to EAPI 6

Package-Manager: portage-2.2.28
---
 dev-libs/libconcord/Manifest              |  2 +-
 dev-libs/libconcord/libconcord-1.2.ebuild | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libconcord/Manifest b/dev-libs/libconcord/Manifest
index a66b4c50..46dfa228 100644
--- a/dev-libs/libconcord/Manifest
+++ b/dev-libs/libconcord/Manifest
@@ -1,3 +1,3 @@
 DIST concordance-1.2.tar.bz2 1143635 SHA256 ce9f23dfcd9bb1de79edd07231062c5e5d5fdefb3dd88ae6da7fb25b8d782434 WHIRLPOOL 494cecea7b63329ae094b9b4b82e5c668ca26a71f8bafbb783b339f2ceaf30149040696e8808fcfa738a0077d467e31976d2b65677a40ca1c85aedb162fa62d7
-EBUILD libconcord-1.2.ebuild 1457 SHA256 9ca27fee33665c7ad20d27846f775ada0c83056567fffa1ea8807691bc951195 WHIRLPOOL d78e1d8281617bfea33db1a0a16f6023c950b7b471d80c9f7b0aaea24d9cfd3bbd67d399d24064e393d0d4e0276d722dcd7ef486f255511ef23443b6135be4c7
+EBUILD libconcord-1.2.ebuild 1646 SHA256 232ba7a6b4ce3dc0a30cb5ccf75477d291bb87ff4e7caf58e582222bec446f49 WHIRLPOOL 9fdd7d3d5faf251748437d7ad33df0c2c31f5156523ee3028f1bf5bdb8e53d69248db09e3da1c5222b5591c8c7567aa36e2a70810c24fc48de0796a33bebaf14
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/dev-libs/libconcord/libconcord-1.2.ebuild b/dev-libs/libconcord/libconcord-1.2.ebuild
index 0f71f136..1f5b88c7 100644
--- a/dev-libs/libconcord/libconcord-1.2.ebuild
+++ b/dev-libs/libconcord/libconcord-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit eutils fdo-mime perl-module distutils-r1
@@ -25,10 +25,12 @@ RDEPEND="dev-libs/hidapi
 S="${WORKDIR}/${MY_P}/${PN}"
 
 src_prepare() {
+	default
+
 	if use perl ; then
 		cd "${S}/bindings/perl"
 		einfo "Prepare perl bindings in ${PWD}"
-		perl-module_src_prep
+		perl-module_src_prepare
 		swig -perl5 concord.i
 		cd "${S}"
 	fi
@@ -38,6 +40,13 @@ src_configure() {
 	econf \
 		--disable-mime-update \
 		$(use_enable static-libs static)
+
+	if use perl ; then
+		cd "${S}/bindings/perl"
+		einfo "Configure perl bindings in ${PWD}"
+		perl-module_src_configure
+		cd "${S}"
+	fi
 }
 
 src_compile() {
@@ -46,6 +55,7 @@ src_compile() {
 	if use perl ; then
 		cd "${S}/bindings/perl"
 		einfo "Compile perl bindings in ${PWD}"
+		mymake=( OPTIMIZE="${CFLAGS} -I${S}" )
 		perl-module_src_compile
 		cd "${S}"
 	fi
-- 
cgit v1.2.3