Add internal rhino as we need it. Fixes bug#430800.

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

5 files changed, 28 insertions, 21 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 6e682c626072..87fd2b5ff555 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.353 2012/08/10 11:53:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.354 2012/08/11 08:44:28 scarabeus Exp $
+
+  11 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.0.4.ebuild,
+  libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Add internal rhino as we need it. Fixes bug#430800.
 
   10 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.0.4.ebuild,
   libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6d6847264f1c..e3ebfdd4e995 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -28,25 +28,25 @@ DIST libreoffice-help-3.5.5.3.tar.xz 1856804 SHA256 62631206eb03de10d24295e21260
 DIST libreoffice-help-3.6.0.4.tar.xz 1863972 SHA256 30b79e3b4cb5b2167d1f3c17b8781e8940665f861197ee9021a6ac8c64d508f8 SHA512 f6fe9296c605999634b484de4a62e7665dae8353d8c5dc20595036b1cc87d51750f6b2eedcae70c4739993337a8ec22de6cf3046d0a15f8669464247e6da1745 WHIRLPOOL 8237777a6bcaf15d875f8cdc909f401906902a5670f2e2097376a90ceb74bd116d42a258faafba563317b7b1e9469b6fdaf1ffa71d95c9d3447d25cfdaf3f6b5
 EBUILD libreoffice-3.5.5.3.ebuild 15651 SHA256 2d917faf6e64025100fc3913d5709d995ecd608b65c977d029e789dfe0ac9d12 SHA512 c45a9848e807334c62b0e3ee537bbf96b4c5fae01756364c02e67b5c4cfc8ab53b5613408f7aa82e1e534ae54d56d375538210bd1cfea20e3375196f424f3364 WHIRLPOOL 63957862d965632f8f60a5fe2a4b1f5d86202f652e4bf5156f0ae62e333656c5c7f5b59dc74de1de4fbaa8805549afbf3e667f00e8c7fd31b3bd1db78472aaa7
 EBUILD libreoffice-3.5.9999.ebuild 15656 SHA256 e53d4935d180d5f3910904e1b90e091f392f268bae3a137fde30f0d1ec7ad996 SHA512 bb81fce7015a3bbb10684bde943bfa29b2f40dec6bffd91f844d770eafab0fba48015e29aaa29d55bcd74c4e67fa3d7c21c6628d8418d878197457894824b78d WHIRLPOOL a6813f67b4bd317f246dcec9347e0cc43d695751f0fd6c8055d0973469e0e31f50445fec4c77861dd4866b5cad0a85796c8120016700ef9780875d36254194ac
