Update isatty patch to better match the unistd.h prototype #122042.

Package-Manager: portage-2.1_pre4-r1

5 files changed, 80 insertions, 20 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 0a7cc69a727d..5a6de762d429 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/flex
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.38 2006/02/08 00:55:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.39 2006/02/09 05:35:18 vapier Exp $
+
+*flex-2.5.31-r2 (09 Feb 2006)
+
+  09 Feb 2006; Mike Frysinger <vapier@gentoo.org>
+  files/flex-2.5.31-isatty.patch, +flex-2.5.31-r2.ebuild:
+  Update isatty patch to better match the unistd.h prototype #122042.
 
   08 Feb 2006; Mike Frysinger <vapier@gentoo.org>
   +files/flex-2.5.31-check-for-locale-header.patch, flex-2.5.31-r1.ebuild:
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 96fb7a428c26..6f3eb905154d 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 89cffde616458736450c3a482119d8db ChangeLog 3316
-RMD160 421c5d8249b0e61b6675ba2c55886ddf23e444ac ChangeLog 3316
-SHA256 d6399ebe3c90f5321b8bb59e9d41e3e44028da9a98839fde896671c13554247c ChangeLog 3316
-MD5 8c9da1ab91353ab97d100e499ae722f7 files/digest-flex-2.5.31-r1 131
-RMD160 5a8f2d987764982a9a75548f08ffcdc084e7f0f9 files/digest-flex-2.5.31-r1 131
-SHA256 79b8290044e824b02fe32822d696b2f8e580d66147964cd6ac94de6af68857d6 files/digest-flex-2.5.31-r1 131
+MD5 495480ee1652ba7a35ec5354ed69b7c8 ChangeLog 3526
+RMD160 31707d81cf0f196ca6db148fd4e2fb9ba773766f ChangeLog 3526
+SHA256 2b056c3e16c36e8d7ea40a08aeba6a1bb0ba61644999f50950677d4e002987d9 ChangeLog 3526
+MD5 8c9da1ab91353ab97d100e499ae722f7 files/digest-flex-2.5.31-r2 131
+RMD160 5a8f2d987764982a9a75548f08ffcdc084e7f0f9 files/digest-flex-2.5.31-r2 131
+SHA256 79b8290044e824b02fe32822d696b2f8e580d66147964cd6ac94de6af68857d6 files/digest-flex-2.5.31-r2 131
 MD5 a50411d58e9407414db98087253bdacd files/digest-flex-2.5.4a-r5 63
 RMD160 c798ce732fdcd129c48305919d971735e7b5b4d5 files/digest-flex-2.5.4a-r5 63
 SHA256 20dd99d2ba78a7231f939e845feee2fa7f6522158889f77eb5d17765bf53ba04 files/digest-flex-2.5.4a-r5 63
@@ -19,9 +19,9 @@ SHA256 67196ce234c5edabd0652f0888ab58503e6f8e10a023fa72f894ca19be7deab7 files/fl
 MD5 2e16e2031744c71cd9cd1019ff0a1af3 files/flex-2.5.31-include.patch 387
 RMD160 450ae53279820d2d8c702be0f471be07892f96f0 files/flex-2.5.31-include.patch 387
 SHA256 deb8f99edc8b3eca11515e36db959d27503c5c1fc317a4ead39f40cc0ec61bce files/flex-2.5.31-include.patch 387
-MD5 5669fcd03ee701361a6186d586e8e290 files/flex-2.5.31-isatty.patch 798
-RMD160 751ebebedef5760a08454879b9ef6f4d7f2de121 files/flex-2.5.31-isatty.patch 798
-SHA256 905bc8b9bf78cf1f60dd294fa67ab82270265b4cb074f72e8d2c856e42b36d72 files/flex-2.5.31-isatty.patch 798
+MD5 e2e82f1744e1b4e3721bd9a0fd602c66 files/flex-2.5.31-isatty.patch 1034
+RMD160 f5dbefa35cda90145c4b1e78871e44007106197a files/flex-2.5.31-isatty.patch 1034
+SHA256 11eddf940bccf42ac43bb17b315f618d3d388467a7021524fe826a3d37b7bbb6 files/flex-2.5.31-isatty.patch 1034
 MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241
 RMD160 124f5d395b4be1926420ad9dace170ef1eba24da files/flex-2.5.4-glibc22.patch 2241
 SHA256 787c733eb4e4d4272930a43fbf13b045c6ed2b363a3066e42eed38bc3c5b0941 files/flex-2.5.4-glibc22.patch 2241
