Version bump. Respect LDFLAGS (bug #338168), CXX. Marked ~ppc again. Set RDEPEND.

(Portage version: 2.2.0_alpha10/cvs/Linux i686)

3 files changed, 74 insertions, 50 deletions

diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog
index 0d1d568760a4..62fce0abc9d8 100644
--- a/dev-lang/nqc/ChangeLog
+++ b/dev-lang/nqc/ChangeLog
@@ -1,51 +1,11 @@
 # ChangeLog for dev-lang/nqc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.15 2009/10/23 15:48:24 vostorga Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.16 2010/12/30 18:42:58 jer Exp $
 
-  23 Oct 2009; Víctor Ostorga <vostorga@gentoo.org> nqc-2.5.1.ebuild:
-  Adding die to make install
+*nqc-3.1_p6 (30 Dec 2010)
 
-  23 Sep 2009; Patrick Lauer <patrick@gentoo.org> nqc-2.5.1.ebuild,
-  nqc-3.1_p4.ebuild:
-  Remove virtual/libc
+  30 Dec 2010; Jeroen Roovers <jer@gentoo.org> nqc-3.1_p4.ebuild,
+  +nqc-3.1_p6.ebuild:
+  Version bump. Respect LDFLAGS (bug #338168), CXX. Marked ~ppc again. Set
+  RDEPEND.
 
-  29 May 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
-  Removing Lars Weiler (Pylon) from metadata.xml (as per #215644). Assigning
-  to maintainer-needed.
-
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-  31 Jan 2007; Marius Mauch <genone@gentoo.org> nqc-2.5.1.ebuild,
-  nqc-3.1_p4.ebuild:
-  Replacing einfo with elog
-
-*nqc-3.1_p4 (18 Jun 2006)
-
-  18 Jun 2006; Lars Weiler <pylon@gentoo.org> +files/nqc-3.1_p4-amd64.patch,
-  +files/nqc-3.1_p4-usb.patch, +metadata.xml, +nqc-3.1_p4.ebuild:
-  Version bump; thanks to all contributors in bug #89257.
-
-  14 Dec 2005; Maurice van der Pot <griffon26@gentoo.org>
-  +files/nqc-2.5.1-gcc34-fix.patch, nqc-2.5.1.ebuild:
-  Fixed compilation with gcc 3.4.4, closing bug #115474. What this package 
-  really needs is an up-to-date ebuild (see bug #89257).
-
-  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> nqc-2.5.1.ebuild:
-  Stable on ppc.
-
-  22 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> nqc-2.5.1.ebuild:
-  Fix einfo, bug #70854
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> nqc-2.5.1.ebuild:
-  virtual/glibc -> virtual/libc
-
-  01 Jan 2004; Luca Barbato <lu_zero@gentoo.org> nqc-2.5.1.ebuild:
-  Marked ~ppc
-
-*nqc-2.5.1 (20 Jun 2003)
-
-  20 Jun 2003; George Shapovalov <george@gentoo.org> Manifest, nqc-2.5.1.ebuild, files/{digest-nqc-2.5.1} :
-  initial release (#12343)
-  Not Quite C - C-like compiler for Lego Mindstorms
-  ebuild submitted by Alexander Holler <aholler@gentoo.de>
diff --git a/dev-lang/nqc/nqc-3.1_p4.ebuild b/dev-lang/nqc/nqc-3.1_p4.ebuild
index 9d9bfb4d3ded..d30e96d37ac2 100644
--- a/dev-lang/nqc/nqc-3.1_p4.ebuild
+++ b/dev-lang/nqc/nqc-3.1_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p4.ebuild,v 1.4 2009/10/23 15:48:24 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p4.ebuild,v 1.5 2010/12/30 18:42:58 jer Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ S=${WORKDIR}/${P/_p/.r}
 
 SLOT="0"
 LICENSE="MPL-1.0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="usb"
 
 DEPEND="usb? ( dev-libs/legousbtower )"
diff --git a/dev-lang/nqc/nqc-3.1_p6.ebuild b/dev-lang/nqc/nqc-3.1_p6.ebuild
new file mode 100644
index 000000000000..8616f4943ced
--- /dev/null
+++ b/dev-lang/nqc/nqc-3.1_p6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 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.1 2010/12/30 18:42:58 jer Exp $
+
+EAPI="2"
+
+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/"
+
+S="${WORKDIR}/${P/_p/.r}"
+
+SLOT="0"
+LICENSE="MPL-1.0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="usb"
+
+DEPEND="usb? ( dev-libs/legousbtower )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e 's|$(CXX) -o |$(CXX) $(LDFLAGS) -o |g' \
+		-e 's|PREFIX?=/usr/local/|PREFIX?=/usr|' \
+		Makefile || die "sed Makefile"
+}
+
+src_configure()
+{
+	if use usb; then
+		epatch "${FILESDIR}"/${P}-usb.patch
+	fi
+	if use amd64; then
+		epatch "${FILESDIR}"/${P}-amd64.patch
+	fi
+}
+
+src_compile() {
+	emake CXX=$(tc-getCXX) LDFLAGS="${LDFLAGS}" || die "emake"
+}
+
+src_install() {
+	dobin bin/*
+	mv nqc-man-2.1r1-0.man nqc.1
+	doman nqc.1
+	dodoc history.txt readme.txt scout.txt test.nqc
+}
+
+pkg_postinst() {
+	elog "To change the default serial name for nqc (/dev/ttyS0) set"
+	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
+		elog "You have enabled USB support. To use usb on the"
+		elog "command line use the -Susb command line option"
+	else
+		elog
+		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
+}