-EBUILD libreoffice-3.6.0.4.ebuild 17195 SHA256 2a4d9e5ec832e0840efbee3714dd3fcfcd4d274b33bd2f5847dc8bd4d6552feb SHA512 4a895266f26871b3a4245b8a85047a77e6a3a93d32e95e48ee6bd3e49be9fbd671fcdfa0881fb0e4fdcc037c2d12804f3fd6cbf01cddeeca6938bf0485fe9da6 WHIRLPOOL 133d079f9912e4247f0c3a444f64ac5927f86eb8a19c49953310ff6f823cc4e4c02fbb415a20a8a8d43c132d4a86c53189ab22d0408e820efd6cbf12b8a25288
-EBUILD libreoffice-3.6.9999.ebuild 17091 SHA256 559731af038a77534c69530b3b410ce384c757aef336a805348a8babd5cf5d50 SHA512 1d5215c1f6b205ade23469819dc84bdf5661a4ca6c415f9725e8e28578f49d2ed95a0998aad54258093a34c1ffdf01f5942fd253c3de045ec1494580d50ffdb6 WHIRLPOOL 03f2c47dabe34cc1e4fa6cdfc12530828239459596869e465de6a16a91e4ccbedbad445844634418f1014018684293647e766fb9e265c6c85a23e1bd6c35c9f5
-EBUILD libreoffice-9999-r2.ebuild 17251 SHA256 ac56826787b80aafe2453464dd4be6709d78b0b7d922c53607ee9bfb00b3548d SHA512 0032d393f5d7752143472a614fa2e26bc6a9ee233e24ec2710d7a20baac160c6eb6143943624ef317814dcff5f677031e2e090df9366b31ebb3865a28d1b722d WHIRLPOOL 2844954d3e856ef27df81ae0d58364e59a44d5a58cd425086d17fe83594288302735ac0a4a775e9c3db483620a0e1998e9a451909872de2822520af5376657a5
-MISC ChangeLog 64906 SHA256 11ef1415d04afa1ef001eff2954faf4b778a96251c384aa0f79035ddcb814573 SHA512 f9b736acb12aae3712f2eb852c109578bb2a5b7fb3cdaeee31207194d7acdede8a6a3d7aae3531a63bb662d08b31e452add043d99c847bf9ef12312d79a40609 WHIRLPOOL f992df21bade728f1ef2952457d9008aa9e93cc42f686ad036939c1f3940a38e0b6043e29a2175c86c84548b99e2f7ae7ad4d803467171cc0016cb9fff216fd4
+EBUILD libreoffice-3.6.0.4.ebuild 17360 SHA256 2d4f1b4bf88399470c120ce3d5b985a410b06ba8a6c31d906bd3f347d1963d2b SHA512 aae194b870d923e2d4a72057030f7ecbda6f0dcf5b3f69a386f7e9a65b96880b9f8c836bff2d1488e685be24e1b1bfdedd4d2bfe522821f50496e91d244a2f3c WHIRLPOOL 596e0ca4792e2c999c8af3d401cb477c2d702d74ab40102e9513b3510f3e02d137b846d44778dd8abaa8e5d6bb7c09272e37fefad61eb03578c0d860c78169dc
+EBUILD libreoffice-3.6.9999.ebuild 17256 SHA256 57977a8ba30d0cf6cd17c8c909bef37eec166dc402b36dc0fe8abed6454e8252 SHA512 865aadf5a98cebf831e2088acf8a0ea31d2e8cbe33a2bc0f87b82ee6f0a59c018181494786d0fae70aaf03fe74459874ead0451c59ba663d818bfd65a108519b WHIRLPOOL b3e9481fb193b08cfecbd8981f3012c64ac1ddc4873570023ea51f22ea767c394f468571cc5d8ba1afd1e21cb219f21f797516663f7a9f264473e5905d19b17d
+EBUILD libreoffice-9999-r2.ebuild 17416 SHA256 e6db68b981fd88feabb0d4810ba77f066edde3334ab87e362da09548f473140e SHA512 2da5448c02223095bf89901b696a24b632831a6a8d01d3219880ca00a2336f35917a4a2f8ab0008c1142533f4fc2a9d9fc49661da6735249907a02ad95733934 WHIRLPOOL ccfe789ca84168a7feafc9e12573aaf11ee15b0697d5bc133083a245a5a17c26ee587c3462953ecb4d83dcec9c614f9ba46dd720fa7489a3235f71b108b32df6
+MISC ChangeLog 65103 SHA256 dcff7b2e50215bfccb3160439f9d271c033725b804bfc3f29298a0bdc62db704 SHA512 c17e1abdecdbe46723b720c04267d4e47668107f0c38d0eef2dcf829f86b7945b0cabe9d170d9b0fa7a261853e5295ef7097d6eef8f7f8af263696ca72412f7c WHIRLPOOL 8170cbdc5c1a453bb1f8647a1f69eccdfbb917023bc9a71182055886932f0e7394ab7b17f365c26b9d9f8b0347062eaeeaad3b02b15bb583f15ed7f4143c008d
 MISC metadata.xml 1534 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401 SHA512 6e07d86c7aef51c72303ae0f41c49ebc9f0bb89d9bc176822c50a2f73684253c16acf718caef6bfe8bd072ae9e987235e0181806fb0989319ea40e894fa2ea39 WHIRLPOOL 4708c3823f88598934b7ffdcc5f02c8a1427e6d06d3424634042e22527f9e16786a45114ea6010fa085ae25170b8ca241a8f2741d522f159b563d511977d521f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQJPbpAAoJEOSiRoyO7jvobPcP/Aoh4ql5Gyk7h5lZt68iKyIi
