From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 17 May 2018 07:26:42 +0000 (+0200)
Subject: media-libs/freetype: Revbumps to fix installation of static libs
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7d9a68ef8e502f06fc968430038c3877112aef40;p=gentoo.git

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 c4a012f69345..d66c2736f40c 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 f8e4fb37a31a..87b22162625b 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 f8e4fb37a31a..87b22162625b 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
 }