From 58d9eb6ba5104e84faaf751864e29d140c8c6e57 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Wed, 19 Jun 2013 02:17:05 +0000
Subject: block old tl-plainextra to avoid collisions, bug #472934 by Muelli

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
---
 dev-texlive/texlive-latexextra/ChangeLog                      | 6 +++++-
 dev-texlive/texlive-latexextra/texlive-latexextra-2012.ebuild | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'dev-texlive')

diff --git a/dev-texlive/texlive-latexextra/ChangeLog b/dev-texlive/texlive-latexextra/ChangeLog
index fc586d103acc..54641cadc296 100644
--- a/dev-texlive/texlive-latexextra/ChangeLog
+++ b/dev-texlive/texlive-latexextra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-texlive/texlive-latexextra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexextra/ChangeLog,v 1.87 2013/04/25 21:29:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexextra/ChangeLog,v 1.88 2013/06/19 02:17:05 aballier Exp $
+
+  19 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  texlive-latexextra-2012.ebuild:
+  block old tl-plainextra to avoid collisions, bug #472934 by Muelli
 
   25 Apr 2013; Agostino Sarubbo <ago@gentoo.org> texlive-latexextra-2012.ebuild:
   Stable for sh, wrt bug #449298
diff --git a/dev-texlive/texlive-latexextra/texlive-latexextra-2012.ebuild b/dev-texlive/texlive-latexextra/texlive-latexextra-2012.ebuild
index 9f676c1bb671..d611753c7412 100644
--- a/dev-texlive/texlive-latexextra/texlive-latexextra-2012.ebuild
+++ b/dev-texlive/texlive-latexextra/texlive-latexextra-2012.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexextra/texlive-latexextra-2012.ebuild,v 1.21 2013/04/25 21:29:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-latexextra/texlive-latexextra-2012.ebuild,v 1.22 2013/06/19 02:17:05 aballier Exp $
 
 EAPI="4"
 
@@ -28,6 +28,7 @@ DEPEND=">=dev-texlive/texlive-latexrecommended-2012
 !=dev-texlive/texlive-latex3-2007*
 !=dev-texlive/texlive-humanities-2007*
 !<dev-texlive/texlive-mathextra-2010
+!<dev-texlive/texlive-plainextra-2010
 dev-perl/Spreadsheet-ParseExcel
 "
 RDEPEND="${DEPEND} "
-- 
cgit v1.2.3-65-gdbad