Make vba scripting optional. Punt undecided.txt file with unknown opts as we set...

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 88ad42c51b6016012a6ca6ec18fdfc266de199d0..d0cb49483cb7f14a7f59913caa7f54d7d85df790 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2011/07/25 17:21:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.52 2011/07/25 18:15:43 scarabeus Exp $
+
+  25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild, -files/libreoffice-unfigured-options.txt,
+  metadata.xml:
+  Make vba scripting optional. Punt undecided.txt file with unknown opts as we
+  set all those that we require.
 
   25 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c4a1b9e5d9a80d5b70c226ec371808c5ee1d93c2..520ff2ffefc5967c28790a90621596ede4b4db4c 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -15,7 +15,6 @@ AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e03
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
-AUX libreoffice-unfigured-options.txt 1886 RMD160 b3ad4169dc6634b5e9e34e41af5a90a5de980577 SHA1 2f2ea97227408c8d55c8697d4180cb7284157cce SHA256 9e9188be96eeaacb4d6f5755370e90a0ee791ee95e20098315c758d659f15320
 AUX libreoffice-vbaobj-visibility-fix.patch 1343 RMD160 a4325ffffbd33ba49f77dc1e4fb83304e45912f1 SHA1 1a018dcecf0eb47223a47c419d3cb01471524d3a SHA256 9a0cd10f837a60b723abbf1e0b972fbe607c7308c5f9a2760a350c731f8a5764
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
@@ -208,13 +207,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 17600 RMD160 dd842f327b23f5a2ed1e636dfafa0966f8b20fa2 SHA1 cae6161479a9a16bb1ff38df480c6aad55d67d74 SHA256 b38a0cc5d3abab27c4b06a9df59b07d7ec0d3c5405f0c3de5a831e2ca98793db
-MISC ChangeLog 10469 RMD160 380793f87ad540a6874862b439afd33d4603ba36 SHA1 f18eff62a2ff52fb1f0180251c7fbfb12b37f884 SHA256 f9a2b72e8f2ec3a3dceffd96ad775532a7153684f04429388a22cf05a3cf3433
-MISC metadata.xml 882 RMD160 fec57be29e81f82a00fe1a3792d06bf55094312f SHA1 2256f830fe8568d99a9104a8446dde40259546d0 SHA256 4b55d790375e3eb2cd00a94f2327efccc0a505cb8e3358eb9a15e44f917f5333
+EBUILD libreoffice-3.4.2.2.ebuild 17663 RMD160 18b4d67cb8da62558a824966037205d38a355b97 SHA1 01fd1d2267112edbfa93520f58d42eafdf225b49 SHA256 b1993960ed2386b0ab033e573dad6b3c4d6e438b25332edb37519c41c5cdf4b3
+MISC ChangeLog 10725 RMD160 45827f08314f01ef227601ddfe1b97a2b7b2a8aa SHA1 b92e5744b665fe98a7cfdfd11f2280ed1a7d149e SHA256 3ba25308a2745ceb4ed5a388b563bcef135bf37540ca104a217bf95c7b86b8ae
+MISC metadata.xml 968 RMD160 4c276f754c1e2f9e2ca31d8afc848c7104405071 SHA1 ffd8cf3e1260eceeca576d417138f2d8584bf0fd SHA256 8dc930d20711f541b049eefa6e2b77fe5904c26ca4a08ea40553acb787c94908
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4tpcIACgkQHB6c3gNBRYdtVACbBChcKKZCFYUa2OFMwI6aYpvi
-0YAAoI1eTgz1KCVj+XJrhcoAHPlKy+6h
-=HfzS
+iEYEARECAAYFAk4tsnAACgkQHB6c3gNBRYfIzQCgmtNd8DYpCKc04n6sS0FONWYf
+dMkAnjwas5wQQvjsv5YypIEiUiaZ2+aj
+=tjx1
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/files/libreoffice-unfigured-options.txt b/app-office/libreoffice/files/libreoffice-unfigured-options.txt
deleted file mode 100644 (file)
index 5a97316..0000000
--- a/app-office/libreoffice/files/libreoffice-unfigured-options.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-  --enable-ext-barcode    Enables the Barcode extension.
-  --enable-ext-diagram    Enables the Diagram extension.
-  --enable-ext-google-docs
-                          Download and enables the Google Documents extension.
-  --enable-ext-hunart     Enables the Hungarian Cross-reference Toolbar
-                          extension.
-  --enable-ext-lightproof Enables the Lightproof extension.
-  --enable-ext-nlpsolver  Download and enables the NLPSolver extension.
-  --enable-ext-ct2n       Enables the ConvertTextToNumber extension.
-  --enable-ext-numbertext Enables the Numbertext extension.
-  --enable-ext-oooblogger Download and enables the OOo Blogger extension.
-  --enable-ext-report-builder
-                          Enables the build of the Report Builder extension.
-  --enable-ext-scripting-javascript
-                          Enables support for scripts in JavaScript.
-  --enable-ext-typo       Enables the Typography Toolbar extension.
-  --enable-ext-validator  Enables the Validator extension.
-  --enable-ext-watch-window
-                          Enables the Watch Window extension to Calc.
-  --enable-ext-wiki-publisher
-                          Enables the Wiki Publisher extension.
-  --disable-vba           Disables the vba compatibility feature.
-  --disable-activex-component
-                          Remove support for ActiveX embedding of LibO.
-  --disable-mathmldtd     Disable mathmldtd (useful for distributions that
-                          want to avoid packaging it).
-  --enable-layout         Enable the compilation and use of layout dialogs.
-  --disable-build-mozilla Use this option if you do not want to build the
-                          mozilla components from the mozilla source code but
-                          take precompiled zips.
-  --disable-nss-module    Whether to use provided NSS module.
-  --enable-lomenubar      Enable global menu support.

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index 21270cb83ac752160f665aa161f4c9194e2b6639..30cec8cb4f9db1c926c70745f01570075be4fdcd 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.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.2.2.ebuild,v 1.11 2011/07/25 17:21:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.12 2011/07/25 18:15:43 scarabeus Exp $
 
 EAPI=3
 
@@ -96,8 +96,8 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter cups custom-cflags dbus debug eds gnome gstreamer
-gtk kde ldap mysql nsplugin odk offlinehelp opengl pch python templates test webdav"
+IUSE="binfilter cups custom-cflags dbus debug eds gnome gstreamer gtk kde ldap
+mysql nsplugin odk offlinehelp opengl python templates test +vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -475,6 +475,8 @@ src_configure() {
                $(use_enable opengl) \
                $(use_enable python) \
                $(use_enable python ext-scripting-python) \
+               $(use_enable vba) \
+               $(use_enable vba activex-component) \
                $(use_enable webdav neon) \
                $(use_with java) \
                $(use_with ldap openldap) \

diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 4e27c3279ca43690ca3791efa3a01d2638de02e6..346c450d5763cec0c176eb20d579faaa764a512f 100644 (file)
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -14,6 +14,8 @@ version</longdescription>
        <flag name='offlinehelp'>Install help files locally instead of
                using the LibreOffice Wiki</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>
 </use>