From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-993678-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 B70C5138AE9
for <garchives@archives.gentoo.org>; Thu, 28 Dec 2017 19:35:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AD342E0C11;
Thu, 28 Dec 2017 19:35:05 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 7DF11E0C11
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Dec 2017 19:35:05 +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 73F0B34105A
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Dec 2017 19:35:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 036BCAFBE
for <gentoo-commits@lists.gentoo.org>; Thu, 28 Dec 2017 19:35:01 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@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, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1514489681.dc0ab178b2ee72b4503faf897dcbddd6534667ed.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/libreoffice/libreoffice-5.4.4.2.ebuild app-office/libreoffice/libreoffice-5.4.9999.ebuild app-office/libreoffice/libreoffice-6.0.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild
X-VCS-Directories: app-office/libreoffice/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: dc0ab178b2ee72b4503faf897dcbddd6534667ed
X-VCS-Branch: master
Date: Thu, 28 Dec 2017 19:35:01 +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: 6753cab5-edf8-4cc3-b85c-d9ba767324b9
X-Archives-Hash: 6b79d13b8446b7f97694dfde80c08b63
commit: dc0ab178b2ee72b4503faf897dcbddd6534667ed
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 19:32:30 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 19:34:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0ab178
app-office/libreoffice: Revert Use $(get_libdir) instead of hardcoded
This reverts commit 5a2580630d7da08361bca09e86df2c2664c2f605.
Thanks-to: James Le Cuirot <chewi <AT> gentoo.org>
Bug: https://bugs.gentoo.org/641826
app-office/libreoffice/libreoffice-5.4.4.2.ebuild | 2 +-
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index 666dc122a41..303d903bcb7 100644
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
@@ -476,7 +476,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index f9f51d5951b..542f04bac54 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -475,7 +475,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 006b828eaf2..9b35442a6de 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -478,7 +478,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 006b828eaf2..9b35442a6de 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -478,7 +478,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
+ --with-jvm-path="${EPREFIX}/usr/lib/"
)
use libreoffice_extensions_scripting-beanshell && \