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

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 c4a012f6934578e7df5bbfb4e318ac86c91a865d..d66c2736f40c796a6994c0f1f61a06492b4200b2 100644 (file)
--- 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 f8e4fb37a31a0dc5cb791769f13269f1d6967cff..87b22162625bbeacebd00f5e8812ef3e212ef79a 100644 (file)
--- 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 f8e4fb37a31a0dc5cb791769f13269f1d6967cff..87b22162625bbeacebd00f5e8812ef3e212ef79a 100644 (file)
--- 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
 }