diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2014-03-10 08:48:41 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2014-03-10 08:48:41 +0000 |
| commit | 0c3b29ecd8649caad065f6e27906f50f1aa28e68 (patch) | |
| tree | f8faa835fe13c96b12ea226ad4c1e287f97da3dd /app-office/libreoffice | |
| parent | Version bump. (diff) | |
| download | gentoo-2-0c3b29ecd8649caad065f6e27906f50f1aa28e68.tar.gz gentoo-2-0c3b29ecd8649caad065f6e27906f50f1aa28e68.tar.bz2 gentoo-2-0c3b29ecd8649caad065f6e27906f50f1aa28e68.zip | |
Fix no-lib-symlinking build failure wrt bug#503624. Thanks to Georgi Georgiev for the patch.
(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.1.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.2.1.1.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.2.9999.ebuild | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 4 |
5 files changed, 15 insertions, 9 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d4ddc93c1f5b..dd58f65df335 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.542 2014/02/25 21:03:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.543 2014/03/10 08:48:41 scarabeus Exp $ + + 10 Mar 2014; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.1.9999.ebuild, + libreoffice-4.2.1.1.ebuild, libreoffice-4.2.9999.ebuild, + libreoffice-9999-r2.ebuild: + Fix no-lib-symlinking build failure wrt bug#503624. Thanks to Georgi Georgiev + for the patch. 25 Feb 2014; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.2.1.1.ebuild, libreoffice-4.2.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-4.1.9999.ebuild b/app-office/libreoffice/libreoffice-4.1.9999.ebuild index d72cbbee7f5a..18e4ef6597f1 100644 --- a/app-office/libreoffice/libreoffice-4.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.1.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.21 2014/01/25 11:25:22 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.22 2014/03/10 08:48:41 scarabeus Exp $ EAPI=5 @@ -400,7 +400,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-4.2.1.1.ebuild b/app-office/libreoffice/libreoffice-4.2.1.1.ebuild index f27f3d6cb209..b42a4a80870a 100644 --- a/app-office/libreoffice/libreoffice-4.2.1.1.ebuild +++ b/app-office/libreoffice/libreoffice-4.2.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.1.1.ebuild,v 1.2 2014/02/25 21:03:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.1.1.ebuild,v 1.3 2014/03/10 08:48:41 scarabeus Exp $ EAPI=5 @@ -404,7 +404,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-4.2.9999.ebuild b/app-office/libreoffice/libreoffice-4.2.9999.ebuild index fab255c15f68..4c365ef14364 100644 --- a/app-office/libreoffice/libreoffice-4.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.8 2014/02/25 21:03:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 1.9 2014/03/10 08:48:41 scarabeus Exp $ EAPI=5 @@ -404,7 +404,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-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 173393335934..27f49c77af25 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.210 2014/02/25 21:03:29 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.211 2014/03/10 08:48:41 scarabeus Exp $ EAPI=5 @@ -401,7 +401,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 && \ |