Use supplied lexer for omegafonts, bug #122365.

(Portage version: 2.1_pre4-r1)

6 files changed, 50 insertions, 15 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index d9201e67d245..2db6945d0812 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.111 2006/02/08 21:15:41 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.112 2006/02/13 12:13:22 ehmsen Exp $
+
+  13 Feb 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/tetex-2.0.2-flex-unput.patch, tetex-2.0.2-r5.ebuild,
+  tetex-2.0.2-r8.ebuild:
+  Using supplied lexer rather than generating our own for omegafonts,
+  thanks to Chris Torske <ct85711@gmail.com> and caleb, bug #122365.
 
 *tetex-3.0_p1-r2 (08 Feb 2006)
 
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 12dbb8b6564c..929d4be653aa 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,12 +1,12 @@
-MD5 489bc9cba9b9d52ad9db51315edeacd1 ChangeLog 20061
-RMD160 7187a39df719b4b2f9cb730973032b0828025fe3 ChangeLog 20061
-SHA256 412130f54fe24edcdb64fa097b1beaa6165c4ffbde1ec25b93d662d967f20466 ChangeLog 20061
+MD5 50b1c8848c6f4fe6ad41fb51b50d3451 ChangeLog 20337
+RMD160 ef6315ca404f1db6461ce866fe4faffa6eb6d92d ChangeLog 20337
+SHA256 f5214381dc0f128ee13c1485e4dfce26c0fb278ffee27a469966f59dd37de9ee ChangeLog 20337
 MD5 cc0be22b4e4ac7d6802a5a2a639a6001 files/digest-tetex-1.0.7-r13 1259
 RMD160 d57a184e1acc3083d0e85bb5bdad07205f475659 files/digest-tetex-1.0.7-r13 1259
 SHA256 87edfe22f8ad177c46988508ef9acbca026052936e80b6afc424ca850d2a5ede files/digest-tetex-1.0.7-r13 1259
-MD5 d9e3971f8b0ed3b93c4c8db657fc3629 files/digest-tetex-2.0.2-r5 282
-RMD160 9fdfb8c4a8f2567474821c29538632ee6e6636a7 files/digest-tetex-2.0.2-r5 282
-SHA256 0c54518c10db1bd21924535447d22d01f889b1b1d37a355a517148283f79a866 files/digest-tetex-2.0.2-r5 282
+MD5 22d6dcce2ae5229c5ba109e6638041ef files/digest-tetex-2.0.2-r5 1030
+RMD160 2575064189200d3d022f6a39736291f7757a862e files/digest-tetex-2.0.2-r5 1030
+SHA256 6c98bb9cfb053bd9cf0bb0fedb62459df5500fcb1c6e91d8625208574f4a773e files/digest-tetex-2.0.2-r5 1030
 MD5 22d6dcce2ae5229c5ba109e6638041ef files/digest-tetex-2.0.2-r8 1030
 RMD160 2575064189200d3d022f6a39736291f7757a862e files/digest-tetex-2.0.2-r8 1030
 SHA256 6c98bb9cfb053bd9cf0bb0fedb62459df5500fcb1c6e91d8625208574f4a773e files/digest-tetex-2.0.2-r8 1030
@@ -34,6 +34,9 @@ SHA256 5f6a525bb57f25a722178716e142a6555058903be0ce3944263b424896941126 files/te
 MD5 ce3900d8a86ef6eb7c20dc2d445f16ff files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
 RMD160 e91170dbe19f8f56706159349e55aac1f77d47bc files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
 SHA256 7a1787521bbffc0bf74e59e658bc5fc38916e7e10ee840e88b5357aa9096df4b files/tetex-2.0.2-epstopdf-wrong-rotation.patch 525