@@ -37,9 +37,9 @@ SHA256 950bf0133a892332d73678b2ca35978abe6184ba9a29e38e60f6e7be773409a8 files/fl
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/flex-configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/flex-configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/flex-configure-LANG.patch 1686
-MD5 b3411d1d5849daf747c12fd089901df4 flex-2.5.31-r1.ebuild 1240
-RMD160 4f7660dbded59439be99ad8764398bbe64ed6564 flex-2.5.31-r1.ebuild 1240
-SHA256 2978d09f1e3fa8049ae4e6882e921bf0cbc34fb318171173f4aac15f07d2cf0a flex-2.5.31-r1.ebuild 1240
+MD5 b2efbe18e20d67c69e0dd4ed81aa1f60 flex-2.5.31-r2.ebuild 1239
+RMD160 bed2e42ac0b9377d176d701b8a2aafd9fc7b95a5 flex-2.5.31-r2.ebuild 1239
+SHA256 0bb561c31862265650d1aab40b6c635259e24c4d1b6a2b80f165ce22a3496f64 flex-2.5.31-r2.ebuild 1239
 MD5 3f4500ac9117f90f14a3a82e3a5dc488 flex-2.5.4a-r5.ebuild 1304
 RMD160 5362fd95822598aa3ed519f8d21e185ea22bb04c flex-2.5.4a-r5.ebuild 1304
 SHA256 de0ecc67f9ace3737258c8df6c658d270e885ad4d5627e363acf86aa60c7b72b flex-2.5.4a-r5.ebuild 1304
@@ -52,7 +52,7 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD6UGK2+ySkm8kpY0RAlqfAJ9O+aQMlXWOVd3rb2GDHiVv8QMKTwCfQn+F
-q2kqlgNlyIkwuQM0vaNYeps=
-=sUld
+iD8DBQFD6tS52+ySkm8kpY0RAscsAJ47hZoSvFve2R4gL6VDGSLUuWLwmACbBwHj
+6ZOTE4SKLWL2NdYio+q8N1k=
+=tOui
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/files/digest-flex-2.5.31-r2 b/sys-devel/flex/files/digest-flex-2.5.31-r2
new file mode 100644
index 000000000000..61100ba95b7b
--- /dev/null
+++ b/sys-devel/flex/files/digest-flex-2.5.31-r2
@@ -0,0 +1,2 @@
+MD5 363dcc4afc917dc51306eb9d3de0152f flex-2.5.31.tar.bz2 681792
+MD5 7ed573f6e5f9cf7ddea521bc06bedb8a flex_2.5.31-36.diff.gz 211072
diff --git a/sys-devel/flex/files/flex-2.5.31-isatty.patch b/sys-devel/flex/files/flex-2.5.31-isatty.patch
index 402d47b9a31e..812293641c80 100644
--- a/sys-devel/flex/files/flex-2.5.31-isatty.patch
+++ b/sys-devel/flex/files/flex-2.5.31-isatty.patch
@@ -4,37 +4,43 @@ http://bugs.gentoo.org/119598
 
 --- flex/scan.c
 +++ flex/scan.c
-@@ -3935,9 +3935,13 @@
+@@ -3935,9 +3935,15 @@
  	yyfree((void *) b  );
  }
  
++#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
 -#ifndef __cplusplus
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
- extern int isatty (int );
+-extern int isatty (int );
++extern int isatty (int ) __THROW;
 -#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,13 @@
+@@ -2183,9 +2183,15 @@
    "[[",
    "    m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,",
    "    [[",
++  "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */",
 -  "#ifndef __cplusplus",
 +  "#ifdef __cplusplus",
 +  "extern \"C\" {",
 +  "#endif",
-   "extern int isatty M4_YY_PARAMS( int );",
+-  "extern int isatty M4_YY_PARAMS( int );",
++  "extern int isatty M4_YY_PARAMS( int ) __THROW;",
 -  "#endif /* __cplusplus */",
 +  "#ifdef __cplusplus",
 +  "}",
 +  "#endif",
++  "#endif",
    "    ]])",
    "]])",
    "%endif",
diff --git a/sys-devel/flex/flex-2.5.31-r2.ebuild b/sys-devel/flex/flex-2.5.31-r2.ebuild
new file mode 100644
index 000000000000..cade5d7d876e
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.31-r2.ebuild
@@ -0,0 +1,46 @@
+# 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.31-r2.ebuild,v 1.1 2006/02/09 05:35:18 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DEB_VER=36
+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
+	epatch "${FILESDIR}"/${P}-include.patch
+	epatch "${FILESDIR}"/${P}-isatty.patch #119598
+	epatch "${FILESDIR}"/${P}-check-for-locale-header.patch #121920
+}
+
+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
+}