dev-lang/nqc: Fix for gcc-4.7, #424661

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

4 files changed, 42 insertions, 24 deletions

diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog
index 5c51906f9f0b..2b558afa7f84 100644
--- a/dev-lang/nqc/ChangeLog
+++ b/dev-lang/nqc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/nqc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.19 2012/05/10 15:47:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.20 2012/07/04 19:46:56 jlec Exp $
+
+  04 Jul 2012; Justin Lecher <jlec@gentoo.org> nqc-3.1_p6.ebuild,
+  +files/nqc-3.1_p6-gcc-4.7.patch:
+  Fix for gcc-4.7, #424661
 
   10 May 2012; Agostino Sarubbo <ago@gentoo.org> -nqc-3.1_p4.ebuild:
   Remove old
diff --git a/dev-lang/nqc/Manifest b/dev-lang/nqc/Manifest
index 3f1a55077733..a953dacbc849 100644
--- a/dev-lang/nqc/Manifest
+++ b/dev-lang/nqc/Manifest
@@ -4,20 +4,18 @@ Hash: SHA512
 AUX nqc-2.5.1-gcc34-fix.patch 425 RMD160 c6a08ba9439cb41e875342bee120714f903c53d9 SHA1 3c20e0d2ee679e3445f195a116da507caa45448c SHA256 4bc45e56d2170a7839f20c1ee95cc09b3fc18413a8e09eb9be6b932c5ca8cc4e
 AUX nqc-3.1_p4-amd64.patch 558 RMD160 86aba2b88caab190d25bb4ca6375902bd5b82362 SHA1 aaf653af03694451b24d81ac152dff672b813fbc SHA256 6deef54a5055f021e0a12fcceb3d549a2d14c3d0afbd616aa2c410e7d26b48c4
 AUX nqc-3.1_p4-usb.patch 924 RMD160 de45bcf66513db9ae3008369ccbabc04cc8e8c40 SHA1 56cfbc1d0572573a84907ac04c630ecbd820406a SHA256 95e46c483aed06df20dad0a6e817953733425fe9b3b94d0f60d0c2253e41f8c6
+AUX nqc-3.1_p6-gcc-4.7.patch 412 RMD160 c1adcb432f999055fdda6233eb37578fb4d3ed1b SHA1 bf6296d8d6f249753efeddeff51690ba018ee862 SHA256 072ef0b0f53bfb1b2bdca8d0b81d7eb57b76629b1e3e6a75e853ba514909fd42
 DIST nqc-2.5.r1.tgz 215808 RMD160 3f8e7e016b21bfb8f03716eed5976345c2bebaf6 SHA1 f926df15312e968359f501bcd7505f84c450cf58 SHA256 439eab22f21e8e28c296c17dd2340956a8c4b2a75d868885df49202d0a8795e2
 DIST nqc-3.1.r6.tgz 329410 RMD160 a991494445debbb6a3157e3a9c57793317fe91c4 SHA1 1de6543cc5152f6dacf375aea2974c09e5fe0ffa SHA256 bfd5e654f639af7a588cfdef4d22bd5efcfff547b10a56cebebde58ef2bfe766
 EBUILD nqc-2.5.1.ebuild 1234 RMD160 5aa195c39d6a48570e499600753df6a82bb6cdf4 SHA1 7b65864dd4faeac11795890304d2bf034909fc8f SHA256 e8dfc0be1a07e00d67874d5fba98f83c322dd7933ad61f8ba28b735894b2947c
