| 1 |
commit: 7b674cdd0997d2106b62d3ef41dbf6db479ea07f |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 29 15:43:18 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 20:10:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b674cdd |
| 7 |
|
| 8 |
media-libs/ilmbase: bump EAPI and drop eutils |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
.../ilmbase/files/ilmbase-1.0.0-asneeded.patch | 4 ++-- |
| 13 |
media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch | 4 ++-- |
| 14 |
media-libs/ilmbase/ilmbase-1.0.2.ebuild | 20 +++++++++++--------- |
| 15 |
3 files changed, 15 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch |
| 18 |
index dc69fb98363..a3953efd351 100644 |
| 19 |
--- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch |
| 20 |
+++ b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
---- IlmThread/Makefile.in |
| 23 |
-+++ IlmThread/Makefile.in |
| 24 |
+--- a/IlmThread/Makefile.in |
| 25 |
++++ b/IlmThread/Makefile.in |
| 26 |
@@ -209,7 +209,7 @@ |
| 27 |
IlmThreadMutexPosix.cpp |
| 28 |
|
| 29 |
|
| 30 |
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch |
| 31 |
index d822092254d..a4e186058fe 100644 |
| 32 |
--- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch |
| 33 |
+++ b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch |
| 34 |
@@ -1,5 +1,5 @@ |
| 35 |
---- Imath/ImathMatrix.h |
| 36 |
-+++ Imath/ImathMatrix.h |
| 37 |
+--- a/Imath/ImathMatrix.h |
| 38 |
++++ b/Imath/ImathMatrix.h |
| 39 |
@@ -37,6 +37,8 @@ |
| 40 |
#ifndef INCLUDED_IMATHMATRIX_H |
| 41 |
#define INCLUDED_IMATHMATRIX_H |
| 42 |
|
| 43 |
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild |
| 44 |
index eb979ea8ca4..b92d275e1df 100644 |
| 45 |
--- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild |
| 46 |
+++ b/media-libs/ilmbase/ilmbase-1.0.2.ebuild |
| 47 |
@@ -1,8 +1,8 @@ |
| 48 |
-# Copyright 1999-2015 Gentoo Foundation |
| 49 |
+# Copyright 1999-2018 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
-EAPI=2 |
| 53 |
-inherit eutils libtool |
| 54 |
+EAPI=6 |
| 55 |
+inherit libtool |
| 56 |
|
| 57 |
DESCRIPTION="OpenEXR ILM Base libraries" |
| 58 |
HOMEPAGE="http://openexr.com/" |
| 59 |
@@ -16,20 +16,22 @@ IUSE="static-libs" |
| 60 |
RDEPEND="!<media-libs/openexr-1.5.0" |
| 61 |
DEPEND="${RDEPEND}" |
| 62 |
|
| 63 |
+PATCHES=( |
| 64 |
+ "${FILESDIR}/${PN}-1.0.0-asneeded.patch" |
| 65 |
+ "${FILESDIR}/${P}-gcc43.patch" |
| 66 |
+) |
| 67 |
+ |
| 68 |
src_prepare() { |
| 69 |
- epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch \ |
| 70 |
- "${FILESDIR}"/${P}-gcc43.patch |
| 71 |
+ default |
| 72 |
elibtoolize |
| 73 |
} |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
econf \ |
| 77 |
- --disable-dependency-tracking \ |
| 78 |
$(use_enable static-libs static) |
| 79 |
} |
| 80 |
|
| 81 |
src_install() { |
| 82 |
- emake DESTDIR="${D}" install || die |
| 83 |
- dodoc AUTHORS ChangeLog NEWS README |
| 84 |
- find "${D}" -name '*.la' -delete |
| 85 |
+ default |
| 86 |
+ find "${D}" -name '*.la' -delete || die "Pruning failed" |
| 87 |
} |
Archives