Block only oo-bin that can't cope together with us (latest version can be side by side).

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

7 files changed, 66 insertions, 31 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index b7b252fa9950..48985d953b52 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -27,13 +27,23 @@ DIST x86-bin-libreoffice-kde-3.5.5.3.tar.xz 75174980 SHA256 34494a74f838f93ee2c8
 DIST x86-bin-libreoffice-kde-java-3.5.4.2-r1.tar.xz 79772804 SHA256 9248e1557df216538ccb9b68d786dcf578cb21e2da331a3b2a70bf64d73a2ab4 SHA512 4d40e07b73fb16668d1f9897945db3b5f47a2b342053bb5aab8885807d5685e7b22dab3d69b95598e4a874a9263ae2980972bd4e413d39eac44d95512500a572 WHIRLPOOL eff491ec09ff67cd093b7a5cf338939a491f6b83aeb2d1c1fe4b16f9c762c0296cd8ae5382e65fe6a6567b134712a158e74bcec910f63e260a281e077d07c2ab
 DIST x86-bin-libreoffice-kde-java-3.5.5.3.tar.xz 79877120 SHA256 522c78141326454cb5d84605cb8ed4a89fbc948fedaf6826c13b07aaee61e1cf SHA512 2869ee9918754d10d9aff1dd45ee11cbd1150197bd5ac4c81287b1fd6dcb439e73c0f042771111af16a2a8426b35aefb543c96a125ac21e3732e70559ce12ae8 WHIRLPOOL 30dcc33faa56e6118636a2cc93687d76dfe6ff1664a7e4cb7aa01a818f6bb0e10670694e04eab40898b0edef221832952b502b4e60dd966bbe2e4102897a0a50
 EBUILD libreoffice-bin-3.5.4.2-r1.ebuild 4526 SHA256 a307251ac12dc1b9b26768186e0e90cc36a6b988908510370a9ffaaaef8c2ddf SHA512 31e340380bfa33ddc805932ead8876239156d7fc1666682f229e118b1c9de65290036c9e27c97df0a1b763da9c1a3ecbd3b0608cc3fb418e88323ed690c837ba WHIRLPOOL 37a5f3d30255d655a91d1011fa701d5b287f3bd8136c37ba7aae1fdb0eaa23f96fe9147db0c581a713f166c2aa3bbade0d2a719d6473f14d0db4093c5a2ff843
-EBUILD libreoffice-bin-3.5.5.3.ebuild 4514 SHA256 f6c74f51f0913c0617523286cbf83b2a6c8c58a40173fad337398f46322a2e7e SHA512 4051c689457d6731cb2ebc56168f8a7a4244b63ef075228ca4dc54100fa604e5efcdea7f0b6f06daf78bf898604e5d8744a01c378e39525436d0434ee33055e3 WHIRLPOOL 044e391310f1375727cba337905d560ac71307cf7ed197f1e738f1029ff305dd5d1b123a01e425a12390879002f419d97041d36ae54c4d981e96a0e16ce3bcbb
-MISC ChangeLog 13648 SHA256 b9e903215a7329ce463b9e0654016a1e09d5ad18e9cfbc7cc99b44a9e7ef714e SHA512 a13cde11ffe95fc17d7fff43523ae5f54f3217d8c905b196c447b04fe651dca7c1b9b3bc797f7d6c30b692af61c8ae272b61263fb5b8f39a3458f498be313eef WHIRLPOOL 006b2ccb90f44fa40d60d9528251e1d42537557dc3d417a4fc2b829a244de44cf6f8aa3afc082bb40b1b988794a9635fba9ef0c918db2f6f8c8ac777717968a1
+EBUILD libreoffice-bin-3.5.5.3.ebuild 4524 SHA256 cbbd2ff3f84a6f0377232c0584265b7a805f0c3d87bcde6870cc64c8eb20cfe7 SHA512 b5e5e044a4769a0eb2366cedfdc5885f4114c89ef114eb81c6f8588f4415b0fd29afb6bf3b5a042cb3cdbc8e04410ced2e888f148095b9cf4c921f036e2e65c6 WHIRLPOOL 52c9fcc317c898e51fb51035b06b99e6e5e4ba25063330aaa4fa801f08db3109e2c15ddb1a829d836663baea24a7a5ae9791c0be0f988a007e2f7b8911d711d4
+MISC ChangeLog 13776 SHA256 6e4c3f35843c2a65adf6aa4853c798cfbcbe0254c2399f4cb6baf47be9d576b0 SHA512 114d803e140982bb6c2344d2f67e5c4012897420b1c5270e4044cf8348e05170dfbc3637208b5287ac672939b2ef02966575ab3b8b2282fd9f9d75c0ea1f7b25 WHIRLPOOL c11054f4407ff60fc52fcbaef49a037cd8b4bec0ab83e98111c85aaf602205e1dba1d98c90f33cc4e5215b6cf30df03e84cc168df4fea60aa41751b5a7add2bd
 MISC metadata.xml 347 SHA256 921fd936c852005f5783fb6810f61bb344f7f565f6f2068b3ee613ff608bf904 SHA512 2d86c42933be5e7954a6f9a18e38d67f73052ef95d2da495338675ca7fc113b545be8600886aa38ec6d805ecb56a8272951b090eb57708e8e1004118129e49c9 WHIRLPOOL 78d846dad865f271d8d364220febb25f3a2a1426f25ed523c42708c00ce598ce2e269f6415037341e7767881a2458c3ad8ac34618321c1dd4b2e7024d82e2cfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAoqH0ACgkQakKUmsHeVLL3WACcDdmcQWzOaOc5do4QoHDYw1TX
