Fix build failure against modern flex (like 2.5.37). Bug #437074 by Chris Smith and others.

Package-Manager: portage-2.2.0_alpha177_p3/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 70 insertions, 7 deletions

diff --git a/app-emulation/dosemu/ChangeLog b/app-emulation/dosemu/ChangeLog
index 33cfbc19ecef..4f2cf2bc25f3 100644
--- a/app-emulation/dosemu/ChangeLog
+++ b/app-emulation/dosemu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/dosemu
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.53 2010/06/24 08:59:31 angelos Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/ChangeLog,v 1.54 2013/06/11 19:40:45 slyfox Exp $
+
+  11 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/dosemu-1.4.1_pre20091009-flex.patch, dosemu-1.4.1_pre20091009.ebuild:
+  Fix build failure against modern flex (like 2.5.37). Bug #437074 by Chris
+  Smith and others.
 
   24 Jun 2010; Christoph Mende <angelos@gentoo.org>
   dosemu-1.4.1_pre20091009.ebuild:
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 1013a5eae657..43ab0510874e 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX dosemu-1.3.4-shm.diff 394 SHA256 2c0091f53f97c55ad9624ccaae91c21ef5245066c8dba5e612ad9f5309694ab7 SHA512 b189f113a32931c1e8d95df3bf300802c3f3d503be029899c5936c664e61600a67881235b55a2c047bdc3cb8f096d31e84ee6fbb4f28871de184c0d23328e99d WHIRLPOOL e2f16aafbae8049848ddc36ea2258e87fb679b12c4beb6c3297e1be109cac8daecf4d6e6124ba6e5fd2f21fab046b485dc158666a95de88334c3b07bdcc1b255
 AUX dosemu-1.4.0.1-gcc433.diff 346 SHA256 000225ce7198fb8d799fa49e5e8262b000e37a2a4557a5cc01e2b63dc30f6e7b SHA512 325488028bf6490fcbaf38d7c6b7d39b853777f995659d31d17c5c0659e472a25d004d296d0e244e673d3eb1671914045657bd89250d411ae8ae85fbb303b84e WHIRLPOOL 542a31f2ae75de903d3380b459689cff404d768f77e2e8a5fb26f013d9fd9f1b78feb948f5ae910558d9689a46d081f6687e0399ba53d0ebdef7e4f133fb9440
