Update linguas dependencies in preparation for the next version of kde-apps/kde4-l10n.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

6 files changed, 65 insertions, 39 deletions

diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index a1a1d653e6a2..2cc4071d6df8 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-meta
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.355 2015/06/04 18:41:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.356 2015/06/05 16:10:56 kensington Exp $
+
+  05 Jun 2015; Michael Palimaka <kensington@gentoo.org>
+  kdepim-meta-4.14.3.ebuild, kdepim-meta-4.14.6.ebuild,
+  kdepim-meta-4.14.8.ebuild, kdepim-meta-4.4.11.1-r1.ebuild:
+  Update linguas dependencies in preparation for the next version of kde-
+  apps/kde4-l10n.
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org>
   kdepim-meta-4.14.3.ebuild, kdepim-meta-4.14.6.ebuild,
diff --git a/kde-base/kdepim-meta/Manifest b/kde-base/kdepim-meta/Manifest
index 79f38bbdf3dc..286e693c7799 100644
--- a/kde-base/kdepim-meta/Manifest
+++ b/kde-base/kdepim-meta/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD kdepim-meta-4.14.3.ebuild 1156 SHA256 f0975f80c21eb17cb76ba02040c8ed57c023e57b8a834025e15917650ed3f33a SHA512 c860f346d39a7a66241207e6cb20081b3e73054d30b9e5b397d12319d10cbf328c5a4196cd73419e9e94c6f09cfee8f8061d8998ca147eb393691909fba8d503 WHIRLPOOL 61026fde669ff8b74b4f9fcc9774aff19083c11b1871aa4ffafb043215699c14fedb904614c922acf62a5db5768fb28da00de062f7247faed366f3fbcdbbf5c7
-EBUILD kdepim-meta-4.14.6.ebuild 1181 SHA256 1cedd508ff82da77edc59d02db778ea298cae0809e4c06f2667c1ea6332ec1be SHA512 8fff6f1fec2dca7f260cbb74cc845f723177204936161853e1d7f77f9e0135c841feb72720726b6525d0038fff216d66d0d201fb26a6826e8c6ce5805a760b24 WHIRLPOOL ce706fa598ca5c20362e60f992a6f38af78f415d80b0aa1e02a692ce1fcf870c999ff2b812ebd5cede6020585a03e970f501c6faffb41f452c6ec32616c23b24
-EBUILD kdepim-meta-4.14.8.ebuild 1180 SHA256 d24ae93b31d5b2d973e1f3b34157f5d088405c37f2575ef56d02a4196c273949 SHA512 16fc9a22159bc7648d09beffa26fa422a99e74be9d53740e58c307f1a93298a4e837a3df91789e2fff8ec3e352facaa63f22a6ec640494dee0c6853191100400 WHIRLPOOL 72513e66d8b85547703ac21f2e306d86b652b640911002c00846b13606a1447bc164f89ac8467a9f611020b92e8bc8e0485f4c723590ad6a5c4f19065357fd68
-EBUILD kdepim-meta-4.4.11.1-r1.ebuild 1221 SHA256 ff3221798148752c79911c5f4ff4c8b63dca740b90d035e3dd1a86bb9bb837f0 SHA512 9bc50f49bb91da74b17ce32580daa8645c07e6b10887f6c21063c95ea2d625d05330770a8743f7521d399989558f5ca6aa1a90bf199727f6df68156d7beb78e0 WHIRLPOOL 45f225e12683ca53e4f629abba382467ffdbe2c100da40337767fe80846d543ab3f4d4a475ee181d256a2696c5403e2425082295491f4a0fe6e8f42d520a634e
-MISC ChangeLog 44016 SHA256 ded43dd68543b581136a3952e3864e31dedb505e43958ff733cda181e246e926 SHA512 2d916cc87575565bfa38bd83d04ae89a4ce9ec5ac85fbecf6dd285e3d12d9200ea95d54af16ab363ec264546c99783bc137bb3f178d48c295b0101689104e13c WHIRLPOOL afc86252fef853fcd4121644a750325009cb12f73782bd3dfce24e5f21e2564c62c44a24ba8d9b45f47b0685155752ae6fb108e54723da885fa49d2103777526
+EBUILD kdepim-meta-4.14.3.ebuild 1244 SHA256 27fb0879e45117f725c8910fa51c6c49bd452edc407931c25ef3ead0ce08ba31 SHA512 90bdcaf03e05568865b1c6125c89c4b5b5ff54e44b045fe38dafc7689ab952abb0bda81ba565922c565314b29fc5ac718a7a77697911e1e625beb6f6e23a5d56 WHIRLPOOL 7b0fe601f89f1386b25d6e623def06e51f4503af9911ca9a2bf4c24f6e44980ecc83a5f92d8d93a2eb968d15c759d67393bea4bd47d41b5edcd95c59e546bec6
+EBUILD kdepim-meta-4.14.6.ebuild 1249 SHA256 e62f0f39905b4b8ce8290c9a8d206ad2ac5baba268ac730f1726e7173d3b76a3 SHA512 2eeb6135ff7f726f8d615e0aef0d9afc31e056c6df6ca1dd0a5fbdf6f092f7a718d7f164616778880128904d9f7baea26d8fbac1aa6f51bb000053027b20ebe2 WHIRLPOOL a50f55931625115b536dc17a79bc688444c40e8cfcbc4fb7dfde0890ee62e3fc9df69bf060556ce4bb2c754564f0465e25f14678dcf5ff5aecd5d22a0150187f
+EBUILD kdepim-meta-4.14.8.ebuild 1248 SHA256 186e6e6770b93f0b394e692059192c8b388c5dcf24e6cb1966c64c6f95bd0219 SHA512 4907ee333dbc946fb1b590bf816a96257c0aa6e1db555e55659eaf8d62340ec140d77e426e5d5ec92c78fdabd8d5f493d5fb8920c4bdb06c9eb1ed7c2443bb17 WHIRLPOOL 753cf5a48dde997204304a94e3f483cd06064e43c80a919d393c12efdbc77756873487a7a1dca104b4b129d74dc3fecf86c23f0405144472518b7eda58c007a4
+EBUILD kdepim-meta-4.4.11.1-r1.ebuild 1309 SHA256 512bb72c0250f0a71b751ba0f8e8b1c4ccdcfa71e3d048daeeac965e92e618fa SHA512 6a483cac0f366d270fe14d6c46b953ad42d0a0ac7e745f48a36b86638579ccee85d737cac2673c00f4017bb6e34393442155ef59da9e58abc614f401d7d3b6fb WHIRLPOOL c622aaf3dbf66afb2eadb65a481660e616bd679d0bb7be6b0235735429b15f9f0b027697101cedda6e58cd4c4c57387b94edd3071af0a7f6b5da3b4fed0b9151
+MISC ChangeLog 44282 SHA256 fb25e23d135b0e237d731b87ed9d11618a257099e3533b85ad3f6727c2d2322f SHA512 958513d857843a272acf9c1c55ae1c0900c0f806a6a51f8c604eb871af0efad286cbd7b62a8436f9e0437f0d4176076bec123a9de163ea7c1df73b4e5ecf045d WHIRLPOOL 491ff224647954f3fe6b7330840d520c25339c24532644f8e688977b3afc2d3d3b5f2f9deed6592a2164002cc5bd08b40d3b85fe365173671ef2311f1ab96c23
 MISC metadata.xml 250 SHA256 2408dde55db5121baf6ea40f9381b79210035703e98a4ce899cba12a47a692f9 SHA512 30aa58a653fa69ff5b9e770f34d701f3074757365d5232d059fd66ab3963dbd5d47bac2484142457e6b55995480ddb3372550bb5d770fa985fac226aea28f656 WHIRLPOOL 08f62759be103db937b21dc395dbd24d9a6b7c7473507cf3b421f955bef82c683d16d77ac7f2e9c37eb94653741554ea97f030e37212098ec3f59bb4bdf9be4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJVcJvuRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVccoRRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7CY0D/4mXfd8bknBqKYvzaLk2iKm3xE2xhCqP7hbLWc6bUnF7b63sNSayKiTYeoo
