version bump and conflicts noted as per bug #71795

9 files changed, 127 insertions, 170 deletions

diff --git a/app-misc/glimpse/ChangeLog b/app-misc/glimpse/ChangeLog
index 1b68e1655086..411fa94842f1 100644
--- a/app-misc/glimpse/ChangeLog
+++ b/app-misc/glimpse/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-misc/glimpse
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.14 2004/10/05 13:34:51 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.15 2004/11/21 12:14:27 dragonheart Exp $
+
+*glimpse-4.18.0 (21 Nov 2004)
+
+  21 Nov 2004; Daniel Black <dragonheart@gentoo.org> +files/4.18.0-gcc3.patch,
+  -glimpse-4.15-r1.ebuild, -files/4.15-errno.patch, glimpse-4.17.4.ebuild, 
+  +glimpse-4.18.0.ebuild:
+  version bump and cleanout. app-text/agrep conflict noted as this package 
+  installs /usr/bin/agrep as well. Noted in bug #71795 by lukenshiro@ngi.it
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   glimpse-4.15-r1.ebuild:
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest
index f73b6845fe61..d4f4f5ffc834 100644
--- a/app-misc/glimpse/Manifest
+++ b/app-misc/glimpse/Manifest
@@ -1,8 +1,10 @@
 MD5 5ca3d1ea9ae3d54b8aa72e481b045d40 ChangeLog 1796
-MD5 6d3b0abd9eaa989bb2dbccf72b3ea555 glimpse-4.15-r1.ebuild 761
-MD5 e36c48e485d3d7cd1dd17409e1cbc34d glimpse-4.17.4.ebuild 1176
+MD5 2a1bf7e1fdaccfd9c9b8a85b540e5c00 glimpse-4.15-r1.ebuild 778
+MD5 3e34e4453b34db3ba511ea9ed1a32487 glimpse-4.17.4.ebuild 1194
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 3e34e4453b34db3ba511ea9ed1a32487 glimpse-4.18.0.ebuild 1194
 MD5 70ba17a37033e7a97c52c9a359f613e0 files/4.15-errno.patch 4623
-MD5 344aa4793307f2aa3574436006c0e14a files/4.17.4-gcc3.patch 2131
 MD5 42e75d4b9b3765782ef71b6519d8adc9 files/digest-glimpse-4.15-r1 64
 MD5 a1275d58e7fbf52d926178e7c4b2c16a files/digest-glimpse-4.17.4 66