+AUX dosemu-1.4.1_pre20091009-flex.patch 1225 SHA256 ee49be4ef83463bf619ea8143d3d6405fd4ee74abdb1a1af8ff90cd1b23d315b SHA512 46698fa76bf34db5fd39a1bd14670022faec0146c39e7c1ba61a1899880f1ea8521b771cb7d6174b34b61869fd35926f4eb28b6a84079fac8e8a83368ddc2b4f WHIRLPOOL cd9ce575f7c1836249c7d6c52eb4a4a3a8895f2f928f7a64ce9ddb79350e65587b11692cbc6a91726e5fcbbcfa26dd7a7f183e5cfb61ac483c42e3e32c6f6ee0
 DIST dosemu-1.4.0.tgz 2295595 SHA256 fc92f77186498e9fd13882748a764df863f118d4cfaffab39cea564178e53f50 SHA512 fdeb48c9d2051eed101919dbf7e9c698c6035770e94bb3b77cf2addf55373526f573ee48cfdac48b263281169c6ae5c44c811e53cd1865614c10c551e12a6794 WHIRLPOOL b41225ec09035ad513cf18ddc69f8459607ffba012ecff73603ecda1f672f02acab07ebee48e7d802e8d4c74d65c1f81c6d09640f130766ff977c01a9a25c3a2
 DIST dosemu-1.4.1_pre20091009.tar.bz2 1965194 SHA256 bf57f3a567008892fcaf0a58f69aae37a4b251f08855968958fa8fc6c06b1d4b SHA512 45aa0fff97f11270a50f9d5f10ec0be137e585c33a163e2b3318e924fe60f6aff90433fa52e90a5f8f9f1557b69720c4750ea685f3f72b644345021a01efc6ae WHIRLPOOL 607a1f92a60f31540d9e7e4033ef913d115a1e2f0a578e4083f8b55c2d0144352fe9f04273dfe953f80ad7bf38dab901dc6b7a4fce2ea3b0676329837b2719cb
 DIST dosemu-freedos-1.0-bin.tgz 1205628 SHA256 080c306a1b611e1861fd64466062f268eb44d2bf38082b8a57efadb5a9c0ebc7 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd WHIRLPOOL 9e6acf38dc8fafe95a49baaaac2a97fdd02c508b7c30c60823f8af7f44aa62b8d82c92661640b4cef05fcdbea401fafea752ec4a0e439a8eff361dd41aa392d3
 DIST patch-1.4.0.1.gz 69968 SHA256 e581715732421a5f2c6744a6fbeae7055fbdc319eaf8677e1739990ed3f06b66 SHA512 b6b06b2b253c3fcca55b00a995a7a35eb8d4b1ba7e0a6d2517882ef89905206a446b1fadec8ef299fb2bc8b828c640e3172e5667c099027bd5e5dc15482c5d9b WHIRLPOOL 1567326c005c7ae967df6c75f064da822fb413609b907659262b3b7a871201cd7d6c71f6c1f8dc2a01290ea1ba797816041fcdc94bbecf5520857a6402232113
 EBUILD dosemu-1.4.0.1.ebuild 1623 SHA256 b44ec6af54d141980f5df0ede0a3e0fd6f0a71e1fb0329db8913dfff13d626a8 SHA512 18137c6ff60146c1bd6705febfed709379e6fbfe6dc58a15766e4d63bf9171d4ebd703151ba552f22b099bafd36f901a7ffd154eef1c12f1de1ad61e4e79be5b WHIRLPOOL c130dbbdc804143dd35cf4a9a5584c1bf52355aa9ab4913212f6a65b50529b4d7e1906d24ca43b1d21db172adffdd7fa9a8efdfee41fed6088b6753b65bd3351
-EBUILD dosemu-1.4.1_pre20091009.ebuild 1496 SHA256 de268ebdcec66f3fe170fe9404674d365acc1949676b8054d18e2ead620f9680 SHA512 8bfe47cf84235ff5e58a9c2056d939f391f3fbd9465077f94caa8b09ab4b2bcaffb6fef42938ca3ac18a23abe5fdb72599a85b395e4c5f2bc6271429cbf64075 WHIRLPOOL 4cb08d44b80043821170f8d06c6f2b1c1fbbf264f4e4bc5480bcdffa03cde4237625727df0c933d43d1b81b86755b87514ea4f147aa010f22ccb7e8d3d4a426c
-MISC ChangeLog 7139 SHA256 429c7e45fb1b37145f1399d88eb5294b24563f39cfec70baa4bfe08fa6af4308 SHA512 a439793f6dff5524ed23f5e2f716b52ef488c80898545bfa553c2702b4c6197e0ebffc299556b7f3a41406019c8dd8ac04d5ccd2f5091223929d951d024ae528 WHIRLPOOL 3d6212eae01006e1e5956d5f136d540f0e03297923072953aa87608d6cf929d0a0ded0ba4743358e0e2a186af0c1c81e19537b68f08afae72631bdfe4b62e3de
+EBUILD dosemu-1.4.1_pre20091009.ebuild 1549 SHA256 a59ac809f3cf04d24704814e07ecc820fb81e14e0fda69d3881420e6cf6df97e SHA512 2d544901681f7423e239c3364d29135888ac0a6dc9c116bdafa564e46ded80f964ca7be84e2d4fa4ccd7f975274bb16a9a2de670305d04e77e736b4e2a73c414 WHIRLPOOL b9c23a187b024a839b9b48168630ef65c1b68596284b15d55d785c9735d2abbce29ab61c4caa7a8d545a07f6ca3bf76960ab2236d1c4a53260c709a33612c58e
+MISC ChangeLog 7368 SHA256 1e863334b184d87bda7df1e2e265f0a43470b983c76df15c21296824ff3613cf SHA512 936ce0215004cbce8d42b3efc865e68c484affc1241d48fbb6d37800f816710d834fd3e282fccd42a2ccc06aaa8fb5c5a3146356a499a820797591cae8819fd7 WHIRLPOOL 5f8ac3d353246c38098239bc3fb412ddd82144d865a21593090e4faab6835304527cf2e50152180232502f41f21392c746b938ed83142b93677ea5d9519b75cd
 MISC metadata.xml 196 SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445 SHA512 ba2a04029fc9fd51726e618311fc0d5ca87333acb0c067a353000a5e0cd31a9f4095adc14faae4d1f14409303051f381c66c3a4cd6ac6699a9476193ac7030f4 WHIRLPOOL 002f8951fc98cfd1917aeef67a1ef0fbc7b662f4cce3c4d9735f198ec8fcaa7e258524a80dbdea1eb485db6faae224dfb317af827582c0777faeba8cd2950ccb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlG3fN0ACgkQcaHudmEf86q17wCfbwITTVFzePcn74OrEGUXZtnN