-f4UQsosq1f6fK7cJ7Qf1z32WbiTLtWfJrwCUATn+/JfGn2HsqJT0Fk2PuJT5tT+Y
-iJOc4579fheC8o49YRwACJJqAvPWnzUM3aKH3MpttcJCrNnTzaKWx0f70TyPKOkF
-BRpupWybynnYwDUTFd3HTA+Pm7toNebS5VfYKZZH1yOrGW5+OCb27mEW8Y6k04eq
-XiRT4YE0Z2iWUlX3iS0+MZ8a7lKXe13zSvsdiCw0zbuWa5B+pCaQ7iQE23XoQfeI
-439E4jTNCGTgD5P5Em+pQnyMT1L/t5+Xqcys+SdEdi3r85ht63qA0GdYlSWxo8lc
-apmx+OnziRNCyhe6kibjSqjKrhkwe0jT3cOh3ICBWvygGHFyC/b7UCMaJCsfCZ1l
-fX0QNjhFq9tYV5ILBLB+0sycxUpfWO4XmCe4CDH66bj8+ZV1IycNZylRnPGJxN33
-5+W+7t3XcUP1qL+eefZz7+F3CYJ9haHOvs8jdrDj3WK6XJVHPf9T5WuGdY65EnkN
-+s6aMOaNovOxK3JuU2Tu9idt6GaAkdvFMeFytBN9rdNtSx2AVng5tF4y4uEuqNqT
-wO6hSxNEEiDjaV6+qXV8Lf7r+20CvuYVO1YrKU9iw3+f3PPadw==
-=G01/
+7OWyEACL1itchYdsj5KNVQaVS9xXrrW7W80lwn0e+9tqU/s8Dl5KxYwGyFG0tLDo
+R8YypdEdWRwuBTGW0iXrDGsQdfAVEVn3OHqZUN1o3krRAm0cOI+FJlias54AGF/r
+oi6mgCUsfH61YcvsF1mRN+tItSXXLMr0bGmVPw/u/h9Nmvay+Bm6oIul4wYP4cEp
+bE4KRsTh7c+G2ID5J5TPkwsdJEcmuA3+KbnffXy3H8EocNJ9SVFrkkwUy2hwkMk7
++T1fHSf7MEXKYq5rolyL/Nd5X9Mpo+hAKRbpjpJlI9rHqTlNleKOsQimTYn0FYgS
+fPhIUKidzqMyOdEYEPf9lJ8i8ZFU//Hrtn7OJW4wfW2JhsUA7IBU5e7xr2vsBhEu
+BL6HNj8NRszT1q8sy7JEsg8EmZItsQh9Tifr+SMOZkJNPzrlAl1DUvul4GDxhIua
+6L2nFplPEONccG5bnn49EESZpWGnNrCSV1LD/eCNijjykW3K1pRQhKbwjdIh4PPf
+scYSeKnPJsQQnk99X3hjsThLJpXoCilruz6KfRa3NyEQ4MCgqnFQaPYGspZSgM1u
+s/ODQ+Kw5fvGNO8CgHk8oG4O6KFwIzsHwnkgPx43g8dXTYMnJyuBR3DgvGX3BiBf
+vpUdq+k//9qh3CUOppDHxCDgKVJgO4ClTbAATy0yTJpGHZkgxg==
+=fMd9
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
index 443def9e0e29..2db494208fa1 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild,v 1.6 2015/06/04 18:41:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild,v 1.7 2015/06/05 16:10:56 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
@@ -31,8 +31,13 @@ RDEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
 	$(add_kdebase_dep ktnef)