-Ot0AmwVlgVidUOHAPXbMcogKFFBS/EAw
-=JgMt
+iQIcBAEBCAAGBQJQKUkoAAoJEOSiRoyO7jvoP5wP/3TPz0uP/x1fY4la7vSUTGFQ
+x/EYMcvdcwx5gHYGO4bhJKQSRpxJwVtc/1IC6Hfev/RqKb/j0re19jzlH5EhfqBb
+7uoTJur3mroGoLxDJumm+WI3PSu/0bFP5GCY2Y4O5NfSLkM1Wh6E9EahP314gMVV
+e36g6c0ACS0USJ64wxW13S6hSzaywcmdbn6yYUx/PI0yL8Jmk61sKctszjKrSqXY
+g7ldva5lURs24kmY7haB0TCgzUaDgjWiDVw+5rOfhDIVhn/kAGIHCsYCsD5LEEdD
+VlfuORtTLLYkg075PKW7JDM5CZYEaHc/CEPodemZUHU9X3jRzF0VEE3vanPe/pD/
+O4ZcIjaym3Lzg+/XNBmlV8BDg+1H9NHSmG/3/k0BLgabVpGRvJzhLlTki31bEa6E
+oz7d7+kETWtKZIvYq7to/GEIENrbz4o7e5sJOXsq595RaAIeivOKrp4tKY9untX/
+CRTv0H5bQSCqX1+8W6FMbDhec+NF2mGMYAyDvis0kcM+em+L5YsECuENpbNthkvY
+qr9Lm/ffdW5HeSw/qJpc8ecFYg/fY0rQsol0ZUpYJ2Re/t0lKi1ELNXw6UjeImg7
+LGstMozdBHc7FxuxWJ974h9H7/YU573LdAq2s4bR21OehRZ0M9RKHFhxnrECBIdo
+TD1sXBdslKLDyqbeUsf1
+=PKSG
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 515abcd6e104..1928efb7e269 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.358 2012/08/13 15:49:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.359 2012/08/13 18:33:39 scarabeus Exp $
+
+  13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
+  libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Block only oo-bin that can't cope together with us (latest version can be side
+  by side).
 
   13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.0.4.ebuild,
   libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b461b8e989e8..6d9b45ce0d29 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -27,26 +27,26 @@ DIST libreoffice-core-3.6.0.4.tar.xz 107125460 SHA256 b301eac605830ed6423cbab49d
 DIST libreoffice-help-3.5.5.3.tar.xz 1856804 SHA256 62631206eb03de10d24295e2126011aa410b1d09881c31deb7fb72459e3209e7 SHA512 f7a35bbbae652e68739eb19179ea142133cac3261d3edc1d91e6d1b3c19c576122f6ba6676ae64cca3f2bb46127431696262a56623642c5fa0045403ee53eb62 WHIRLPOOL cdd7c421a5fd3e153c72e3cc218e74abeb006d05e0399605d8aef2769f7aca572412646ff50195a3970aaf0e898527e67e5fc1006bf44356e3b0e49226933413
 DIST libreoffice-help-3.6.0.4.tar.xz 1863972 SHA256 30b79e3b4cb5b2167d1f3c17b8781e8940665f861197ee9021a6ac8c64d508f8 SHA512 f6fe9296c605999634b484de4a62e7665dae8353d8c5dc20595036b1cc87d51750f6b2eedcae70c4739993337a8ec22de6cf3046d0a15f8669464247e6da1745 WHIRLPOOL 8237777a6bcaf15d875f8cdc909f401906902a5670f2e2097376a90ceb74bd116d42a258faafba563317b7b1e9469b6fdaf1ffa71d95c9d3447d25cfdaf3f6b5
 EBUILD libreoffice-3.5.5.3.ebuild 15651 SHA256 2d917faf6e64025100fc3913d5709d995ecd608b65c977d029e789dfe0ac9d12 SHA512 c45a9848e807334c62b0e3ee537bbf96b4c5fae01756364c02e67b5c4cfc8ab53b5613408f7aa82e1e534ae54d56d375538210bd1cfea20e3375196f424f3364 WHIRLPOOL 63957862d965632f8f60a5fe2a4b1f5d86202f652e4bf5156f0ae62e333656c5c7f5b59dc74de1de4fbaa8805549afbf3e667f00e8c7fd31b3bd1db78472aaa7
