[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2022-12-27 Thread Sam James
commit: a288f455ec1f527b20e3c90ae4b3662413bf68fe
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 27 23:54:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 28 00:32:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a288f455

sys-devel/flex: drop 2.6.4-r2, 2.6.4-r4

Signed-off-by: Sam James  gentoo.org>

 .../flex-2.6.4-fix-build-with-glibc2.6+.patch  | 767 -
 sys-devel/flex/flex-2.6.4-r2.ebuild|  94 ---
 sys-devel/flex/flex-2.6.4-r4.ebuild|  93 ---
 3 files changed, 954 deletions(-)

diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch 
b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
deleted file mode 100644
index 328b57524565..
--- a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
+++ /dev/null
@@ -1,767 +0,0 @@
-Backport of 
https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
-
-Bug: https://bugs.gentoo.org/628744
-
 a/configure
-+++ b/configure
-@@ -3605,13 +3605,142 @@ test -z "$SED" && SED=sed
- Xsed="$SED -e 1s/^X//"
- 
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C 
preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if ${ac_cv_prog_CPP+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  # Double quotes because CPP needs to be expanded
-+for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+do
-+  ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer  to  if __STDC__ is defined, since
-+  #  exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include 
-+#else
-+# include 
-+#endif
-+   Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include 
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
- 
-+done
-+ac_cv_prog_CPP=$CPP
- 
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer  to  if __STDC__ is defined, since
-+  #  exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include 
-+#else
-+# include 
-+#endif
-+   Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include 
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
- 
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details" "$LINENO" 5; }
-+fi
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2017-01-11 Thread Lars Wendler
commit: 920eefba5481eef110406a2b6859c4edd0b4c48e
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 11 13:14:48 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 11 13:14:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920eefba

sys-devel/flex: Security cleanup (bug #589820).

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-devel/flex/Manifest|  1 -
 .../flex/files/flex-2.6.0-out-of-tree-build.patch  | 16 
 .../flex/files/flex-2.6.0-out-of-tree-test.patch   | 90 --
 sys-devel/flex/flex-2.5.39-r1.ebuild   | 66 
 4 files changed, 173 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a95665e..7e63a4e 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,2 @@
-DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
 DIST flex-2.6.1.tar.xz 835048 SHA256 
2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 
1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1
 WHIRLPOOL 
d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
 DIST flex-2.6.3.tar.gz 1405560 SHA256 
68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 
f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 WHIRLPOOL 
266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
deleted file mode 100644
index 36c69f2..
--- a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/567332
-
-this is a snippet taken from the upstream commit:
-09eae589d3954a1e1206aa01108ee75ef57776da Used in-tree header file for c++ 
tests.
-
 a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -35,6 +35,8 @@
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
- 
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-+
- VPATH = @srcdir@
- am__is_gnu_make = { \
-   if test -z '$(MAKELEVEL)'; then \

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
deleted file mode 100644
index fafa085..
--- a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/567332
-https://github.com/westes/flex/pull/39
-
-From e7761df66e8412093d0c1c25ce24e3a912076564 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Sat, 12 Dec 2015 23:28:43 -0500
-Subject: [PATCH] tests: fix paths to input files
-
-The current test wrapper works only when the inputs are specified using
-relative paths.  If they're specified with absolute paths, the driver
-fails to detect the inputs because it always prepends the input dir name
-which itself is a relative path:
-$ cd tests
-$ ./testwrapper.sh -d . -i $PWD/reject.txt -t ./reject_ver.table
-
-
-This normally doesn't show up because people run `./configure` or, for
-out of tree builds, `../configure`.  But if you happen to run configure
-with an absolute path, then automake tends to generate absolute paths
-as well leading to test failures.
-
-Fix all of this by dropping the implicit input directory prepending.
-In practice, it doesn't even make sense:
-- INPUT_NAME is often a list of files, not just a single one
-- the input directory is used to find the testname tables which are
-  usually generated, so it's impossible to use files from both source
-  and build directories
-- most of the time, the full/correct path is already specified

- tests/Makefile.am|  4 ++--
- tests/testwrapper.sh | 10 +-
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index cc9c178..6d1d9fe 100644
 a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -35,7 +35,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh
- LOG_COMPILER = $(srcdir)/testwrapper.sh
- AM_LOG_FLAGS = -d $(srcdir) -r
- REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
--AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r
-+AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r
- TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh
- AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t
- DIRECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
-@@ 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2015-12-12 Thread Mike Frysinger
commit: 775dcc66689e18fe7c037b59a4b1b7394742a008
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Dec 13 04:39:33 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun Dec 13 04:45:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775dcc66

sys-devel/flex: fix tests #567332

 .../flex/files/flex-2.6.0-out-of-tree-build.patch  | 16 
 .../flex/files/flex-2.6.0-out-of-tree-test.patch   | 90 ++
 sys-devel/flex/flex-2.6.0.ebuild   |  5 ++
 3 files changed, 111 insertions(+)

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
new file mode 100644
index 000..36c69f2
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/567332
+
+this is a snippet taken from the upstream commit:
+09eae589d3954a1e1206aa01108ee75ef57776da Used in-tree header file for c++ 
tests.
+
+--- a/tests/Makefile.in
 b/tests/Makefile.in
+@@ -35,6 +35,8 @@
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ # PURPOSE.
+ 
++AM_CPPFLAGS = -I$(top_srcdir)/src
++
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+   if test -z '$(MAKELEVEL)'; then \

diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch 
b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
new file mode 100644
index 000..fafa085
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
@@ -0,0 +1,90 @@
+https://bugs.gentoo.org/567332
+https://github.com/westes/flex/pull/39
+
+From e7761df66e8412093d0c1c25ce24e3a912076564 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Sat, 12 Dec 2015 23:28:43 -0500
+Subject: [PATCH] tests: fix paths to input files
+
+The current test wrapper works only when the inputs are specified using
+relative paths.  If they're specified with absolute paths, the driver
+fails to detect the inputs because it always prepends the input dir name
+which itself is a relative path:
+$ cd tests
+$ ./testwrapper.sh -d . -i $PWD/reject.txt -t ./reject_ver.table
+
+
+This normally doesn't show up because people run `./configure` or, for
+out of tree builds, `../configure`.  But if you happen to run configure
+with an absolute path, then automake tends to generate absolute paths
+as well leading to test failures.
+
+Fix all of this by dropping the implicit input directory prepending.
+In practice, it doesn't even make sense:
+- INPUT_NAME is often a list of files, not just a single one
+- the input directory is used to find the testname tables which are
+  usually generated, so it's impossible to use files from both source
+  and build directories
+- most of the time, the full/correct path is already specified
+---
+ tests/Makefile.am|  4 ++--
+ tests/testwrapper.sh | 10 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index cc9c178..6d1d9fe 100644
+--- a/tests/Makefile.in
 b/tests/Makefile.in
+@@ -35,7 +35,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh
+ LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_LOG_FLAGS = -d $(srcdir) -r
+ REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+-AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r
++AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r
+ TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t
+ DIRECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+@@ -437,7 +437,7 @@ tableopts_tests  := $(tableopts_opttests) 
$(tableopts_vertests) $(tableopts_sert
+ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) 
$(tableopts_sertests)
+ tableopts_c := $(addsuffix .c,$(tableopts_tests))
+ OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+-AM_OPT_LOG_FLAGS = -d $(srcdir) -i tableopts.txt -r
++AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r
+ SER_LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t
+ VER_LOG_COMPILER = $(srcdir)/testwrapper.sh
+diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh
+index 30127b5..051e20b 100755
+--- a/tests/testwrapper.sh
 b/tests/testwrapper.sh
+@@ -30,10 +30,10 @@ while getopts :d:i:rt1 OPTION ; do
+ 
+ TESTNAME="${!OPTIND}"
+ 
+-INPUT_NAME=${INPUT_NAME:-`basename $TESTNAME`.txt}
++INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename $TESTNAME`.txt}
+ 
+ if [ "$DO_COMPARISON" -eq "1" ] ; then
+-test `$TESTNAME 1 < $INPUT_DIRECTORY/$INPUT_NAME` -eq `$TESTNAME < 
$INPUT_DIRECTORY/$INPUT_NAME`
++test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME`
+ exit $?
+ fi
+ 
+@@ -42,11 +42,11 @@ if [ $INPUT_COUNT -gt 1 ] ; then
+ exit $?
+ fi
+ 
+-if [ -f ${INPUT_DIRECTORY}/${INPUT_NAME} ] ; then
++if [ -f ${INPUT_NAME} ] ; then
+ if [ $USE_REDIRECT == 1 ] ; then
+-$TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/

2015-11-23 Thread Lars Wendler
commit: 2950652b36f17fcd573888d2a5cfe999afd4023d
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov 23 11:01:27 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov 23 11:02:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2950652b

sys-devel/flex: Removed old.

Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler  gentoo.org>

 sys-devel/flex/Manifest|   4 -
 sys-devel/flex/files/flex-2.5.33-pic.patch |  12 ---
 sys-devel/flex/files/flex-2.5.34-isatty.patch  |  53 --
 sys-devel/flex/files/flex-2.5.35-gcc44.patch   |  13 ---
 .../flex/files/flex-2.5.35-saneautotools.patch |  77 --
 sys-devel/flex/files/flex-2.5.37-proto.patch   |  27 -
 sys-devel/flex/files/flex-2.5.37-tests.patch   | 113 -
 sys-devel/flex/flex-2.5.35.ebuild  |  43 
 sys-devel/flex/flex-2.5.35_p10.ebuild  |  50 -
 sys-devel/flex/flex-2.5.37.ebuild  |  51 --
 sys-devel/flex/flex-2.5.38-r1.ebuild   |  40 
 sys-devel/flex/flex-2.5.39.ebuild  |  40 
 12 files changed, 523 deletions(-)

diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 1c92cb9..c9d385a 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,6 +1,2 @@
-DIST flex-2.5.35.tar.bz2 1256501 SHA256 
0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b SHA512 
aa5aebbc7ccaa4697d7f0cfa3ba899dd3b327bc8551ba341c26bece7f9044951d0532e3ebf6ec63760204b4ff805f9f957d064e9a213ef8aac428e565de31343
 WHIRLPOOL 
5cb46a2cec84b1c6d25e22a1e4a6ac1a5100fcf32a488918f8bfe9236339ff2aac7f2dc35a590417fe1609d89511ab47de4ba4f7db17251b7408ea0f18e6894d
-DIST flex-2.5.37.tar.bz2 1303313 SHA256 
17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a SHA512 
1f34285953a7f058e6a2dddc305fc82cfcaaa451d6dda17bf9cccbe4a08e480c8c28951fa5d2920e7c7adc40ccd0e51191b363c9a3c4137db5ded1cbbc2a
 WHIRLPOOL 
ee5a4dde9b373c57248df261a53ea951e12ccb3e6f2e6344c56c2d8393511389560b4843660edf2a0929e2ed6fc46ab8d832e36a8ee5fe4317ce85ccea14d6ca
-DIST flex-2.5.38.tar.xz 1349536 SHA256 
3621e0217f6c2088411e5b6fd9f2d83f2fbf014dcdf24e80680f66e6dd93729c SHA512 
98d4a722dcb23c0ebca997ef28ae40cebbe65e24adf8700ac9127404d1bcd0e30638d296d639afb092b65b4767f35f5ee0b0bf229ac040ef8029a04694d6d4c2
 WHIRLPOOL 
56e282bc56ef825a953d1211602de1a243164d09b9b794debffbd7c56830572d24910b20b44b8749173c9bc008bae99406320a5042a4054290b69320a1df3aed
 DIST flex-2.5.39.tar.xz 1347436 SHA256 
c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 
488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec
 WHIRLPOOL 
6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
 DIST flex-2.6.0.tar.xz 1369552 SHA256 
d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73 SHA512 
9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe
 WHIRLPOOL 
e44cab6763699a9d4d8af29b8c45c2e5b203a643834730f35e5745d145e5b3a4605506da209aa8e4e087e2e8872926261d0d2f29751d616cc77df36021d753b2
-DIST flex_2.5.35-10.diff.gz 41011 SHA256 
1d57a2a73ae7b7d4bd95a7c3f5801ab39c0b2b55b5d838782da8d3801cc1a3b9 SHA512 
ecb64cb5d27da0c82c99958640ee5f09afff4096a93817f68ff86a838ab4f21daf959bfc650b89e0d52a827c55265cb4c4a4f9efab050a8f91dd82258820
 WHIRLPOOL 
4fa27c32d81c766e657645816e4a24e46b126e5eb38ad38fc66a7d3d3e3100b76ec694898dcbcc486687f4ec9d89d517a670f7ca20de22586d2f0b56a7fe50cd

diff --git a/sys-devel/flex/files/flex-2.5.33-pic.patch 
b/sys-devel/flex/files/flex-2.5.33-pic.patch
deleted file mode 100644
index 88ac8b3..000
--- a/sys-devel/flex/files/flex-2.5.33-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 Makefile.in2007-02-06 12:27:32.0 +0100
-+++ Makefile.in.new2007-02-06 12:29:50.0 +0100
-@@ -993,7 +993,9 @@
- ecs.o: ecs.c flexdef.h flexint.h
- gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h
- libmain.o: libmain.c
-+  $(COMPILE) -fPIC -DPIC -o libmain.o -c libmain.c
- libyywrap.o: libyywrap.c
-+  $(COMPILE) -fPIC -DPIC -o libyywrap.o -c libyywrap.c
- main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \
-  tables.h tables_shared.h
- misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h

diff --git a/sys-devel/flex/files/flex-2.5.34-isatty.patch 
b/sys-devel/flex/files/flex-2.5.34-isatty.patch
deleted file mode 100644
index b397433..000
--- a/sys-devel/flex/files/flex-2.5.34-isatty.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Declare the isatty prototype all the time ... otherwise packages like
-doxygen and ttmkfdir fail to build.
-
-http://bugs.gentoo.org/119598
-
 flex/scan.c
-+++ flex/scan.c
-@@ -4179,9 +4179,19 @@
-   yyfree((void *) b  );
- }
- 
-+#ifndef