-	nls? (
-		$(add_kdeapps_dep kde4-l10n)
-		$(add_kdebase_dep kdepim-l10n)
-	)
+	nls? ( || (
+		(
+			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
+		)
+		(
+			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+			$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+		)
+	) )
 "
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.6.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.6.ebuild
index 02f7c75d7838..5925f003627e 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.6.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.14.6.ebuild,v 1.2 2015/06/04 18:41:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.14.6.ebuild,v 1.3 2015/06/05 16:10:56 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
@@ -31,8 +31,13 @@ RDEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
 	$(add_kdebase_dep ktnef)
-	nls? (
-		$(add_kdeapps_dep kde4-l10n '' 4.14.3)
-		$(add_kdebase_dep kdepim-l10n '' 4.14.3)
-	)
+	nls? ( || (
+		(
+			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
+		)
+		(
+			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+			$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+		)
+	) )
 "
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
index 9e5aba777774..d8bbb364ddbc 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild,v 1.3 2015/06/04 18:41:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild,v 1.4 2015/06/05 16:10:56 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
@@ -31,8 +31,13 @@ RDEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep ktimetracker)
 	$(add_kdebase_dep ktnef)
-	nls? (
-		$(add_kdeapps_dep kde4-l10n '' 4.14.3)
-		$(add_kdebase_dep kdepim-l10n '' 4.14.3)
-	)
+	nls? ( || (
+		(
+			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
+		)
+		(
+			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+			$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+		)
+	) )
 "
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild
index 95769c1b2ef2..d7f01b9f28d3 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild,v 1.5 2015/06/04 18:41:50 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.4.11.1-r1.ebuild,v 1.6 2015/06/05 16:10:56 kensington Exp $
 
 EAPI=5
 inherit kde4-meta-pkg
@@ -33,8 +33,13 @@ RDEPEND="
 	$(add_kdebase_dep libkleo)
 	$(add_kdebase_dep libkpgp)
 	akonadi? ( $(add_kdebase_dep akonadi) )
-	nls? (
-		$(add_kdeapps_dep kde4-l10n)
-		$(add_kdebase_dep kdepim-l10n)
-	)
+	nls? ( || (
+		(
+			$(add_kdeapps_dep kde4-l10n '' 15.04.0)
+		)
+		(
+			$(add_kdeapps_dep kde4-l10n '' 4.14.3)
+			$(add_kdebase_dep kdepim-l10n '' 4.14.3)
+		)
+	) )
 "