-EBUILD libreoffice-3.5.9999.ebuild 15656 SHA256 e53d4935d180d5f3910904e1b90e091f392f268bae3a137fde30f0d1ec7ad996 SHA512 bb81fce7015a3bbb10684bde943bfa29b2f40dec6bffd91f844d770eafab0fba48015e29aaa29d55bcd74c4e67fa3d7c21c6628d8418d878197457894824b78d WHIRLPOOL a6813f67b4bd317f246dcec9347e0cc43d695751f0fd6c8055d0973469e0e31f50445fec4c77861dd4866b5cad0a85796c8120016700ef9780875d36254194ac
+EBUILD libreoffice-3.5.9999.ebuild 15670 SHA256 f2d0a3bab81902be7835260cfbb407b6cfd42dc7ea48d9bd5bd28bdba2cb3e9f SHA512 60a35d57ff539082d5478b1acb1813c3c38402ab4019c36ef07f11c9b7cd81c7f9ef43cf256fff1f9df7c984d5383c97e5e7b386b54fb67673975c3145498981 WHIRLPOOL 4073a2bb78ec8ece3effe3cdeb020aa400d03aca7657f8ace5352123472665e82a0c68940f48965dbf8e270d01891d375cd44216520417ba09cdd264cb430092
 EBUILD libreoffice-3.6.0.4.ebuild 17563 SHA256 081c95391b4864227d82fa5a199ff8cbf1a3476c59f249cca4fed7d36f17ba49 SHA512 bb93f9e0cbc028cca9f3d533bd9ad4197963d17b07fac1b1edd0cc2da902f14c8e5285b95b06b238f1dc41c6267d453843733c56a762297a33c5c3311caf9994 WHIRLPOOL a2d63c446ce6f77e9a47c791549cb6356287bd665f4af9b90010b56b0b5668275d6894ca434be8339c89206b5ca52f8450c472c1ce01b1d41e437ecc7644c73f
