Add a hard block on older versions as it fails upgrading, bug #428430

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

3 files changed, 12 insertions, 7 deletions

diff --git a/dev-texlive/texlive-langcjk/ChangeLog b/dev-texlive/texlive-langcjk/ChangeLog
index 409828f41e2f..f0ca46ca937b 100644
--- a/dev-texlive/texlive-langcjk/ChangeLog
+++ b/dev-texlive/texlive-langcjk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-texlive/texlive-langcjk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcjk/ChangeLog,v 1.58 2012/07/27 12:31:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcjk/ChangeLog,v 1.59 2012/07/31 13:42:55 aballier Exp $
+
+  31 Jul 2012; Alexis Ballier <aballier@gentoo.org>
+  texlive-langcjk-2012.ebuild:
+  Add a hard block on older versions as it fails upgrading, bug #428430
 
   27 Jul 2012; Alexis Ballier <aballier@gentoo.org>
   texlive-langcjk-2012.ebuild:
diff --git a/dev-texlive/texlive-langcjk/Manifest b/dev-texlive/texlive-langcjk/Manifest
index f49f8db67bb8..60c28a4ce18f 100644
--- a/dev-texlive/texlive-langcjk/Manifest
+++ b/dev-texlive/texlive-langcjk/Manifest
@@ -103,13 +103,13 @@ DIST texlive-module-zhspacing-2012.tar.xz 11892 SHA256 9f2adbba197052558595fa49b
 DIST texlive-module-zhspacing.doc-2011.tar.xz 156504 SHA256 673ddb70b234486d3ee5454d506b7e5f76d784cfeb08713c524dbeb08a7e20b4 SHA512 4517a0d6de00a7d98762db0ea55539a4495d653b59dd19072fc9d01f72850e43318f8046cc9a9f53aa4b899756f401d98a2ff8cc5da8d26c774c4dca2173f768 WHIRLPOOL 0ccb4cc1a4c316f14e4f25301698d80a4a0e7f2ffe02e1f86f9dd996c275c376454d7f3fdd60c5d64c7679e1e5b8bffe4213eebb57be9db8a11a4e9278d4cef6
 DIST texlive-module-zhspacing.doc-2012.tar.xz 152004 SHA256 e6a5eeff5f6ed55f4eba59d38402de5ef0d1eff2f0bd6f62b7c436334b818c47 SHA512 ef4706611b1d22087423d1768cc509960c0cfa5cd5cbee92021972d9e0e62fff1944a15b24208363a0997a7205f19f2c79bf25889582d19dc9522b9cdb45fa51 WHIRLPOOL 4b08baa6f5446eef0edefceae640e9f3354c5486d9c4bf5a05a34e9c804809d426cc62bff6e625f9abff3ac65b185151266e94063790358cf0a1d2ef65f62e2e
 EBUILD texlive-langcjk-2011.ebuild 1179 SHA256 8be398e92d98eb8a4196b26ca260940d4c5b0104f74fc6ba6bd79ba10e814f31 SHA512 fde9304312b417784f4755867bdfd8983be6658c3c2d22bd0e7423629a7834be851e687765b488db211f6b9793d2f0489479f4de4c5ab65e88e2516d2c13e4d9 WHIRLPOOL ab0feeb044b13474052a81dd75447db1f61a241311822a864eb615621f5cfd7be252bc197180f6d41d56e4d833735010444805121b952998ff1de58816e3fb39
