Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

4 files changed, 16 insertions, 18 deletions

diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index bcffcf40d586..0c9ed8a7d755 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,11 +1,11 @@
-AUX ilmbase-1.0.0-asneeded.patch 434 BLAKE2B 0bdb50ec8def23f821b8fa820c7f680f7037bd641213b5a881992141fd7afab11512f10441b94b4d596919663e59b39d56eda44415992b45a3b900b31534989e SHA512 b282b6fc8eb7a26a992deb49e62ecfa55208524b703a1e09edc53575b18593cb3d750a873f31d87c13b303fb737e64a22ef023f56be6a6fbb27e1c38861ab191
-AUX ilmbase-1.0.2-gcc43.patch 294 BLAKE2B ca179b94dfa7db269502772fefd7339281ae5c252db942da0eb527e6d782fb7a225caf3b947bacdc52605156006fa0fa1305df84842eedb3f6d80bea184683c8 SHA512 d891afedb80b2e1270469eeefce9497a025b308d88ab9b71b79130cea864f927782b00ae890cd2cc6c115e9efd56df449c4d0a5b624527faf9c33917b0bfbf64
+AUX ilmbase-1.0.0-asneeded.patch 430 BLAKE2B dc57749e5c56c54b1f596fdabdc1b7ee59da67a6d0eac2cb445ba0733657e28753d443867219ecd3751af3c2c7ccfc556e6237f6e6b8dc88030bd4934e9c358f SHA512 ee217602f51f146324c277f3876d9fe6f23524e9e7d81c00707b7a29a0edcaa200adf2e8835485f04c4b7914b7fcfc8307dbb984072d895588e4e10ef0cff525
+AUX ilmbase-1.0.2-gcc43.patch 290 BLAKE2B f10e2cc1a3f1c1f883b69f9abc478fc23504c5eaed797a3c50e2e6aaef86813ed8e3db436c649c76a08244acce8b78782bcd8e8b86492294b9baf10d0b1024b9 SHA512 7436f6ea0bc6a25a6496566b2d3169f11103fd5376dfa7883bc0a420e32d2f2dbcd94ad02cb7eecede36ac1d0f27564d9b442c4ee9d82c19a9c7c1cba51204cf
 AUX ilmbase-2.2.0-Remove-register-keyword.patch 2582 BLAKE2B 04c54acec24b523e657ea9b5db787c4ab82fc43748c3fb47589a03f376eba31622071ae42a9ad1df4170d3dc832a9853d57ae458750d5e5241f41c5e0121fc38 SHA512 786b2edc895efd06fcfa78441704ea0ec9608d872d0953212adfe83f9a9c2c838e9caa88dfe9fab140a237e645ac90d8a099761057e3cc6a4e44865cc316459c
 DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba546000653f7028c511e6cd208bcbf23b27478db25f41890bb362e687e10fc9342785d25a92df6a3d7b0b77d90 SHA512 5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
 DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712
 DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342
 DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
-EBUILD ilmbase-1.0.2.ebuild 730 BLAKE2B 018474bd4196c2ee89f1c9e14359d2c4cfbf9b8277ae4cf1e5ee4a2be742ff0884881bf9967c28be6cf27b13edcf5e753222e5991be20239ee9604710fd98e8b SHA512 0e746dc823c5ea990a2f05329c45716ebff1c7094097a3095fd513a0a82f8c5a47688b57d37e9c158574a15947aa85426398aec728a89f825a4c5b1ce371407e
+EBUILD ilmbase-1.0.2.ebuild 800 BLAKE2B 2527e4bf3601d64423e7e46b897bdf524c60dd0e369314e9bb0ab04f06c2f0812c226bff55dd885eb5083f43dc4b9a593e9a98b03856056c1eb1f33b18999eaf SHA512 e302e98e65e0620e0367d74b0a797578420ad540394e8ee307883b70a1d1673e863ae418f4e00966960dc5c39be4d43649e84f2338cb0fea31a5b79e7c8557a4
 EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d265227dc5c63e70f7c84d5ea05ac177b416cc37744bc6f5360911ed3d3e112596f14f81aa456cd472682d017efaf2 SHA512 4a5392c5be8b1758dc8c2fc0e59530fafb7d353ca70711060f4e43759a9f22c6524323b3db50774b94d7a40472b4854810d012f5eeee375af8f08b4577eae18e
 EBUILD ilmbase-2.1.0.ebuild 758 BLAKE2B 20825fee87f24bc2e31d4c01e690ed7d6ed4827ea9422dd83354da8a8c85c832f0d8d172ac802193b56a482f0d656f79a5aa483a995ae05e17e91ac8b4e8a202 SHA512 fdb41c8dc58900b21d3dd42e8cd65b99639f343985ae8b99e04a8a4e5eb0b68b13725d03b3bd03776d528d2998f62d0f6496bb6ef13b0cc9dda1d804d84b7e2e
 EBUILD ilmbase-2.2.0-r1.ebuild 970 BLAKE2B 322ac4df65286c9aedaf85b43fc8d1fecbc3816fff231695f59647d55ba978610a3156f072416f7e7f211c59606b4364917d98c93034a6a7a532dab47a401978 SHA512 c3b4313c5f67e0082ec5b0f5d7c793e99be3c1c85f9ce1ef923c784b1307a22ca82c47bb2547dd7db30a4a67a98b729ac34ca32791c0d0b62d66e089ac38db11
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 a3953efd3513..dc69fb983636 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 @@
---- a/IlmThread/Makefile.in
-+++ b/IlmThread/Makefile.in
+--- IlmThread/Makefile.in
++++ 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 a4e186058fe8..d822092254d8 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 @@
---- a/Imath/ImathMatrix.h
-+++ b/Imath/ImathMatrix.h
+--- Imath/ImathMatrix.h
++++ 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 b92d275e1df2..eb979ea8ca4c 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-2018 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit libtool
+EAPI=2
+inherit eutils libtool
 
 DESCRIPTION="OpenEXR ILM Base libraries"
 HOMEPAGE="http://openexr.com/"
@@ -16,22 +16,20 @@ 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() {
-	default
+	epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	elibtoolize
 }
 
 src_configure() {
 	econf \
+		--disable-dependency-tracking \
 		$(use_enable static-libs static)
 }
 
 src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die "Pruning failed"
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+	find "${D}" -name '*.la' -delete
 }