dev-libs/oniguruma: Bump to EAPI=6, remove autotools-multilib.eclass

Package-Manager: portage-2.3.0

diff --git a/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild b/dev-libs/oniguruma/oniguruma-5.9.5-r1.ebuild
index 928a15d0ef94780d729b140afaf127e60ea13700..ef40ae4145c5cedac9f84ba794ee7e4bc4a0c5b0 100644 (file)
--- 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
 }