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 && \
