Version bump.

Package-Manager: portage-2.1.4_rc9

5 files changed, 125 insertions, 8 deletions

diff --git a/sys-devel/flex/ChangeLog b/sys-devel/flex/ChangeLog
index 7bbf501a1ac8..9e61c3dc777c 100644
--- a/sys-devel/flex/ChangeLog
+++ b/sys-devel/flex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/flex
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.69 2007/10/16 14:10:48 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/ChangeLog,v 1.70 2007/12/13 04:44:08 vapier Exp $
+
+*flex-2.5.34 (13 Dec 2007)
+
+  13 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/flex-2.5.34-isatty.patch, +flex-2.5.34.ebuild:
+  Version bump.
 
   16 Oct 2007; Christoph Mende <angelos@gentoo.org> flex-2.5.33-r3.ebuild:
   Stable on amd64 wrt bug #195255
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 4f5c196f4c9f..9619b70507d0 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -17,6 +17,10 @@ AUX flex-2.5.33-setlocale.patch 330 RMD160 a6795135ed618eef666cc75208f5d4d7176dc
 MD5 dd5a86d3bc101e27e1eb8c3d277ca83c files/flex-2.5.33-setlocale.patch 330
 RMD160 a6795135ed618eef666cc75208f5d4d7176dc66e files/flex-2.5.33-setlocale.patch 330
 SHA256 c5df07c06847cae32927c59dacd77642db2be4b6bb0aced738003e2ce2cc5f6b files/flex-2.5.33-setlocale.patch 330
+AUX flex-2.5.34-isatty.patch 1221 RMD160 fe70e4737fbff4f5b1048795e0fcafdc55ab97af SHA1 e994eee87933db613bb0662d825de9ec1468c4ec SHA256 7b3e8e51dfb91de195eb750f610516cbc9a9b842334a79ace6a6acef45b457db
+MD5 fdc306ecb5b3a34c9eeb7da16bee4bbc files/flex-2.5.34-isatty.patch 1221
+RMD160 fe70e4737fbff4f5b1048795e0fcafdc55ab97af files/flex-2.5.34-isatty.patch 1221
+SHA256 7b3e8e51dfb91de195eb750f610516cbc9a9b842334a79ace6a6acef45b457db files/flex-2.5.34-isatty.patch 1221
 AUX flex-2.5.4-glibc22.patch 2241 RMD160 124f5d395b4be1926420ad9dace170ef1eba24da SHA1 e42a9ae22ca57efc8ecc719cd4ecacb6a7e3ee3f SHA256 787c733eb4e4d4272930a43fbf13b045c6ed2b363a3066e42eed38bc3c5b0941
 MD5 06f3fd21134a6d82073ce64e2ad60274 files/flex-2.5.4-glibc22.patch 2241
 RMD160 124f5d395b4be1926420ad9dace170ef1eba24da files/flex-2.5.4-glibc22.patch 2241
@@ -38,6 +42,7 @@ MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/flex-configure-LANG.patch 1686
 RMD160 4ff8355af81705058fd411910dfae94887bcd884 files/flex-configure-LANG.patch 1686
 SHA256 dc9386b88eac48c282d63d0be7e7be81d4a0a08035a8b97138a61133e057bcea files/flex-configure-LANG.patch 1686
 DIST flex-2.5.33.tar.bz2 695464 RMD160 360e08457d324c5b87c02b0ed61983877c173c98 SHA1 acdb8fff6455967ad1a5bfc71855dbcc1253ee56 SHA256 53b56a62ea9409b99b7a0ac4a5204fac16ca7eaf39b9374164c346d6badc6914
