summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-07-30 10:12:06 +0000
committerMike Frysinger <vapier@gentoo.org>2007-07-30 10:12:06 +0000
commitecf7d8d18d9f3626438a570d864d6e4226cc3d1f (patch)
tree9a3f5609e250c4bba43b4a559d12d9e9639cbdfa /sys-devel/flex
parentfix keywords (diff)
downloadgentoo-2-ecf7d8d18d9f3626438a570d864d6e4226cc3d1f.tar.gz
gentoo-2-ecf7d8d18d9f3626438a570d864d6e4226cc3d1f.tar.bz2
gentoo-2-ecf7d8d18d9f3626438a570d864d6e4226cc3d1f.zip
old
(Portage version: 2.1.3_rc9)
Diffstat (limited to 'sys-devel/flex')
-rw-r--r--sys-devel/flex/files/digest-flex-2.5.33-r13
-rw-r--r--sys-devel/flex/files/flex-2.5.31-check-for-locale-header.patch37
-rw-r--r--sys-devel/flex/files/flex-2.5.31-gnu-m4.patch30
-rw-r--r--sys-devel/flex/files/flex-2.5.31-isatty.patch53
-rw-r--r--sys-devel/flex/flex-2.5.33-r1.ebuild39
5 files changed, 0 insertions, 162 deletions
diff --git a/sys-devel/flex/files/digest-flex-2.5.33-r1 b/sys-devel/flex/files/digest-flex-2.5.33-r1
deleted file mode 100644
index 7a65ac6d8d99..000000000000
--- a/sys-devel/flex/files/digest-flex-2.5.33-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 343374a00b38d9e39d1158b71af37150 flex-2.5.33.tar.bz2 695464
-RMD160 360e08457d324c5b87c02b0ed61983877c173c98 flex-2.5.33.tar.bz2 695464
-SHA256 53b56a62ea9409b99b7a0ac4a5204fac16ca7eaf39b9374164c346d6badc6914 flex-2.5.33.tar.bz2 695464
diff --git a/sys-devel/flex/files/flex-2.5.31-check-for-locale-header.patch b/sys-devel/flex/files/flex-2.5.31-check-for-locale-header.patch
deleted file mode 100644
index fe60828b41c1..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-check-for-locale-header.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-the source code has an '#ifdef HAVE_LOCALE_H' but forgets to
-actually check for locale.h in configure
-
-http://bugs.gentoo.org/121920
-
---- flex-2.5.31/configure
-+++ flex-2.5.31/configure
-@@ -6964,7 +6991,7 @@
-
-
-
--for ac_header in unistd.h stdbool.h netinet/in.h limits.h
-+for ac_header in unistd.h stdbool.h netinet/in.h limits.h locale.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
---- flex-2.5.31/conf.in
-+++ flex-2.5.31/conf.in
-@@ -4,6 +4,9 @@
- language is requested. */
- #undef ENABLE_NLS
-
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
- /* Define to 1 if you have the <cunistd> header file. */
- #undef HAVE_CUNISTD
-
-configure.in changes
- dnl checks for header files
-
- AC_HEADER_STDC
--AC_CHECK_HEADERS(unistd.h stdbool.h netinet/in.h limits.h)
-+AC_CHECK_HEADERS(unistd.h stdbool.h netinet/in.h limits.h locale.h)
- AC_CHECK_HEADERS( sys/wait.h sys/params.h)
- AC_CHECK_HEADERS(cunistd)
-
diff --git a/sys-devel/flex/files/flex-2.5.31-gnu-m4.patch b/sys-devel/flex/files/flex-2.5.31-gnu-m4.patch
deleted file mode 100644
index 875a0e663f52..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-gnu-m4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This is a simple hack to get flex to use GNU m4 on non-GNU systems.
-The issue has been fixed properly upstream already, we use this
-because it's much smaller.
-
-Patch by Diego Pettenò
-
-http://bugs.gentoo.org/123471
-
---- flex-2.5.31/main.c
-+++ flex-2.5.31/main.c
-@@ -344,7 +344,7 @@ void check_options ()
-
- /* Setup the filter chain. */
- output_chain = filter_create_int(NULL, filter_tee_header, headerfilename);
-- filter_create_ext(output_chain,"m4","-P",0);
-+ filter_create_ext(output_chain,GM4_PROGRAM,"-P",0);
- filter_create_int(output_chain, filter_fix_linedirs, NULL);
-
- /* For debugging, only run the requested number of filters. */
---- flex-2.5.31/Makefile.in
-+++ flex-2.5.31/Makefile.in
-@@ -290,7 +290,7 @@ SUBDIRS = \
-
-
- localedir = $(datadir)/locale
--AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
-+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -DGM4_PROGRAM=\"@M4@\"
-
- # Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
- #
diff --git a/sys-devel/flex/files/flex-2.5.31-isatty.patch b/sys-devel/flex/files/flex-2.5.31-isatty.patch
deleted file mode 100644
index ca272cfe2182..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-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
-@@ -3935,9 +3935,19 @@
- yyfree((void *) b );
- }
-
-+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
--#ifndef __cplusplus
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#ifdef __THROW /* this is a gnuism */
-+extern int isatty (int ) __THROW;
-+#else
- extern int isatty (int );
-+#endif
--#endif /* __cplusplus */
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-
- /* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
---- flex/skel.c
-+++ flex/skel.c
-@@ -2183,9 +2183,19 @@
- "[[",
- " m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,",
- " [[",
-+ "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */",
-- "#ifndef __cplusplus",
-+ "#ifdef __cplusplus",
-+ "extern \"C\" {",
-+ "#endif",
-+ "#ifdef __THROW /* this is a gnuism */",
-+ "extern int isatty M4_YY_PARAMS( int ) __THROW;",
-+ "#else",
- "extern int isatty M4_YY_PARAMS( int );",
-+ "#endif",
-- "#endif /* __cplusplus */",
-+ "#ifdef __cplusplus",
-+ "}",
-+ "#endif",
-+ "#endif",
- " ]])",
- "]])",
- "%endif",
diff --git a/sys-devel/flex/flex-2.5.33-r1.ebuild b/sys-devel/flex/flex-2.5.33-r1.ebuild
deleted file mode 100644
index 240b48176036..000000000000
--- a/sys-devel/flex/flex-2.5.33-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.33-r1.ebuild,v 1.9 2007/02/28 22:23:35 genstef Exp $
-
-inherit eutils flag-o-matic
-
-#DEB_VER=36
-DESCRIPTION="GNU lexical analyser generator"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${P}.tar.bz2"
-# mirror://debian/pool/main/f/flex/${PN}_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls static"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- [[ -n ${DEB_VER} ]] && epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
- epatch "${FILESDIR}"/${PN}-2.5.31-include.patch
- epatch "${FILESDIR}"/${P}-isatty.patch #119598
-}
-
-src_compile() {
- use static && append-ldflags -static
- econf $(use_enable nls) || die
- emake || die
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
- dosym flex /usr/bin/lex
-}