From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1088863-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 30601138334
	for <garchives@archives.gentoo.org>; Thu,  9 May 2019 18:19:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EA0CAE07E2;
	Thu,  9 May 2019 18:19:22 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 CE591E07E2
	for <gentoo-commits@lists.gentoo.org>; Thu,  9 May 2019 18:19:21 +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 21ED4343ED4
	for <gentoo-commits@lists.gentoo.org>; Thu,  9 May 2019 18:19:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C06E57B
	for <gentoo-commits@lists.gentoo.org>; Thu,  9 May 2019 18:19:17 +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: <1557425950.8fb65afa733a09f02eb8be241b8074ed2193aa11.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/gettext/gettext-0.20.ebuild
X-VCS-Directories: sys-devel/gettext/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 8fb65afa733a09f02eb8be241b8074ed2193aa11
X-VCS-Branch: master
Date: Thu,  9 May 2019 18:19:17 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4e7ce996-447c-4a35-bbe8-f50412452cab
X-Archives-Hash: 0a8da08428ce6b66fc6f19beedd2990d

commit:     8fb65afa733a09f02eb8be241b8074ed2193aa11
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 18:18:49 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May  9 18:19:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb65afa

sys-devel/gettext: Removed some superfluous rm calls.

Circumvent parallel install bug by calling emake with "-j1".

Closes: https://bugs.gentoo.org/685462
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-devel/gettext/gettext-0.20.ebuild | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/sys-devel/gettext/gettext-0.20.ebuild b/sys-devel/gettext/gettext-0.20.ebuild
index ed1c8764f3e..cfbde00a170 100644
--- a/sys-devel/gettext/gettext-0.20.ebuild
+++ b/sys-devel/gettext/gettext-0.20.ebuild
@@ -110,7 +110,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
-	default
+	emake -j1 DESTDIR="${D}" install
 
 	if multilib_is_native_abi ; then
 		dosym msgfmt /usr/bin/gmsgfmt #43435
@@ -119,14 +119,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	if ! use nls ; then
-		rm -r "${ED}"/usr/share/locale || die
-	fi
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-
-	rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	if use java ; then
 		java-pkg_dojar "${ED}"/usr/share/${PN}/*.jar