-EBUILD nqc-3.1_p6.ebuild 1522 RMD160 5df1e21734d110b387eaf77ff27229461a506671 SHA1 7a47daed210aef4b6a3382af35108d4d587b10a4 SHA256 74fa5cf8712033c15589ef2c1c08df099daad2807dbb39eb44f6e3f9dea8aa7b
-MISC ChangeLog 764 RMD160 00edcca2173196cf7100ce59cf6c3a43b8473000 SHA1 0cb591d7d4e207c3c31d0ce0eb10b16d142e699d SHA256 6199e17a17ce2e5bde1db623a847a7dbd3a478ae9e9ccb1f05d4d0433fec4ecb
+EBUILD nqc-3.1_p6.ebuild 1531 RMD160 bbe134980a205d1538fae2520b0301ce9f8955a0 SHA1 b7565d270e4622390d25c5794fbcff75e4baf635 SHA256 8776b38a693018d187d43cdaf3ade675cd24f14f747f3e3bba972e3e3ddb5e26
+MISC ChangeLog 894 RMD160 31743659fed93cf43fbab7ede8d3eceb3451cbea SHA1 528a67ca48c88d1ce63a31d18a7ccf4c08d93e65 SHA256 93cb6be3d89f81f0b3e625bfe7e70095ba0f22df5838146d615b24bdce0a2cc1
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQEcBAEBCgAGBQJPq+MpAAoJEOTDgjZ80txdW/EH/0NJw3Y3YnC2wVUUtx76mVKS
-D2WXPty1llaDshQwrp8NU/bMpwzjTQamC5KoWYdbbsecYOeQ3nPvbSMVk2KKyIBa
-ttpcjEALK1N8LHC5jzYrN8I+NC6ewXHtVjriCsh6yv2A15HJ9E6o2ZMaXM6uj5su
-wiKangpJEkrTJ8TFJwtpkbY7EA2IVTWh0cApyoiaX7EFx59Q8UvHS4EDYZ0Av/JH
-s/xYHgUT25OHWQDRycMkuesm5TVtWGIn8psbhxa+kx5zm/WkhWury/89gWqqJDZi
-EB33SC/iMq35VSdJKflX/wA/B56A2hICVQr69aKEvePoufbbZqLk/sF07Hkopsw=
-=lT0x
+iEYEAREKAAYFAk/0nbUACgkQgAnW8HDreRZ6qwCgg/4hc29m5I5+RaWiQC84DbMO
+vgIAoM+r8THFIdM1MkgnofZv+IkDKcgE
+=2xUR
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/nqc/files/nqc-3.1_p6-gcc-4.7.patch b/dev-lang/nqc/files/nqc-3.1_p6-gcc-4.7.patch
new file mode 100644
index 000000000000..73a96abef293
--- /dev/null
+++ b/dev-lang/nqc/files/nqc-3.1_p6-gcc-4.7.patch
@@ -0,0 +1,15 @@
+ compiler/lexer.cpp |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/compiler/lexer.cpp b/compiler/lexer.cpp
+index 14e6d92..274b1a7 100755
+--- a/compiler/lexer.cpp
++++ b/compiler/lexer.cpp
+@@ -10,6 +10,7 @@
+ #define YY_FLEX_MAJOR_VERSION 2

+ #define YY_FLEX_MINOR_VERSION 5

+ 

++#include <unistd.h>

+ #include <stdio.h>

+ 

+ #if defined(__MWERKS__) && !__MACH__ && !YY_NEVER_INTERACTIVE

diff --git a/dev-lang/nqc/nqc-3.1_p6.ebuild b/dev-lang/nqc/nqc-3.1_p6.ebuild
index 8ec4074d0c5f..07057190cdd4 100644
--- a/dev-lang/nqc/nqc-3.1_p6.ebuild
+++ b/dev-lang/nqc/nqc-3.1_p6.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.3 2011/01/10 15:59:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.4 2012/07/04 19:46:56 jlec Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Not Quite C - C-like compiler for Lego Mindstorms"
-SRC_URI="http://bricxcc.sourceforge.net/nqc/release/${P/_p/.r}.tgz"
 HOMEPAGE="http://bricxcc.sourceforge.net/nqc/"
+SRC_URI="http://bricxcc.sourceforge.net/nqc/release/${P/_p/.r}.tgz"
 
-S="${WORKDIR}/${P/_p/.r}"
-
-SLOT="0"
 LICENSE="MPL-1.0"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="usb"
 
 DEPEND="usb? ( dev-libs/legousbtower )"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}"
+
 src_prepare() {
-	sed -i Makefile \
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+	sed \
 		-e 's|$(CXX) -o |$(CXX) $(LDFLAGS) -o |g' \
 		-e 's|/usr/local|/usr|' \
+		-i Makefile \
 		|| die "sed Makefile"
 }
 
@@ -34,13 +36,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake CXX=$(tc-getCXX) LDFLAGS="${LDFLAGS}" || die "emake"
+	emake CXX=$(tc-getCXX) LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
 	dobin bin/*
-	mv nqc-man-2.1r1-0.man nqc.1
-	doman nqc.1
+	newman nqc-man-2.1r1-0.man nqc.1
 	dodoc history.txt readme.txt scout.txt test.nqc
 }
 
@@ -49,11 +50,11 @@ pkg_postinst() {
 	elog "the environment variable RCX_PORT or use the nqc command line"
 	elog "option -S to specify your serial port."
 	if use usb; then
-		elog
+		echo
 		elog "You have enabled USB support. To use usb on the"
 		elog "command line use the -Susb command line option"
 	else
-		elog
+		echo
 		elog "You have not enabled usb support and will be unable"
 		elog "to use the usb IR tower. To enable USB use the usb use flag"
 	fi