diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-03 19:11:25 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-03 19:11:25 +0000 |
| commit | 9a993b34a300fdb14fd785fc57006b22ab56e950 (patch) | |
| tree | c4762308e2105e147851ef86b4204126a4d21b59 /app-office | |
| parent | Fix HOMEPAGE (diff) | |
| download | historical-9a993b34a300fdb14fd785fc57006b22ab56e950.tar.gz historical-9a993b34a300fdb14fd785fc57006b22ab56e950.tar.bz2 historical-9a993b34a300fdb14fd785fc57006b22ab56e950.zip | |
Add the l10n package to pdepend to avoid collisions.
Package-Manager: portage-2.2.0_alpha52/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild | 8 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 28 |
2 files changed, 29 insertions, 7 deletions
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild index 0d4e3fde71cd..2787969f2326 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3-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-bin/libreoffice-bin-3.4.3-r1.ebuild,v 1.2 2011/09/03 11:56:58 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.ebuild,v 1.3 2011/09/03 19:11:25 scarabeus Exp $ EAPI="3" @@ -40,7 +40,6 @@ RDEPEND="!app-office/libreoffice !app-office/openoffice !app-office/openoffice-bin !prefix? ( sys-libs/glibc ) - >=app-office/libreoffice-l10n-${PV} app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 @@ -51,7 +50,10 @@ RDEPEND="!app-office/libreoffice DEPEND="${RDEPEND} sys-apps/findutils" -PDEPEND="java? ( >=virtual/jre-1.5 )" +PDEPEND=" + >=app-office/libreoffice-l10n-${PV} + java? ( >=virtual/jre-1.5 ) +" RESTRICT="strip" diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 05b0967fa902..883c401be7de 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4 @@ -166,8 +169,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599 EBUILD libreoffice-3.3.4.ebuild 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38da4b7 SHA1 a2bb549a0c6c66c477db08bae202d581ecfea5b4 SHA256 1233871084a7fb29500478bc3891f23c398d30811c06224c3da4344f3c4fd280 -EBUILD libreoffice-3.4.3.2.ebuild 18525 RMD160 110a9551f21e1502d98b3153c1864904123d694e SHA1 db0a4c67be30b09881fa276e4fc535cc2158c862 SHA256 d442311ce9a67253b36ae5ddfc7c23df666c5306ce66d8a9fe97aadb36c39182 -EBUILD libreoffice-3.4.9999.ebuild 18527 RMD160 358faba4b11837061f04623e3db6ede37b1bf6d2 SHA1 bc8b9e23801a9a3bd40db963a8116245e1acfd71 SHA256 d0236520eb79c7b7abe6e72765c854a00e05d5109aa9070ec3fa7e8cd47be46d -EBUILD libreoffice-9999.ebuild 17854 RMD160 3776ca8546a4a74d27f078574bd2d4e6a6c17ac9 SHA1 582cac55b38396945a4c380ee484284ef8f91730 SHA256 5743dbe3387e753a05ce21ef77863045b42d99c92248fa6a0ca3b974df93043e -MISC ChangeLog 23429 RMD160 e0c5bb6a320567c955f626cb1830d245a7fc953d SHA1 1d5629940139d0ee07f41fc1c6c015f99c46b292 SHA256 8e59cba18a85fc5eb7bae6743d2a7cccc05fbb9c98a49ba859a89dfc569f38be +EBUILD libreoffice-3.4.3.2.ebuild 18538 RMD160 79b64f271f602adad4ccdde5d6e5609a42bfb927 SHA1 885d681730d5455209bbc25372a00bc64d7ca276 SHA256 d1b12e3aa757cf608e0b89746420e15bca70c94ee9d5bbd51015593c563a069e +EBUILD libreoffice-3.4.9999.ebuild 18543 RMD160 3d8f32872821b026c53056f3f45af7da497d5c2f SHA1 f423ca123dec47527643e64e6cb051f6bb406531 SHA256 c00666491a924f466d5e675282f0118f078f0524398fe4592bd8226090e17f05 +EBUILD libreoffice-9999.ebuild 17870 RMD160 c5bb715aa5b411da8697ddfd44d2b47ac3377a65 SHA1 d0af2e38b575d7b792744e0930e6663627ab9da0 SHA256 43b9aa66aa72a30a5d48573fc7cf0c1bdee6222017d0b2b9f2d30bb899a65041 +MISC ChangeLog 23633 RMD160 cd1fcb29e139aadc799c618aa54324b274b825b8 SHA1 82431259d3ea84fdc4c85b83b39b71e0f340453d SHA256 e1480c7c34bab1ac2444280934304d14be855539e474d33c03a4656c0ba08c0c MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBAgAGBQJOYnxXAAoJEOSiRoyO7jvoYeAP+gLEl/foy4ToUWQcllHpGUP5 +G4LGBcCOS3oL7OdYCkTEyqBouWWONTeEqat3sFjqbp9IZFcwpClSbmImJ2y9XmaF +Q9kYMpn6w2srRl6zeATFFBzgju/fevUN0Pz8rpEEy/eV9KCKUCTQD/3mrDlKSJaf +sClnReiCqarTTZS9MeiBMi5xYY8UF/2VLRi0WcLb64f1PtaZppvALevNyLmv8JPY +zc7ZfE8N4wZ1UjhNEfMy8AxS2GP12W9mD2ZfrJRF+Wc31ZZAw9xAt1vnXGTbPDid +9IicpDKYuyHt870eFrghYoYYILVc6OuT5AnM8FRnpxPbBaKaDbKjIGpyiVDw2NW3 +2YAmOr4y3MqWt3CO9FTbKXdrVLKvmyK0tu8UI2b6hGMz2uOt/0nexbytbSyM9Pxz +Vv32QKXzyVUlAiW2jPuS75xcOm9kT6DntUCv6OMdMUQAIfdCCMH3fXtgCburHAOW +8v/GGI533xwauYyrQAJku5nfGEMLJqkrf1XCPDU+/PYLyMo3wiwaQ0AVRYQNt6vH +3aM3Pr6H31Z3WFTpN+K74Dwzn52pvBabPjBN6QAMVfQWFNBg0WeQrQeuz1jAQr+T +ifeGvTkMKhvQzA/qx3xufOeLjhMeZe3OHgDTy+Nf21UfgMQcPTeDN2IAG35X74P3 +VqeJkWywu9WiEWf+66jp +=b3pW +-----END PGP SIGNATURE----- |