Drop unused switches. Add arm everywhere where at missed. force due to unupdated tree.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8EEE3BE8

6 files changed, 33 insertions, 21 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 50fa6e0417c5..b98b854f9fd4 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,12 @@
 # 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.413 2012/12/08 12:57:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.414 2012/12/08 19:47:23 scarabeus Exp $
+
+  08 Dec 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.4.3.ebuild,
+  libreoffice-3.6.9999.ebuild, libreoffice-4.0.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Drop unused switches. Add arm everywhere where at missed. force due to
+  unupdated tree.
 
   08 Dec 2012; Markus Meier <maekke@gentoo.org> libreoffice-3.6.3.2.ebuild:
   add ~arm, bug #440908
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 724b3be2eef9..150235672110 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -34,16 +34,26 @@ DIST libreoffice-help-3.6.3.2.tar.xz 1864084 SHA256 954edba6f6109037a001af97ecd3
 DIST libreoffice-help-3.6.4.3.tar.xz 1863976 SHA256 ed4395f9264a27411050b0be4a953f67f754a9b7f913aad576ceef236db6686f SHA512 123009eef4d1ed342a4c23acf5ec52002cbe5f8083d1fc5d485e86f67f461765ebb34ff1edfcc0ff6d321de7f8a2bc40d87f757c66b3c2ac22785549f4098f27 WHIRLPOOL b275bded52e998e5a12111260123c7b3456d2dc7fba4e6b13ffda787b1712df4af4838ab426760f7abdb9824aced163a470255d83afb7daf46a83845bff900b8
 EBUILD libreoffice-3.5.7.2.ebuild 15682 SHA256 d86d6b532a7d1c8b66a7671e4db14d0f5bf25d61f2d0fa3fc01d9eb701d99c9d SHA512 b8388601186c29d43b26222a8f0a8f77c3f0ac468c068f284f7498a26d42685eabc61b22047bc94c5509fd796f1b95d3ee9d6a5e88370932ec1d9c37327a23b5 WHIRLPOOL 4a1bd0e270e83d3282ab768ee19c8a07ff79566bf9d3d0010dd6aca55ed5479aca48f4c577e6d90ba47af7bea4b40e2ae0c33f8e8ef4f9388c56ca5c1bb7887a
 EBUILD libreoffice-3.6.3.2.ebuild 17752 SHA256 18c3091c018aab01bb0958aaa055f578c2ef7ba68c8dd1688befea54d052e6ec SHA512 8e4828a684171793edd818a2a87a288aabc23212a1a62b533b6254c9aa5c05204d30804616607aaad5ba8159d98d4bdacd3efc7e066d2937d8c137990017bc70 WHIRLPOOL c9f8f0d280492e30f82a1ba87ffddb48a877785216e0ad2e6a5ab851c5c5bf298585a867a27e83235a3bc0be48327ae1b0032ddfc6539a27433bc94b82fe09f7
