gcc-3.x patch #42970 and clean up CFLAGS

3 files changed, 89 insertions, 15 deletions

diff --git a/app-misc/glimpse/ChangeLog b/app-misc/glimpse/ChangeLog
index bdfcf26ba2da..12287955cccc 100644
--- a/app-misc/glimpse/ChangeLog
+++ b/app-misc/glimpse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/glimpse
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.10 2004/02/17 00:00:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.11 2004/04/22 02:14:08 vapier Exp $
+
+*glimpse-4.17.4 (06 Dec 2003)
+
+  21 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc-3.x patch #42970 by Joe Khoobyar.  Also cleanup ebuild so that
+  the package uses user's CFLAGS.
 
   16 Feb 2004; Aron Griffis <agriffis@gentoo.org> glimpse-4.15-r1.ebuild,
   glimpse-4.17.4.ebuild:
@@ -9,8 +15,6 @@
   08 Jan 2004; Heinrich Wendel <lanius@gentoo.org> glimpse-4.17.4.ebuild:
   added iuse=static
 
-*glimpse-4.17.4 (06 Dec 2003)
-
   06 Dec 2003; Heinrich Wendel <lanius@gentoo.org> glimpse-4.17.4.ebuild:
   bump
 
diff --git a/app-misc/glimpse/files/4.17.4-gcc3.patch b/app-misc/glimpse/files/4.17.4-gcc3.patch
new file mode 100644
index 000000000000..6ed6c292eba6
--- /dev/null
+++ b/app-misc/glimpse/files/4.17.4-gcc3.patch
@@ -0,0 +1,58 @@
+diff -Naur glimpse-4.17.4-old/libtemplate/include/util.h glimpse-4.17.4/libtemplate/include/util.h
+--- glimpse-4.17.4-old/libtemplate/include/util.h	1999-11-03 16:40:57.000000000 -0500
++++ glimpse-4.17.4/libtemplate/include/util.h	2004-03-01 19:07:06.438665221 -0500
+@@ -93,9 +93,14 @@
+ void init_log3 _PARAMS((char *,FILE *,FILE *));	/* Initialize log routines */
+ void log_errno _PARAMS((char *));		/* Same as perror(3) */
+ void fatal_errno _PARAMS((char *));		/* Same as perror(3) & exit */
+-#ifdef __STRICT_ANSI__
++#if defined(__STRICT_ANSI__) || (defined(__GNUC__) && __GNUC__ >= 3)
+ #include <stdarg.h>
++# if defined(__GNUC__)
++#define log xlog
++void xlog _PARAMS((char *, ...));		/* Log a message */
++# else
+ void log _PARAMS((char *, ...));		/* Log a message */
++# endif
+ void errorlog _PARAMS((char *, ...));		/* Log an error message */
+ void fatal _PARAMS((char *, ...));		/* Log error msg and exit */
+ #else
+diff -Naur glimpse-4.17.4-old/libtemplate/util/log.c glimpse-4.17.4/libtemplate/util/log.c
+--- glimpse-4.17.4-old/libtemplate/util/log.c	1999-11-03 15:42:14.000000000 -0500
++++ glimpse-4.17.4/libtemplate/util/log.c	2004-03-01 19:07:13.934576926 -0500
+@@ -55,7 +55,7 @@
+ #include <errno.h>
+ #include <time.h>
+ #include <sys/file.h>
+-#if defined(__STRICT_ANSI__)
++#if defined(__STRICT_ANSI__) || (defined(__GNUC__) && __GNUC__ >= 3)
+ #include <stdarg.h>
+ #else
+ #include <varargs.h>
+@@ -119,7 +119,7 @@
+ /*
+  *  log() - used like printf(3).  Prints message to stdout.
+  */
+-#if defined(__STRICT_ANSI__)
++#if defined(__STRICT_ANSI__) || (defined(__GNUC__) && __GNUC__ >= 3)
+ void log(char *fmt,...)
+ {
+ 	va_list ap;
+@@ -155,7 +155,7 @@
+ /*
+  *  errorlog() - used like printf(3).  Prints error message to stderr.
+  */
+-#if defined(__STRICT_ANSI__)
++#if defined(__STRICT_ANSI__) || (defined(__GNUC__) && __GNUC__ >= 3)
+ void errorlog(char *fmt,...)
+ {
+ 	va_list ap;
+@@ -193,7 +193,7 @@
+ /*
+  *  fatal() - used like printf(3).  Prints error message to stderr and exits
+  */
+-#if defined(__STRICT_ANSI__)
++#if defined(__STRICT_ANSI__) || (defined(__GNUC__) && __GNUC__ >= 3)
+ void fatal(char *fmt,...)
+ {
+ 	va_list ap;
diff --git a/app-misc/glimpse/glimpse-4.17.4.ebuild b/app-misc/glimpse/glimpse-4.17.4.ebuild
index 55dc183b8323..d04bc2423470 100644
--- a/app-misc/glimpse/glimpse-4.17.4.ebuild
+++ b/app-misc/glimpse/glimpse-4.17.4.ebuild
@@ -1,27 +1,39 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.3 2004/02/17 00:00:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.4 2004/04/22 02:14:08 vapier Exp $
 
-inherit eutils
+inherit flag-o-matic eutils
 
 DESCRIPTION="A index/query system to search a large set of files quickly"
-SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 HOMEPAGE="http://webglimpse.net/"
+SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~mips ~amd64 ~sparc ~alpha ~ia64"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha amd64 ia64"
 IUSE="static"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
+	sed -i \
+		-e 's:-O3 -fomit-frame-pointer:$(OPTIMIZEFLAGS):' \
+		dynfilters/Makefile.in \
+		|| die "removing -O3 failed"
+	sed -i \
+		-e '/^CFLAGS/s:$: $(OPTIMIZEFLAGS):' \
+		{agrep,compress,index}/Makefile.in \
+		Makefile.in \
+		libtemplate/{template,util}/Makefile.in \
+		|| die "inserting OPTIMIZEFLAGS failed"
+}
+
 src_compile() {
-	econf || die
+	use static && append-ldflags -static
 
-	if [ -z "`use static`" ]
-	then
-	    emake || die
-	else
-	    emake LDFLAGS=-static || die
-	fi
+	econf || die
+	emake -j1 OPTIMIZEFLAGS="${CFLAGS}" || die
 }
 
 src_install() {