Add flex-2.5.31 back in with Debian patchset #97921 by Martin Mokrejs.

(Portage version: 2.0.51.22-r1)

7 files changed, 61 insertions, 138 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 4ab4fc7b04a7..50aa11d364bb 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for sys-devel/flex
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.28 2005/02/15 06:21:40 kito Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.29 2005/07/09 23:36:48 vapier Exp $
 
-  15 Feb 2005; Kito <kito@gentoo.org> flex-2.5.4a-r6.ebuild:
-  ~ppc-macos keyword
+*flex-2.5.31 (09 Jul 2005)
+
+  09 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  -files/flex-2.5.31-yytext_ptr.patch, flex-2.5.4a-r6.ebuild,
+  +flex-2.5.31.ebuild, -flex-2.5.31-r1.ebuild:
+  Add flex-2.5.31 back in with Debian patchset #97921 by Martin Mokrejs.
 
 *flex-2.5.4a-r6 (20 Jan 2005)
 
@@ -20,12 +24,6 @@
   Fixing a very silly typo. I meant "bigcheck", not "bigtest". Sorry. Fixes
   bug #63697.
 
-  07 Oct 2004; Lina Pezzella <j4rg0n@gentoo.org> flex-2.5.4a-r5.ebuild:
-  Removed ~macos keyword Bug #65763
-
-   06 Sep 2004; Alexander Plank <alexander@gentoo.org> flex-2.5.4a-r5.ebuild:
-   add ~macos -- it overwrites apple's flex
-
   16 Sep 2004; <rmoss@gentoo.org> flex-2.5.4a-r5.ebuild:
   flex-2.5.4a was using a broken, irritatingly short version of the testsuite.
   Adding "make bigcheck" in the previously nonexistent src_test function fixes
@@ -38,73 +36,15 @@
   take out the emake || make bit.  Works for me with -j and no verified
   bug reports exist; tidy
 
-  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> flex-2.5.23.ebuild,
-  flex-2.5.31-r1.ebuild, flex-2.5.31.ebuild, flex-2.5.4a-r5.ebuild:
-  virtual/glibc -> virtual/libc
-
-  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> flex-2.5.23.ebuild,
-  flex-2.5.31-r1.ebuild, flex-2.5.31.ebuild:
-  QA - fix use invocation
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> flex-2.5.31-r1.ebuild:
-  Add inherit eutils
-
-*flex-2.5.31-r1 (17 Oct 2003)
-
-  17 Oct 2003; Martin Holzer <mholzer@gentoo.org> flex-2.5.31-r1.ebuild:
-  adding fix. Closes #31240.
-
-  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> flex-2.5.4a-r5.ebuild:
-  set stable on sparc
-
-*flex-2.5.31 (18 Apr 2003)
-
-  18 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
-  flex-2.5.23.ebuild, flex-2.5.31.ebuild, flex-2.5.4a-r5.ebuild:
-  Version bumped. Changed SRC_URI to gentoo-mirrors.
-
-  20 Feb 2003; Zach Welch <zwelch@gentoo.org> flex-2.5.4a-r5.ebuild :
-  Added arm to keywords.
-
-  08 Feb 2003; Guy Martin <gmsoft@gentoo.org> flex-2.5.4a-r5.ebuild :
-  Added hppa to keywords.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*flex-2.5.23 (18 Nov 2002)
-
-  25 Mar 2003; Seemant Kulleen <seemant@gentoo.org> flex-2.5.23.ebuild:
-  homepage syntax fix thanks to: Frantz Dhin <tragedy_rm@hotmail.com> in bug
-  #18145
-
-  01 Dec 2002; Seemant Kulleen <seemant@gentoo.org> flex-2.5.23.ebuild
-  flex-2.5.4a-r5.ebuild :
-
-  emake -> emake || make.  Closes bug #11446 by bartelt@gentoo.org (Ulf
-  Bartelt)
-
-  18 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update version.
-
-*flex-2.5.22 (21 Oct 2002)
-
-  21 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Update version thanks to new URL from Nicholas Wourms <nwourms@netscape.net>.
 
 *flex-2.5.4a-r5 (13 Oct 2002)
 
   13 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
-
   Add various Redhat patches to make it more gcc3 friendly.  Fix
   form in a few places.
 
 *flex-2.5.4a-r4 (1 Feb 2002)
 