+DIST flex-2.5.34.tar.bz2 1253930 RMD160 1a86b48ee255911406eb328bd79e208f0922d027 SHA1 e2a761030903b5bdb8e272476066a0c47c5fcacf SHA256 1c8e64f32508841b0441ddfb139c4cfd25fee3728cadb63f5f351c6eb9b224a6
 DIST flex-2.5.4a-autoconf.patch.bz2 13710 RMD160 e2797f6e1e0f60cb715906eae34415a66b0e3f8b SHA1 ff2a951abdb82a2384bf3c643ae7f4e8c913fdc2 SHA256 d2c9367c0995c8cc986c4e991e880bf49ce2766df3e5139b6811a67ee94ce46c
 DIST flex-2.5.4a.tar.gz 380995 RMD160 6b8ff62207fd3961ad2544db083cec1e42b8519b SHA1 38a5e15c348d2ca7dce94d71de2b51484d23e2ef SHA256 791e8e26d35faed05654b17fe3a9e64eea0874d623c5aaaaf532e164378e8407
 EBUILD flex-2.5.33-r2.ebuild 1168 RMD160 0cd33ea90c900a0b6b473f0ffb35f73e9689d24d SHA1 c2f0d00ae6e64cba3d6951f5e862f83cd9e70102 SHA256 cd2a66b1333ef43966502e1da6c195b5786250a038eab2c1fcc53fb7bc2836e9
@@ -48,14 +53,18 @@ EBUILD flex-2.5.33-r3.ebuild 1237 RMD160 e443fcd2ef584af80031e7728831343fca2ef27
 MD5 f0700e71cd13d0d5c399ba5b8046551c flex-2.5.33-r3.ebuild 1237
 RMD160 e443fcd2ef584af80031e7728831343fca2ef274 flex-2.5.33-r3.ebuild 1237
 SHA256 c291db8756ce4ad8e7c396c63bcdbb257ffe194e68e3da3e21855b5b7838ef5c flex-2.5.33-r3.ebuild 1237
+EBUILD flex-2.5.34.ebuild 1458 RMD160 d81de729f3ab3f2497a8082acaba2876d1e45aa7 SHA1 0c949777be4a3874da0e2740e208320adec976bd SHA256 2c1c61e3ecce06d3263246b60fc5c6a7c01258754a32014efd1723fb3253a0fb
+MD5 ed3727a40338179e3ccfda4cf09c63db flex-2.5.34.ebuild 1458
+RMD160 d81de729f3ab3f2497a8082acaba2876d1e45aa7 flex-2.5.34.ebuild 1458
+SHA256 2c1c61e3ecce06d3263246b60fc5c6a7c01258754a32014efd1723fb3253a0fb flex-2.5.34.ebuild 1458
 EBUILD flex-2.5.4a-r6.ebuild 1503 RMD160 5d55d4d97f3db7b5723b668d52b8e408dea5c5a0 SHA1 a995e0af8b13cf73a303157998ed4ac8a62a966a SHA256 3a5bdc146e8965503d8adc65ed235a8d4a1384da17d2bad85ce0df3e3372bc55
 MD5 db3a332edb8736f7ab472366015aebf3 flex-2.5.4a-r6.ebuild 1503
 RMD160 5d55d4d97f3db7b5723b668d52b8e408dea5c5a0 flex-2.5.4a-r6.ebuild 1503
 SHA256 3a5bdc146e8965503d8adc65ed235a8d4a1384da17d2bad85ce0df3e3372bc55 flex-2.5.4a-r6.ebuild 1503
