diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-05 15:16:51 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-05 15:16:51 +0000 |
| commit | b0731263bcf6b0c82836e32c65505a6aa40e37f6 (patch) | |
| tree | ad0be00970ae25f4ebd8cb59ce91c85db7976df7 /app-office/libreoffice | |
| parent | Version bump (diff) | |
| download | gentoo-2-b0731263bcf6b0c82836e32c65505a6aa40e37f6.tar.gz gentoo-2-b0731263bcf6b0c82836e32c65505a6aa40e37f6.tar.bz2 gentoo-2-b0731263bcf6b0c82836e32c65505a6aa40e37f6.zip | |
First attempt for wiki-publisher building.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 22 |
2 files changed, 23 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a54f16e54eb0..49f06b4557b2 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,9 @@ # 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.303 2012/05/05 14:31:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.304 2012/05/05 15:16:51 scarabeus Exp $ + + 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: + First attempt for wiki-publisher building. 05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index a9c4627c3c8c..6bba1b0e9863 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.64 2012/05/05 14:31:15 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.65 2012/05/05 15:16:51 scarabeus Exp $ EAPI=4 @@ -75,13 +75,12 @@ IUSE="binfilter +branding +cups dbus eds gnome +graphite gstreamer +gtk gtk3 jemalloc kde mysql +nsplugin odk opengl postgres svg test +vba +webdav +xmlsec" -LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript" +LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher" # Unneeded extension (just can be separate package: # google-docs ; barcode ; diagram ; hunart ; numbertext ; oooblogger ; typo ; # validator ; watch-window ; ct2n (requres two patches from lo tree -> repack) # Extensions that need extra work: # report-builder: missing java packages -# wiki-publisher: missing java packages for lo_xt in ${LO_EXTS}; do IUSE+=" libreoffice_extensions_${lo_xt}" done @@ -150,6 +149,13 @@ 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_wiki-publisher? ( + dev-java/commons-codec:0 + dev-java/commons-httpclient:3 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/tomcat-servlet-api:3.0 + ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) @@ -223,6 +229,7 @@ REQUIRED_USE=" libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) " S="${WORKDIR}/${PN}-core-${PV}" @@ -371,6 +378,15 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" + if use libreoffice_extensions_wiki-publisher; then + java_opts+=" + --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar) + --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar) + --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar) + --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar) + " + fi + if use test; then java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)" else |