-EBUILD texlive-langcjk-2012.ebuild 1875 SHA256 d8a1911f264e2399d4c64b0c0793fbf2b63760294caf46f2d9af0415b666c909 SHA512 13e7341f5248ce04b96e84cdac0f6cb51bb1b6fb0d790bfea9add8ccf7e43e2dd051f1ad15d7f5c72aecd42b7be852d4584e02220745498b6b16f8a8ea1a1862 WHIRLPOOL a1b927f4910c13d5aeb6928aa9fc241f7dd5529fb1b50a8c79c7be634920a957173a095841ddfc11b714bcef46b465b80439b7bb89e8a8c4ac6e5abcd6002b81
-MISC ChangeLog 7654 SHA256 8cd0e85787f8ad98f05e19d6bb7320ed9072eb80cd3f65a7061fbfd100f2f776 SHA512 8651470089cfbf13a883de84b9dceea4a374171603f5f9f6247c7348748fe7f6f3d07681cb6a5bfa20dd166e0dda4504f6ee67cdad3b27ed33e9634723bf64f0 WHIRLPOOL be38bdd0a248b77617a86cf17480985a3c96245c5543f25dca52658276efff59a429802b7aba225436d1dcc31411a7a904eb46ba0b2f3c885fd02ccb5d54c6fa
+EBUILD texlive-langcjk-2012.ebuild 1907 SHA256 b281e558e5c3fc0d1f845f5d66312fca7e323e75b7f71296a41e4f79e092be2c SHA512 7da92ed9a1d810020b1fc226a15a7ee94368716e895817cbb8846ba2382589d9a144454d61935a399a055b41abc1fa105badefbc54a96890302b6f6fb81d044f WHIRLPOOL 6cbcfa1c02b61d25e8bd855bad9f236403f026585d396786c8c93df95ba3c05bc9302d106412840e7c1ec6690383bbfde3b99a8b35e9345ef447dc936eece41c
+MISC ChangeLog 7810 SHA256 c8cb7198437401d3d0678b1cf07d289100a9d7c130a445c4c36ea93e19fb7a3e SHA512 23e12896c4323ba52f0967c3d351db6f525275f266b53e0bc1a80f6539a989901f3b51bf64ce8d194129f9150c0a7401c82e9b77e2d28e636a5403d511759f3d WHIRLPOOL 885bac0cc082ff894d7cbfadf8337944259036522e9c07185dcee19ac360a338627c252c0e300557f12d5ae0ecd7e0cb5e5cb62ba5c12ef1d5f09ee809b297cc
 MISC metadata.xml 414 SHA256 32c6419d087d202d553af063f74f9370f0444097607e1aa1a3a49818230a1796 SHA512 23440b2229afd39029e8f65edc857e62ffb29470f82343aca8b7c10f5932fec710aafddd705602be6eeecd264526b30141b5fc1f85500bf2cce78e0cdc78c451 WHIRLPOOL 633e187096044a21d773f1b64dbb2155862f0d4cf1dce4edc72efb484c24a260d84be1ba1381decbe3d4ca0607fe53299fbef8716267a12e88e5a90771bb18d6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlASijYACgkQvFcC4BYPU0prVwCbBIX/fKLtufeQbSDkPpJ1gXvd
-1E0AoMk+rPz35v/Y19DbUe0AQFNt7mBV
-=7Ejf
+iEYEAREIAAYFAlAX4OQACgkQvFcC4BYPU0pKIgCgoi+7LrvZVSelzNQ6bRjbdbsh
+ducAoIDi3heMV/eTlzXxxzxpCzvaSfgG
+=syrP
 -----END PGP SIGNATURE-----
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2012.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2012.ebuild
index 1e26a32f7785..bc5656b7f00d 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2012.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2012.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/dev-texlive/texlive-langcjk/texlive-langcjk-2012.ebuild,v 1.2 2012/07/27 12:31:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-langcjk/texlive-langcjk-2012.ebuild,v 1.3 2012/07/31 13:42:55 aballier Exp $
 
 EAPI="4"
 
@@ -18,6 +18,7 @@ IUSE=""
 DEPEND=">=dev-texlive/texlive-basic-2012
 >=app-text/texlive-core-2010[cjk]
 >=dev-texlive/texlive-latex-2011
+!!<dev-texlive/texlive-cjk-2012
 "
 RDEPEND="${DEPEND} dev-lang/ruby
 "