-MISC ChangeLog 6964 RMD160 3e1dbc1d588f39b6f3098a73b75a2f893381e3d3 SHA1 cb6441fe61c88f3f5ae1049ace00ee69578ec3ec SHA256 8764856430d3d4ff598e66b23c32906b3bdfbc43412453d5719057e48d21d0c2
-MD5 28d0480ed359ed9db2beeb51044fd44a ChangeLog 6964
-RMD160 3e1dbc1d588f39b6f3098a73b75a2f893381e3d3 ChangeLog 6964
-SHA256 8764856430d3d4ff598e66b23c32906b3bdfbc43412453d5719057e48d21d0c2 ChangeLog 6964
+MISC ChangeLog 7114 RMD160 d52c60f967af4433fafd615ecae89f31a8442ef3 SHA1 d8114546b8c5dc588dfd7484d36c3d19c5f8cba7 SHA256 b8537b9cc8ac5d71124c65f4f236ea88806fc345779de39589a65b9cfc78a458
+MD5 a6b6b023862488c8a424141a5991c266 ChangeLog 7114
+RMD160 d52c60f967af4433fafd615ecae89f31a8442ef3 ChangeLog 7114
+SHA256 b8537b9cc8ac5d71124c65f4f236ea88806fc345779de39589a65b9cfc78a458 ChangeLog 7114
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -66,13 +75,16 @@ SHA256 5538b6de3cd6cf0539b89900d1c8daed42580261f3a8961faed4a6bbabba026f files/di
 MD5 e68b10187d8bdca8df57ac846f303f60 files/digest-flex-2.5.33-r3 238
 RMD160 94aecec05781807a73dfd57470b2945b702e821e files/digest-flex-2.5.33-r3 238
 SHA256 5538b6de3cd6cf0539b89900d1c8daed42580261f3a8961faed4a6bbabba026f files/digest-flex-2.5.33-r3 238
+MD5 f705191e93b00e5be2916a80e65546bd files/digest-flex-2.5.34 241
+RMD160 dcb216a93b7e4dcc7e02533d3d648e663659883e files/digest-flex-2.5.34 241
+SHA256 d4a3e11b621a9a061a2d60a8f07745d7b2a8a5cd8a8b692d2109e3aae785f3e1 files/digest-flex-2.5.34 241
 MD5 788d22236c14474298d9855a3f4e07b1 files/digest-flex-2.5.4a-r6 503
 RMD160 5046cb32171af73ef02d2a2672ce86e5cbd01659 files/digest-flex-2.5.4a-r6 503
 SHA256 0747f6d3edfddecae7e8463a4186e61ba1c025c09babaab95c074d13ba46b698 files/digest-flex-2.5.4a-r6 503
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHYLD0p/wUKkr7RBoRAtc/AKDe9Q9F/teS5bmyhe20y2OXc4vi/wCcCMZJ
-RMmqSSLMbcpsvkfXrd7En3M=
-=yBFp
+iD8DBQFHYLiep/wUKkr7RBoRAj8cAKDbu7QG5UpJYuH3KlRzBpmFsUwLNwCff0z2
+wCWhANeZd/Bj5bsRmJsglgM=
+=Nc8E
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/flex/files/digest-flex-2.5.34 b/sys-devel/flex/files/digest-flex-2.5.34
new file mode 100644
index 000000000000..0fb545f0a885
--- /dev/null
+++ b/sys-devel/flex/files/digest-flex-2.5.34
@@ -0,0 +1,3 @@
+MD5 fbdabda79de417b863970eb03c0f53a3 flex-2.5.34.tar.bz2 1253930
+RMD160 1a86b48ee255911406eb328bd79e208f0922d027 flex-2.5.34.tar.bz2 1253930
+SHA256 1c8e64f32508841b0441ddfb139c4cfd25fee3728cadb63f5f351c6eb9b224a6 flex-2.5.34.tar.bz2 1253930
diff --git a/sys-devel/flex/files/flex-2.5.34-isatty.patch b/sys-devel/flex/files/flex-2.5.34-isatty.patch
new file mode 100644
index 000000000000..b397433c5c57
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.5.34-isatty.patch
@@ -0,0 +1,53 @@
+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 _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.34.ebuild b/sys-devel/flex/flex-2.5.34.ebuild
new file mode 100644
index 000000000000..be7e38bd0687
--- /dev/null
+++ b/sys-devel/flex/flex-2.5.34.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/flex/flex-2.5.34.ebuild,v 1.1 2007/12/13 04:44:08 vapier 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"
+# Three regressions (according to test suite):
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1849812&group_id=97492&atid=618177
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1849809&group_id=97492&atid=618177
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1849805&group_id=97492&atid=618177
+#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}"/${P}-isatty.patch #119598
+	epatch "${FILESDIR}"/${PN}-2.5.33-pic.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS ONEWS README* THANKS TODO
+	dosym flex /usr/bin/lex
+}