+MD5 344aa4793307f2aa3574436006c0e14a files/4.17.4-gcc3.patch 2131
+MD5 fc0addd1a3501736c39e5a70ae882717 files/digest-glimpse-4.18.0 66
diff --git a/app-misc/glimpse/files/4.15-errno.patch b/app-misc/glimpse/files/4.15-errno.patch
deleted file mode 100644
index 0ca41fd989bb..000000000000
--- a/app-misc/glimpse/files/4.15-errno.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-diff -uwr glimpse-4.15.orig/agrep/agrep.c glimpse-4.15/agrep/agrep.c
---- glimpse-4.15.orig/agrep/agrep.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/agrep/agrep.c	2003-02-25 22:27:54.000000000 +0200
-@@ -11,7 +11,6 @@
- #define PRINT(s)
- 
- extern char **environ;
--extern int errno;
- int pattern_index;	/* index in argv where the pattern is */
- 
- int glimpse_isserver=0;	/* so that there is no user interaction */
-diff -uwr glimpse-4.15.orig/agrep/checksg.c glimpse-4.15/agrep/checksg.c
---- glimpse-4.15.orig/agrep/checksg.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/agrep/checksg.c	2003-02-25 22:27:54.000000000 +0200
-@@ -1,8 +1,8 @@
- /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal.  All Rights Reserved. */
-+#include <errno.h>
- #include "agrep.h"
- #include "checkfile.h"
- 
--extern int errno;
- extern CHAR Progname[MAXNAME]; 
- extern int SGREP, PAT_FILE, PAT_BUFFER, EXITONERROR, SIMPLEPATTERN,
- 	CONSTANT, D, NOUPPER, JUMP, I, LINENUM, INVERSE, WORDBOUND, WHOLELINE,
-diff -uwr glimpse-4.15.orig/agrep/compat.c glimpse-4.15/agrep/compat.c
---- glimpse-4.15.orig/agrep/compat.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/agrep/compat.c	2003-02-25 22:27:54.000000000 +0200
-@@ -1,5 +1,6 @@
- /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal.  All Rights Reserved. */
- /* test the conflicts between options */
-+#include <errno.h>
- #include <stdio.h>
- #include "agrep.h"
- 
-@@ -15,7 +16,6 @@
- extern char Progname[MAXNAME];
- extern int agrep_initialfd;
- extern int EXITONERROR;
--extern int errno;
- 
- int
- compat()
-diff -uwr glimpse-4.15.orig/agrep/maskgen.c glimpse-4.15/agrep/maskgen.c
---- glimpse-4.15.orig/agrep/maskgen.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/agrep/maskgen.c	2003-02-25 22:27:54.000000000 +0200
-@@ -1,4 +1,5 @@
- /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal.  All Rights Reserved. */
-+#include <errno.h>
- #include "agrep.h"
- 
- extern unsigned D_endpos, endposition, Init1, wildmask;
-@@ -7,7 +8,6 @@
- extern unsigned char Progname[];
- extern int agrep_initialfd;
- extern int EXITONERROR;
--extern int errno;
- 
- int
- maskgen(Pattern, D)
-diff -uwr glimpse-4.15.orig/agrep/preprocess.c glimpse-4.15/agrep/preprocess.c
---- glimpse-4.15.orig/agrep/preprocess.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/agrep/preprocess.c	2003-02-25 22:27:54.000000000 +0200
-@@ -13,6 +13,7 @@
- /* upon return, Pattern contains the pattern to be processed by maskgen  */
- /* D_pattern contains transformed D_pattern                              */
- 
-+#include <errno.h>
- #include "agrep.h"
- 
- extern int PAT_FILE, PAT_BUFFER;
-@@ -25,7 +26,6 @@
- extern int table[WORD][WORD];
- extern int agrep_initialfd;
- extern int EXITONERROR;
--extern int errno;
- 
- extern int  multifd;
- extern char *multibuf;
-diff -uwr glimpse-4.15.orig/get_index.c glimpse-4.15/get_index.c
---- glimpse-4.15.orig/get_index.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/get_index.c	2003-02-25 22:27:54.000000000 +0200
-@@ -1,4 +1,5 @@
- /* Copyright (c) 1994 Burra Gopal, Udi Manber.  All Rights Reserved. */
-+#include <errno.h>
- #include "glimpse.h"
- #include "defs.h"
- 
-@@ -14,7 +15,6 @@
- extern	unsigned int *dest_index_set;
- extern	unsigned char *dest_index_buf;
- extern	int	mask_int[32];
--extern	int	errno;
- extern	int	ByteLevelIndex;
- extern  int	RecordLevelIndex;
- extern  int	rdelim_len;
-diff -uwr glimpse-4.15.orig/index/build_in.c glimpse-4.15/index/build_in.c
---- glimpse-4.15.orig/index/build_in.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/index/build_in.c	2003-02-25 22:27:54.000000000 +0200
-@@ -23,6 +23,7 @@
-            this 12 19 \n is 9 17 12 18 19 \n an 7 12 \n example 16 \n
- -----------------------------------------------------------------------*/
- 
-+#include <errno.h>
- #include "glimpse.h"
- 
- #define debugt
-@@ -604,7 +605,6 @@
-     int ret;
-     char s[MAX_LINE_LEN], es1[MAX_LINE_LEN], es2[MAX_LINE_LEN], es3[MAX_LINE_LEN];
-     char s1[MAX_LINE_LEN];
--    extern int errno;
-     static int maxsortlinelen = 0;
-     int	i;
- 
-diff -uwr glimpse-4.15.orig/index/partition.c glimpse-4.15/index/partition.c
---- glimpse-4.15.orig/index/partition.c	2003-02-25 22:29:06.000000000 +0200
-+++ glimpse-4.15/index/partition.c	2003-02-25 22:27:54.000000000 +0200
-@@ -1,6 +1,7 @@
- /* Copyright (c) 1994 Sun Wu, Udi Manber, Burra Gopal.  All Rights Reserved. */
- /* ./glimpse/index/partition.c */
- #include "glimpse.h"
-+#include <errno.h>
- #include <sys/stat.h>
- #include <sys/time.h>
- 
-@@ -27,7 +28,6 @@
- int  files_per_partition;
- int  files_in_partition;
- int  ATLEASTONEFILE = 0;
--extern int errno;
- 
- char patbuf[MAX_PAT];
- extern unsigned char *src_index_buf;
diff --git a/app-misc/glimpse/files/4.18.0-gcc3.patch b/app-misc/glimpse/files/4.18.0-gcc3.patch
new file mode 100644
index 000000000000..80a14152f386
--- /dev/null
+++ b/app-misc/glimpse/files/4.18.0-gcc3.patch
@@ -0,0 +1,59 @@
+--- libtemplate/include/util.h.orig	2003-11-13 14:47:13.000000000 +0930
++++ libtemplate/include/util.h	2004-11-21 20:47:11.720417816 +0930
+@@ -93,8 +93,15 @@
+ 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 glimpselog _PARAMS((char *, ...));		/* Log a message */
+ void errorlog _PARAMS((char *, ...));		/* Log an error message */
+ void fatal _PARAMS((char *, ...));		/* Log error msg and exit */
+--- libtemplate/util/log.c.orig	2004-11-21 20:54:48.899650080 +0930
++++ libtemplate/util/log.c	2004-11-21 20:55:04.454285416 +0930
+@@ -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>
+--- libtemplate/util/log.c.orig	2004-11-21 20:55:39.692928328 +0930
++++ libtemplate/util/log.c	2004-11-21 20:58:29.934047744 +0930
+@@ -120,7 +120,7 @@
+  *  glimpselog() - used like printf(3).  Prints message to stdout.
+  */
+ 
+-#if defined(__STRICT_ANSI__)
++#if defined(__STRICT_ANSI__) || (defined(__GNUC__) && __GNUC__ >= 3)
+ void glimpselog(char *fmt,...)
+ {
+ 	va_list ap;
+@@ -156,7 +156,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;
+@@ -194,7 +194,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/files/digest-glimpse-4.15-r1 b/app-misc/glimpse/files/digest-glimpse-4.15-r1
deleted file mode 100644
index 0f14f6cfb013..000000000000
--- a/app-misc/glimpse/files/digest-glimpse-4.15-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5831b378a9b2fccbeb24707773537cf glimpse-4.15.tar.gz 425475
diff --git a/app-misc/glimpse/files/digest-glimpse-4.18.0 b/app-misc/glimpse/files/digest-glimpse-4.18.0
new file mode 100644
index 000000000000..ba9ffe3cee98
--- /dev/null
+++ b/app-misc/glimpse/files/digest-glimpse-4.18.0
@@ -0,0 +1 @@
+MD5 f62819ef08f679bb7b468fa3dc19edd7 glimpse-4.18.0.tar.gz 445081
diff --git a/app-misc/glimpse/glimpse-4.15-r1.ebuild b/app-misc/glimpse/glimpse-4.15-r1.ebuild
deleted file mode 100644
index af21e31ed395..000000000000
--- a/app-misc/glimpse/glimpse-4.15-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.15-r1.ebuild,v 1.9 2004/10/05 13:34:51 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="A index/query system to search a large set of files quickly"
-HOMEPAGE="http://webglimpse.net/"
-SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha amd64 ia64"
-IUSE=""
-
-RDEPEND="!dev-libs/tre
-	virtual/libc"
-DEPEND="virtual/libc"
-
-src_compile() {
-	epatch ${FILESDIR}/${PV}-errno.patch
-	make distclean || die
-	econf || die
-	make || die
-}
-
-src_install() {
-	einstall || die
-	dodir /usr/share/man/man1
-	mv ${D}/usr/share/man/*.1 ${D}/usr/share/man/man1/
-}
diff --git a/app-misc/glimpse/glimpse-4.17.4.ebuild b/app-misc/glimpse/glimpse-4.17.4.ebuild
index ec39bd2cf743..8390ee84a85d 100644
--- a/app-misc/glimpse/glimpse-4.17.4.ebuild
+++ b/app-misc/glimpse/glimpse-4.17.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.7 2004/06/28 03:38:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.8 2004/11/21 12:14:27 dragonheart Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,9 @@ KEYWORDS="x86 ppc sparc mips alpha amd64 ia64"
 IUSE="static"
 
 RDEPEND="!dev-libs/tre
+	!app-text/agrep
 	virtual/libc"
+
 DEPEND="virtual/libc"
 
 src_unpack() {
diff --git a/app-misc/glimpse/glimpse-4.18.0.ebuild b/app-misc/glimpse/glimpse-4.18.0.ebuild
new file mode 100644
index 000000000000..ba47a5339375
--- /dev/null
+++ b/app-misc/glimpse/glimpse-4.18.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.18.0.ebuild,v 1.1 2004/11/21 12:14:27 dragonheart Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="A index/query system to search a large set of files quickly"
+HOMEPAGE="http://webglimpse.net/"
+SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~amd64 ~ia64"
+IUSE="static"
+
+RDEPEND="!dev-libs/tre
+	!app-text/agrep
+	virtual/libc"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
+	sed -i \
+		-e "s:CC=.*:CC=$(tc-getCC):" \
+		-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() {
+	use static && append-ldflags -static
+
+	econf || die
+	emake -j1 OPTIMIZEFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	einstall || die
+	dodir /usr/share/man/man1
+	mv ${D}/usr/share/man/*.1 ${D}/usr/share/man/man1/
+}