+hP4An2FjP288fYvK3oJGJGLtKosg+ldp
+=bN6a
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
index 3b34eb64bfe7..5377fb055e0b 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild,v 1.3 2010/06/24 08:59:31 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/dosemu/dosemu-1.4.1_pre20091009.ebuild,v 1.4 2013/06/11 19:40:45 slyfox Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 P_FD="dosemu-freedos-1.0-bin"
 DESCRIPTION="DOS Emulator"
@@ -34,6 +34,8 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 
 src_compile() {
+	epatch "${FILESDIR}"/${P}-flex.patch #437074
+
 	# Has problems with -O3 on some systems
 	replace-flags -O[3-9] -O2
 
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch
new file mode 100644
index 000000000000..7e8e291ef1b8
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20091009-flex.patch
@@ -0,0 +1,45 @@
+Gentoo-bug: http://bugs.gentoo.org/437074
+
+commit 81232816b90e85488d7f11f96b8fcdc5f4988c93
+Author: Stas Sergeev <stsp@users.sourceforge.net>
+Date:   Sun Oct 14 19:51:09 2012 +0400
+
+    remove prototypes for lex-generated functions
+
+diff --git a/src/base/init/lexer.h b/src/base/init/lexer.h
+index 65b3ab8..082f08c 100644
+--- a/src/base/init/lexer.h
++++ b/src/base/init/lexer.h
+@@ -1,4 +1,4 @@
+-/* 
++/*
+  * (C) Copyright 1992, ..., 2007 the "DOSEMU-Development-Team".
+  *
+  * for details see file COPYING.DOSEMU in the DOSEMU distribution
+@@ -6,7 +6,9 @@
+ 
+ /*
+  * We are intercepting the yylex() function calls from the parser
+- */ 
++ */
++#ifndef LEXER_H
++#define LEXER_H
+ #define OUR_YY_DECL int yylex (YYSTYPE* yylval)
+ OUR_YY_DECL;
+ 
+@@ -27,14 +29,4 @@ extern int include_lines[];
+ extern int line_count;
+ extern int last_include;
+ 
+-extern int yyget_lineno(void);
+-extern void yyset_lineno(int line_number);
+-extern void yyset_out(FILE * out_str);
+-extern void yyset_in(FILE * out_str);
+-extern void yyset_debug(int bdebug );
+-extern int yyget_debug(void);
+-extern int yylex_destroy(void);
+-extern FILE* yyget_in(void);
+-extern FILE* yyget_out(void);
+-extern int yyget_leng(void);
+-extern char *yyget_text(void);
++#endif