Version bump; thanks to all contributors in bug #89257.

Package-Manager: portage-2.1.1_pre1

8 files changed, 152 insertions, 17 deletions

diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog
index dad9f643265c..85b8390306b5 100644
--- a/dev-lang/nqc/ChangeLog
+++ b/dev-lang/nqc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/nqc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.9 2005/12/14 00:59:32 griffon26 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.10 2006/06/18 14:06:51 pylon Exp $
+
+*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:
diff --git a/dev-lang/nqc/Manifest b/dev-lang/nqc/Manifest
index 22b017d746b7..346dee170abd 100644
--- a/dev-lang/nqc/Manifest
+++ b/dev-lang/nqc/Manifest
@@ -1,14 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d232760d5fa8982a46068029078cce78 ChangeLog 1093
-MD5 ec2eb2fa60d922ccddc0e768135303c4 files/digest-nqc-2.5.1 59
+AUX nqc-2.5.1-gcc34-fix.patch 425 RMD160 c6a08ba9439cb41e875342bee120714f903c53d9 SHA1 3c20e0d2ee679e3445f195a116da507caa45448c SHA256 4bc45e56d2170a7839f20c1ee95cc09b3fc18413a8e09eb9be6b932c5ca8cc4e
 MD5 397f6d97f513b13c40f92743258e64ff files/nqc-2.5.1-gcc34-fix.patch 425
