Add pdfimport useflag.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 830fd31032335424370437f2dffec623c0f719d0..8b9e4e8cc4571c0502a1fdfc1391830b85151046 100644 (file)
--- 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/Manifest b/app-office/libreoffice/Manifest
index 741facf1737230324cf8d59c54690864d9ad69da..72d73afa9c944c0b93228aecf49ec2bc667f2c98 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,24 +173,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 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18392 RMD160 988b114219c3914cf18ca8c60fbc6012d310a5a7 SHA1 cf661741a45d50f8489a2c0160701570b4bc0c5b SHA256 0d2d3450a86f19b9959c4efa9e37828cda5a8d313ae7e9e401087a921e313e40
-EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb
-EBUILD libreoffice-9999-r1.ebuild 14073 RMD160 a5c3bbd8bddf989c1293599ed93ca78fd4126eab SHA1 05e064546c1405491947863697c224746d6c586a SHA256 706099d21db822bfcfda507b9fd1ad2935c1687f22c324e1a4aca455fd81573a
-MISC ChangeLog 28888 RMD160 f59cbefe460f8c9156f0ed786f1d8146f7daba3b SHA1 b10db3c2bdf755f73a6cf0f1742bfd87506fbe9a SHA256 50ca4b9aaf5099ebe67b47d5252f08f4f53cb2d200cea34b01d399477518afe3
-MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092
+EBUILD libreoffice-3.4.9999-r1.ebuild 16078 RMD160 e296524c64209e00a4fbdeefd022eaef87b4eabd SHA1 6f82a057952733af6a7762b9a0cd61b46212ec90 SHA256 44246714d937e8cedf3e78109fa69484099d07bbcab6f1c76e3125d00087fa3f
+EBUILD libreoffice-9999-r1.ebuild 14140 RMD160 1dfc6090abd1c2646fe2503f6cb57dd4da36e736 SHA1 47a1d895d04fb40ce5e1c780b93cd1c3af7e69cd SHA256 a8c685f6e4a7d213dd214303b5f66ede4cc2553903fb9779eb7378b48526dce6
+MISC ChangeLog 29045 RMD160 8a3a88726a22df7c896303e468ae399359fa7064 SHA1 632602a5dfd2db56bb81b191a0bc5c3c331f42e6 SHA256 e74db65db2f2e8cf8ae25f4f2e172cd68c380323a1a40a3c7aa3cd5f831a8430
+MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOhHw3AAoJEOSiRoyO7jvouDQQAJTG+FC7xyJuQvxap3/wptNG
-AjlE2LFwrwiKzYkjPq0LvTEdD8nkJo0MlDZ/j0hIbvdvUW68phE3c4n3OWH3QRxo
-pu8bJg6cPYsQSoTB5lUrAYX9peQTsqWZYBnIhCipGlhwqBM4U377y/vcxSMT5Nwn
-N8kCzYG4PKtDCGd/EsNyn9WwfXiopt9i9fhWY+jWY0dmTaAr9utyySylc7rDnhvO
-MXHEuMBg7p8csXwDJCHibsPx776/G6LMZEYMsxjZMrP94qC+p3BpNHWmSeV7/IjX
-nyZskAb7ZY8dmFA7dBEKcto+1ca9ItQQFBOL9UjHqmDe0r31V9oD5O2evB+B6Ytz
-cw++AeEdY7Wmfb9U/eYnu0gGjCsqMwzJpYua5xZkWR9LpUqsJAkaqoKp8oB1JOQo
-xkNmUZIskGa5005olRXYhCecHTXXpMU28MoerxtK6opY5MlxzeejjItdpbyx68gt
-TAYiEiGzncvpLOwT22f/fTdx/ONDw28ogz0xrpNkZMjzbpJrndZTz/l3kkX5awBr
-GkTNmS3ZOVYrLiw3T29SjNr7FZUPF2HVecohLn3MyNfDwZy3IWUbwSuyoGl1uO4O
-9q/5eHpiUZJ/TBawguRa1awsWSLOAglJ7jq+Rhy0tF8OTv3OzSKKO2bc6Duc3H6Y
-vTg0tAsM3QVVdgYjij8x
-=dQ3G
+iQIcBAEBAgAGBQJOhIAfAAoJEOSiRoyO7jvo7X4QAJs5Do0UZaJz65uR77v4Q6dd
+E4HN3WYpTtReMd8MEDwW0sanoLnUoQgDEYIKoHCjhWa2j/9OeGzEw5Wg1icKqEIR
+B11Y+QZfF+mlft4V472Trg4GYF/KoWGPJyHCKfhBujrZnj0DIFUBelhaNpsXaNf6
+OeILFg3fLlAP0/YC6t4gxzimj5EScG09uX/CzWnaeVMqTA7ycebQDjbUTjPrmhoW
+9fRaPsrX8ADLxWInLeWuuTIvD+Okbd/rfzr0Z4KPDKSAY/ItVIxHGh90N+5YgQ9w
+1zGXaazxmmZoAmpY7FX7w17EQKJptz1dF8Qdc3SNRz73MHbwx28J8Uwe/F+Ow+KS
+qXrI9O/B9tGHLFyaQkA++SM8y3NoF+nQoUZFZY/6H2azUchCaDjhgjOyKaiN5R3C
+D1Z8D9vW80LUXfySy+dBW9KfZFGVH+x1F5ufN2Sod6VJmYSUJGxuIJ1Hn7/c2iuR
+yfmd8FmA3x/QgD6zwCiea1Lw3AYElvwkSmmngi+vIqAJ7V0kEN65UVMXHpbgMcf9
+y5x/mf+DsvFvIPMnc0pevb0XMsj1ft17nBujDi/K7gwV/1w/BnQwX8m/5JgsVeFg
+HzBB0YQiozTwuQkAjK6jpzSWdSdMblpwrhLHdFjzMr6zpiZfvJizNBZjklwntMGq
+KV2/Kd8HOzWNhFSIN1le
+=oiQs
 -----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 7b312b14274f027ddd9574632185c57e1b61047f..babda701d6928f3bcabea7847a44490dcbabd7bd 100644 (file)
--- 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 ccf8654542c8c656213c68f8bb93e3200d0ed693..6841e30592697bb138bb3bcdbcce515f322f049e 100644 (file)
--- 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 890357e7945e0535e68eea7169a9b40178ab6c44..2c094c39a5651e3d0bee279e62cb2610f63b2bb8 100644 (file)
--- 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>