diff options
| -rw-r--r-- | app-office/libreoffice-l10n/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/libreoffice-l10n/Manifest | 24 | ||||
| -rw-r--r-- | app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild | 10 | ||||
| -rw-r--r-- | app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild | 8 |
4 files changed, 34 insertions, 15 deletions
diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog index 019b1aa901e1..5cb9a73c2407 100644 --- a/app-office/libreoffice-l10n/ChangeLog +++ b/app-office/libreoffice-l10n/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice-l10n # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.18 2011/11/12 21:27:12 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.19 2011/11/12 21:41:37 polynomial-c Exp $ + + 12 Nov 2011; Lars Wendler <polynomial-c@gentoo.org> + libreoffice-l10n-3.4.4-r1.ebuild, libreoffice-l10n-9999-r1.ebuild: + non-maintainer commit: Fixed dependency on libreoffice{,-bin} packages (bug + #390271). Changes added with kind permission from scarabeus. 12 Nov 2011; Zac Medico <zmedico@gentoo.org> libreoffice-l10n-3.4.4-r1.ebuild: Bug #390271 - Remove all KEYWORDS, as the current blockers are the equivalent diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index dfb695476e79..f4a6d5286fa2 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX lo_gen_langs.sh 1380 RMD160 f1f595c92e8a69f88239070b3711b32d524b52e3 SHA1 2cf1577fac50ee8514a1c92f898ed0c527710e81 SHA256 a4dfdce56b269abca84b8812008c109e608c569cd9d7f92412dac68574d87efd DIST 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8 @@ -321,15 +321,25 @@ DIST LibO_3.4.4_Linux_x86_langpack-rpm_zu.tar.gz 1720450 RMD160 34c4ca3e6d1fae78 DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859 DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4 EBUILD libreoffice-l10n-3.4.3-r3.ebuild 3892 RMD160 d35706fb4d9ddb13c38655a0a46479c22e5ccd7d SHA1 76b8b927fafd40ff9075709c81af010f5a9acc47 SHA256 e5607315b228488cdcc10f03afa39b1b3c97a5ce8fe96fda15fa7edd3ea8b057 -EBUILD libreoffice-l10n-3.4.4-r1.ebuild 5044 RMD160 b407e04c6dfafb9d6f17f14f1e192e275aaf52f2 SHA1 8688017ca9fd5d25d9227814647bef1f92e203ec SHA256 11f66672a01085e5dd83969e8763da6e61448ba72873ab671f56f9e14d395941 +EBUILD libreoffice-l10n-3.4.4-r1.ebuild 5098 RMD160 00843325e37c9582537377ab12a7147397c79415 SHA1 85dd2a5f061d060c3bc3bb4de5ca7141afd40c4c SHA256 f6c2d4292aee4b3ce3cce6dc34e11322ee5f040f3dd87b77eb32ab451418f542 EBUILD libreoffice-l10n-3.4.4.ebuild 3635 RMD160 b207749e1391029a74e6f5f82b73e31534d7c201 SHA1 eff7c9b5c559418a4eb983deeec2af1a9e2b4da2 SHA256 166b6c5a00c5589c44b08d6466c8e0e0215b989d68a5e35f44b8c011469ef1aa -EBUILD libreoffice-l10n-9999-r1.ebuild 5085 RMD160 f8a07e1e3ff7fc85e2719e6256b25250b7197a56 SHA1 32c9f7ee48f43cdab25d6663fa5d6acc1f031463 SHA256 e0d6e2044687cccfa8d0b23c442d1bbd5e0e1526ff0fa99e95e6700b0699845b -MISC ChangeLog 3514 RMD160 093285f81a50348c8145439cf0cc1821c23932c1 SHA1 044246e7e5d14e33d3a37b4fd086597db916f0ba SHA256 c10505bb9a562611e77dc5915819bb4203712806c29f6119b552473db7d90e4e +EBUILD libreoffice-l10n-9999-r1.ebuild 5097 RMD160 76812a2b4c582d6fa9591a4ee749716debc42e5e SHA1 fc1cdc1fde505ac63c1985f73859cf79d8e72a18 SHA256 9c56bebe247522e5eacb2592c61b235b9561234d2b9d766fa588d6d4edbf9d4e +MISC ChangeLog 3784 RMD160 7ef7ac5273998e20aae607113ada5f6ae6c9ee9f SHA1 57333ff438d2b0285b46279af57be41bf1ce9cdb SHA256 a89ef0af29fa97008e9ed6defbc93fc160b21a4c29f048861064e42e1a0bba0f MISC metadata.xml 347 RMD160 9f877917cd81032044930b5585910cacd590ea41 SHA1 71e2840a19fab2cf3a6f1c32e305e457cdb29ba3 SHA256 8b80b71771e14ffebe84e2537b6207a459d1160b4d0880773657ce2f082eae0b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6+5LYACgkQ/ejvha5XGaOTpACeNE4T+gUEE8hEP0LL5ZtXBMhM -ApUAnjxwSV45a3omxRfgTLdqbffItDnn -=qdTu +iQIcBAEBCgAGBQJOvugXAAoJEPiazRVxLXTF4zMQAKarDAwN1XHV0lmzCC9iLhCv +vFrWi2uA0diuivumSJs3Rw/0Jg6yurR0vqfnVcd1FYaX88rSje3q+2xEpuDZ/lJu +5mb9379Q2SsEhjWYubmaqOCZF4pBDYb1F4ZJ/uzqa29ftKvUo/kMAy6nVHyuiJOp +IiVNVXea8DDGBjj+pyFOLRfENHmfjyuc3OpNgfwUHaWYoee2Sa1Jb3GuPYHW/Qzu +mb1VSAHM7hrbhrfPBsxVkBNwtwSRvAX3O8U0YbDAFHikntyUXcDNY38/1XCwazG5 +pd0D5js81BhLg4k+gF7Io7uiskIm6AR4aK5UHua6XZ71peAYIr4RzLJQvXA3uVmV +C2kEMar6uymu9ia25QzJkxN9VoVHXOZiTiKSY8guYSMq5AincL0veUtsroIvLZA+ +tF1Zd/MBHMuoVundeUpelRdmac9FfSbjIPoSvHu1aC+XPEmwSHGeFNUzb2jqUSMJ +xOzRi2loTCHGoEmRO9Fr8VLldDjnBngRAyXCGowSYO2carnaargrLD9xdSyGdJhB +USS7KRJZ8917pyxCphSsQjxPsSTSgJ6aYCZ2DdM90fSmgaMvnfJ8N5x8Ljy1inky +eWub+zm9tii9whe7ZNNXTDwgvd6aKlRlhVMB3ejIN+AXzAfaWemTu6zfdQklEKL9 +B6WSW6RgbKcpogKCWkiD +=D8Ja -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild index bfb9f4860ab7..5e48ac8b9133 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-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-l10n/libreoffice-l10n-3.4.4-r1.ebuild,v 1.2 2011/11/12 21:27:12 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.4-r1.ebuild,v 1.3 2011/11/12 21:41:37 polynomial-c Exp $ EAPI=4 @@ -24,7 +24,7 @@ HOMEPAGE="http://www.libreoffice.org" LICENSE="LGPL-3" SLOT="0" -[[ ${PV} == 9999 ]] || KEYWORDS="" +[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="offlinehelp templates" LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu @@ -78,10 +78,12 @@ unset i lingua TDEPEND EXT_URI # blockers for old libreoffice with bundled linguas RDEPEND+=" - !<=app-office/libreoffice-3.4.4.2-r1 !=app-office/libreoffice-3.4.9999-r1 !=app-office/libreoffice-9999-r1 - !<=app-office/libreoffice-bin-3.4.4.2-r1 + || ( + >=app-office/libreoffice-3.4.4.2-r1 + >=app-office/libreoffice-bin-3.4.4.2-r1 + ) " RESTRICT="strip" diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild index 19cba865c921..51c9b19d8e04 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-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-l10n/libreoffice-l10n-9999-r1.ebuild,v 1.1 2011/11/12 12:25:57 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild,v 1.2 2011/11/12 21:41:37 polynomial-c Exp $ EAPI=4 @@ -78,10 +78,12 @@ unset i lingua TDEPEND EXT_URI # blockers for old libreoffice with bundled linguas RDEPEND+=" - !<=app-office/libreoffice-3.4.4.2-r1 !=app-office/libreoffice-3.4.9999-r1 !=app-office/libreoffice-9999-r1 - !<=app-office/libreoffice-bin-3.4.4.2-r1 + || ( + >=app-office/libreoffice-3.4.4.2-r1 + >=app-office/libreoffice-bin-3.4.4.2-r1 + ) " RESTRICT="strip" |