(soft) block older versions of tl-mathextra as they collide, bug #429432 by Priit Laes

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

3 files changed, 13 insertions, 8 deletions

diff --git a/dev-texlive/texlive-xetex/ChangeLog b/dev-texlive/texlive-xetex/ChangeLog
index 01ee5cf7c700..d89faf5f7572 100644
--- a/dev-texlive/texlive-xetex/ChangeLog
+++ b/dev-texlive/texlive-xetex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-texlive/texlive-xetex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-xetex/ChangeLog,v 1.58 2012/07/27 02:59:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-xetex/ChangeLog,v 1.59 2012/08/02 12:36:44 aballier Exp $
+
+  02 Aug 2012; Alexis Ballier <aballier@gentoo.org> texlive-xetex-2012.ebuild:
+  (soft) block older versions of tl-mathextra as they collide, bug #429432 by
+  Priit Laes
 
 *texlive-xetex-2012 (27 Jul 2012)
 
diff --git a/dev-texlive/texlive-xetex/Manifest b/dev-texlive/texlive-xetex/Manifest
index ce705c163e10..b8a71946cef9 100644
--- a/dev-texlive/texlive-xetex/Manifest
+++ b/dev-texlive/texlive-xetex/Manifest
@@ -111,13 +111,13 @@ DIST texlive-module-xunicode-2012.tar.xz 25736 SHA256 7880795b5abe62002b3c02025e
 DIST texlive-module-xunicode.doc-2011.tar.xz 584 SHA256 1e0611decd7abc5e492c2bead520c1b23df10f10b39621d0c7320e2283652531 SHA512 18e82a53e2aeb959d91ee747f060ed985cf80713d01ef46cf22638ff85eceac01f895dc4410f2974ebba2928ec98ace58d8213c57528ba4b5350f8a9d6ffddca WHIRLPOOL ff9dc9b37ceecbc9d216581f4f29fd90fc0d6f6f43cce91975fdab49add8113fb371916cc2cac529964cd36dca27ef39bc42cf4ed15391135acc31b14a8573b8
 DIST texlive-module-xunicode.doc-2012.tar.xz 584 SHA256 0cb136b5ab2713b2b33b3f5b288713e60a531c4578166410c62ac4f942e73fa0 SHA512 8b0dbec87da1ac303b2232956eea815edff4100496f3a0ffb898691241e51a540b4448e96e5ffdf2f9c57e299b54411f83b45ca534261b2a691204678492107e WHIRLPOOL c9f4f3c1ccfcb989eaabcc1ecf6190a8bd68485c4746b895c024d751bc0f932db0e756412fae61260f91cb49020da7953e3e7cdc5da85d87bbf5a64bff07ce4d
 EBUILD texlive-xetex-2011.ebuild 1789 SHA256 0baf85d34dae209b6af44796ce06981ddee35cbf9d8d9cbae6fbef0f96e31679 SHA512 678bf3d02d2223b127e4a1a244c8bad6e31860d9421e028cca906d7cc612a5759fce0ddafe87df9f6d3b4d1a4b7ace699eb080da2f888e688de4263526d15785 WHIRLPOOL 702dd8fe7f054a3fdcada692a71b99449221078b34fc9dff1d769e192d0243028c2820ed54d2841db68a9b69fc4bf92eed74f5dcc2e9b0c6b2cbb65361f161b9