-EBUILD libreoffice-3.6.9999.ebuild 17363 SHA256 75225c7a6815790887cd0ff2363b353164b9d5f6b023af241bce805c885188f0 SHA512 64eac7fece6409e5bde85aa952fc0f41f0e4ccbc3f970fea9cdd2b2302e9c9d69b899f9f3d678a7878c6951834158646575281ed338f9ddc5a7a71298ddc7355 WHIRLPOOL 86b24e2293dac050ffed03e2bafdddbbac52c97aec47adf93916639ba84432afa91e0937d9f0670ebd0b5950a320191f6265685652bf47fc7ef3659b19d92bdf
-EBUILD libreoffice-9999-r2.ebuild 17642 SHA256 24110436bddbd7b65d4876ce92e59eff78be841894e22aaca395b7c33e9c2000 SHA512 2933d8ac2da0dcef30f8b40f71499271acaf291870e910664429ca6e57f9f400f051e7a2e58f7c1958e2ff1ca79210344bbcdb8aca3dd84b8dd3ca1e8a11d0ff WHIRLPOOL 3d4a5410411785cbec1f26f338a7a2c454d63549d35ea76b68c5b59b6eb731cd9cf0023cdab56e74fbea3489bb52113e4bf212d553633f22b6284e38ce3f8109
-MISC ChangeLog 65838 SHA256 bd781d40307d3aebd2c789b61a0484fb5f4f485014797c00495ab9d861981950 SHA512 f0596283288ca470662b45936f5317fcef2e3456c16dd44f1b4bd3ef42fee088d2b8aab3c5c202b48c6f3278d8a8e6b63a585518320b2ea72fac2708f603861c WHIRLPOOL f6c20ee8dc1ba896730e75f0aa1e46e8e0b6950ce80eaaaff71309f1a428633486afcc312a9826f8e173e84a8b9a33757dd0a35ccf6f03d74ed90e52039aab05
+EBUILD libreoffice-3.6.9999.ebuild 17377 SHA256 f004e7d25fe29c5d4d2b0f0aa6c866dfd80e7d3b4115836c081c47567355a2f2 SHA512 476bf1559ec2a7ad57d2a37ffb8f61e0783d76c46de9ed3651ccc85d368ab7b4100502dd4b23bf5e80ae4834fb00e89c6e82793b300d8b4430c77e2cce4a6015 WHIRLPOOL 180ef28b8833b5b7ac154bd8030eb9307adc54b457616d7ee9d7d0cd4b410bec71b63825e4792aeb1cf6067d918fb80f073bfc0cd4eb2483651e729d5eb25596
+EBUILD libreoffice-9999-r2.ebuild 17656 SHA256 dd1f8239acb119f9e399d453ef9e42b7c4364e1ade4f537828da8bbc19b4bc4b SHA512 4d238450bd10922916b0c93600c60cba413215dcde792390d3a3f9fa732febe54a5c78ee6af0371133829cb361f64e75945c4d113588e4cef5c20c49b3cfb1f7 WHIRLPOOL 16eee0325091b5d30008367c5982f85419ec5c77e18221b57470c6f20ee5281bffd09fe33822216eb11d1c04fa0e137c9beba3daf215f30c2db676209334d55e
+MISC ChangeLog 66075 SHA256 cc0c6dc5a8bbb986063806a63df462a8605204ce3028792c7b042b11438fdd01 SHA512 f1a72b85aa1e5decec464974ce82192e26829e3d1ca79a92438ed3b636e52f0e02529de1a4805d6bf700456b87b765aa8047b50a89a75cc265e3e5ff044c87c7 WHIRLPOOL 298976914628c5af1238ed05b50d7e666ecea7916630341c41c6e7292352f994e256c4ce77101eec6cc0df7378dbaca287edb74c30eeae47a152371d58e7cd1f
 MISC metadata.xml 1534 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401 SHA512 6e07d86c7aef51c72303ae0f41c49ebc9f0bb89d9bc176822c50a2f73684253c16acf718caef6bfe8bd072ae9e987235e0181806fb0989319ea40e894fa2ea39 WHIRLPOOL 4708c3823f88598934b7ffdcc5f02c8a1427e6d06d3424634042e22527f9e16786a45114ea6010fa085ae25170b8ca241a8f2741d522f159b563d511977d521f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQKSIYAAoJEOSiRoyO7jvooywP/js/tjM2j1y4mCYKB4xW0zZh
