Remove all references to config.h so the configure script will never run again #77348.

4 files changed, 89 insertions, 23 deletions

diff --git a/sys-apps/net-tools/ChangeLog b/sys-apps/net-tools/ChangeLog
index 37387709626e..c198b578a027 100644
--- a/sys-apps/net-tools/ChangeLog
+++ b/sys-apps/net-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/net-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.47 2005/01/07 03:40:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/ChangeLog,v 1.48 2005/01/10 18:30:53 vapier Exp $
+
+  10 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/1.60-Makefile.patch, net-tools-1.60-r10.ebuild:
+  Remove all references to config.h so the configure script will never run
+  again #77348.
 
 *net-tools-1.60-r10 (06 Jan 2005)
 
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 42d9ab2ca578..c1f16d97632b 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,12 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8224cf0be07c251d08f4cbe891777624 ChangeLog 7758
+MD5 a2e3cc1e9d74acfbe8fe8d6014cd2c4d ChangeLog 7957
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 201ac629534e1b7f4c80ac33a47db967 net-tools-1.60-r10.ebuild 3521
+MD5 7cc352d215a4d78c9a4c3485fca2cd6d net-tools-1.60-r10.ebuild 3398
 MD5 34331bb3a0cf59517f6f656296d01317 net-tools-1.60-r9.ebuild 3296
 MD5 21723cf8906d7431823260022ba2bb12 files/1.60-gcc34.patch 712
 MD5 f8edd79687cbd930b5a5d749b3d8b4f1 files/1.60-man.patch 987
+MD5 c71c1508ac5e5345d14c60b5fd625226 files/1.60-Makefile.patch 1950
 MD5 51de6eabe2d6d6dc860f72c41cee636b files/net-tools-1.60-2.6-compilefix.patch 784
 MD5 e98da89f3a64d4842946223b199fd5c7 files/net-tools-1.60-cleanup-list-handling.patch 1322
 MD5 7677c2a1d1498eaba49ac1eae30d897a files/1.60-wide.patch 5137