-MD5 6b733ffb2ab2f5acc7d5f33531fa6d7e nqc-2.5.1.ebuild 1219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDn26CMGnpIbeahxwRAm9AAKDAQ3U9sAwpboqPbKz1+ZesNT1MewCdGAbn
-wAtHmNLTZACi+TaA2boPP84=
-=ThlR
------END PGP SIGNATURE-----
+RMD160 c6a08ba9439cb41e875342bee120714f903c53d9 files/nqc-2.5.1-gcc34-fix.patch 425
+SHA256 4bc45e56d2170a7839f20c1ee95cc09b3fc18413a8e09eb9be6b932c5ca8cc4e files/nqc-2.5.1-gcc34-fix.patch 425
+AUX nqc-3.1_p4-amd64.patch 558 RMD160 86aba2b88caab190d25bb4ca6375902bd5b82362 SHA1 aaf653af03694451b24d81ac152dff672b813fbc SHA256 6deef54a5055f021e0a12fcceb3d549a2d14c3d0afbd616aa2c410e7d26b48c4
+MD5 c598a59d7c2cc043cd15ea118260ac84 files/nqc-3.1_p4-amd64.patch 558
+RMD160 86aba2b88caab190d25bb4ca6375902bd5b82362 files/nqc-3.1_p4-amd64.patch 558
+SHA256 6deef54a5055f021e0a12fcceb3d549a2d14c3d0afbd616aa2c410e7d26b48c4 files/nqc-3.1_p4-amd64.patch 558
+AUX nqc-3.1_p4-usb.patch 924 RMD160 de45bcf66513db9ae3008369ccbabc04cc8e8c40 SHA1 56cfbc1d0572573a84907ac04c630ecbd820406a SHA256 95e46c483aed06df20dad0a6e817953733425fe9b3b94d0f60d0c2253e41f8c6
+MD5 a20517a5aea5470ea356d9ffc1b48ac4 files/nqc-3.1_p4-usb.patch 924
+RMD160 de45bcf66513db9ae3008369ccbabc04cc8e8c40 files/nqc-3.1_p4-usb.patch 924
+SHA256 95e46c483aed06df20dad0a6e817953733425fe9b3b94d0f60d0c2253e41f8c6 files/nqc-3.1_p4-usb.patch 924
+DIST nqc-2.5.r1.tgz 215808
+DIST nqc-3.1.r4.tgz 334211 RMD160 b251210efc52022f1d4d97d9c02c06d4251b3666 SHA256 e40d179783ef1fa492e6804b99f202c7d61c6bda476ddbe2936c8956eaafd629
+EBUILD nqc-2.5.1.ebuild 1215 RMD160 60a0464e625a603bbfcf035730549e166a96a139 SHA1 33b0625cd9789bf68813c5915dd93028f5541cdb SHA256 a837d778bfa18de0a29413107daae38e0a881a110a1ce7e6eaa36118d99af87b
+MD5 1a0bd26b99839e4c717a417380b6e97f nqc-2.5.1.ebuild 1215
+RMD160 60a0464e625a603bbfcf035730549e166a96a139 nqc-2.5.1.ebuild 1215
+SHA256 a837d778bfa18de0a29413107daae38e0a881a110a1ce7e6eaa36118d99af87b nqc-2.5.1.ebuild 1215
+EBUILD nqc-3.1_p4.ebuild 1386 RMD160 61e76483698234799e1778fdceee39ed3d246715 SHA1 0e6eea08c0f70fbcd15d19a94340a90b14b31426 SHA256 b69a9f8136a3828872fbd9010aef91eff9e4bd8c6b03c59d56908113450af3be
+MD5 31696dad985860faf3fa7ee737eb2b14 nqc-3.1_p4.ebuild 1386
+RMD160 61e76483698234799e1778fdceee39ed3d246715 nqc-3.1_p4.ebuild 1386
+SHA256 b69a9f8136a3828872fbd9010aef91eff9e4bd8c6b03c59d56908113450af3be nqc-3.1_p4.ebuild 1386
+MISC ChangeLog 1319 RMD160 015487d7622e6e08c7d8ec6d6ec2ddc06303a58b SHA1 a9ff012bf6f067b45bfa6abb19308bc10445dcbb SHA256 4076ab8b7ce44414d7c0a8b55fd153ac7f5dd0b22c1516403733671e774449d4
+MD5 ed7e7aa3eafbe01452e23eac3e2c6f66 ChangeLog 1319
+RMD160 015487d7622e6e08c7d8ec6d6ec2ddc06303a58b ChangeLog 1319
+SHA256 4076ab8b7ce44414d7c0a8b55fd153ac7f5dd0b22c1516403733671e774449d4 ChangeLog 1319
+MISC metadata.xml 221 RMD160 1b2f671f76e6f5633ecad58b5d2468c6560b99f9 SHA1 b630d69fb363782b8163d50b777beaae36a13067 SHA256 9df9acfdf2e8203b8e0559e8b74ddf9d7b4c5693978c9aedc6ccff32c71cead2
+MD5 035613e4ea415232c9b9fea9783994ce metadata.xml 221
+RMD160 1b2f671f76e6f5633ecad58b5d2468c6560b99f9 metadata.xml 221
+SHA256 9df9acfdf2e8203b8e0559e8b74ddf9d7b4c5693978c9aedc6ccff32c71cead2 metadata.xml 221
+MD5 ec2eb2fa60d922ccddc0e768135303c4 files/digest-nqc-2.5.1 59
+RMD160 06abfd0e90ad984773b23ff4f8e04fd669ddb21b files/digest-nqc-2.5.1 59
+SHA256 7ffce835a1131fd7b69f695665b4fc132e6a4709ceaaaedfffbedac6115c8fb0 files/digest-nqc-2.5.1 59
+MD5 abf2cbf0e26d20ea06f32a6ff415cfe2 files/digest-nqc-3.1_p4 223
+RMD160 65ac011516edfd2537503c901fc5c3e3afc25ed2 files/digest-nqc-3.1_p4 223
+SHA256 a3c9b892c8818e9d0c76ab1ecdc4ab0d2819d223a12a0033d9362b080778f9bc files/digest-nqc-3.1_p4 223
diff --git a/dev-lang/nqc/files/digest-nqc-3.1_p4 b/dev-lang/nqc/files/digest-nqc-3.1_p4
new file mode 100644
index 000000000000..3883e13011fd
--- /dev/null
+++ b/dev-lang/nqc/files/digest-nqc-3.1_p4
@@ -0,0 +1,3 @@
+MD5 f7868445a25615ad82e6e63bf16aef3c nqc-3.1.r4.tgz 334211
+RMD160 b251210efc52022f1d4d97d9c02c06d4251b3666 nqc-3.1.r4.tgz 334211
+SHA256 e40d179783ef1fa492e6804b99f202c7d61c6bda476ddbe2936c8956eaafd629 nqc-3.1.r4.tgz 334211
diff --git a/dev-lang/nqc/files/nqc-3.1_p4-amd64.patch b/dev-lang/nqc/files/nqc-3.1_p4-amd64.patch
new file mode 100644
index 000000000000..cca6b7fa0df7
--- /dev/null
+++ b/dev-lang/nqc/files/nqc-3.1_p4-amd64.patch
@@ -0,0 +1,12 @@
+diff -Naur nqc-3.1.r4.orig/compiler/Error.h nqc-3.1.r4/compiler/Error.h
+--- nqc-3.1.r4.orig/compiler/Error.h	2005-03-16 17:52:44.000000000 +0000
++++ nqc-3.1.r4/compiler/Error.h	2006-05-08 06:25:30.000000000 +0000
+@@ -118,7 +118,7 @@
+ 	};
+ 
+ 			Error(ErrorCode code, int data=0) : fCode(code), fData(data) {}
+-			Error(ErrorCode code, const char *s) : fCode(code), fData((int)s) {}
++			Error(ErrorCode code, const char *s) : fCode(code), fData((long)s) {}
+ 
+ 	// raising errors
+ 	void	Raise(const LexLocation *loc) const;	// raise error at specified location
diff --git a/dev-lang/nqc/files/nqc-3.1_p4-usb.patch b/dev-lang/nqc/files/nqc-3.1_p4-usb.patch
new file mode 100644
index 000000000000..d69df483195e
--- /dev/null
+++ b/dev-lang/nqc/files/nqc-3.1_p4-usb.patch
@@ -0,0 +1,31 @@
+--- Makefile.old	2005-08-24 17:46:58.000000000 -0500
++++ Makefile	2005-08-24 17:48:16.000000000 -0500
+@@ -53,7 +53,7 @@
+ 
+ 
+ # installation information
+-PREFIX?=/usr/local
++PREFIX?=/usr/
+ BINDIR?=${PREFIX}/bin
+ MANDIR?=${PREFIX}/man/man1
+ MANEXT?=1
+@@ -69,7 +69,7 @@
+ #CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
+ 
+-USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
++#USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
+ 
+ 
+ #
+@@ -86,8 +86,8 @@
+ ifneq (,$(strip $(findstring $(OSTYPE), Linux)))
+   # Linux
+ # uncomment this next line if you have the USB tower library installed
+-#  USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o
+-  CFLAGS += -I/usr/local/include/LegoUSB -Wno-deprecated
++  USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o
++  CFLAGS += -I/usr/include/LegoUSB -Wno-deprecated
+ else
+ ifneq (,$(findstring $(OSTYPE), SunOS))
+   # Solaris
diff --git a/dev-lang/nqc/metadata.xml b/dev-lang/nqc/metadata.xml
new file mode 100644
index 000000000000..66e0c3df3934
--- /dev/null
+++ b/dev-lang/nqc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>pylon@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-lang/nqc/nqc-2.5.1.ebuild b/dev-lang/nqc/nqc-2.5.1.ebuild
index 8be23a076cc8..f44e92bb764c 100644
--- a/dev-lang/nqc/nqc-2.5.1.ebuild
+++ b/dev-lang/nqc/nqc-2.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-2.5.1.ebuild,v 1.10 2005/12/14 00:59:32 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-2.5.1.ebuild,v 1.11 2006/06/18 14:06:51 pylon Exp $
 
 inherit eutils
 
