[gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/

[Aaron Bauman]

commit:     7b674cdd0997d2106b62d3ef41dbf6db479ea07f
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 15:43:18 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue May 29 20:10:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b674cdd

media-libs/ilmbase: bump EAPI and drop eutils

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../ilmbase/files/ilmbase-1.0.0-asneeded.patch       |  4 ++--
 media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch   |  4 ++--
 media-libs/ilmbase/ilmbase-1.0.2.ebuild              | 20 +++++++++++---------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch 
b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
index dc69fb98363..a3953efd351 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
@@ -1,5 +1,5 @@
---- IlmThread/Makefile.in
-+++ IlmThread/Makefile.in
+--- a/IlmThread/Makefile.in
++++ b/IlmThread/Makefile.in
 @@ -209,7 +209,7 @@
                          IlmThreadMutexPosix.cpp
  

diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch 
b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
index d822092254d..a4e186058fe 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
@@ -1,5 +1,5 @@
---- Imath/ImathMatrix.h
-+++ Imath/ImathMatrix.h
+--- a/Imath/ImathMatrix.h
++++ b/Imath/ImathMatrix.h
 @@ -37,6 +37,8 @@
  #ifndef INCLUDED_IMATHMATRIX_H
  #define INCLUDED_IMATHMATRIX_H

diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild 
b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
index eb979ea8ca4..b92d275e1df 100644
--- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild
+++ b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils libtool
+EAPI=6
+inherit libtool
 
 DESCRIPTION="OpenEXR ILM Base libraries"
 HOMEPAGE="http://openexr.com/";
@@ -16,20 +16,22 @@ IUSE="static-libs"
 RDEPEND="!<media-libs/openexr-1.5.0"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-1.0.0-asneeded.patch"
+       "${FILESDIR}/${P}-gcc43.patch"
+)
+
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch \
-               "${FILESDIR}"/${P}-gcc43.patch
+       default
        elibtoolize
 }
 
 src_configure() {
        econf \
-               --disable-dependency-tracking \
                $(use_enable static-libs static)
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
-       dodoc AUTHORS ChangeLog NEWS README
-       find "${D}" -name '*.la' -delete
+       default
+       find "${D}" -name '*.la' -delete || die "Pruning failed"
 }