Build updates, expand a bit addons_src for java.

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

3 files changed, 21 insertions, 21 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3bb3dd3ec254..d3f7c6b76c0f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -174,24 +174,24 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
 EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18436 RMD160 b191fa9979d6dbdaa1bcd28e2c6d2f9032bbc1e3 SHA1 8257e6ccadccce2be69f4b505434b6797acb069a SHA256 db88c53de529b6375dc88e0d80a20fb9e60c6662141ef0a6671cfb266c4b67c7
-EBUILD libreoffice-3.4.9999-r1.ebuild 16078 RMD160 e296524c64209e00a4fbdeefd022eaef87b4eabd SHA1 6f82a057952733af6a7762b9a0cd61b46212ec90 SHA256 44246714d937e8cedf3e78109fa69484099d07bbcab6f1c76e3125d00087fa3f
-EBUILD libreoffice-9999-r1.ebuild 14357 RMD160 a16655e857b18af8e194c50a75dd16968db0e9c3 SHA1 b029a5af4812a3e8747bd713f2676c9b855dc6b1 SHA256 e17f1daca770c367d3fa5959e6ad50c9429f5ee934843af2133df0c899bce78f
+EBUILD libreoffice-3.4.9999-r1.ebuild 16232 RMD160 c231738d7bddf6864506de2340e689741516de06 SHA1 c1088425b7f4e05d206c9fb82852cab485d3023b SHA256 854be998206ea97ad425a41e2b287aa4e4f9c4bcf2da8b39bf5e5e0688d6fb18
+EBUILD libreoffice-9999-r1.ebuild 14425 RMD160 f1e30be282873964af902a9de2757400d1af1521 SHA1 c8d1b84de95aca6d571354f0ce30c58d196288f3 SHA256 759e062989a7932dda045c03bc0a71d19ee034810feee7b532610231251d2493
 MISC ChangeLog 30822 RMD160 ddd7ba749f7d210e4b38854141ca6c0d97f40c5a SHA1 cb4072bdca5bc8a8440af69db4da6bfbd3c445eb SHA256 0b56f315b1dfc837fcebc443528457048b714341cb95c8d6799820e7b6448b8a
 MISC metadata.xml 1288 RMD160 c6b52caaa3e75c7397e6861118161c8a1fc5c71b SHA1 853447f772970ae4fadd8946514ca8e5fdd2c94c SHA256 be7565ef5c1d68c3d1403d267adde287588d51145da8f374ee247ee5549f8a9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOjCJvAAoJEOSiRoyO7jvo0nAP/1G310/aHkSr3OpZKbMgyJNp
-0uzXUfA7d899jiyn4j+mVq1bQef1nlKhYsXdej/kV1qbpq+OnazSpsG+B93MhUFX
-7C/WZugMRv5RjuFhMvBlu9/t9Gm+RHpfDuztcxuf0mJxVoXuzApoNpYNGzoCdQLH
-u7s9iZzmQqVkWOhkIszHpCWjC3xC0S9LpHWVUso7zPw+VRt6F0Lwd9pObxeAw9Sr
-0TK6VgniVYr5tazVlEDv3hqB3a1vPU6v9R6OUrADFzzzyIi/6F6pcjVyvM19yDJx
-Itd+KP5JaM4rxyeq38R16AZE5vrq6vrb90r+k7bEuJukYUcYguiF+JIHe8aeoIq5
-zctU5LJBizbDXH3wSfd6TvVSOwHIrDQvNgorllAi6H7b170J5NU/8iM22SzymsDw
-HecifTD9ICeAdAF7JC7FBeRd70gmmAaBRGYWv0c635bljcDtzuKm0vsbGCraaacm
-ccwiB9L1SgDvpZVZzPIKvGA7BQlGpGOVganV4rneKUkzbFpAFuetQycEhi84IPzz
-r3KzjHtRugfewE1ZImhot6/Xg3rGUCkVw4weEF8HGbs87Nz+6y/lWaa0vCk3kwr8
-uuLTbvSbGVmqDXAKtfAY8CE2cdOnvbAxk7IdmgSOQ3LnmEipHBZNTn+VgQqj7xdT
-6THbEahlmDfo4Xt1fiPu
-=9r+A
+iQIcBAEBAgAGBQJOjGjYAAoJEOSiRoyO7jvoOzQP/jUg78uQgOt9BeQj66/XB1pT
+fWLfS9Rp4KPgbS/QUiQqt46vDXPItV7rUAS6zt3TkQbiuV1aoxQpAI1HV9OhthCt
+2oHAeg7Kv2s1K+mBNOWy42XB3ktYOYPTrRL51b99UfLNrj4YSEohNCTfDQOOISM5
+hG/OK97nHbhLjexholMm6y0BCfTOkG8mbaA17al1QKo6QD+4jvj0FLelQQkYLTtP
+/XqLtaEVkT+vtpFFec5/GBevLf07bMneDhg+VkB3XgYzrFC7sAU/epm4p7tCbK42
+/zkBaeFgV6LnvnlX2OUX2SfeJztAhDJaytQoSt9r6cy8xwZumdmgKFW2fbdGRQUu
+MP6qyZref4Wkbly16Qk8FjAHdfP7gpW0063CBdXrofpgQvA3j1DXynmrTCLGrQc5
+TxjFiVnf2WOOx4aGwgRJONViNPU0iOwGkKj+So9sQ/vqfg4JxXFoopxHAjDnHyuB
+7CIerzQ+Ygx5K09CUmmPpjEkrXmEAC4RpM9e9ehqCzw40FJHoj4Pl2K8xxBDRgzn
+Br0zpl7cPEX2Lb+2q2dVvcIy29WFw9Zo/ZrnauRjaPPeZVCHM5g4rYf/i+7cCBbc
+RJgHInT40AgV/Mf+gPVVwDeJty/rXN9y9yHdZYXQE2Qw/pMt/pezF6NEZe2aDEgM
++aDGXde/LWOX85gXhAhY
+=I2nJ
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index babda701d692..e8d9c5dbe910 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.11 2011/09/29 14:27:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.12 2011/10/05 14:25:41 scarabeus Exp $
 
 EAPI=3
 
@@ -55,6 +55,8 @@ ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
 ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
 SRC_URI+=" ${ADDONS_SRC}"
 
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index c0dfa0d79782..9f94116cb93e 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.37 2011/10/05 09:25:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.38 2011/10/05 14:25:41 scarabeus Exp $
 
 EAPI=3
 
@@ -57,6 +57,8 @@ unset DEV_URI
 ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
 ADDONS_SRC+=" nsplugin? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
 SRC_URI+=" ${ADDONS_SRC}"
 
 TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
@@ -366,11 +368,7 @@ src_configure() {
 		--with-system-headers \
 		--with-system-libs \
 		--with-system-jars \
-		--with-system-libcmis \
-		--with-system-db \
 		--with-system-dicts \
-		--with-system-libvisio \
-		--with-system-libexttextcat \
 		--with-system-translate-toolkit \
 		--enable-cairo-canvas \
 		--enable-largefile \