From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1043907-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 D3363138334
	for <garchives@archives.gentoo.org>; Sat, 25 Aug 2018 06:14:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B655CE07F9;
	Sat, 25 Aug 2018 06:14:27 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(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 8E9DEE07F9
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Aug 2018 06:14:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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 47BC9335C7F
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Aug 2018 06:14:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A19083A2
	for <gentoo-commits@lists.gentoo.org>; Sat, 25 Aug 2018 06:14:23 +0000 (UTC)
From: "Michał Górny" <mgorny@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, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1535177556.069f996669210ce98261870a6e65bddf6dfe3576.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/imlib2/imlib2-1.5.1-r1.ebuild
X-VCS-Directories: media-libs/imlib2/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 069f996669210ce98261870a6e65bddf6dfe3576
X-VCS-Branch: master
Date: Sat, 25 Aug 2018 06:14:23 +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: 7c2eec6e-747e-417b-b957-57054fa15b63
X-Archives-Hash: 880ead5aceacfdb42aa8756d79242bcc

commit:     069f996669210ce98261870a6e65bddf6dfe3576
Author:     Joonas Niilola <juippis <AT> gmail <DOT> com>
AuthorDate: Thu Aug 23 14:08:50 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 06:12:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069f9966

media-libs/imlib2: fix build issue with 'doc' USE in 1.5.1-r1

Package-Manager: Portage[mgorny]-2.3.43.3
Closes: https://github.com/gentoo/gentoo/pull/9674

 media-libs/imlib2/imlib2-1.5.1-r1.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
index 54c743ce05e..b324395625c 100644
--- a/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
+++ b/media-libs/imlib2/imlib2-1.5.1-r1.ebuild
@@ -64,12 +64,13 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	V=1 emake install DESTDIR="${D}"
+	find "${D}" -name '*.la' -delete || die
+}
 
+multilib_src_install_all() {
 	if use doc; then
 		local HTML_DOCS=( "${S}"/doc/. )
 		rm "${S}"/doc/Makefile.{am,in} || die
 	fi
 	einstalldocs
-
-	find "${D}" -name '*.la' -delete || die
 }