-M5vJ4qgzG4A9LrmFpPZnKe3r/aIfv6C+fGn3KkqQeUsgiq6NoSV8bBvwaowVRA6j
-CwKobS3w24Yt8OFQ7isKTg1fqJhTH6YUclqcUZbQqwrfgx3wAFmgW8OgWMq2ApWf
-+TffkQ/KZgtUO7fJqYyNJl5eBlarYwn/hwrPlKcOqMIuPmmOhQLmZGiz3fEo/thK
-WyheJ6zaymQ484L/ngS0ox71SMHz3IVBN5IGjWOWOaqVvetqjSfd033BMbtqyeXH
-7IqRNAPgRsbLMGzwxmWX2rcdU1ErIT+gjZSXr7Qy8BcD4fAYR/zekKyPUK3n9sfY
-U97+xeUG2D/lhTOllb1P769+igYqrrY0xyfE5j3W6Q85GKY+vEYgaltXOhkdj/8B
-i8IRXy6bzj9P6+v8nEu6sEvTOtZU+hZUnmrQXdfeG6ve/CYBl5bsTETYRtApoS7l
-3uheoe+voc9VI3pCYbxPH5VoP6d6VvXi0v9Ly6EoXxzeskbcx1EkP0LBRFHy1iqE
-OfX6lOXf4avTk4+QRfVGaCeyGfkrJHzJ56qZZTKJYgmotP2YOlyaRqTWgOyH6guT
-3Ne+A2b6JIJMNjbG3a8k8b70eQ68DGJU3xdWDjpFN0dLwS+l3LYTagYOOjTE9uzv
-7cKBpsnaLaguqWlK94lV
-=8ju6
+iQIcBAEBCAAGBQJQJht2AAoJEOSiRoyO7jvo0GYQAIQz7jyT/fWg0urm4lqHmKny
+6VHgKJYY+/sZXVSgaV4mGkm28TSPw5BZlJxdUJO1hfVtVkFcQEduqTuq7druJWE4
+vBch4zVuPoT2HLWI1U7TlMbtmfEm5fdFiHECI0KXLQEy1RnBg25vXm+n7JslzCub
+grQS5BPxIAMmE4V9w5rUWhSvrF9TPrGutYbWS88VIg59xIO9jozPvhEIXFosufLQ
+V/uRVANz8oRFCUk5Kt7yLTfdGhhH/beaErrjwI0e5eTdfj0vbPdi7+r51mFOOWUj
+OAM+fWBgt7My8ByJS0SbGA3hZ6Hdp6tWAZvfCqHuxol4uC/4m+mxQBiskBBtEINx
+q++LR/sh9Im5AUj/iROWJ92vMqQNfW8aBDbFR8BlQt4uhWJCoq75/KgcbSvETw7F
+HNOPNdzsCz9oF0l3t7xo2U4mwQd3dbHakDN9Ckgq4+t4x1aX1iubTHzbi0Z6TZeu
+Y90Fq2UWYT7maCqSDzP3ydJ1M8zC6Mu3ZwCuYqeQSfWRrVnUwifNzkeh7ZUiLVg5
+8yIBKoYfGEf1f5Z0hiE3IfF9RIUWt+VHS3MqSE4EtDQBrLWE4DBpcMFwnlR/tvm0
+1wvBunItbkG6A3zshcdQQQeCZDnyXddh3926JcHpsEQY4ewTehxTvy+haXdRCE2w
+PJGf989H1x26A0taNFMp
+=6UXd
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
index 3990c06006c8..162f3247bea5 100644
--- a/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.6 2012/08/10 11:53:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.0.4.ebuild,v 1.7 2012/08/11 08:44:28 scarabeus Exp $
 
 EAPI=4
 
@@ -63,6 +63,7 @@ ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
 ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
 ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
 SRC_URI+=" ${ADDONS_SRC}"
 
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index f07d9646f045..c1a868f4960e 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.16 2012/08/10 11:53:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.17 2012/08/11 08:44:28 scarabeus Exp $
 
 EAPI=4
 
@@ -63,6 +63,7 @@ ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
 ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
 ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
 SRC_URI+=" ${ADDONS_SRC}"
 
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index e89eaa57eb3d..2be55ecaa6ac 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.98 2012/08/10 11:53:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.99 2012/08/11 08:44:28 scarabeus Exp $
 
 EAPI=4
 
@@ -63,6 +63,7 @@ ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
 ADDONS_SRC+=" java? ( ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip )"
 ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
 ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
 SRC_URI+=" ${ADDONS_SRC}"