From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-893194-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 E32E213832E
for <garchives@archives.gentoo.org>; Sat, 23 Jul 2016 12:22:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 179E1E08B8;
Sat, 23 Jul 2016 12:22:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id ABABFE08B8
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Jul 2016 12:22:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AFB44340D90
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Jul 2016 12:22:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 91A687C9
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Jul 2016 12:22:38 +0000 (UTC)
From: "Jeroen Roovers" <jer@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, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1469276550.af25d3c4b933e50a6372acc2ae5fab010012f09a.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/opera/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-client/opera/opera-38.0.2220.41.ebuild
X-VCS-Directories: www-client/opera/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: af25d3c4b933e50a6372acc2ae5fab010012f09a
X-VCS-Branch: master
Date: Sat, 23 Jul 2016 12:22:38 +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: c605ddec-d26f-4ff5-8e82-366921fd7fa1
X-Archives-Hash: 2dab3027e9376d02e08ce9495127d41b
commit: af25d3c4b933e50a6372acc2ae5fab010012f09a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 12:21:18 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 12:22:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af25d3c4
www-client/opera: Fix src_prepare() on x86 (bug #589438).
Package-Manager: portage-2.3.0
www-client/opera/opera-38.0.2220.41.ebuild | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/www-client/opera/opera-38.0.2220.41.ebuild b/www-client/opera/opera-38.0.2220.41.ebuild
index c8868b9..ef65797 100644
--- a/www-client/opera/opera-38.0.2220.41.ebuild
+++ b/www-client/opera/opera-38.0.2220.41.ebuild
@@ -62,8 +62,16 @@ src_unpack() {
}
src_prepare() {
- mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
- rm -r usr/lib || die
+ case ${ARCH} in
+ amd64)
+ mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+ rm -r usr/lib || die
+ ;;
+ x86)
+ mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir) || die
+ rmdir usr/lib/i386-linux-gnu || die
+ ;;
+ esac
rm usr/bin/${PN} || die