From 013a4924bcee93f3df06c556cc28a9b426830625 Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Thu, 8 Sep 2016 20:19:41 +0200
Subject: dev-libs/oniguruma: Bump to EAPI=6, remove autotools-multilib.eclass

Package-Manager: portage-2.3.0
---
 dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'dev-libs')

diff --git a/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild b/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild
index 928a15d0ef94..ef40ae4145c5 100644
--- a/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild
@@ -2,12 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 # Needed for a sane .so versionning on fbsd, please dont drop
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils autotools-multilib
+inherit autotools multilib-minimal
 
 MY_P=onig-${PV}
 
@@ -25,15 +23,21 @@ DOCS=( AUTHORS HISTORY README{,.ja} doc/{API,FAQ,RE}{,.ja} )
 
 S=${WORKDIR}/${MY_P}
 
-src_configure() {
-	local myeconfargs=(
-		$(use_enable combination-explosion-check)
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable combination-explosion-check) \
 		$(use_enable crnl-as-line-terminator)
-	)
-	autotools-multilib_src_configure
 }
 
-src_install() {
-	autotools-multilib_src_install
-	use static-libs || prune_libtool_files
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
 }
-- 
cgit v1.2.3-65-gdbad