diff --git a/dev-lang/nqc/nqc-3.1_p4.ebuild b/dev-lang/nqc/nqc-3.1_p4.ebuild
new file mode 100644
index 000000000000..c621c7540b3f
--- /dev/null
+++ b/dev-lang/nqc/nqc-3.1_p4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 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.1 2006/06/18 14:06:51 pylon Exp $
+
+inherit eutils
+
+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="~x86 ~amd64"
+IUSE="usb"
+
+DEPEND="virtual/libc
+	usb? ( dev-libs/legousbtower )"
+
+src_compile()
+{
+	if use usb; then
+		epatch ${FILESDIR}/${P}-usb.patch
+	fi
+	if use amd64; then
+		epatch ${FILESDIR}/${P}-amd64.patch
+	fi
+	sed -i -e 's/PREFIX?\=\/usr\/local/PREFIX?\=\/usr/' Makefile
+	emake || die
+}
+
+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() {
+	einfo "To change the default serial name for nqc (/dev/ttyS0) set"
+	einfo "the environment variable RCX_PORT or use the nqc command line"
+	einfo "option -S to specify your serial port."
+	if use usb; then
+		einfo
+		einfo "You have enabled USB support. To use usb on the"
+		einfo "command line use the -Susb command line option"
+	else
+		einfo
+		einfo "You have not enabled usb support and will be unable"
+		einfo "to use the usb IR tower. To enable USB use the usb use flag"
+	fi
+}