inherit tetex.eclass. Block app-text/cstetex from merge. See bug #31657

7 files changed, 31 insertions, 9 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index 4607b1a2db60..9ebe6af8fef7 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.50 2003/11/04 08:33:52 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.51 2003/11/12 21:49:13 usata Exp $
+
+*tetex-2.0.2-r3 (13 Nov 2003)
+
+  13 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> tetex-2.0.2-r3.ebuild:
+  inherit tetex.eclass (app-text/ptex and app-text/cstetex inherit it
+  too). Mostly identical to tetex-2.0.2-r2, but take care of symlinks
+  left behind /usr/bin after unmerge. See bug #31657.
 
 *tetex-2.0.2-r2 (04 Nov 2003)
 
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index c2facdea232a..94a6bcf28ba2 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,11 +1,11 @@
-MD5 c091d1d981151caa97f79094decc12c2 ChangeLog 9484
+MD5 131a1ca4320193b37566ec18b0cb8600 ChangeLog 9784
 MD5 f86349dda2b7ede76ce7a816265d9fcb tetex-1.0.7-r12.ebuild 4938
-MD5 2bac268585ab2a1f867a0c5f9ebef874 tetex-2.0.2.ebuild 4746
+MD5 cb1874929425ae8f67807c605ede300a tetex-2.0.2.ebuild 4765
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 1bfbe142b2aaed750bcc105fcb4c995b tetex-1.0.7-r13.ebuild 4670
-MD5 bcb81624ddc1013db7196ba51efdd700 tetex-2.0.2-r1.ebuild 4507
-MD5 95f8d4fd7f10659c58a8726366a7aef2 tetex-2.0.2-r2.ebuild 4634
-MD5 b9321fce8b721a6c6bf1857f41502907 tetex-2.0.2-r3.ebuild 365
+MD5 0fe68b54ad7a367f7b2964e8f5a8a672 tetex-2.0.2-r1.ebuild 4526
+MD5 5484eab2f44a7a7ced1bf8fd5ad54f8d tetex-2.0.2-r2.ebuild 4655
+MD5 fa8054eb4ada3355d52349280e73f85d tetex-2.0.2-r3.ebuild 365
 MD5 eb29daccee75f5f007fa30e18ff0ccb8 files/digest-tetex-1.0.7-r12 1132
 MD5 b8cb43e3d6ac916e7d69e843b43aafad files/digest-tetex-2.0.2 1068
 MD5 4cefd677082951973c64809e5368874f files/teTeX-1.0-dvips.diff 389
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r3 b/app-text/tetex/files/digest-tetex-2.0.2-r3
new file mode 100644
index 000000000000..c26826e9812e
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r3
@@ -0,0 +1,3 @@
+MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
+MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
+MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
diff --git a/app-text/tetex/tetex-2.0.2-r1.ebuild b/app-text/tetex/tetex-2.0.2-r1.ebuild
index 96111a30b8b3..709bac522309 100644
--- a/app-text/tetex/tetex-2.0.2-r1.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r1.ebuild,v 1.7 2003/10/07 20:46:40 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r1.ebuild,v 1.8 2003/11/12 21:49:13 usata Exp $
 
 inherit eutils flag-o-matic
 filter-flags "-fstack-protector"
@@ -22,6 +22,7 @@ LICENSE="GPL-2"
 IUSE="X"
 
 DEPEND="!app-text/ptex
+	!app-text/cstetex
 	sys-apps/ed
 	sys-libs/zlib
 	X? ( virtual/x11 )
diff --git a/app-text/tetex/tetex-2.0.2-r2.ebuild b/app-text/tetex/tetex-2.0.2-r2.ebuild
index 5cf05ca9f304..e2a5c9be3970 100644
--- a/app-text/tetex/tetex-2.0.2-r2.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r2.ebuild,v 1.1 2003/11/04 08:33:52 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r2.ebuild,v 1.2 2003/11/12 21:49:13 usata Exp $
 
 inherit eutils
 filter-flags "-fstack-protector"
@@ -22,6 +22,7 @@ LICENSE="GPL-2"
 IUSE="X"
 
 DEPEND="!app-text/ptex
+	!app-text/cstetex
 	sys-apps/ed
 	sys-libs/zlib
 	X? ( virtual/x11 )
diff --git a/app-text/tetex/tetex-2.0.2-r3.ebuild b/app-text/tetex/tetex-2.0.2-r3.ebuild
new file mode 100644
index 000000000000..ad14f4ef9b15
--- /dev/null
+++ b/app-text/tetex/tetex-2.0.2-r3.ebuild
@@ -0,0 +1,9 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r3.ebuild,v 1.1 2003/11/12 21:49:13 usata Exp $
+
+inherit tetex
+
+DESCRIPTION="a complete TeX distribution"
+HOMEPAGE="http://tug.org/teTeX/"
+KEYWORDS="~ia64 ~x86 ~ppc ~sparc ~alpha ~amd64"
diff --git a/app-text/tetex/tetex-2.0.2.ebuild b/app-text/tetex/tetex-2.0.2.ebuild
index d6a7f208f114..56c0d703b16e 100644
--- a/app-text/tetex/tetex-2.0.2.ebuild
+++ b/app-text/tetex/tetex-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2.ebuild,v 1.12 2003/10/24 18:34:49 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2.ebuild,v 1.13 2003/11/12 21:49:13 usata Exp $
 
 inherit eutils flag-o-matic
 filter-flags "-fstack-protector"
@@ -22,6 +22,7 @@ LICENSE="GPL-2"
 IUSE="ncurses X libwww png"
 
 DEPEND="!app-text/ptex
+	!app-text/cstetex
 	sys-apps/ed
 	sys-libs/zlib
 	X? ( virtual/x11 )