-  18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
-  Added mips to keywords
-
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/sys-devel/flex/files/digest-flex-2.5.31 b/sys-devel/flex/files/digest-flex-2.5.31
new file mode 100644
index 000000000000..3d5b79c583aa
--- /dev/null
+++ b/sys-devel/flex/files/digest-flex-2.5.31
@@ -0,0 +1,2 @@
+MD5 363dcc4afc917dc51306eb9d3de0152f flex-2.5.31.tar.bz2 681792
+MD5 9b6696bda9c3775ef19276e69f52a0a6 flex_2.5.31-32.diff.gz 194698
diff --git a/sys-devel/flex/files/digest-flex-2.5.31-r1 b/sys-devel/flex/files/digest-flex-2.5.31-r1
deleted file mode 100644
index 729b6cd03752..000000000000
--- a/sys-devel/flex/files/digest-flex-2.5.31-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 363dcc4afc917dc51306eb9d3de0152f flex-2.5.31.tar.bz2 681792
diff --git a/sys-devel/flex/files/flex-2.5.31-yytext_ptr.patch b/sys-devel/flex/files/flex-2.5.31-yytext_ptr.patch
deleted file mode 100644
index 3d0642a4ca72..000000000000
--- a/sys-devel/flex/files/flex-2.5.31-yytext_ptr.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- flex.skl.org	2003-10-16 06:04:37.000000000 +0000
-+++ flex.skl	2003-10-16 06:06:02.000000000 +0000
-@@ -3280,7 +3280,6 @@
- #undef yy_set_bol
- #undef yy_new_buffer
- #undef yy_set_interactive
--#undef yytext_ptr
- #undef YY_DO_BEFORE_ACTION
- 
- #ifdef YY_DECL_IS_OURS
diff --git a/sys-devel/flex/flex-2.5.31-r1.ebuild b/sys-devel/flex/flex-2.5.31-r1.ebuild
deleted file mode 100644
index 3971dbf04845..000000000000
--- a/sys-devel/flex/flex-2.5.31-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31-r1.ebuild,v 1.8 2005/01/20 08:25:23 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU lexical analyser generator"
-SRC_URI="mirror://sourceforge/lex/${P}.tar.bz2"
-HOMEPAGE="http://lex.sourceforge.net/"
-
-SLOT="0"
-LICENSE="FLEX"
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ppc64"
-IUSE="build nls static"
-
-DEPEND="virtual/libc
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-yytext_ptr.patch
-}
-
-src_compile() {
-	myconf=""
-
-	use nls || myconf="--disable-nls"
-
-	econf ${myconf} || die
-
-	if ! use static
-	then
-		emake || make || die
-	else
-		emake LDFLAGS=-static || die
-	fi
-}
-
-src_install() {
-	einstall || die
-
-	if ! use build
-	then
-		dodoc AUTHORS COPYING ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
-	else
-		rm -rf ${D}/usr/share ${D}/usr/include ${D}/usr/lib
-	fi
-
-	dosym flex /usr/bin/lex
-}
diff --git a/sys-devel/flex/flex-2.5.31.ebuild b/sys-devel/flex/flex-2.5.31.ebuild
new file mode 100644
index 000000000000..867497fdd537
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.31.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.31.ebuild,v 1.12 2005/07/09 23:36:48 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DEB_VER=32
+DESCRIPTION="GNU lexical analyser generator"
+HOMEPAGE="http://lex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lex/${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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="build nls static"
+
+DEPEND="nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "make install failed"
+
+	if use build ; then
+		rm -r "${D}"/usr/{include,lib,share}
+	else
+		dodoc AUTHORS ChangeLog NEWS ONEWS README* RoadMap THANKS TODO
+	fi
+
+	dosym flex /usr/bin/lex
+}
diff --git a/sys-devel/flex/flex-2.5.4a-r6.ebuild b/sys-devel/flex/flex-2.5.4a-r6.ebuild
index f7633f4fc2ff..4d5d16a7f173 100644
--- a/sys-devel/flex/flex-2.5.4a-r6.ebuild
+++ b/sys-devel/flex/flex-2.5.4a-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r6.ebuild,v 1.3 2005/05/22 02:02:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.4a-r6.ebuild,v 1.4 2005/07/09 23:36:48 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="build static"
 
 DEPEND=""
@@ -22,15 +22,15 @@ S=${WORKDIR}/${P/a/}
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd "${S}"
 	# Some Redhat patches to fix various problems
-	epatch ${FILESDIR}/flex-2.5.4-glibc22.patch
-	epatch ${FILESDIR}/flex-2.5.4a-gcc3.patch
-	epatch ${FILESDIR}/flex-2.5.4a-gcc31.patch
-	epatch ${FILESDIR}/flex-2.5.4a-skel.patch
+	epatch "${FILESDIR}"/flex-2.5.4-glibc22.patch
+	epatch "${FILESDIR}"/flex-2.5.4a-gcc3.patch
+	epatch "${FILESDIR}"/flex-2.5.4a-gcc31.patch
+	epatch "${FILESDIR}"/flex-2.5.4a-skel.patch
 
 	# included autotools are crusty, lets polish em up
-	epatch ${WORKDIR}/${P}-autoconf.patch
+	epatch "${WORKDIR}"/${P}-autoconf.patch
 }
 
 src_compile() {