-vIl+JG0hHMIH/hy8R3X+gEs1sSCMTvcEv5IRM2fuYPo2uTxyH4s9rI1+7fGWHw20
-1oOTRRudICiq4N7p1HJ9E0yzCmVxSXKqpbjx+oRRnZdPEJfT0xtVens3Ziay7XuW
-PoXS2pY3edvzRcnmTBCHeb9Cm1+1evH9GvjI0DnNHr+05glawAo9GNYB3yLxrTMs
-MMfXofzRja1nfbYktf12gMl/qmFVb8ZoueKM+YFl2AXHCAM8h1mEPGyjfdM/IcfO
-8ob3nmnBBQEaguE/KPjsdYvbziQDmWRMhJz359WXguTzomBHDIP6VoByof/eN1wm
-XNiDnYsYnezcvoOn1AzRT6sU1Sw6NrtSV7l3xTMgrf0JMZB9IDIGpTcfbAyg8K0M
-RnNwye5pXQSsPxi0Al+ZZwbjNUnp8YQzwE004vwSLFYATkq3kyJn+jkOmN1tM45V
-96+vbtY5SPB25XuEfaum5c6ltjklCuQbt1UFxpwmCEgIAC5s13B1Py26yiWyedpB
-+8RBzM37UBvoQ0pIfBLKOVJIuTCTimJ3vJ+ZjJZyf+K8fMJMmXpsFme2MK/3Lczu
-k3NV4YTh8jzg9OFW/9w0zr5YIRx/f4fhE0chCxR8bB/4NkTkwsTxRNiSE9J6sYLR
-gT6FAnGeRjiONzK3HIwR
-=go+c
+iQIcBAEBCAAGBQJQKUiKAAoJEOSiRoyO7jvo9AAP/jh0R+4YHjvD1DZh6cvKvbOc
+cDDYgnlL6tJ2jLLcMX/BWRjhbzPXJIXuAAxKFEhCsPX3pzsIqYzQ1KQnunoucNDj
+tFrzupsZZGbXxgHuHAvkOe0LwxhvnWu1bI/JAIGwU9MsWtY5BOtvvdMPqNFmVuf6
+/d4ISiIKAatF7F1vzof1vvHJMPSOUay14jsv3eAuq+NND7AOAVidPQ0Fj9ZYk1iv
+rZJ8n5oI1Hi1DftxugjRaZeWROsG2tNUBojd+u4AAdzrxMEg5o5uMupr1RpUAt0q
+ntLuxL2vyVpb5j8/ynhLR9KjPuQ4EwnqWjFxvTyBnij15YdPqWUpefr34zQOfecK
+vkN++dpdhbBMoGFRpwMXXWalU6/ZO/1GQQG8zM+7wXwT+5C0Xpo9wMDN5ei7Cnsb
+9lFVacYKu4Cae9hbr50OxvVk2dSfzIfF5nU5xPrW96nAeu6H9qOH0Asu8yNx0TyY
+0ptFJHl6owRuqIvc2R8fJbWPP3iME4WHM9khbcNndAUot7F7NwhLP0Vy764vzSnL
+o0ov1eb/gJ9GmZCq4PmW+1BFUar4/jEunNZizeiMwyITVWNskW4v8GJbI1/w9eX0
+jKda92918pTtWEYDZXCWUAKaCGrQU4/jL0CMSPRNWiArAuBDtt5QO5+yny7A6D7O
+ttKshy+MknrxOLQPnVc9
+=EKGM
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index 34b353c2d822..ad6f1726416b 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.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.5.9999.ebuild,v 1.54 2012/08/08 16:37:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.55 2012/08/13 18:33:39 scarabeus Exp $
 
 EAPI=4
 
@@ -139,7 +139,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
-	!app-office/openoffice-bin
+	!<app-openoffice/openoffice-bin-3.4.0-r1
 	!app-office/openoffice
 	media-fonts/libertine-ttf
 	media-fonts/liberation-fonts
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 4180f6ec25f2..2264690d7e6c 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.21 2012/08/13 15:49:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.22 2012/08/13 18:33:39 scarabeus Exp $
 
 EAPI=4
 
@@ -161,7 +161,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
-	!app-office/openoffice-bin
+	!<app-openoffice/openoffice-bin-3.4.0-r1
 	!app-office/openoffice
 	media-fonts/libertine-ttf
 	media-fonts/liberation-fonts
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 5306646e51fa..6fc959f20c14 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.103 2012/08/13 15:49:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.104 2012/08/13 18:33:39 scarabeus Exp $
 
 EAPI=4
 
@@ -165,7 +165,7 @@ COMMON_DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!app-office/libreoffice-bin
 	!app-office/libreoffice-bin-debug
