From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 13 Dec 2017 21:56:31 +0000 (+0100)
Subject: app-office/libreoffice: Use $(get_libdir) instead of hardcoded
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5a2580630d7da08361bca09e86df2c2664c2f605;p=gentoo.git

app-office/libreoffice: Use $(get_libdir) instead of hardcoded

Package-Manager: Portage-2.3.18, Repoman-2.3.6
---

diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 542f04bac545..f9f51d5951b9 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/lib/"
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
 		)
 
 		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 6422eb9c9f8c..46cbbf6aec29 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.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/lib/"
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
 		)
 
 		use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 6422eb9c9f8c..46cbbf6aec29 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.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/lib/"
+			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
 		)
 
 		use libreoffice_extensions_scripting-beanshell && \