Fix gcc33 compilation

6 files changed, 68 insertions, 50 deletions

diff --git a/gnome-extra/gtop/ChangeLog b/gnome-extra/gtop/ChangeLog
index a8b128139b5b..383ad969b8a1 100644
--- a/gnome-extra/gtop/ChangeLog
+++ b/gnome-extra/gtop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/gtop
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtop/ChangeLog,v 1.6 2003/02/12 06:54:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtop/ChangeLog,v 1.7 2003/09/21 12:19:48 foser Exp $
+
+  21 Sep 2003; foser <foser@gentoo.org> gtop-1.0.13-r2.ebuild :
+  Added gcc33 patch provided by Joel Hill <joelhill@earthlink.net> in #29056
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/gnome-extra/gtop/Manifest b/gnome-extra/gtop/Manifest
index d5f8ccb2589d..c2ce8ebc94b5 100644
--- a/gnome-extra/gtop/Manifest
+++ b/gnome-extra/gtop/Manifest
@@ -1,6 +1,5 @@
-MD5 cd4d3a90a677b5745e22ed90f89aa28d ChangeLog 694
-MD5 ba766e418a1e58972357b8e9b15dfb09 gtop-1.0.13-r1.ebuild 982
-MD5 28591f5e590fd60ad979e4eed9c91ac0 gtop-1.0.13-r2.ebuild 1017
+MD5 84c543fbabd3081628b2283f1cfc54ad gtop-1.0.13-r2.ebuild 1109
+MD5 7f5a00d98f2e448b863104db1dc0a9ac ChangeLog 835
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 060270f8f304c05ad883998165905dc1 files/digest-gtop-1.0.13-r1 63
 MD5 060270f8f304c05ad883998165905dc1 files/digest-gtop-1.0.13-r2 63
+MD5 da1795c7e27f92b3dcd45b8f1a3d3997 files/gtop-1-gcc33_fix.patch 2006
diff --git a/gnome-extra/gtop/files/digest-gtop-1.0.13-r1 b/gnome-extra/gtop/files/digest-gtop-1.0.13-r1
deleted file mode 100644
index 608db7d60a5b..000000000000
--- a/gnome-extra/gtop/files/digest-gtop-1.0.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4580801db3c87784b25f46a5bf1f5aba gtop-1.0.13.tar.gz 823015
diff --git a/gnome-extra/gtop/files/gtop-1-gcc33_fix.patch b/gnome-extra/gtop/files/gtop-1-gcc33_fix.patch
new file mode 100644
index 000000000000..4f532b377e8a
--- /dev/null
+++ b/gnome-extra/gtop/files/gtop-1-gcc33_fix.patch
@@ -0,0 +1,50 @@
+diff -ur gtop-1.0.13/main.c gtop-1.0.13-gentoo/main.c
+--- gtop-1.0.13/main.c	2003-09-21 12:04:02.000000000 +1200
++++ gtop-1.0.13-gentoo/main.c	2003-09-21 12:15:06.000000000 +1200
+@@ -149,7 +149,7 @@
+ 	GNOMEUIINFO_END
+ };
+ 
+-#define ADD_PROPERTIES(x,y) gtop_property_object_list = g_list_append (gtop_property_object_list, gnome_property_object_new (& ## x ## Property_Descriptor, &gtop_properties. ## y ##))
++#define ADD_PROPERTIES(x,y) gtop_property_object_list = g_list_append (gtop_property_object_list, gnome_property_object_new (& x ## Property_Descriptor, &gtop_properties. y ))
+ 
+ void
+ gtop_quit (void)
+diff -ur gtop-1.0.13/procview.c gtop-1.0.13-gentoo/procview.c
+--- gtop-1.0.13/procview.c	2003-09-21 12:04:02.000000000 +1200
++++ gtop-1.0.13-gentoo/procview.c	2003-09-21 12:26:17.000000000 +1200
+@@ -96,29 +96,29 @@
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * ((*P)-> ## NAME - (*Q)-> ## NAME); \
++	  return (*P)->d->sort_order * ((*P)-> NAME - (*Q)-> NAME); \
+ }
+ 
+ #define CMP_INT(NAME) \
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * ((*P)->p-> ## NAME - (*Q)->p-> ## NAME); \
++	  return (*P)->d->sort_order * ((*P)->p-> NAME - (*Q)->p-> NAME); \
+ }
+ 
+ #define CMP_INT2(NAME,V1,V2) \
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * ((*P)->p-> ## V1 + (*P)->p-> ## V2 - (\
+-                               (*Q)->p-> ## V1 + (*Q)->p-> ## V2)); \
++	  return (*P)->d->sort_order * ((*P)->p-> V1 + (*P)->p-> V2 - (\
++                               (*Q)->p-> V1 + (*Q)->p-> V2)); \
+ }
+ 
+ #define CMP_STR(NAME) \
+ \
+ static int cmp_ ## NAME (const ProcProcData **P, const ProcProcData **Q) \
+ { \
+-	  return (*P)->d->sort_order * strcasecmp ((*P)->p-> ## NAME, (*Q)->p-> ## NAME); \
++	  return (*P)->d->sort_order * strcasecmp ((*P)->p-> NAME, (*Q)->p-> NAME); \
+ }
+ 
+ #define SORT_ASC 1
diff --git a/gnome-extra/gtop/gtop-1.0.13-r1.ebuild b/gnome-extra/gtop/gtop-1.0.13-r1.ebuild
deleted file mode 100644
index 9fc0953eac27..000000000000
--- a/gnome-extra/gtop/gtop-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtop/gtop-1.0.13-r1.ebuild,v 1.10 2003/09/08 05:22:59 msterret Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="gtop"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND=">=gnome-base/libgtop-1.0.12-r1
-	>=gnome-base/gnome-libs-1.4
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    $myconf || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-}
-
diff --git a/gnome-extra/gtop/gtop-1.0.13-r2.ebuild b/gnome-extra/gtop/gtop-1.0.13-r2.ebuild
index 81a25de5d060..985907d9ed77 100644
--- a/gnome-extra/gtop/gtop-1.0.13-r2.ebuild
+++ b/gnome-extra/gtop/gtop-1.0.13-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtop/gtop-1.0.13-r2.ebuild,v 1.9 2003/09/08 05:22:59 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtop/gtop-1.0.13-r2.ebuild,v 1.10 2003/09/21 12:19:48 foser Exp $
+
+inherit eutils
 
 IUSE="nls"
 
@@ -17,6 +19,14 @@ DEPEND="( >=gnome-base/libgtop-1.0.12-r1
 	>=gnome-base/gnome-libs-1.4.1.7
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+
+	unpack ${A}
+
+	epatch ${FILESDIR}/${PN}-1-gcc33_fix.patch
+
+}
+
 src_compile() {
 	local myconf