-	!app-office/openoffice-bin
+	!<app-openoffice/openoffice-bin-3.4.0-r1
 	!app-office/openoffice
 	media-fonts/libertine-ttf
 	media-fonts/liberation-fonts
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 786421f0194e..9bc17cf0e228 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 50-openoffice-bin 155 SHA256 62d474190ad4f88d78dfdb12eb9fab9b17a94d8635fae40f9035e00ee6660f93 SHA512 2166980e57158d75fc20b6260d16d94c83199c98b751939cb2089ca86fff71157c61ed75cc9ba3e0b532b112e84a7cba393aabae1809609e5cce471a4b94242f WHIRLPOOL 9a8ca91fe16ecec770e55c6106d75029102acb417fbbbec93ff6fe508dc9c072857e16b81e45610a370dde4dd96bf07dd1e01d6d9653fde412a2f66a2f1ed1b0
 AUX wrapper.in 119 SHA256 377c5d9ab219855e54999a0321cb2a43f19693d56f99bd73cafab605e47e5ae4 SHA512 616ad676b95797dbef1bb4e0b7c4dce7070909bc148eecb1eb8f144881378bebb4c03f3d9ecf9046000287c5417259b89b4194c6b851dab99d06009173ec6919 WHIRLPOOL 232dad81c30f7d7e7372f9bb7b48cf1114ba46226b6d01b5cb4de3f80ef99fb90685c0965b239eafda6c576f7d7151458feff7b3c7412161a0d95b8be20699a2
 DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz 179845290 SHA256 f5fb12f64e7d35991418b094f090c44f33abbd174e17cfe47feec8fbd92b915d SHA512 f85d7ba3598821ad11a3fa5037c90ace7c27a7a5e7f34ec40f052cc452074c9d9dd37866aceba22d3ef96438bebf4e2f518dc5a6c25e8b0761c4080b8f824f49 WHIRLPOOL 5e57b56877cd3baec6492f6ab5c70c5bcb1790310860c56c5bdcab2fa035ef76cfe126e4687c9339f514b708b0513c9a81f4f7d55898bc6f7123d3c4247b08fa
@@ -30,6 +33,23 @@ DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_pt-BR.tar.gz 1272
 DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_ru.tar.gz 13794665 SHA256 6fd0bc82316292d42429483e508f8952571b956a54b83928486ad1969b034a88 SHA512 6fa267b1755449f78327fc9bf49dae60398fecc53c8c221082dd1d258df6cfa10b0ff902e8465b91fcacdb148fb7a7269069dd5fafc5e8573cf5959ce8d949c4 WHIRLPOOL 7fd566ca7881245e5ecc60ad9a8bcc8144aca684ad1f648097dd6ba221751fa659301917864c06d0fd728a735be0fa53cbad5a58cceec906210a44c5fcbdb91e
 DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_zh-CN.tar.gz 13927135 SHA256 48d1dc1762177a5662866cd6bf0f33b407e8c41d35d06a0e4bafc4aa8b742f89 SHA512 397b28244c97ee9e83f3452ddf9803ec48c621d38fc3d6265e5e4c9b80ee30e00243cd206fcce55fb437fbd2977539b015e01dba642c8b275fdc3ea031a09148 WHIRLPOOL c76cabf4479da2dc8acaa9fa4b08157abc8bd482a51f05ab035e28ca1139dbf12a535820541ffe13c9dd44804c1579917a026f04f40d7977e99ea5e4c0a9ebe6
 DIST Apache_OpenOffice_incubating_3.4.0_Linux_x86_langpack-rpm_zh-TW.tar.gz 14136951 SHA256 c8403fb5d5d09d56261948b1f761e9b39b91177739f391a2a7128e99769dfb9f SHA512 abf74793021f37a3a6aaf61df34876ee6cdc1442df75de45c6cb819a2e290659d39ac083836c6cf2f281da8a2ab67dec350db14f7c44fef96490313c66fcbe41 WHIRLPOOL 6c56533d4ca090e2c81283a54963e6ad1c8cc0f42094d7deec06fdb48cc75023951153d810ee4388e7ff0d0b44a762b8d67714b0f68dd0559f4ea9554f88fbc7