@@ -16,9 +17,9 @@ MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r10 148
 MD5 7af2e1df001555e6624e35e2bf2c9d09 files/1.60-appletalk.patch 3210
 MD5 b1288e643ec595e07f37d7fd0d755ba5 files/digest-net-tools-1.60-r9 148
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB3gSproRuSHgZdywRAqKbAJoC6xlqGu1Fs2hu36/mVFfZpseM1ACdGMzv
-AjxkOdlDas1WPxTFtgRGZec=
-=rXlY
+iD8DBQFB4spgroRuSHgZdywRAvx2AJsGib9pv6lDU1jp3KKz49bVdMQlaQCcCGVt
+nhR8n4dR0mglaEpQPYsD+ok=
+=ZkGS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/net-tools/files/1.60-Makefile.patch b/sys-apps/net-tools/files/1.60-Makefile.patch
new file mode 100644
index 000000000000..586f54eb009d
--- /dev/null
+++ b/sys-apps/net-tools/files/1.60-Makefile.patch
@@ -0,0 +1,67 @@
+Let's clean up the Makefile ... we want to:
+ - make sure COPTS is clean for clobbering with user $CFLAGS
+ - make sure LOPTS is clean for clobbering with user $LDFLAGS
+ - remove all references to config.h since we generate it for the 
+   user and we really do NOT want the interactive configure running
+ - make sure libdir depends on version.h to fix parallel builds
+
+--- Makefile.orig	2005-01-10 13:11:00.369702792 -0500
++++ Makefile	2005-01-10 13:15:36.542718112 -0500
+@@ -88,7 +88,7 @@
+ 
+ # Compiler and Linker Options
+ # You may need to uncomment and edit these if you are using libc5 and IPv6.
+-COPTS = -D_GNU_SOURCE -O2 -Wall -g # -I/usr/inet6/include
++COPTS = 
+ ifeq ($(origin LOPTS), undefined)
+ LOPTS = 
+ endif
+@@ -113,7 +113,7 @@
+ 
+ NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a
+ 
+-CFLAGS	= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH)
++CFLAGS	= $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH) -D_GNU_SOURCE -Wall
+ LDFLAGS	= $(LOPTS) -L$(NET_LIB_PATH)
+ 
+ SUBDIRS	= man/ $(NET_LIB_PATH)/
+@@ -127,12 +127,12 @@
+ 
+ MDEFINES = COPTS='$(COPTS)' LOPTS='$(LOPTS)' TOPDIR='$(TOPDIR)'
+ 
+-%.o:		%.c config.h version.h intl.h net-features.h $<
++%.o:		%.c version.h intl.h net-features.h $<
+ 		$(CC) $(CFLAGS) -c $<
+ 
+-all:		config.h version.h subdirs $(PROGS)
++all:		version.h subdirs $(PROGS)
+ 
+-config: 	cleanconfig config.h
++config: 	cleanconfig
+ 
+ install:	all savebin installbin installdata
+ 
+@@ -159,14 +159,6 @@
+ 		@tar -cvz -f ../net-tools-$(RELEASE).tar.gz -C .. net-tools
+ 
+ 
+-config.h: 	config.in Makefile 
+-		@echo "Configuring the Linux net-tools (NET-3 Base Utilities)..." ; echo
+-		@if [ config.status -nt config.in ]; \
+-			then ./configure.sh config.status; \
+-		   else ./configure.sh config.in; \
+-		 fi
+-
+-
+ version.h:	Makefile
+ 		@echo "#define RELEASE \"net-tools $(RELEASE)\"" >version.h
+ 
+@@ -175,7 +167,7 @@
+ 
+ i18n.h:		i18ndir
+ 
+-libdir:
++libdir: version.h
+ 		@$(MAKE) -C $(NET_LIB_PATH) $(MDEFINES)
+ 
+ i18ndir:
diff --git a/sys-apps/net-tools/net-tools-1.60-r10.ebuild b/sys-apps/net-tools/net-tools-1.60-r10.ebuild
index 6e5f39ea1044..bc80f4a1a1b1 100644
--- a/sys-apps/net-tools/net-tools-1.60-r10.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r10.ebuild,v 1.1 2005/01/07 03:40:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/net-tools/net-tools-1.60-r10.ebuild,v 1.2 2005/01/10 18:30:53 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -57,12 +57,11 @@ src_unpack() {
 		append-ldflags -static
 	fi
 
+	epatch "${FILESDIR}"/${PV}-Makefile.patch
 	sed -i \
-		-e 's/^libdir:/libdir: version.h/' \
-		-e "s:-O2 -Wall -g:${CFLAGS}:" \
-		-e "/^LOPTS =/ s/\$/${CFLAGS}/" \
-		Makefile || die "sed Makefile failed"
-
+		-e "/^COPTS =/s:=:=${CFLAGS}:" \
+		-e "/^LOPTS =/s:=:=${LDFLAGS}:" \
+		Makefile || die "sed FLAGS Makefile failed"
 	sed -i \
 		-e "s:/usr/man:/usr/share/man:" \
 		man/Makefile || die "sed man/Makefile failed"
@@ -73,20 +72,14 @@ src_unpack() {
 	fi
 
 	if ! use nls ; then
-		sed -i -e 's:\(#define I18N\) 1:\1 0:' config.h || \
-			die "sed config.h failed"
-
-		sed -i -e 's:I18N=1:I18N=0:' config.make ||
-			die "sed config.make failed"
+		sed -i -e 's:\(#define I18N\) 1:\1 0:' config.h \
+			|| die "sed config.h failed"
+		sed -i -e 's:I18N=1:I18N=0:' config.make \
+			|| die "sed config.make failed"
 	fi
-
-	# sync timestamps
-	touch config.h
-	touch -r config.h config.make
 }
 
 src_compile() {
-	# configure shouldn't run anymore so bug #820 shouldn't apply...
 	tc-export CC
 	emake libdir || die "emake libdir failed"
 	emake || die "emake failed"