Patch for bug 127042 and keyword for 133173

Package-Manager: portage-2.1.1_pre1-r1

5 files changed, 48 insertions, 6 deletions

diff --git a/dev-tex/detex/ChangeLog b/dev-tex/detex/ChangeLog
index a02561315ca5..dae29704e195 100644
--- a/dev-tex/detex/ChangeLog
+++ b/dev-tex/detex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tex/detex
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/ChangeLog,v 1.12 2006/01/19 00:54:24 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/ChangeLog,v 1.13 2006/06/23 15:39:10 joslwah Exp $
+
+  23 Jun 2006; Joshua <joslwah@gentoo.org> +files/detex-flexbrackets.patch,
+  detex-2.7.ebuild:
+  Added patch, from Patrick Guimond, to get around bug in flex (127042).
+  Added ~ppc64, #133173.
+  Permission for fixing given by Pylon of text-markup.
 
   19 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org> detex-2.7.ebuild:
   This didn't need to go back to ~arch, restabilized x86/ppc/s390.
diff --git a/dev-tex/detex/Manifest b/dev-tex/detex/Manifest
index da1ecd6c7b8b..44942fb0fb31 100644
--- a/dev-tex/detex/Manifest
+++ b/dev-tex/detex/Manifest
@@ -1,4 +1,20 @@
-MD5 f4d49fd284a6d43f3276c8d0e2d49fe7 ChangeLog 1272
-MD5 5286f57d19e5f9a3b577347c3a80ceea detex-2.7.ebuild 1008
-MD5 dab2b399b59ec37d22e7c173360029d0 files/digest-detex-2.7 57
+AUX detex-flexbrackets.patch 438 RMD160 b9627e070f205eca8ef355261d234a4f742bf6a5 SHA1 a1c49dccb4e5cfabeac73814e0a5d2f2ed1d442f SHA256 1dc669b1fbc9fdfcaff9157cf91bce1a30bb01678ee63062ee8b20005022ef4e
+MD5 e33dcd977f5432b98c75b3be56a9a9d0 files/detex-flexbrackets.patch 438
+RMD160 b9627e070f205eca8ef355261d234a4f742bf6a5 files/detex-flexbrackets.patch 438
+SHA256 1dc669b1fbc9fdfcaff9157cf91bce1a30bb01678ee63062ee8b20005022ef4e files/detex-flexbrackets.patch 438
+DIST detex-2.7.tar 94720 RMD160 059919ef4d7d16caa6c1a6a13b067ce73e2052c2 SHA1 84b975a57ea199a29a795d699bb92dca0bad42d5 SHA256 cc24ad6f71cb26744442b6bf54f8357a3a162f171c27ca8a6abbc3c2024d0684
+EBUILD detex-2.7.ebuild 1140 RMD160 1f91875a240fd7d8480d9a722bc7ef39c6ec4d51 SHA1 d75bdeb697508fe66566f6d2458ef3fd3d254d80 SHA256 f8f68953924f9b441b7c9825a5d74d6cb71b098d3eb57f8dfa78a7373ef44c8a
+MD5 d14398ab192ed8ee2378f928b9360e01 detex-2.7.ebuild 1140
+RMD160 1f91875a240fd7d8480d9a722bc7ef39c6ec4d51 detex-2.7.ebuild 1140
+SHA256 f8f68953924f9b441b7c9825a5d74d6cb71b098d3eb57f8dfa78a7373ef44c8a detex-2.7.ebuild 1140
+MISC ChangeLog 1521 RMD160 02de30781eb11207666bdc7902e4ebce337e13d5 SHA1 e0f6490ab931d4b0f7539e3ab735c7ba646958ba SHA256 87d43db40323fb1e101eab56d74827375920e0f78467181093be6a3c02f38e57
+MD5 f3f91d87c78fb85abf9e65f06b9e3ce1 ChangeLog 1521
+RMD160 02de30781eb11207666bdc7902e4ebce337e13d5 ChangeLog 1521
+SHA256 87d43db40323fb1e101eab56d74827375920e0f78467181093be6a3c02f38e57 ChangeLog 1521
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+MD5 39c686dfeb5c387aa61f0feb4563828f files/digest-detex-2.7 217
+RMD160 223232dce8171ec73adee73a87f8d4bf90209411 files/digest-detex-2.7 217
+SHA256 2015672337b2029fe2cb91d9b4ce34b83aa2410f55e18653867454dff32bbf4a files/digest-detex-2.7 217
diff --git a/dev-tex/detex/detex-2.7.ebuild b/dev-tex/detex/detex-2.7.ebuild
index 31ca28c7aa72..63d93dfeff9f 100644
--- a/dev-tex/detex/detex-2.7.ebuild
+++ b/dev-tex/detex/detex-2.7.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/detex-2.7.ebuild,v 1.14 2006/01/19 00:54:24 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/detex/detex-2.7.ebuild,v 1.15 2006/06/23 15:39:10 joslwah Exp $
+
+
+inherit eutils
 
 DESCRIPTION="A filter program that removes the LaTeX (or TeX) control sequences"
 HOMEPAGE="http://www.cs.purdue.edu/homes/trinkle/detex/"
