[gentoo-commits] repo/gentoo:master commit in: dev-libs/oniguruma/

[David Seifert]

commit:     013a4924bcee93f3df06c556cc28a9b426830625
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 18:19:41 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 18:20:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013a4924

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(-)

diff --git a/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild 
b/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild
index 928a15d..ef40ae4 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
 }