Added block of >=tetex-3.0 as this package is now part of tetex.

Package-Manager: portage-2.0.51.22-r3

diff --git a/dev-tex/xcolor/ChangeLog b/dev-tex/xcolor/ChangeLog
index c836a615bbe5d90e0abd4b623af8389601adc959..b33aada679050ba08d171eec5f5538543a213da2 100644 (file)
--- a/dev-tex/xcolor/ChangeLog
+++ b/dev-tex/xcolor/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-tex/xcolor
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/xcolor/ChangeLog,v 1.13 2005/08/27 09:21:08 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/xcolor/ChangeLog,v 1.14 2005/11/28 18:31:19 nattfodd Exp $
+
+*xcolor-2.00-r1 (28 Nov 2005)
+*xcolor-1.11-r1 (28 Nov 2005)
+
+  28 Nov 2005; Alexandre Buisse <nattfodd@gentoo.org> -xcolor-1.11.ebuild,
+  +xcolor-1.11-r1.ebuild, -xcolor-2.00.ebuild, +xcolor-2.00-r1.ebuild:
+  Added block of >=tetex-3.0 as this package is now part of tetex and the
+  block was previously not mutual (bug #94815).
 
   27 Aug 2005; Fabian Groffen <grobian@gentoo.org> xcolor-2.00.ebuild:
   Marking ~ppc-macos (bug #81542)

diff --git a/dev-tex/xcolor/Manifest b/dev-tex/xcolor/Manifest
index 9b8b01c3b8fa3c61fb5af9f9767a021317493fdf..88176fde4cd3882b0b562472f02c08e4afc05ac8 100644 (file)
--- a/dev-tex/xcolor/Manifest
+++ b/dev-tex/xcolor/Manifest
@@ -1,6 +1,6 @@
-MD5 604bdf982096a323fe8810a382295d31 xcolor-2.00.ebuild 684
-MD5 4b91cce56ea02abc8b105df33db9288e xcolor-1.11.ebuild 672
-MD5 622b5c8672331e189934889065d39037 ChangeLog 1789
+MD5 32eea1cc30593ecf7450ac882b789c49 xcolor-2.00-r1.ebuild 711
+MD5 2020ff075743470df5f89e551f0dfa16 xcolor-1.11-r1.ebuild 701
+MD5 b5a87deaeb1cc7629b48fc057b075e9c ChangeLog 2120
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 605cbabd23712fbae6096e541871377c files/digest-xcolor-1.11 58
-MD5 a432671ccabff764d310bd2a1d5da170 files/digest-xcolor-2.00 58
+MD5 605cbabd23712fbae6096e541871377c files/digest-xcolor-1.11-r1 58
+MD5 a432671ccabff764d310bd2a1d5da170 files/digest-xcolor-2.00-r1 58

diff --git a/dev-tex/xcolor/files/digest-xcolor-1.11 b/dev-tex/xcolor/files/digest-xcolor-1.11-r1
similarity index 100%
rename from dev-tex/xcolor/files/digest-xcolor-1.11
rename to dev-tex/xcolor/files/digest-xcolor-1.11-r1

diff --git a/dev-tex/xcolor/files/digest-xcolor-2.00 b/dev-tex/xcolor/files/digest-xcolor-2.00-r1
similarity index 100%
rename from dev-tex/xcolor/files/digest-xcolor-2.00
rename to dev-tex/xcolor/files/digest-xcolor-2.00-r1

diff --git a/dev-tex/xcolor/xcolor-1.11.ebuild b/dev-tex/xcolor/xcolor-1.11-r1.ebuild
similarity index 72%
rename from dev-tex/xcolor/xcolor-1.11.ebuild
rename to dev-tex/xcolor/xcolor-1.11-r1.ebuild
index 16deb6aff944619566322bbb03b0a6007cced855..c06ba4fbdc71300168213a7153772aa29994f493 100644 (file)
--- a/dev-tex/xcolor/xcolor-1.11.ebuild
+++ b/dev-tex/xcolor/xcolor-1.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/xcolor/xcolor-1.11.ebuild,v 1.4 2004/10/05 06:57:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/xcolor/xcolor-1.11-r1.ebuild,v 1.1 2005/11/28 18:31:19 nattfodd Exp $
 
 inherit latex-package
 
@@ -15,7 +15,8 @@ KEYWORDS="x86 alpha ppc ~amd64 ~sparc"
 IUSE=""
 
 DEPEND="virtual/tetex
-       app-arch/unzip"
+       app-arch/unzip
+       !>=app-text/tetex-3.0"
 RDEPEND="virtual/tetex"
 S="${WORKDIR}/${PN}"
 

diff --git a/dev-tex/xcolor/xcolor-2.00.ebuild b/dev-tex/xcolor/xcolor-2.00-r1.ebuild
similarity index 78%
rename from dev-tex/xcolor/xcolor-2.00.ebuild
rename to dev-tex/xcolor/xcolor-2.00-r1.ebuild
index 4bc7dff0a0ba1d1ddbf57b7e78f6cc0e9868e917..bc65bdaa029ca7c79f9dc4b4796560fc16055b1c 100644 (file)
--- a/dev-tex/xcolor/xcolor-2.00.ebuild
+++ b/dev-tex/xcolor/xcolor-2.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/xcolor/xcolor-2.00.ebuild,v 1.4 2005/08/27 09:21:08 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/xcolor/xcolor-2.00-r1.ebuild,v 1.1 2005/11/28 18:31:19 nattfodd Exp $
 
 inherit latex-package
 
@@ -15,7 +15,8 @@ KEYWORDS="alpha amd64 ppc ~ppc-macos ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/tetex
-       app-arch/unzip"
+       app-arch/unzip
+       !>=app-text/tetex-3.0"
 RDEPEND="virtual/tetex"
 S="${WORKDIR}/${PN}"