-EBUILD texlive-xetex-2012.ebuild 1888 SHA256 36aed1fda70c44eaceb3d90d1fe23610ccfb5f2d11a602213c7949cfd82e6053 SHA512 3097c86e9de227ff6859dbdf8deb98dd69b1a88bb54c466ecb23d236fd4e80cb6638c4496cc081457d8e23c09113334d23f99cb0619b14df12e96b346aaf9b0a WHIRLPOOL dc78b0dbfaba70e704a826b5311c368c623f235b1876453949a20fe4ec583ea16cb8e8602e0356cf0db868460a80a5655456d410e4af24dbc4fe0b7a9234b6fe
-MISC ChangeLog 7672 SHA256 fa963a8dc524b7af7cbb6f2c2099db113fe67300d6847a726ea9d0e8e819ebd7 SHA512 5f11edbf0533cb744347a25a75fef5d047fa26ffdfd518c741a16c15918b98170aa15f7604e0908daddd65538aed821c62b68759792ea993f9ad9e3055f3c097 WHIRLPOOL b8fada75b4319553b9efeeec9bf5d68a9688d0d2369c693355f8f7310425cb21daab63543a502377c52d1f003c076f0f9d89ae7b83b712b6873db2ddad742fe0
+EBUILD texlive-xetex-2012.ebuild 1925 SHA256 2688c54d1bd295ae9d1a2b9a64ad754bb93644c8ed62a14a293b8218a06e0825 SHA512 91109f1c43d1e847f82b370af1313969845aa551473aa0432574866d6147b907d6ea83306fc2a8774980f0b068623b8629b2af72a3cbcc26cad323bb92c56ac7 WHIRLPOOL 5c4208d127c25275c8abbcb08d868c09af513f30830cc8defa4b0f0e47f31952952b5bc9f67ec9bb6bd803f18107229cc542251ebc1fad5d3e331b4b637e6977
+MISC ChangeLog 7843 SHA256 438c240e82b53b793285e71bca300b0675cc0b518d2faa056aa731d9973cc90a SHA512 cb5566df3017677089ec0f1291610b7ce25a0b8e097a7e7411090b06e751d86fb756d5df4127e8d293727c8cbf07046949ea013eb0fe246a700e3bbb3232d20b WHIRLPOOL c7e015b6f2d35dbe1a9894fd4e8db68cb4357148115587eb6734c71cef372993eb20969b4cbb93a8366deee9c80fab4812db4180c2f3284984158c5f6d44a5d2
 MISC metadata.xml 392 SHA256 d2f51110ac7b5891bf3aa8a7667bf4e4faef58e00d43e527a9363e9f07307d6f SHA512 cf70ff34a58afa7a543337ec75321f184812c5bfb272a01a29b31287ada682aca3f9158c21d1e91ab67a35ecc3fba4621f69c5eaa91921b1244992f58ddd2608 WHIRLPOOL 28305c208f24c5b110d6476497178b2523dd99de01d25a27196612fb0eca4e1ad3c63218c204d772d71a542cce981cf0ab3058736d712ed8d7ef7b43ab17d7e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlASBDQACgkQvFcC4BYPU0oePwCfdCKTyaaib1ARW5/XCDmx6aeH
-wF8AnRaTw4ZDghDPeY6znAuqtxYVPSf/
-=PcY7
+iEYEAREIAAYFAlAadGIACgkQvFcC4BYPU0pxbQCcCJzrbCPdxLFnq/bqnqf5Fwuh
+rx4An0eIPQsg2nyb5Nor8U04dzWgjqbv
+=va3w
 -----END PGP SIGNATURE-----
diff --git a/dev-texlive/texlive-xetex/texlive-xetex-2012.ebuild b/dev-texlive/texlive-xetex/texlive-xetex-2012.ebuild
index d74ef9d91896..5eeb2f7edcb6 100644
--- a/dev-texlive/texlive-xetex/texlive-xetex-2012.ebuild
+++ b/dev-texlive/texlive-xetex/texlive-xetex-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-xetex/texlive-xetex-2012.ebuild,v 1.1 2012/07/27 02:59:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-xetex/texlive-xetex-2012.ebuild,v 1.2 2012/08/02 12:36:44 aballier Exp $
 
 EAPI="4"
 
@@ -20,7 +20,8 @@ DEPEND=">=dev-texlive/texlive-basic-2012
 >=dev-texlive/texlive-latexextra-2010
 >=app-text/texlive-core-2010[xetex]
 >=dev-texlive/texlive-genericrecommended-2010
->=dev-texlive/texlive-mathextra-2010
+>=dev-texlive/texlive-mathextra-2012
+!<dev-texlive/texlive-mathextra-2012
 "
 RDEPEND="${DEPEND} "
 FONT_CONF=( "${FILESDIR}"/09-texlive.conf )