cc fixes, marking alpha, removing gcc hardcode

6 files changed, 65 insertions, 9 deletions

diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog
index 1d34c70114c4..12cae17e86a8 100644
--- a/media-libs/libgd/ChangeLog
+++ b/media-libs/libgd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libgd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.25 2003/05/18 20:53:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.26 2003/05/24 19:14:02 taviso Exp $
+
+  24 May 2003; Tavis Ormandy <taviso@gentoo.org> libgd-1.8.3-r6.ebuild,
+  libgd-1.8.4.ebuild, files/gd-1.8.3-dec-alpha-compiler.diff,
+  files/gd-1.8.4-dec-alpha-compiler.diff:
+  makring alpha, also ccc fixes.
 
   18 May 2003; Martin Holzer <mholzer@gentoo.org> libgd-1.8.3-r6.ebuild,
   libgd-1.8.4.ebuild:
diff --git a/media-libs/libgd/Manifest b/media-libs/libgd/Manifest
index 77a19febfa77..eb23265fe1f8 100644
--- a/media-libs/libgd/Manifest
+++ b/media-libs/libgd/Manifest
@@ -1,8 +1,10 @@
-MD5 36edbee3898ec6dd6d88a888452937af ChangeLog 3692
-MD5 916c37c9bcd25393155bca37e0ab0dcd libgd-1.8.3-r6.ebuild 1714
-MD5 a7056a35f606dbeb4b70a7f87a5fe76d libgd-1.8.4.ebuild 1727
+MD5 295e84552ff48812564d42246e1e44d2 libgd-1.8.3-r6.ebuild 1855
 MD5 1172a98d01758a3401ae2adf82450bb5 libgd-2.0.12.ebuild 950
-MD5 d511d179becfddc2f4b475a92a26fae4 files/digest-libgd-1.8.3-r6 60
-MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4 60
+MD5 abff7bb9ac9d9260c1b2cb57719b60d5 ChangeLog 3901
+MD5 1d0839b1a8455eff75d5591220bae0dc libgd-1.8.4.ebuild 1863
+MD5 c700ef06f9532087e4f27487633179a9 files/gd-1.8.3-dec-alpha-compiler.diff 725
+MD5 c700ef06f9532087e4f27487633179a9 files/gd-1.8.4-dec-alpha-compiler.diff 725
 MD5 fb76cd227ccbc8d9e53b3c235bd54d3e files/gd-2.0.11-gif-support.patch.bz2 25710
 MD5 6b3637a270c03c1ee62cf2c6ab2964a5 files/digest-libgd-2.0.12 61
