Fix no-lib-symlinking build failure wrt bug#503624. Thanks to Georgi Georgiev for the patch.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8EEE3BE8

6 files changed, 33 insertions, 27 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/Manifest b/app-office/libreoffice/Manifest
index 524d366bdb7e..3f6b24408efe 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -32,26 +32,26 @@ EBUILD libreoffice-4.0.4.2.ebuild 17560 SHA256 7987c4166eba595234087cf2774ceb112
 EBUILD libreoffice-4.1.3.2-r2.ebuild 17613 SHA256 0c494bb1f7f7eaf6854b9e1832215649beda560eed63acbdb14151fa6c2ab21a SHA512 1541e0a4eaef5376d80801ce3d570f1cf67b1938cdf36809446984a81f443742b6d2ae29d8e0852ecd21bde4223a4c60da58425b3d01372887d1474a096bc775 WHIRLPOOL 8d9bdf9ae2114b0ef4220c659134b611fc083acac84066791de3fa773ccd523efe81e204e7e542313d7009019ef3588b95f2633c48b958a0acb15bffe0ae1773
 EBUILD libreoffice-4.1.4.2.ebuild 17670 SHA256 2251ddef86ca4e6f37b00d549bdf22b7d2b647ecdd9fe5865f8c8320a3628f62 SHA512 5f95639a9e57a52432a07323a774018de2af4d4f0a1f5ed11a1d868b1c5f73a4ec7c18a733bb8445e2c27614c4fe99176301882fc5e74f52d48d35d8d93662d9 WHIRLPOOL 51d901cb29382304a80107aa6542a735a3cd6d9f28b144484f06a651f7422eb90bbf93b84b854f1e43a792185cfd663b5abec3585ec1adf28a887ede12c17cc3
 EBUILD libreoffice-4.1.5.3.ebuild 17675 SHA256 b0ddc0fb9af342d3b2a566c7678157db84b6bc27e6713b73e7ad60fe32406a3a SHA512 b8ecff445b9b9499016a966ad92ce3322ec7542ff20ca8a489e773e35d2b47aeb39a7c83b4d1ad67ebbd40eab83990bd1857f7c69ec622400f56c5189ff7b623 WHIRLPOOL 19c222492b94319d4df4e8e149fb8392699ec04999554881f51fbba4282979667f20566edc0db00d75d3b689e80083a5283d19d7f79bfe4b4e7b24717fac278f