+MD5 56e1062f89330aad64afa0208ea09b30 files/tetex-2.0.2-flex-unput.patch 498
+RMD160 834d9c73bcbd2cecedd51c31b38e742e6919b31f files/tetex-2.0.2-flex-unput.patch 498
+SHA256 40305736699ab42b68203b43483f669aee57b98dad5ee60eb05d19d8e5d7652d files/tetex-2.0.2-flex-unput.patch 498
 MD5 b15d18a85d673070c4b9ac48ebc586ed files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 RMD160 214286fa8333858a5627b8f88c6d540401ce2217 files/tetex-3.0-epstopdf-wrong-rotation.patch 521
 SHA256 10f1987f03fc28d1cb5d13c090f0c508c1517c6acb02c65d91c93a0e8a01f683 files/tetex-3.0-epstopdf-wrong-rotation.patch 521
@@ -85,12 +88,12 @@ SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata
 MD5 3e41886004d55eb01635f3837dec252c tetex-1.0.7-r13.ebuild 4926
 RMD160 cbc4d15a274aff3bdac538ea9ce6deb29cc40410 tetex-1.0.7-r13.ebuild 4926
 SHA256 404a9912c7fb70721fe7e90f814bae1a4cd682918c435832755bee4a74e309a2 tetex-1.0.7-r13.ebuild 4926
-MD5 ac832dc2976c466da737908fafa9a30b tetex-2.0.2-r5.ebuild 1272
-RMD160 f3abfa5a1df5d9b5dcf855e33b451022549e883f tetex-2.0.2-r5.ebuild 1272
-SHA256 3195b6f96b7fa75997cb870e29b1b64d8edf508798e847da454528de1f732ff0 tetex-2.0.2-r5.ebuild 1272
-MD5 77fddedf668820438d2800cf8e87b41f tetex-2.0.2-r8.ebuild 1477
-RMD160 4e7a15c83b86ff2f39183e5bccebf009c80bd7d6 tetex-2.0.2-r8.ebuild 1477
-SHA256 def656fb3f2ddd4fb4ed769d84b1d20ebf24ebc24e65f126e46024fce8fde76f tetex-2.0.2-r8.ebuild 1477
+MD5 9b03f411415c5a7f9015c1e218925569 tetex-2.0.2-r5.ebuild 1270
+RMD160 03ae3ee6fc47126cbe2a095407aaf387fc2444b3 tetex-2.0.2-r5.ebuild 1270
+SHA256 54111d232a835b8ea5a18455cf81a0ef387a80e8266719d1a2e55ca34c7ebb75 tetex-2.0.2-r5.ebuild 1270
+MD5 6ad11d56da699d9873d00f1bf86b732d tetex-2.0.2-r8.ebuild 1476
+RMD160 ce8da8a3f09174c1518385bf7e1d847ead99ecae tetex-2.0.2-r8.ebuild 1476
+SHA256 e3c88281be4c1f4d2f08ef29e682389bbb0a0f5fdb97c4617422dd691917740d tetex-2.0.2-r8.ebuild 1476
 MD5 6d84991ef4fd00210a9eb68fdb393bd8 tetex-3.0-r3.ebuild 1272
 RMD160 de9967ea3058a5e634cfd1d99d6b94e4255d9149 tetex-3.0-r3.ebuild 1272
 SHA256 f5c2932ab9a675fc6e7abc795470ca1c64a4f165cde5d2c249d3efcfe308f82f tetex-3.0-r3.ebuild 1272
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r5 b/app-text/tetex/files/digest-tetex-2.0.2-r5
index fcad70744266..e95ce21e5e41 100644
--- a/app-text/tetex/files/digest-tetex-2.0.2-r5
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r5
@@ -1,4 +1,12 @@
 MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
+RMD160 f32700bfe389c9c15a72344770c7abe2ee048c38 tetex-2.0.2-gentoo.tar.gz 1704
+SHA256 331ac072cf658c22b983b16439dc0e6f95cac0cc95f4d993fcb4bad883ea2622 tetex-2.0.2-gentoo.tar.gz 1704
 MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
