From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1024576-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B0B761382C5
for <garchives@archives.gentoo.org>; Thu, 17 May 2018 07:28:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9B922E081A;
Thu, 17 May 2018 07:28:42 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5E393E081A
for <gentoo-commits@lists.gentoo.org>; Thu, 17 May 2018 07:28:42 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ADB79335C2E
for <gentoo-commits@lists.gentoo.org>; Thu, 17 May 2018 07:28:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 44DC143
for <gentoo-commits@lists.gentoo.org>; Thu, 17 May 2018 07:28:39 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1526542112.7d9a68ef8e502f06fc968430038c3877112aef40.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/freetype/freetype-2.9.1-r1.ebuild media-libs/freetype/freetype-2.9.1-r2.ebuild media-libs/freetype/freetype-2.9.1-r3.ebuild media-libs/freetype/freetype-2.9.1-r4.ebuild media-libs/freetype/freetype-9999.ebuild
X-VCS-Directories: media-libs/freetype/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 7d9a68ef8e502f06fc968430038c3877112aef40
X-VCS-Branch: master
Date: Thu, 17 May 2018 07:28:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: edf640c7-9269-4374-b1a8-8f1d09e1d722
X-Archives-Hash: 887781e61c58bc0e8f71d951414bd86c
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
}