-EBUILD openoffice-bin-3.4.0.ebuild 5863 SHA256 938a93c5107460a700b40e2a7ace710140294cc30a96dda21f0baf66e7e6eaad SHA512 70f0b9331eaa6532da5624defa7e14f3148d49ca1418c8835b1018b1cb810bf1124e49075695061219d334885f3c0c371655e91b1890274e04972228489841d5 WHIRLPOOL 450eb59f4ec857aed9b775af2a6264b4be866c709a94ec5ab657643f9f1aa16974409463e59d05d221a509bec3f539a58d84cb03df60104b11aa0ea2097ab35d
-MISC ChangeLog 44839 SHA256 600176bbb759b1ca9c359436f5edefcc3f7e2a60886d16cd8efa76e1ba6cf7da SHA512 01bf2d1b61fac1010f698de2a8dafdf668718d3279c5ff482fe7e8941b3149cf05e889a470fa2ac471c5a82616b46619e14f380eafe1e36cc57e5e6ecd130108 WHIRLPOOL 9fac4bf83dd2049939b51112f143bfb9bb12a027885dd0396a89224d5c0cf51b01726d40a1ea06b8b196bdb07937751e8c76ecfccb35e5ed1471eedb62e7914e
+EBUILD openoffice-bin-3.4.0-r1.ebuild 6224 SHA256 0b9124828311a84644744b61adbf5bd54cda4be0b9c7f879bc3b70db71d263aa SHA512 bf088c6c2d82687363fc7ffef95677c27d10ef965ea0d5d1a64dbf1df5c81b3dd992c94cb0266c00277c0423e8753903b1d2ea7b403e161c0ee295f8a2676cc2 WHIRLPOOL b67ce3ba608151ddf10d7309ade0d1e72487cffcc1251fcb171c60768b9bd3e6468e6bfa03466222079d9f8309bec42b57db35e9f4143c5216a98cf56bef0dee
+MISC ChangeLog 45073 SHA256 559a5fedac6e91aede95ed87e93b4287b8bd5804d4fb04e3f936001652a3dce5 SHA512 d1ca4d7b5b4d1fdb8481c42daf7392d3dc621a0834e541585d800765b0f94e4e584856c04c058d3b8b499f62de90adef289d9759764a2dafbac105ae07bf69ac WHIRLPOOL d62da357a07d5f63a6d445e3a7064916bdc4bf457f155ea28a8f650232fbde0a739c866f4c929db0d057b45c36d2e61aedaac7de91128ea9b13d5f88452a2b8e
 MISC metadata.xml 543 SHA256 9c8d2e08d16049c1965d17844c3116d9081825e9981667e081da61054bc4db82 SHA512 8e89f4f7ae9c19d903678fd90b46b123788138fc1d59d8e8ec8db8adfbc512af820367a602310bb64e5a71925887879e64166ab37a7bccd2b74c4ffed80c03bd WHIRLPOOL 545646bbe99f5a3c56c7105e73f1c8a1044b5b410c4e1b5b6342297cfa1257ba1279fff44f7c1951926a79c598c656771297cbf20a6f8ed753c8bfc479cca9f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQKUidAAoJEOSiRoyO7jvo7EwP/RbnIelLOe+GTKnyiZcenjgs
+wAKhnOgMXMwRYEhR6o0BskjB7cYtKtqZ+KIu1qcYdVi/imeLvxcI2P71PlVWmlau
+tF6i8aaR54wXQk0/rSEbmrMtv72L2H+6nrjmK2ojXxFTSv4FCjKxyd3SJ8q3pgOs
+EvoSkF/Cf6DDYZRzaiQqAihN1O2HywsWtoxy6BOt+23CL4iSfa/IwSmMlRk/g6p2
+Z3/inc8/blDYQIfk1YS+xcQ24bf5H7hPhQaWw1V6I05qOqx7D5gK4HJFkWuIL2qb
+glR4C+Lq2fhNPjc4hMs/6IIn5aruPcX3HlFlvAEHEKG5KoymPz7XSEuArnKTVKQR
+1ifCrgP+Hi3pAz6Hg5GSCFTCkTKtsE4E2BEHolquMDsq77wKhoRCHz3OOH8bZDJO
+GKe92Z5Na2MJ+oQMui2cInr/d1FZGyrxWeyr8Q+/aUmbi2ZyoZXLbnfMPI+NsC3U
+Kr1CGDT/mVZiruWMFszrg9riyAW3C7eP7WOQ40982nUscdZFT6uEC0kXsfTPXuCp
+xWfOMLDBt4S5MFevI1uYmMOZEwCYXpUrclHzKNjRjw8w9oqUhoCnnTrqpaQNbMzO
+AE1XHSFQ9mLMawBC+ROm+3LQJMK0/XLROpbxmCmzp3zF5HEWvwaaQ4MeHiMEWYHX
+FkEHQVvFEPs3brGYBMn9
+=iWm8
+-----END PGP SIGNATURE-----