Remove old version and leave mips with broken one.

(Portage version: 2.1.2.3)

5 files changed, 13 insertions, 120 deletions

diff --git a/app-misc/glimpse/ChangeLog b/app-misc/glimpse/ChangeLog
index 33c1a1c9f98d..d2fa1f4d730d 100644
--- a/app-misc/glimpse/ChangeLog
+++ b/app-misc/glimpse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/glimpse
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.27 2007/02/06 12:10:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/ChangeLog,v 1.28 2007/04/15 16:40:21 drac Exp $
+
+  15 Apr 2007; Samuli Suominen <drac@gentoo.org> -files/4.18.0-gcc3.patch,
+  glimpse-4.17.4.ebuild, -glimpse-4.18.0.ebuild:
+  Remove old version and leave mips with broken one.
 
   06 Feb 2007; Simon Stelling <blubb@gentoo.org> glimpse-4.18.5.ebuild:
   stable on amd64
diff --git a/app-misc/glimpse/files/4.18.0-gcc3.patch b/app-misc/glimpse/files/4.18.0-gcc3.patch
deleted file mode 100644
index 80a14152f386..000000000000
--- a/app-misc/glimpse/files/4.18.0-gcc3.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- 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.18.0 b/app-misc/glimpse/files/digest-glimpse-4.18.0
deleted file mode 100644
index a35ab2e1e219..000000000000
--- a/app-misc/glimpse/files/digest-glimpse-4.18.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f62819ef08f679bb7b468fa3dc19edd7 glimpse-4.18.0.tar.gz 445081
-RMD160 4a761a5cdaf4b5a660c4424524a8d9f358d73596 glimpse-4.18.0.tar.gz 445081
-SHA256 2c014b60d1a845e182fc8f48091a823ef784a3dbed0ff9f41bf9219acbefbcb1 glimpse-4.18.0.tar.gz 445081
diff --git a/app-misc/glimpse/glimpse-4.17.4.ebuild b/app-misc/glimpse/glimpse-4.17.4.ebuild
index a8bc3d204705..b495e2998663 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-2006 Gentoo Foundation
+# Copyright 1999-2007 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.11 2006/12/11 07:25:12 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/glimpse/glimpse-4.17.4.ebuild,v 1.12 2007/04/15 16:40:21 drac Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 
 LICENSE="glimpse"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha amd64 ia64"
+KEYWORDS="mips"
 IUSE="static"
 
 RDEPEND="!dev-libs/tre
@@ -18,14 +18,12 @@ RDEPEND="!dev-libs/tre
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc3.patch
-	sed -i \
-		-e 's:-O3 -fomit-frame-pointer:$(OPTIMIZEFLAGS):' \
+	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):' \
+	sed -i -e '/^CFLAGS/s:$: $(OPTIMIZEFLAGS):' \
 		{agrep,compress,index}/Makefile.in \
 		Makefile.in \
 		libtemplate/{template,util}/Makefile.in \
@@ -42,5 +40,5 @@ src_compile() {
 src_install() {
 	einstall || die
 	dodir /usr/share/man/man1
-	mv ${D}/usr/share/man/*.1 ${D}/usr/share/man/man1/
+	mv "${D}"/usr/share/man/*.1 "${D}"/usr/share/man/man1/
 }
diff --git a/app-misc/glimpse/glimpse-4.18.0.ebuild b/app-misc/glimpse/glimpse-4.18.0.ebuild
deleted file mode 100644
index 0df34b0f0452..000000000000
--- a/app-misc/glimpse/glimpse-4.18.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 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.4 2006/12/11 07:25:12 beu 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="glimpse"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~amd64 ~ia64"
-IUSE="static"
-
-RDEPEND="!dev-libs/tre
-	!app-text/agrep"
-
-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/
-}