-EBUILD libreoffice-3.6.4.3.ebuild 17472 SHA256 a681c297835874b3210fe2a8c43fe0e1987a789371ca88c011faf40def56de23 SHA512 05d2898d692f6e9bd7128c985b1a915a96cda1741724243fe97ec1102d537c627f5f3e2010ded74a7c7671a7962396d6dd5e54e24c5c689e0c05cfff91aab120 WHIRLPOOL fa9ab379df1f0f94ba1e351638c471327ec3b92c16245c8262a41651a03fe8e8726183c510c637ecdf2dd605216b22e0ac7de62e85b7d005350b939c33d3bf7a
-EBUILD libreoffice-3.6.9999.ebuild 17474 SHA256 f9ef876bcfd4f1bb99995fcae1a9882a5ac34e73df2c8e343f23d544b0acb5ab SHA512 9322420f0922f973967462dfe51d539de7b10277a17802b619ebe32bf36719849e52a68fcafd3234194fc9c5effedf92d577f092783a97995980d3c4052f7037 WHIRLPOOL e9b61fa503b354c1b5d764ab0f69ab676c46c34defa80fa585d85b7d04a5088fba9119c0693c5a543a31bc820d8c854a4d18aaa69bc2af7f18c078237b943046
-EBUILD libreoffice-4.0.9999.ebuild 17408 SHA256 91ce9115d756716e3a375a6a827f0c5db6c483128beb1eae9886370611a9d229 SHA512 dd1c61c0555e8157222a5f6a32e00342ba3088bbf3797ebb542d0bed2954c677e544a21d3297f0913c7eb545370919386e511e05e1dfa202f8db0eb286050a88 WHIRLPOOL 6021f1d08056e22bbccd284dd8e927494e108dcbf1fb9b3702fe7fd53eac389ab962fff36c56f9f88a17d6cb67d72cb4a4284c3c0a459083e6ea6059de74370b
-EBUILD libreoffice-9999-r2.ebuild 17409 SHA256 1a2eee0c0176090f70b342d5c6b8bc977ca6d37e448f60e3409e4ec62e71c5a7 SHA512 f83aa87395be17b3d0351d45e6dfa41e990ccbbe72b3256b65be35def9e1a82363a7a2b16d1a201bb573303843ec122fc04b54dfd17ba882edad7398d7ce8c60 WHIRLPOOL 6020267b78d2236022ef1acdf565d77081c7595bdec93871d34d14c1c4b23b3867799a458394e6421f98eb70e51f241e029de51f08ba087d3f503bf6520224ff
-MISC ChangeLog 74706 SHA256 2c81a93e7464af85777908a405fa6c39fdfce2ce27f5ff5dd9d55acc6f365f83 SHA512 10397c4625931622407bbfdcd7957b3644f77befd4c5d2c9090181fa05f71d7cb85d20f1114e21c9a8f5a9448b218f0c04583fa5dfa7447d2f444ff84a0b2cf4 WHIRLPOOL d35b0dde92a73472145ba0b1fd18ae5764ddafa3b1618556a0151fc8a21af10de11f85b33e39c865096cb1233a2002ac25f55b3a2ad9cf19ae2692801fc13ecf
+EBUILD libreoffice-3.6.4.3.ebuild 17477 SHA256 1192001cf892b2151e02276362adef491e7f20cdb5a0b879363260c2fbedb275 SHA512 ce50933ae4e12d191b1575d2d334b8758482ca7781adfe466f4a73e4294823c0dc6f41a0665f83e82b5f2cfff4d1752b113312d0bfad572ddc6b76d30a305943 WHIRLPOOL adb686e112f31b7cd9f31003b9c6ff93d3fc9921a30c46f098f61fe9bfce551df37a7ecb2326d5bf974ccb7f953b79c96888f45a42e08b2c9b0cabee91c3755e
+EBUILD libreoffice-3.6.9999.ebuild 17479 SHA256 15a5118aa526180063a8ce70bb833d08dcbdbdcff869de13b09d1a50013dd347 SHA512 5d25ff67d51d31ac5aeb4ba7ec25e65f213a80d676b92dff81b073e119d0c825c44da5916b124a7df470eba3f03f2856039b0b0e126ff911a0137dbb7d3d8ee9 WHIRLPOOL 3945486c2be650a19850410286cc257fa0bb861e29a3d201a0e9dbade4dcd84ce81dd038ba15157d9adb49de9f01dd1b14bd022b3712b7e971bf510fb9884a10
+EBUILD libreoffice-4.0.9999.ebuild 17413 SHA256 d679769c226e182a19af9d2cb9f74c3ed594b747d135ba2369fa1edc36c5cfa1 SHA512 e2431220349d664ae90434d99ddd8d314c5209ade0bde9b073416723591bd3227696762d72aef9d03127cc3fe2e303e8141ad7462f164fc552ed8ca00679c5de WHIRLPOOL a142c5f8422d7709414e8f6a63ff5074ac5de9d5b150de651a72437587990a30d5be63141da62a5cc1f34a30c351b3b63e3115d6113011e9ac6ab53887bf45e5
+EBUILD libreoffice-9999-r2.ebuild 17269 SHA256 ae823d06aaf526ac572f8a7d9f6d612353a65b55b5999bc087303ace3f0b6be9 SHA512 a76bb37a08836233024d5645b6b6e12accc358cb60ae224ba5c86c23fac4d2a3ec3b2167dad60fceba70988324b6e52756080808cf4f99f005e089eadda27e1b WHIRLPOOL 480bf1bafaec90344bf4f028830cfb68763c1520ff02a7bbe3e79050fb79411cc4f193e08d06ede3626adbecaabc084d79ca0de188e69ad268fb82fc8d14def5
+MISC ChangeLog 74974 SHA256 7bcb80a89884487615615e3382c2f432f968826a72a8ba696b1c08e12f9caa3c SHA512 85129aea09d32281b239913fa9de15fc1da24fbb76b03281e25e80a66c43b3f6bb94a621fe2b115a4b1fbb9ca39958150e3dfb0c2f53f5a96fdeaf1200a818a8 WHIRLPOOL 9e1e61863fa32c245cf722a3a3efddcf8a675feefad79f111695c3d463100e164f1006cb6c02ea54903c0ad5a6287bed19abbb91ff8556a3941c6b75768a4b6f
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDDOiUACgkQkKaRLQcq0GKe5wCfW39paGZ0K+C6dlOR496vw0jp
-PxIAoJ7MPye5kW9ye44G91OUQValBAeb
-=rh3L
+iQIcBAEBCAAGBQJQw5lEAAoJEOSiRoyO7jvoyLwQAKmb6aylv11wEfRIzXCa1S88
+WVHdfZ1Z/+9UQGEEICEtpV8Llw993R3ChlwEe16954I2AC7s+5EsYYuMflBfODwQ
+Oi/zd0aDnencOTkW63U186rWVqkmC9qcPZf36zxwLobMSxH7F6XVqo2i8PA3U7Mq
+prP1wAgTd3jeC2SncL0Pdl0g6uxTrPnSQ0O/3obI9L6uPaKDI4ChODVBUDa5Zn6y
+xtFU4W8b2FEQoDtHGeBdiin6wGWrZ2dyQDGRNcZTXGPdSWUd7bdVxRzg6FoVF8bg
+8GS4N2YeWOKI2CPfOu1x3EpPVLbohqwCtHruhUqIvwer/fWAuw50tY3nW6XA/AGD
+sKs3HffZ6Fpmxh/n+p+0oZd/L5z6erqG7dEriq4HG8NISbFpcdqR7Dj+wmxJM+ap
+k340W4+85+CNCNZlnf7fW48UJVlEvOZzM5MssiOZjvg/pl88rJjShh3iR6S0fN0R
+pEUD+D0NZ2AtGaSaZMYOabX6Qk4NA2e+Wg7piqFoluvHF/42Q1hhx1DFekvoDDLF
+OmdQKMI7p406Y5+FxmETfqVcSkWv5TfMNvJ73ZXxwPV1oup/Xgsx0jZqrbB4dGix
+sh9geG/V+0SGPzrH0g17k976bXM5YnNRAca7KSralK2RDz9hCUbZ3/3K5G5mO5Uy
+UgK6Xqi4soH/vu3hOvIZ
+=/Ae3
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.6.4.3.ebuild b/app-office/libreoffice/libreoffice-3.6.4.3.ebuild
index a64ec5eb1c3a..50f67a17d311 100644
--- a/app-office/libreoffice/libreoffice-3.6.4.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.4.3.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-3.6.4.3.ebuild,v 1.1 2012/12/04 17:34:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.4.3.ebuild,v 1.2 2012/12/08 19:47:23 scarabeus Exp $
 
 EAPI=4
 
