diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild | 38 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r1.ebuild | 7 | ||||
| -rw-r--r-- | app-office/libreoffice/metadata.xml | 13 |
4 files changed, 19 insertions, 45 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 830fd3103233..8b9e4e8cc457 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.152 2011/09/29 14:09:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.153 2011/09/29 14:27:25 scarabeus Exp $ + + 29 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> + libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild, metadata.xml: + Add pdfimport useflag. 29 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> files/libreoffice-poppler-0.18.0.patch: diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild index 7b312b14274f..babda701d692 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.10 2011/09/17 12:43:29 scarabeus Exp $ +# $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 $ EAPI=3 @@ -53,37 +53,9 @@ unset DEV_URI ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz" 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}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz" ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html" -ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip" -ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip" -ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip" -ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt" -ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip" -ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar" -ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip" -ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip" -ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip" ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip" -ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip" -ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip" -ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip" -ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip" -ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip" -ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip" -ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip" -ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt" -ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2" -ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2" -ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz" -ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2" -ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip" SRC_URI+=" ${ADDONS_SRC}" TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt" @@ -101,8 +73,8 @@ unset EXT_URI unset ADDONS_SRC IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite -gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl python templates test -+vba webdav" +gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl pdfimport python +templates test +vba webdav" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" @@ -122,7 +94,6 @@ COMMON_DEPEND=" app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 - >=app-text/poppler-0.12.3-r3[xpdf-headers] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.18 @@ -168,6 +139,7 @@ COMMON_DEPEND=" >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) + pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers] ) webdav? ( net-libs/neon ) " @@ -370,7 +342,7 @@ src_configure() { # list the extensions we are going to build by default extensions=" - --enable-ext-pdfimport + $(use_enable pdfimport ext-pdfimport) --enable-ext-presenter-console --enable-ext-presenter-minimizer " diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index ccf8654542c8..6841e3059269 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.26 2011/09/29 13:20:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.27 2011/09/29 14:27:25 scarabeus Exp $ EAPI=3 @@ -70,7 +70,7 @@ unset EXT_URI unset ADDONS_SRC IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk +jemalloc -kde ldap mysql nsplugin odk opengl svg templates test +vba webdav" +kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba webdav" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" @@ -91,7 +91,6 @@ COMMON_DEPEND=" app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 - >=app-text/poppler-0.12.3-r3[xpdf-headers] dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.18 @@ -137,6 +136,7 @@ COMMON_DEPEND=" >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) + pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers] ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) " @@ -426,6 +426,7 @@ src_configure() { $(use_enable nsplugin mozilla) \ $(use_enable odk) \ $(use_enable opengl) \ + $(use_enable pdfimport ext-pdfimport) \ $(use_enable svg librsvg system) \ $(use_enable vba) \ $(use_enable vba activex-component) \ diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 890357e7945e..2c094c39a565 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -8,16 +8,13 @@ compilation can take up to a day depending on the speed of your computer. It will however make a snappier openoffice than the binary version</longdescription> <use> - <flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier - file formats</flag> - <flag name="graphite">Enable support for non-Roman fonts via - <pkg>media-gfx/graphite2</pkg></flag> + <flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier file formats</flag> + <flag name="graphite">Enable support for non-Roman fonts via <pkg>media-gfx/graphite2</pkg></flag> <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> <flag name="odk">Build the Office Development Kit</flag> + <flag name="pdfimport">Build pdf-import extension using <pkg>app-text/poppler</pkg>. Note that you don't need this for pdf-export!</flag> <flag name="templates">Enable installation of Sun templates</flag> - <flag name="vba">Enable support for VBA compatibility and ActiveX - embedding</flag> - <flag name="webdav">Adds support for HTTP repositories via - <pkg>net-libs/neon</pkg></flag> + <flag name="vba">Enable support for VBA compatibility and ActiveX embedding</flag> + <flag name="webdav">Adds support for HTTP repositories via <pkg>net-libs/neon</pkg></flag> </use> </pkgmetadata> |