@@ -8,7 +11,7 @@ SRC_URI="http://www.cs.purdue.edu/homes/trinkle/detex/${P}.tar"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc s390"
+KEYWORDS="ppc ~ppc64 s390 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -24,6 +27,9 @@ src_unpack() {
 		-e 's:#DEFS	+= ${DEFS} -DNO_MALLOC_DECL:DEFS += -DNO_MALLOC_DECL:' \
 		-e 's:	${CC} ${CFLAGS} -o $@ ${D_OBJ} -ll:	${CC} ${CFLAGS} -o $@ ${D_OBJ} -lfl:' \
 		Makefile || die "sed failed"
+
+	# This is a hack to get round bug 127042 until flex is fixed.
+	epatch ${FILESDIR}/${PN}-flexbrackets.patch
 }
 
 src_compile() {
diff --git a/dev-tex/detex/files/detex-flexbrackets.patch b/dev-tex/detex/files/detex-flexbrackets.patch
new file mode 100644
index 000000000000..d254b06bef3c
--- /dev/null
+++ b/dev-tex/detex/files/detex-flexbrackets.patch
@@ -0,0 +1,12 @@
+diff -Nau detex-2.7.orig/detex.l detex-2.7/detex.l
+--- detex-2.7.orig/detex.l	2006-04-01 05:32:33.000000000 -0500
++++ detex-2.7/detex.l	2006-04-01 05:32:58.000000000 -0500
+@@ -4,7 +4,7 @@
+ #endif
+ 
+ /*
+- * detex [-e environment-list] [-c] [-l] [-n] [-s] [-t] [-w] [file[.tex]]
++ * detex [-e environment-list] [-c] [-l] [-n] [-s] [-t] [-w] [file[.tex] ]
+  *
+  *	This program is used to remove TeX or LaTeX constructs from a text
+  *	file.
diff --git a/dev-tex/detex/files/digest-detex-2.7 b/dev-tex/detex/files/digest-detex-2.7
index 3c13b431b128..a3b4438a8628 100644
--- a/dev-tex/detex/files/digest-detex-2.7
+++ b/dev-tex/detex/files/digest-detex-2.7
@@ -1 +1,3 @@
 MD5 2f4f99e7d1c6829053ca2c78d7e6b774 detex-2.7.tar 94720
+RMD160 059919ef4d7d16caa6c1a6a13b067ce73e2052c2 detex-2.7.tar 94720
+SHA256 cc24ad6f71cb26744442b6bf54f8357a3a162f171c27ca8a6abbc3c2024d0684 detex-2.7.tar 94720