gcc-3.4 fix #48167

3 files changed, 59 insertions, 22 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 4ac086377b0b..7e597d182d79 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.28 2004/03/29 15:37:22 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.29 2004/04/19 05:47:26 vapier Exp $
+
+  19 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc-3.4 patch #48167 by George L. Emigh.
 
   29 Mar 2004; Sven Blumenstein <bazik@gentoo.org>
   files/net-tools-1.60-cleanup-list-handling.patch:
diff --git a/sys-apps/net-tools/files/1.60-gcc34.patch b/sys-apps/net-tools/files/1.60-gcc34.patch
new file mode 100644
index 000000000000..87a5a75bf6c9
--- /dev/null
+++ b/sys-apps/net-tools/files/1.60-gcc34.patch
@@ -0,0 +1,36 @@
+--- ./hostname.c.orig	2001-04-08 17:04:23.000000000 +0000
++++ ./hostname.c	2004-04-17 01:31:11.686122040 +0000
+@@ -98,6 +98,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	;
+ 	}
+ 	exit(1);
+     };
+@@ -117,6 +118,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	;
+ 	}
+ 	exit(1);
+     };
+@@ -174,6 +176,7 @@
+ 	printf("%s\n", hp->h_name);
+ 	break;
+     default:
++    ;
+     }
+ }
+ 
+--- ./lib/inet_sr.c.orig	2000-02-20 21:46:45.000000000 +0000
++++ ./lib/inet_sr.c	2004-04-17 01:31:02.388535488 +0000
+@@ -105,6 +105,7 @@
+     case 2:
+        isnet = 0; break;
+     default:
++    ;
+     }
+ 
+     /* Fill in the other fields. */
diff --git a/sys-apps/net-tools/net-tools-1.60-r8.ebuild b/sys-apps/net-tools/net-tools-1.60-r8.ebuild
index 982a930ec391..352711ef7d4a 100644
--- a/sys-apps/net-tools/net-tools-1.60-r8.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r8.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r8.ebuild,v 1.1 2004/03/29 07:34:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r8.ebuild,v 1.2 2004/04/19 05:47:26 vapier Exp $
 
-inherit eutils
+inherit flag-o-matic gcc eutils
 
 DESCRIPTION="Standard Linux networking tools"
+HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
 SRC_URI="http://www.tazenda.demon.co.uk/phil/net-tools/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-extra-1.tar.bz2"
-HOMEPAGE="http://sites.inka.de/lina/linux/NetTools/"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64 ~s390"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa mips amd64 ia64 ppc64 s390"
 IUSE="nls build static"
 
 DEPEND="nls? ( sys-devel/gettext )
 	>=sys-apps/sed-4"
 
 src_unpack() {
-
-	if [ "`use static`" ] ; then
-		CFLAGS="${CFLAGS} -static"
-		LDFLAGS="${LDFLAGS} -static"
-	fi
+	use static && append-flags -static && append-ldflags -static
 
 	PATCHDIR=${WORKDIR}/${P}-gentoo
 
@@ -32,6 +28,8 @@ src_unpack() {
 	# Compile fix for 2.6 kernels
 	epatch ${FILESDIR}/net-tools-1.60-2.6-compilefix.patch
 
+	epatch ${FILESDIR}/${PV}-gcc34.patch #48167
+
 	epatch ${FILESDIR}/net-tools-1.60-cleanup-list-handling.patch
 
 	# some redhat patches
@@ -53,16 +51,16 @@ src_unpack() {
 
 	sed -i \
 		-e "s:-O2 -Wall -g:${CFLAGS}:" \
-		-e "/^LOPTS =/ s/\$/${CFLAGS}/" Makefile ||
-			die "sed Makefile failed"
+		-e "/^LOPTS =/ s/\$/${CFLAGS}/" Makefile \
+		|| die "sed Makefile failed"
 
-	sed -i -e "s:/usr/man:/usr/share/man:" man/Makefile || \
-		die "sed man/Makefile failed"
+	sed -i -e "s:/usr/man:/usr/share/man:" man/Makefile \
+		|| die "sed man/Makefile failed"
 
 	cp -f ${PATCHDIR}/ether-wake.c ${S}
 	cp -f ${PATCHDIR}/ether-wake.8 ${S}/man/en_US
 
-	if [ -z "`use nls`" ] ; then
+	if ! use nls ; then
 		sed -i -e 's:\(#define I18N\) 1:\1 0:' config.h || \
 			die "sed config.h failed"
 
@@ -77,21 +75,21 @@ src_compile() {
 	# Changing "emake" to "make" closes half of bug #820;
 	# configure is run from *inside* the Makefile, sometimes
 	# breaking parallel makes (if ./configure doesn't finish first)
-	make || die
+	emake -j1 || die
 
-	if [ "`use nls`" ] ; then
+	if use nls ; then
 		cd po
 		make || die
+		cd ..
 	fi
 
-	cd ${S}
-	gcc ${CFLAGS} -o ether-wake ether-wake.c || die
+	$(gcc-getCC) ${CFLAGS} -o ether-wake ether-wake.c || die "ether-wake failed to build"
 }
 
 src_install() {
 	make BASEDIR=${D} install || die
 
-	dosbin ether-wake
+	dosbin ether-wake || die
 	mv ${D}/bin/* ${D}/sbin
 	for i in hostname domainname netstat dnsdomainname ypdomainname nisdomainname
 	do
@@ -100,7 +98,7 @@ src_install() {
 	dodir /usr/bin
 	dosym /bin/hostname /usr/bin/hostname
 
-	if [ -z "`use build`" ]
+	if ! use build
 	then
 		dodoc COPYING README README.ipv6 TODO
 	else