gpc-2.1 has been released, updated gpc ebuild.

10 files changed, 30 insertions, 244 deletions

diff --git a/dev-lang/gpc/ChangeLog b/dev-lang/gpc/ChangeLog
index 88faf23dbb37..c4587a2d931e 100644
--- a/dev-lang/gpc/ChangeLog
+++ b/dev-lang/gpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gpc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/ChangeLog,v 1.2 2002/04/14 09:14:32 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/ChangeLog,v 1.3 2002/05/11 08:02:36 george Exp $
+
+*gpc-2.1 (10 May 2002)
+
+  gpc-2.1 has been released. Updated ebuild and removed pre-release versions
+  (otherwise naming conflict is developed - 2.1 is seen as older version 
+  than daily builds)
 
 *gpc-20020410,  (13 Apr 2002)
 
diff --git a/dev-lang/gpc/files/digest-gpc-2.1 b/dev-lang/gpc/files/digest-gpc-2.1
new file mode 100644
index 000000000000..f785d8176df3
--- /dev/null
+++ b/dev-lang/gpc/files/digest-gpc-2.1
@@ -0,0 +1,2 @@
+MD5 2db23cb4b36f078aabdda259f64700db gpc-2.1.tar.gz 2954007
+MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz 12911721
diff --git a/dev-lang/gpc/files/digest-gpc-20020402 b/dev-lang/gpc/files/digest-gpc-20020402
deleted file mode 100644
index 340fc4e83a3f..000000000000
--- a/dev-lang/gpc/files/digest-gpc-20020402
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bdf548c589a203e8a80123a2817985e3 gpc-20020402.tar.gz 2909935
-MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz 12911721
diff --git a/dev-lang/gpc/files/digest-gpc-20020410 b/dev-lang/gpc/files/digest-gpc-20020410
deleted file mode 100644
index 91f4b7b3aaf4..000000000000
--- a/dev-lang/gpc/files/digest-gpc-20020410
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 99a127907f1b32cf0c3cc972ea00bfc5 gpc-20020410.tar.gz 2936803
-MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz 12911721
diff --git a/dev-lang/gpc/files/digest-gpc-20020410-r1 b/dev-lang/gpc/files/digest-gpc-20020410-r1
deleted file mode 100644
index 91f4b7b3aaf4..000000000000
--- a/dev-lang/gpc/files/digest-gpc-20020410-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 99a127907f1b32cf0c3cc972ea00bfc5 gpc-20020410.tar.gz 2936803
-MD5 f3ad4f32c2296fad758ed051b5ac8e28 gcc-2.95.3.tar.gz 12911721
diff --git a/dev-lang/gpc/files/gpc-20020410-r1_lang.c.patch b/dev-lang/gpc/files/gpc-20020410-r1_lang.c.patch
deleted file mode 100644
index f1dfb3abc6fc..000000000000
--- a/dev-lang/gpc/files/gpc-20020410-r1_lang.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lang.c-orig	Fri Apr 19 17:36:20 2002
-+++ lang.c	Fri Apr 19 17:38:00 2002
-@@ -105,6 +105,9 @@
-       if (BYTES_BIG_ENDIAN)
-         fputs ("--big-endian\n", stderr);
-       #endif
-+      while (fgetc (finput) != EOF) ;
-+      //previous line is suggested by Frank Heckenbach;
-+      //it seems to resolve "-pipe" issue
-       exit (1);
-     }
-   #if BYTES_BIG_ENDIAN
diff --git a/dev-lang/gpc/files/gpc-20020510_lang.h.patch b/dev-lang/gpc/files/gpc-20020510_lang.h.patch
new file mode 100644
index 000000000000..ecedf945a98d
--- /dev/null
+++ b/dev-lang/gpc/files/gpc-20020510_lang.h.patch
@@ -0,0 +1,10 @@
+--- lang.h-orig	Sat May 11 00:09:23 2002
++++ lang.h	Sat May 11 00:09:47 2002
+@@ -22,6 +22,7 @@
+   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA. */
+ 
++#define LONG64
+ #ifndef _GPC_LANG_H
+ #define _GPC_LANG_H
+ 
diff --git a/dev-lang/gpc/gpc-20020410-r1.ebuild b/dev-lang/gpc/gpc-2.1.ebuild
index 648ae0107daa..23113bc6f037 100644
--- a/dev-lang/gpc/gpc-20020410-r1.ebuild
+++ b/dev-lang/gpc/gpc-2.1.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: George Shapovalov <georges@its.caltech.edu>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20020410-r1.ebuild,v 1.2 2002/04/27 23:08:36 bangert Exp $
+# /space/gentoo/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20020410-r1.ebuild,v 1.2 2002/04/27 23:08:36 bangert Exp
 