@@ -90,7 +90,7 @@ unset lo_xt
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	app-arch/zip
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 2b371d118305..c2aa4f86558b 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.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-3.6.9999.ebuild,v 1.35 2012/11/30 22:37:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.36 2012/12/08 19:47:23 scarabeus Exp $
 
 EAPI=4
 
@@ -90,7 +90,7 @@ unset lo_xt
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	app-arch/zip
diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild
index cb00f951cffe..13522bff7713 100644
--- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.0.9999.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-4.0.9999.ebuild,v 1.2 2012/12/05 13:48:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.3 2012/12/08 19:47:23 scarabeus Exp $
 
 EAPI=4
 
@@ -86,7 +86,7 @@ unset lo_xt
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	app-arch/zip
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 5d39e9c2fdaa..5fa600c38c07 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.138 2012/12/05 13:48:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.139 2012/12/08 19:47:23 scarabeus Exp $
 
 EAPI=4
 
@@ -86,7 +86,7 @@ unset lo_xt
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	app-arch/zip
@@ -416,8 +416,6 @@ src_configure() {
 	# --disable-gnome-vfs: old gnome virtual fs support
 	# --disable-kdeab: kde3 adressbook
 	# --disable-kde: kde3 support
-	# --disable-mozilla: mozilla internal is for contact integration, never
-	#   worked on linux
 	# --disable-pch: precompiled headers cause build crashes
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-systray: quickstarter does not actually work at all so do not
@@ -452,7 +450,6 @@ src_configure() {
 		--disable-ext-report-builder \
 		--disable-kdeab \
 		--disable-kde \
-		--disable-mozilla \
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
@@ -475,7 +472,6 @@ src_configure() {
 		--without-fonts \
 		--without-myspell-dicts \
 		--without-stlport \
-		--without-system-mozilla \
 		--without-help \
 		--with-helppack-integration \
 		--without-sun-templates \