Fix building with flex-2.5.31 #110169.

Package-Manager: portage-2.0.53

4 files changed, 44 insertions, 19 deletions

diff --git a/x11-wm/amiwm/ChangeLog b/x11-wm/amiwm/ChangeLog
index b7e88f8c7394..126c132bb18c 100644
--- a/x11-wm/amiwm/ChangeLog
+++ b/x11-wm/amiwm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/amiwm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.4 2005/05/10 09:06:04 dholm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.5 2005/12/25 04:41:37 vapier Exp $
+
+  25 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/amiwm-0.20_p48-flex.patch, amiwm-0.20_p48.ebuild:
+  Fix building with flex-2.5.31 #110169.
 
   10 May 2005; David Holm <dholm@gentoo.org> amiwm-0.20_p48.ebuild:
   Added to ~ppc.
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index c79113d3e6b2..7ab795efd35d 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1,4 +1,15 @@
-MD5 31aecbd736b335ec3aa401969f79e5c9 ChangeLog 639
-MD5 f172622d352fc6ae045af14628db239c amiwm-0.20_p48.ebuild 939
-MD5 db4c42351dc265cd9668e40667cfe9e9 metadata.xml 420
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4f5da915c32e4a5fdc9c3db4076d8054 ChangeLog 791
+MD5 acaf4d94c9475f0e1a4db1233e043938 amiwm-0.20_p48.ebuild 928
+MD5 987bc0b78d8a94197698a912753d7451 files/amiwm-0.20_p48-flex.patch 250
 MD5 3fb87d8b6cf877ea7926258b01f708dd files/digest-amiwm-0.20_p48 65
+MD5 db4c42351dc265cd9668e40667cfe9e9 metadata.xml 420
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDriML2+ySkm8kpY0RAkiPAKC6uQhFg/7QiBj7tOXSm2+wOsI23ACeL0Si
+77+jh4keaA5txIax8jO1Bj0=
+=l5ht
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/amiwm/amiwm-0.20_p48.ebuild b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
index f471ca86064c..a9b013bf3cf5 100644
--- a/x11-wm/amiwm/amiwm-0.20_p48.ebuild
+++ b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.5 2005/05/10 09:06:04 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.6 2005/12/25 04:41:37 vapier Exp $
+
+inherit eutils
 
 MY_P="${PN}${PV/_p/pl}"
 DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)"
@@ -14,23 +16,19 @@ IUSE=""
 
 DEPEND="virtual/x11"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	econf || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-flex.patch #110169
 }
 
 src_install() {
 	dodir /usr/bin
-	einstall
-
-#	make \
-#		prefix=${D}/usr \
-#		mandir=${D}/usr/share/man \
-#		install || die
+	einstall || die
 
-	rm ${D}/usr/bin/requestchoice
+	rm "${D}"/usr/bin/requestchoice
 	dosym /usr/lib/amiwm/requestchoice /usr/bin/requestchoice
 
 	dosed /usr/lib/amiwm/{Xinitrc,Xsession,Xsession2}
@@ -38,6 +36,6 @@ src_install() {
 	dodoc INSTALL README*
 
 	exeinto /etc/X11/Sessions
-	echo "/usr/bin/amiwm" > ${T}/amiwm
-	doexe ${T}/amiwm
+	echo "/usr/bin/amiwm" > "${T}"/amiwm
+	doexe "${T}"/amiwm
 }
diff --git a/x11-wm/amiwm/files/amiwm-0.20_p48-flex.patch b/x11-wm/amiwm/files/amiwm-0.20_p48-flex.patch
new file mode 100644
index 000000000000..c346fbb0bc08
--- /dev/null
+++ b/x11-wm/amiwm/files/amiwm-0.20_p48-flex.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/110169
+
+--- amiwm/lex.l
++++ amiwm/lex.l
+@@ -6,6 +6,7 @@
+ extern FILE *rcfile;
+ #undef yyin
+ #define yyin rcfile
++#define YY_SKIP_YYWRAP
+ #define yywrap() 1
+ extern int parse_keyword(char *);
+ void fixup_string(char *, char *);