-# Source directory; the dir where the sources can be found
-# (automatically unpacked) inside ${WORKDIR}.	Usually you can just
-# leave this as-is.
 S="${WORKDIR}/gcc-2.95.3"
 
 DESCRIPTION="Gnu Pascal Compiler"
@@ -24,6 +21,10 @@ RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack "${P}.tar.gz"
 	unpack "gcc-2.95.3.tar.gz"
+	
+	#the release is just a renamed 20020510 package
+	#thus need to reset ${P} at this point
+	P=gpc-20020510
 
 	cd "${WORKDIR}/${P}/p"
 
@@ -31,8 +32,12 @@ src_unpack() {
 	cp config-lang.in config-lang.in.orig
     sed -e "s:read:#read:" config-lang.in.orig > config-lang.in
 
-	#patch lang.c to handle "-pipe" option properly when built in parallel.
-	patch lang.c < ${FILESDIR}/${PF}_lang.c.patch
+	#this fix seems to be specific to gentoo glibc
+	#one of the patches to glibc-2.2.5-r4 was causing problems
+	#if emake and -pipe were used when building gpc
+	#looks like this patch in not in glibc-2.2.5-r5, but I'll keep this fix
+	#it does not seem to do any harm
+	patch lang.h < ${FILESDIR}/gpc-20020510_lang.h.patch
 
 	cd "${WORKDIR}/${P}"	
 	mv p "${S}/gcc/"
diff --git a/dev-lang/gpc/gpc-20020402.ebuild b/dev-lang/gpc/gpc-20020402.ebuild
deleted file mode 100644
index 72d57d4d8e82..000000000000
--- a/dev-lang/gpc/gpc-20020402.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: George Shapovalov <georges@its.caltech.edu>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20020402.ebuild,v 1.2 2002/04/27 23:08:36 bangert Exp $
-
-# Source directory; the dir where the sources can be found
-# (automatically unpacked) inside ${WORKDIR}.	Usually you can just
-# leave this as-is.
-S="${WORKDIR}/gcc-2.95.3"
-
-DESCRIPTION="Gnu Pascal Compiler"
-
-#!!!ATTENTION
-#I need to do some non standard initialization stuff here!
-#before I even specify sources!
-#(may actually delete it later)
-#GCCVER=emerge search gcc|grep Installed|grep -v Not|awk '{ print $4 }'|cut -d "-" -f 1
-#this will return 2.95.3 most likely
-
-#scrap that for now, as user may have two versions of gcc installed.
-
-SRC_URI="http://gnu-pascal.de/current/${P}.tar.gz
-		ftp://gcc.gnu.org/pub/gcc/releases/gcc-2.95.3/gcc-2.95.3.tar.gz"
-#only need gcc-core (smaller download), but user will likely have this one already
-
-HOMEPAGE="http://gnu-pascal.de"
-
-DEPEND="virtual/glibc
-		~sys-devel/gcc-2.95.3"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	unpack "gcc-2.95.3.tar.gz"
-
-	cd "${WORKDIR}/${P}/p"
-
-	cp config-lang.in config-lang.in.orig
-    sed -e "s:read:#read:" config-lang.in.orig > config-lang.in
-
-	cd "${WORKDIR}/${P}"	
-	mv p "${S}/gcc/"
-
-	cd "${S}"
-}
-
-src_compile() {
-
-	#lets reduce optimisation somewhat
-	export CFLAGS="${CFLAGS/-O?/-O2}"
-    export CXXFLAGS="${CXXFLAGS/-O?/-O2}"
-
-	#it also looks like gpc does not like -pipe
-	export CFLAGS="${CFLAGS/-pipe/}"
-	export CXXFLAGS="${CXXFLAGS/-pipe/}"
-			
-	./configure --enable-languages=pascal\
-		--host=${CHOST} --build=${CHOST} --target=${CHOST} \
-		--enable-version-specific-runtime-libs \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-	#make || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	#now for the true magic :)
-	#gpc is based on gcc and therefore rebuilds gcc backend when compiled
-	#we do not want to overwrite it, do we? (even though the binaries are supposed to be the same)
-	#so do a dirty hack:
-	#go in to the image dir and delete everything inappropriate
-	
-	cd ${D}/usr/
-
-	mv bin bin.orig
-	mkdir bin
-	mv bin.orig/gpc* bin
-	rm -rf bin.orig
-
-	#now lib
-	cd ${D}/usr/lib/
-	rm libiberty.a
-	
-	cd ${D}/usr/lib/gcc-lib/i686-pc-linux-gnu/
-	mv 2.95.3 2.95.3.orig
-	mkdir 2.95.3
-	mv 2.95.3.orig/{gpc1,gpcpp,libgpc.a,units} 2.95.3
-	mkdir 2.95.3/include
-	mv 2.95.3.orig/include/gpc-in-c.h 2.95.3/include/
-	rm -rf 2.95.3.orig
-	
-
-	# Install documentation.
-	#gpc wants to install some files and a lot of demos under /usr/doc
-	#lets move it under /usr/share/doc
-	#(Ok, this is not the most buitiful way to do it, but it seems to be the easiest here :))
-	cd ${D}/usr/doc
-	mkdir -p ${D}/usr/share/doc/
-	mv gpc/ ${D}/usr/share/doc/${P}
-#	cd ${D}/usr/share/doc 
-#	mv gpc ${P}
-	cd ${D}/usr/share/doc/${P}
-	for fn in *; do [ -f $fn ] && gzip $fn; done
-
-	cd ${D}/usr/
-	rmdir doc
-}
diff --git a/dev-lang/gpc/gpc-20020410.ebuild b/dev-lang/gpc/gpc-20020410.ebuild
deleted file mode 100644
index acc303335c15..000000000000
--- a/dev-lang/gpc/gpc-20020410.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: George Shapovalov <georges@its.caltech.edu>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gpc/gpc-20020410.ebuild,v 1.2 2002/04/27 23:08:36 bangert Exp $
-
-# Source directory; the dir where the sources can be found
-# (automatically unpacked) inside ${WORKDIR}.	Usually you can just
-# leave this as-is.
-S="${WORKDIR}/gcc-2.95.3"
-
-DESCRIPTION="Gnu Pascal Compiler"
-
-SRC_URI="http://gnu-pascal.de/current/${P}.tar.gz
-		ftp://gcc.gnu.org/pub/gcc/releases/gcc-2.95.3/gcc-2.95.3.tar.gz"
-#only need gcc-core (smaller download), but user will likely have this one already
-
-HOMEPAGE="http://gnu-pascal.de"
-
-DEPEND="virtual/glibc
-		~sys-devel/gcc-2.95.3"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	unpack "gcc-2.95.3.tar.gz"
-
-	cd "${WORKDIR}/${P}/p"
-
-	cp config-lang.in config-lang.in.orig
-    sed -e "s:read:#read:" config-lang.in.orig > config-lang.in
-
-	cd "${WORKDIR}/${P}"	
-	mv p "${S}/gcc/"
-
-	cd "${S}"
-}
-
-src_compile() {
-
-	#lets reduce optimisation somewhat
-	export CFLAGS="${CFLAGS/-O?/-O2}"
-    export CXXFLAGS="${CXXFLAGS/-O?/-O2}"
-
-	#it also looks like gpc does not like -pipe
-    export CFLAGS="${CFLAGS/-pipe/}"
-    export CXXFLAGS="${CXXFLAGS/-pipe/}"
-
-	./configure --enable-languages=pascal\
-		--host=${CHOST} --build=${CHOST} --target=${CHOST} \
-		--prefix=/usr \
-		--enable-version-specific-runtime-libs \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-	#make || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	#now for the true magic :)
-	#gpc is based on gcc and therefore rebuilds gcc backend when compiled
-	#we do not want to overwrite it, do we? (even though the binaries are supposed to be the same)
-	#so do a dirty hack:
-	#go in to the image dir and delete everything inappropriate
-	
-	cd ${D}/usr/
-
-	mv bin bin.orig
-	mkdir bin
-	mv bin.orig/gpc* bin
-	rm -rf bin.orig
-
-	#now lib
-	cd ${D}/usr/lib/
-	rm libiberty.a
-	
-	cd ${D}/usr/lib/gcc-lib/i686-pc-linux-gnu/
-	mv 2.95.3 2.95.3.orig
-	mkdir 2.95.3
-	mv 2.95.3.orig/{gpc1,gpcpp,libgpc.a,units} 2.95.3
-	mkdir 2.95.3/include
-	mv 2.95.3.orig/include/gpc-in-c.h 2.95.3/include/
-	rm -rf 2.95.3.orig
-	
-
-	# Install documentation.
-	#gpc wants to install some files and a lot of demos under /usr/doc
-	#lets move it under /usr/share/doc
-	#(Ok, this is not the most buitiful way to do it, but it seems to be the easiest here :))
-	cd ${D}/usr/doc
-	mkdir -p ${D}/usr/share/doc/
-	mv gpc/ ${D}/usr/share/doc/${P}
-	cd ${D}/usr/share/doc/${P}
-	for fn in *; do [ -f $fn ] && gzip $fn; done
-
-	cd ${D}/usr/
-	rmdir doc
-}