[gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/

[Lars Wendler]

commit:     7d9a68ef8e502f06fc968430038c3877112aef40
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 07:26:42 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 17 07:28:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9a68ef

media-libs/freetype: Revbumps to fix installation of static libs

Closes: https://bugs.gentoo.org/655932
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 .../freetype/{freetype-2.9.1-r1.ebuild => freetype-2.9.1-r3.ebuild}  | 5 ++++-
 .../freetype/{freetype-2.9.1-r2.ebuild => freetype-2.9.1-r4.ebuild}  | 5 ++++-
 media-libs/freetype/freetype-9999.ebuild                             | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/media-libs/freetype/freetype-2.9.1-r1.ebuild 
b/media-libs/freetype/freetype-2.9.1-r3.ebuild
similarity index 98%
rename from media-libs/freetype/freetype-2.9.1-r1.ebuild
rename to media-libs/freetype/freetype-2.9.1-r3.ebuild
index c4a012f6934..d66c2736f40 100644
--- a/media-libs/freetype/freetype-2.9.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r3.ebuild
@@ -230,5 +230,8 @@ multilib_src_install_all() {
                dodoc -r docs/*
        fi
 
-       find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+       find "${ED}" -name '*.la' -delete || die
+       if ! use static-libs ; then
+               find "${ED}" -name '*.a' -delete || die
+       fi
 }

diff --git a/media-libs/freetype/freetype-2.9.1-r2.ebuild 
b/media-libs/freetype/freetype-2.9.1-r4.ebuild
similarity index 98%
rename from media-libs/freetype/freetype-2.9.1-r2.ebuild
rename to media-libs/freetype/freetype-2.9.1-r4.ebuild
index f8e4fb37a31..87b22162625 100644
--- a/media-libs/freetype/freetype-2.9.1-r2.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r4.ebuild
@@ -230,5 +230,8 @@ multilib_src_install_all() {
                dodoc -r docs/*
        fi
 
-       find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+       find "${ED}" -name '*.la' -delete || die
+       if ! use static-libs ; then
+               find "${ED}" -name '*.a' -delete || die
+       fi
 }

diff --git a/media-libs/freetype/freetype-9999.ebuild 
b/media-libs/freetype/freetype-9999.ebuild
index f8e4fb37a31..87b22162625 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -230,5 +230,8 @@ multilib_src_install_all() {
                dodoc -r docs/*
        fi
 
-       find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+       find "${ED}" -name '*.la' -delete || die
+       if ! use static-libs ; then
+               find "${ED}" -name '*.a' -delete || die
+       fi
 }