-EBUILD libreoffice-4.1.9999.ebuild 17677 SHA256 1993cb863c0fa23ab0c72f623b3f9e176bcbd44588d6237ac01e91493fc14e60 SHA512 4b826f3ace323ecbbd23bbabbbf305ee800a2ed70196ae7b14c37cef1775d419b1debbeb1afd1d02d978e2845eb45d554e0c01244339aa2e36753ad8dd46f832 WHIRLPOOL f03545423d8dacb1a16f1c005aaae001b26aec777774e8c0ac57888d8bcf2a6e159123ddf457a2f138ad8da6d645526f2e5ea72cfb8ee4f47db65abc5eb864d2
-EBUILD libreoffice-4.2.1.1.ebuild 17768 SHA256 6dfbe13e7b83402c025253eb94c569047b75afb26c450a8d76eac7011a5ca6a7 SHA512 e217064eafd9e03997ada484eaec7f79e0e100da32134c8e37645ae7774d7e38650a958d0f3afb33df82fef6608922eab30ca8f3ad2877ba786ac5dcbeb71baf WHIRLPOOL 896a739fd60ac39a30706b12b63dbfe3048000179bc4c32944b3c34c93b2cc3710f59ec4a069000bd50a0665669caeaea1e987da6cf2169a81d32d458807d640
-EBUILD libreoffice-4.2.9999.ebuild 17769 SHA256 2a05be69096901face8ebbaa97ba046782bb05b91dce1def4c686acae9d9e10f SHA512 49ee28afffb6f1500db5d8ac42000cb7d5955bec12c5b104829823dbdf23dfbfa7cf9b43343b29e5160c7838eb80e1add5c2dc8412bd8e9d166de4ac60dc0ba7 WHIRLPOOL 12a6886306c5ec9872e923ec3d1fd4e4b68c67884d731e716e00517ebda56e153302b200cc04dca7dd94fd60fa0e3cb35bdd7f7a8ab484033099a5f72bed5b0c
-EBUILD libreoffice-9999-r2.ebuild 17697 SHA256 4e54fa18e890df5b0f0bfc211f1933b3805bdda1a57cd5f0a8fc61921fb7fe5f SHA512 8f68aa1b6b5978bfa228cb42ac6a3739f1e2cc3dcc9647d34dfcbd8b12c88fe3f9a5728671b383d76a19f7ba3b4833166b1f20d727a4f03bb6cbc7e9b97d3b12 WHIRLPOOL 38361ba99c58c6e5d5d60cd7f249b6c40f1baf32590b71df1b44eecb7121a64dd6b0f5695fad986913f15074e1b921b38a537d63d503c8fd4ef4bdf5e065765b
-MISC ChangeLog 98498 SHA256 2e7f1690e834000aeeb5bddb3c47b68218349c262aee5dcd5724a31388329ccb SHA512 8c43e13b815779f3ee7db7938988a40f442a65b519a46f4bc18d10ed631a0dd28a23da640784d60cc9d9753940c72ac2106596df126cfe68da53816fc94f2ee6 WHIRLPOOL 3bafe1545db0c5306ca01f930b790858c4d64bb76fb6a51765b33480ebd5940a72e31d0e7d91ac500709fd1221c97aef20c16c7f722ad9ee2acf603f3fac711d
+EBUILD libreoffice-4.1.9999.ebuild 17667 SHA256 3ca87e2db528385f2140942dbfb16821b63486b3a4d010fe26980ee5cd48b07b SHA512 b4a1ca904e72f1b32f7cd2a909040815ff2641a4ed7ca7ea36797eea2946fe06b732aa4c8b41ad64ccd71737e61567edcd74a65243ef6649de876d347146847c WHIRLPOOL 3e8c0c117f41ec795d3c2339525a29f83959dc0b32fc4d02caf97dd9aed00e3c1f92a55af753b3d0f3595e464c63288ea079341486f33b433a42da9ef49e83be
+EBUILD libreoffice-4.2.1.1.ebuild 17758 SHA256 488756e56bc28cfb049d2e0a1d4a72aaac2d8c502de4953af17cedc704e97e72 SHA512 4436a9de3d59e85dbfd2aacd01b01ad00c099ec63d582df750732f048e45f48c02649e468ddb926d1a51fe6723d6cfc3fe3f2803a988df52017e8214e966fc65 WHIRLPOOL bbe7a5a28abfd3dd857c6dff3d72674a6ac5e9b66fd4eefab9d40182450d9206b2aa123c8ee41e0d0f0f5245aa8b1df3ea791224bf0c048e157b47f73f610338
+EBUILD libreoffice-4.2.9999.ebuild 17759 SHA256 4f2b6a1ab907d8d01c62ee3b124e3304c1fdf524896c33f7c2e43ed7d96edab8 SHA512 ae7af833406cb90f653db8653f8d846ecbf719a27782274d4b1125c1c8c09d880dafde6765be4b63dfe271fa040bcae036b0f51674e49a4918175047b646c6b1 WHIRLPOOL e12dec940cf819b446d65fa53d6cc04915e00f78fd965428ead4cb8cc2932ccd36e07c37f7d2928960161edc7c318c156c26578c12c331aace3532b41b4a8c9a
+EBUILD libreoffice-9999-r2.ebuild 17687 SHA256 0a61b8670a23c08a676962f0d5f04909de9fb3760091c03396c6fc870afb18cb SHA512 56f10570ad50f2cfd9651e171d45a0a78543d6d5795af276c44071d1aa1f3d1a1d37faa423c2b853bdd484df1b9553ca900766693beb4290805b37016a3a27f0 WHIRLPOOL fcd263362d1c7e21a84d78c15b85004b08b654daef8f6afd38c36ff3f7fcb2534088a92a01f5ef7b1ad00e13b004bfe4dfcd9378cb16ef5af426b6063c862db2
+MISC ChangeLog 98769 SHA256 573a616a5203bb4ab580bd92c0d58e049ef9ce4d08ee7c74dcbd5ae610296f92 SHA512 c7765b1bd2150dcbbf60e2b0566e87e1dd1bd11b50309d4c71c7065fbe47e35e9b80ba5540cea93707d63d329072dc9f8db1e04aa845e8709c87a7ad9a9639f9 WHIRLPOOL 07865b2293435405d5242f9cf222c0645a00d7309703662e7557dcea42a5bf532f33dad4603824ee2703af401a63a007ea367f1a054c8d21b860ebd47d93cb88
 MISC metadata.xml 1057 SHA256 fae4981111eeb4ca46bc24106d32559f0ae4372e60b38433b4eebf748fead545 SHA512 d249cec1b2ce6e600d34034fa961ffbcef9bd5b0d614dfe043b414ba105e477681bbe0c9b98f982ccfc075f98d409c3897f76b6eec0aaaafb7f3d841442bd355 WHIRLPOOL 73de668873d556236dfc7b86cc197f8426c4e1617e860df1f60dac51cb68e620b01d335fa6d9553927adfb0aba3a349fe6f4baff0e994ce078833b2bbd17b682
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTDQVSAAoJEOSiRoyO7jvoYJMQAJQqOnzDDNrkyw2kHN2ERjpf
-hqBWy1TnTkloGSiNEJs95Zle62ZsXfxf+X+DtEEVe98TMB0rxe4V9imygrIF/u2U
-/LopQHhO7xNqg/SfSCTeOV5rj3h8VO9p3SBAGKa5MthVndpy4j6l41QlJtvEaFzp
-OvJjLNGNemNBWuopAe3ClNOTv8H8eJNPTYY58zOK2Hw3RhsrjtK1nuyJDDPKy0Kx
-jAg5ExdtY9EPUHyA1u5pCfuXjFBlshtfBy+ZFYUoLmfQqR2JK7RoZE6CKp7N6JNK
-DYQxIjpyT6z4hQiORh16IRZln5YaRn3z++4OlY7m5Y1NVY0Jqzei0/ncVZcAQdtj
-tOKym+c1lJ9IoIWl/uujuBHEqUrg0tNcQpE0vFEcZhaWS3BkP5CGUUj76Uspva2b
-nL5M14RmUNbdgXLH0bJfDSHgEXkJdXdiQhu7L2G7Dt+2P6iunrCG0HTzzGyhHVtx
-OeVqy8Fa+GRtAwHSrx8O5dUkA5LhodyCn6HzG7znmCNkI2Jfmh5/IJTp2iX5WjrP
-bzHXO2E/leqajEHqHL6jT167EZyg33oj0ffUSWQg7IhJPKsAwPx7Evq1btmT0IAC
-8JMSrCM34Mv5IBruIrvQ6AB6H7h1OTSbWt98wVJop/jDNwDc4ELf7vo3RHG5SVEo
-QAjVUbbwWdOxpDqw8IgC
-=5UTr
+iQIcBAEBCAAGBQJTHXxjAAoJEOSiRoyO7jvofXkP/R5AIMCgyzzjgZepPN8z7Oce
+41LqKd+9J+Zs6q2bpUFCcajy/9581mgqsUnvKRiU56eG0GClJsxm0Vn4yJLz1L82
+1JoAN+nezRXC+qAR/WRr42MhtuHt2aSbCARzwVDXLlDa7sa0+Ip3tHjaPEceu7fa
+gN3Q6nW3umQgTM8XyHNgWlYbtkouUnbyAIz9OTR6nejj6yFIQN399IKHREhkCIag
+qHBa7hQCGWz7sFMQW+lpmuH0RQPSDE7g+3ID8vyOuFPAzB+IiDx02G5mrJGY53dN
+1F3/mwNVXoBU1I6K8NdlqBZXcSJvLzej9ERhNtQf0NHDFITD4zwItfG3Y1gIdAWX
+4UXtfSrXM/GFz3GxFQw5kYqzhvguNxQkkF/geCrVV/MtBqRCci9RNbga7u1WtMwN
+QoLZMRsX0O9VbF1l7+JKPWBFQ2+T2wNgFwedsdDvTza9bTeKMam3Q/LreskQ1lWI
+GYAS0Ab0PubG8JAgwNIk4/wy9ZZYUaTSNhqIE9fztKGdhuob1mZsWQvEzUQOF9Gw
+nzfc/z4uwkf9jzVDtT8sUS6Ow6dK0fTTBd3r3VwUDdM87x14v3uAdqV+dnFko382
+cFKSVd3VhUrmb3odBK3Y2p/5BYKjFoHnYqNZLs1ZpkeS1O1Cvfy2Q8FURLle/Gmi
+MjVM229r7k2TDVEDm99l
+=QUxc
 -----END PGP SIGNATURE-----
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 && \