diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-06 10:55:04 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-06 10:55:04 +0000 |
| commit | 97a07967ab831eeec90dba308cb0a3de43fe6dfb (patch) | |
| tree | 2137e0e63b37ba030c3a0fa9d0065010fa5163d7 /app-office | |
| parent | fix typo (diff) | |
| download | historical-97a07967ab831eeec90dba308cb0a3de43fe6dfb.tar.gz historical-97a07967ab831eeec90dba308cb0a3de43fe6dfb.tar.bz2 historical-97a07967ab831eeec90dba308cb0a3de43fe6dfb.zip | |
First attempt to use sytem rhino. Still needs code fixes wrt internal debug interface.
Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 30 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 8 |
3 files changed, 25 insertions, 19 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 9431189cbc26..d8a1b9be6b12 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.305 2012/05/05 16:12:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.306 2012/05/06 10:55:04 scarabeus Exp $ + + 06 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: + First attempt to use sytem rhino. Still needs code fixes wrt internal debug + interface. 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Make the wiki-publisher actually work. diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index a2cd5b625edc..50276cb72266 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -26,23 +26,23 @@ DIST libreoffice-core-3.5.3.2.tar.xz 103327220 RMD160 cb084b763e6a8136ab23f368b7 EBUILD libreoffice-3.5.2.2.ebuild 14796 RMD160 50e705b52d06cbe7e2aa820fbafd8cbe56997d7a SHA1 c0130bdd1cd67d9d60a285ff2842581952d6eb24 SHA256 69394c1cf5045771069a2cd2fcbb0b2e64127b57ae637447364f53947db5033f EBUILD libreoffice-3.5.3.2.ebuild 14713 RMD160 69113220913112ad2991ac8d11b6430709b2b533 SHA1 c39c772b87a65eafa21268d6a02265fefce7d6c9 SHA256 897b78d4873db482cea569f967c9c5620044ca4e36a2bac627135a55d2d039b6 EBUILD libreoffice-3.5.9999.ebuild 15227 RMD160 d2d899c2d2016d64d64bee9135dbf4c1b7d1947b SHA1 bbf9ba1d42ac09045b11c395129ddbe4608bb955 SHA256 28afcaabc0080ea25eaf553543a54f9d1b81b557f7828189091a03829767d0fe -EBUILD libreoffice-9999-r2.ebuild 17029 RMD160 007736fbc11d44008d6bf92e5f8dbbb1fc551671 SHA1 320614149ff9acc433530b8a7ce052e2fe971aef SHA256 cb3b286b055a542ffee6fa109a871f02772fdac907694714c463de5c90e991ef -MISC ChangeLog 56740 RMD160 0c3b498b353e09b6bbf61e7119d0aadafc22e9bf SHA1 b349f22f94f5883ae5ce455985f82a7ec11a7cf2 SHA256 4772123b4f61446b2487294f0b4317febfad2b8438f4b4ea6a3a98dbc8d63c4e +EBUILD libreoffice-9999-r2.ebuild 16972 RMD160 f7b5bd5291026e6094f30108a72272ef487dd29c SHA1 2e846bcc9b8eda139e42709efa950b73f1ec9a29 SHA256 e032c7adb6bc43db9a7940855cce50bc5cb30c49e5ee52653600aa6813da2643 +MISC ChangeLog 56915 RMD160 67ef56451d6a76cc51a2ee40dee78d54a5f02f57 SHA1 780e344c776534b4c6510f415288cb613428e7b0 SHA256 8b4b30434d48067b0c567380ddd370ffc2b9dca173586a7c663bba9210ccb659 MISC metadata.xml 1421 RMD160 a0e0f80b284843de1d2dcdb3b5f8031cd564fe9a SHA1 6bf23b009c940cfbe05d28ca6fad31abfb7a5040 SHA256 74eaaa0c786765c327bbd8dfa8a5ad51b044e050717f8a6311f71e773ade1936 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPpVFZAAoJEOSiRoyO7jvokwEP/2OMpzOOTUdZFes7H+Xr88s/ -MTd5Hp/6Z90zSV7aGIbOhkwzu+7pwMJYqyFmEAjY6YKxTXGbM+E6zRamdCYgKFrP -Zptwgxkmx4Uo5/I99bF1tMSqe12awM+4/Xvcl+iDIEPAQBNxY/S5vhnnEmp//XCZ -xReO07RP49xmYNZdvsvJpt/COSU2hbOQ4xyO3Fh3747AqB3Sgj0at2g0vk0EqHd0 -1kt8NAj7qMmYPXhofFLPDbT2Xwb/KwSeakVqK5tq9vqkp2dvn7fOr1ATLzoFxsN/ -eWJSpSvyhLRFFIeU7qkkAua+rR7yMIbfikzv4BzmroW7UeqrJefp5cLZablkpoYq -2vkdhbXDFolczWdt9+GYDvFiIqTv7xDT7l55dZQidlFHIzgge51CLKuQBmGUhb/W -ErDv97K6wyWoCEZ8YbMAxDMOR1mIHFJxVxb4vt7BaoR6FIr5Sp1FfnIsQQQQD3Fh -IdXEic8Om64rv5LNGc8btaUFjkpLXPrEk9iIIQa/XW5L5pqIMvQyxYcX1/2O+1bG -8SlCyijILzI6UjxSVO6PfocqIVomxqxUm9RUHgfWItn3AKQaNvevQO+GaiW/XuJL -6rsOY0HsSsKTusUJvAzAPTA9heTJZkxmsip6PjCTDdN4Uzc/wAV7Nr8XsHPPXMOe -NXFEP99GxrZF7u9J/MOb -=6eEw +iQIcBAEBAgAGBQJPpliNAAoJEOSiRoyO7jvoiWMP/2krUOzJkd2V+t0eaqG5DYM1 +wlw1DkjaYm18On5N2lpBWX9xTW5yPM84ihWPzy52sfMwS8ct11OK6nhBU4kwJ1BX +JIsomPFjaxFn6A1JKPYoVve0Nl5tS+jjiJycZ1a9o/e6Jc/5msgGB9gs0gg0Jwdh +yUAGQj3D739sn/ByuG1MEI2JglKbzj6k72zq15Yd7NYcVG+jNB5NrT5/+Utpz1PP +DpygpNM2PmN4eOPYhvvdIjr8qNNqD3R9Ebc/k7YVweOKUlwUJl8OAOBDbycuzO1+ +WaODU0cybsoxwr7w8LEeuSnRU583ydzvgbYt3h+hHsSxN6ns8YEql8PTRxSzRKTD +6oY5E4IgmcV18NhXCVakPPnxaRAe8tM4rUVHiZfpoi1CgzCO734Jn3zaK155XW5B +USTluhKSJGofmYSLNrTxLniqyscLNaLbv5k/LPXBTtfBCNGHCPsFtfajHeUmBsGi +9tNaNmpkddsgQB5l6zwk0TeUlFEhjQUDmPTnJX5l0N5RPC7WAP7IVZR8LC/BaruC +KQgtjG3fJDd6LhiZlwAn9YdPegtcrx7hT4LRhSd65uVRGKQgM4tmvpZW1jbVpUKd +7CnP7JO6wf3qi8oZQ0ds0c0EBfFoJjIriyhkD3GEgo8aeqqw2MgctxyN0L7nlAVg +2Ccr2JooGAV/VIht0LLl +=LA6d -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 564099ad372e..23bac8fbf94d 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.66 2012/05/05 16:12:02 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.67 2012/05/06 10:55:04 scarabeus Exp $ EAPI=4 @@ -62,8 +62,6 @@ ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" ADDONS_SRC+=" xmlsec? ( ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz )" # modifies source code 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_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" -ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.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+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable SRC_URI+=" ${ADDONS_SRC}" @@ -150,6 +148,7 @@ COMMON_DEPEND=" jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) libreoffice_extensions_wiki-publisher? ( dev-java/commons-codec:0 dev-java/commons-httpclient:3 @@ -379,6 +378,9 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + use libreoffice_extensions_scripting-javascript && \ + java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)" + if use libreoffice_extensions_wiki-publisher; then java_opts+=" --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) |