+RMD160 9bbb274c0598547bcecb00ff48e459d41bc65e93 tetex-src-2.0.2.tar.gz 11745933
+SHA256 9f8a35b3abd293d71fa6785a4c3e6aa4fdaeff03ae71863ad5ec9e1a9fc087f5 tetex-src-2.0.2.tar.gz 11745933
 MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
+RMD160 ff88622c2d97416a4f67fbdf7a00d837af35d94e tetex-texmf-2.0.2.tar.gz 52424280
+SHA256 0d5c4adb7a72a33fffa9eeb5e3137e0094c912eafc45e358ca20cd9257f79f0d tetex-texmf-2.0.2.tar.gz 52424280
 MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
+RMD160 bc444152b2f45cf3c0a743f6416134e31e8635b4 tetex-texmfsrc-2.0.2.tar.gz 22909537
+SHA256 9348f10c9e95fdb5e9a9702956cfce38be42c48621fcfc6c9ae192363e08d267 tetex-texmfsrc-2.0.2.tar.gz 22909537
diff --git a/app-text/tetex/files/tetex-2.0.2-flex-unput.patch b/app-text/tetex/files/tetex-2.0.2-flex-unput.patch
new file mode 100644
index 000000000000..57a037e09ba6
--- /dev/null
+++ b/app-text/tetex/files/tetex-2.0.2-flex-unput.patch
@@ -0,0 +1,12 @@
+diff -uNr tetex-src-2.0.2.old/texk/web2c/omegafonts/Makefile.in tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in
+--- tetex-src-2.0.2.old/texk/web2c/omegafonts/Makefile.in	2001-11-10 14:42:37.000000000 +0100
++++ tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in	2006-02-13 12:38:48.000000000 +0100
+@@ -40,7 +40,7 @@
+ 	-test -f y.tab.h && mv -f y.tab.h y_tab.h
+ $(LEX_OUTPUT_ROOT).o: parser.h
+ $(LEX_OUTPUT_ROOT).c: pl.l
+-	$(LEX) $(srcdir)/pl.l
++	cp $(srcdir)/lex.yy.c-dist $(srcdir)/lex.yy.c
+ 
+ 
+ 
diff --git a/app-text/tetex/tetex-2.0.2-r5.ebuild b/app-text/tetex/tetex-2.0.2-r5.ebuild
index b3f8f40f0b4e..f0a6f6ba0ac1 100644
--- a/app-text/tetex/tetex-2.0.2-r5.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r5.ebuild,v 1.14 2006/01/21 11:47:36 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r5.ebuild,v 1.15 2006/02/13 12:13:22 ehmsen Exp $
 
 inherit tetex-2 flag-o-matic
 
@@ -21,6 +21,9 @@ src_unpack() {
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-CAN-2005-0064.patch
 	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xdvizilla.patch
 
+	# bug 122365
+	EPATCH_OPTS="-d ${WORKDIR}" epatch ${FILESDIR}/tetex-2.0.2-flex-unput.patch || die
+
 	# bug 118264
 	EPATCH_OPTS="-d ${WORKDIR} -p0" epatch \
 	${FILESDIR}/${P}-dvi-draw-conflicting-types.patch
diff --git a/app-text/tetex/tetex-2.0.2-r8.ebuild b/app-text/tetex/tetex-2.0.2-r8.ebuild
index a2439dbf8c09..446329b7f5f9 100644
--- a/app-text/tetex/tetex-2.0.2-r8.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r8.ebuild,v 1.9 2006/02/07 06:20:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r8.ebuild,v 1.10 2006/02/13 12:13:22 ehmsen Exp $
 
 inherit tetex-2 flag-o-matic
 
@@ -20,6 +20,9 @@ src_unpack() {
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl2-CAN-2004-1125.patch
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-CAN-2005-0064.patch
 
+	# bug 122365
+	EPATCH_OPTS="-d ${WORKDIR}" epatch ${FILESDIR}/tetex-2.0.2-flex-unput.patch || die
+
 	#bug 115775
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p2" epatch ${FILESDIR}/xpdf-2.02pl1-CAN-2005-3191-3.patch