+MD5 1b0c2bb216ba3a29f024514a934ca995 files/digest-libgd-1.8.4 60
+MD5 d511d179becfddc2f4b475a92a26fae4 files/digest-libgd-1.8.3-r6 60
diff --git a/media-libs/libgd/files/gd-1.8.3-dec-alpha-compiler.diff b/media-libs/libgd/files/gd-1.8.3-dec-alpha-compiler.diff
new file mode 100644
index 000000000000..b63aeb62f709
--- /dev/null
+++ b/media-libs/libgd/files/gd-1.8.3-dec-alpha-compiler.diff
@@ -0,0 +1,21 @@
+diff -ru gd-1.8.3.orig/gd.c gd-1.8.3/gd.c
+--- gd-1.8.3.orig/gd.c	2000-06-03 20:26:12.000000000 +0100
++++ gd-1.8.3/gd.c	2003-05-24 20:04:41.000000000 +0100
+@@ -1,6 +1,3 @@
+-#ifndef _OSD_POSIX	/* _OSD_POSIX defines *alloc() in stdlib.h */
+-#include <malloc.h>
+-#endif /*_OSD_POSIX*/
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
+diff -ru gd-1.8.3.orig/gdcache.h gd-1.8.3/gdcache.h
+--- gd-1.8.3.orig/gdcache.h	2000-06-03 20:26:12.000000000 +0100
++++ gd-1.8.3/gdcache.h	2003-05-24 20:04:55.000000000 +0100
+@@ -40,7 +40,6 @@
+ /* header                                                */
+ /*********************************************************/
+ 
+-#include <malloc.h>
+ #ifndef NULL
+ #define NULL (void *)0
+ #endif
diff --git a/media-libs/libgd/files/gd-1.8.4-dec-alpha-compiler.diff b/media-libs/libgd/files/gd-1.8.4-dec-alpha-compiler.diff
new file mode 100644
index 000000000000..b63aeb62f709
--- /dev/null
+++ b/media-libs/libgd/files/gd-1.8.4-dec-alpha-compiler.diff
@@ -0,0 +1,21 @@
+diff -ru gd-1.8.3.orig/gd.c gd-1.8.3/gd.c
+--- gd-1.8.3.orig/gd.c	2000-06-03 20:26:12.000000000 +0100
++++ gd-1.8.3/gd.c	2003-05-24 20:04:41.000000000 +0100
+@@ -1,6 +1,3 @@
+-#ifndef _OSD_POSIX	/* _OSD_POSIX defines *alloc() in stdlib.h */
+-#include <malloc.h>
+-#endif /*_OSD_POSIX*/
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
+diff -ru gd-1.8.3.orig/gdcache.h gd-1.8.3/gdcache.h
+--- gd-1.8.3.orig/gdcache.h	2000-06-03 20:26:12.000000000 +0100
++++ gd-1.8.3/gdcache.h	2003-05-24 20:04:55.000000000 +0100
+@@ -40,7 +40,6 @@
+ /* header                                                */
+ /*********************************************************/
+ 
+-#include <malloc.h>
+ #ifndef NULL
+ #define NULL (void *)0
+ #endif
diff --git a/media-libs/libgd/libgd-1.8.3-r6.ebuild b/media-libs/libgd/libgd-1.8.3-r6.ebuild
index 0e900f01daf7..a9d41bed89fb 100644
--- a/media-libs/libgd/libgd-1.8.3-r6.ebuild
+++ b/media-libs/libgd/libgd-1.8.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.3-r6.ebuild,v 1.8 2003/05/18 20:53:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.3-r6.ebuild,v 1.9 2003/05/24 19:14:02 taviso Exp $
 
 IUSE="X jpeg truetype"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.boutell.com/gd/"
 
 SLOT="0"
 LICENSE="as-is | BSD"
-KEYWORDS="x86 ppc sparc hppa"
+KEYWORDS="x86 ppc sparc hppa alpha"
 
 DEPEND="media-libs/libpng
 	X? ( virtual/x11 )
@@ -26,6 +26,8 @@ src_unpack() {
 	local compopts
 	local libsopts
 
+	use alpha \
+		&& [ "${CC}" == "ccc" ] && epatch ${FILESDIR}/gd-${PV}-dec-alpha-compiler.diff
 	use X \
 		&& compopts="${compopts} -DHAVE_XPM" \
 		&& libsopts="${libsopts} -lXpm -lX11"
@@ -52,6 +54,7 @@ src_unpack() {
 	else
 		sed -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \
 		-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
+		-e "s:\(COMPILER=\)gcc:\1${CC:-gcc}:" \
 		Makefile.old > Makefile || die
 	fi
 }
diff --git a/media-libs/libgd/libgd-1.8.4.ebuild b/media-libs/libgd/libgd-1.8.4.ebuild
index dd89153416e5..d0a4ace56524 100644
--- a/media-libs/libgd/libgd-1.8.4.ebuild
+++ b/media-libs/libgd/libgd-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4.ebuild,v 1.3 2003/05/18 20:53:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4.ebuild,v 1.4 2003/05/24 19:14:02 taviso Exp $
 
 IUSE="X jpeg truetype"
 
@@ -27,6 +27,9 @@ src_unpack() {
 	local compopts
 	local libsopts
 
+	use alpha \
+		&& [ "${CC}" == "ccc" ] && epatch ${FILESDIR}/gd-${PV}-dec-alpha-compiler.diff
+
 	use X \
 		&& compopts="${compopts} -DHAVE_XPM" \
 		&& libsopts="${libsopts} -lXpm -lX11"
@@ -53,6 +56,7 @@ src_unpack() {
 	else
 		sed -e "s:^\(CFLAGS\)=.*:\1=${CFLAGS} ${compopts} :" \
 		-e "s:^\(LIBS\)=.*:\1=-lm -lgd -lz ${libsopts}:" \
+		-e "s:\(COMPILER=\)gcc:\1${CC:-gcc}:" \
 		Makefile.old > Makefile || die
 	fi