From 3a60d0ccd952150522a9123b255849cdf2b5ac4c Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 15 Apr 2007 16:40:21 +0000 Subject: [PATCH] Remove old version and leave mips with broken one. Package-Manager: portage-2.1.2.3 --- app-misc/glimpse/ChangeLog | 6 +- app-misc/glimpse/Manifest | 28 +++------- app-misc/glimpse/files/4.18.0-gcc3.patch | 59 -------------------- app-misc/glimpse/files/digest-glimpse-4.18.0 | 3 - app-misc/glimpse/glimpse-4.17.4.ebuild | 18 +++--- app-misc/glimpse/glimpse-4.18.0.ebuild | 47 ---------------- 6 files changed, 21 insertions(+), 140 deletions(-) delete mode 100644 app-misc/glimpse/files/4.18.0-gcc3.patch delete mode 100644 app-misc/glimpse/files/digest-glimpse-4.18.0 delete mode 100644 app-misc/glimpse/glimpse-4.18.0.ebuild 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 -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 glimpse-4.18.5.ebuild: stable on amd64 diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest index be46f967a381..03ce21bc3323 100644 --- a/app-misc/glimpse/Manifest +++ b/app-misc/glimpse/Manifest @@ -2,29 +2,20 @@ AUX 4.17.4-gcc3.patch 2131 RMD160 794023c169ef344cd7de0838e621715b51e951e5 SHA1 MD5 344aa4793307f2aa3574436006c0e14a files/4.17.4-gcc3.patch 2131 RMD160 794023c169ef344cd7de0838e621715b51e951e5 files/4.17.4-gcc3.patch 2131 SHA256 03d9fc1e4db5b9f3d9fc7468b78d622c226db585ae737cb89088ebf0fa51ce0a files/4.17.4-gcc3.patch 2131 -AUX 4.18.0-gcc3.patch 2106 RMD160 5537943e53a479d909539ff5ef95185a47c9279f SHA1 a7f0c3014ebcb1fb2e50f2ee2de23a04af81d6b5 SHA256 12e1a3cc21dcedb3cbb440e2b92b90979a3d83f03cd381af4ef7f77813d03700 -MD5 bcfe7c55d54ccab22d6d272cef2b235d files/4.18.0-gcc3.patch 2106 -RMD160 5537943e53a479d909539ff5ef95185a47c9279f files/4.18.0-gcc3.patch 2106 -SHA256 12e1a3cc21dcedb3cbb440e2b92b90979a3d83f03cd381af4ef7f77813d03700 files/4.18.0-gcc3.patch 2106 DIST glimpse-4.17.4.tar.gz 382829 RMD160 fa22ac96bc2a1ff01efe79d5bf3847727da2cacd SHA1 4c346f16c3c49f0e7488017ca5a46d3966655517 SHA256 0224665a76770bc3f7467e43f13f18b0f563048150adbb710a0da491ce337edf -DIST glimpse-4.18.0.tar.gz 445081 RMD160 4a761a5cdaf4b5a660c4424524a8d9f358d73596 SHA1 285ea097abb798c66ef10ee1a79ccc741e10ce04 SHA256 2c014b60d1a845e182fc8f48091a823ef784a3dbed0ff9f41bf9219acbefbcb1 DIST glimpse-4.18.5.tar.gz 402754 RMD160 12693f9fd4565fc795e43e32b0d318401cdadbe2 SHA1 929bfb03bcef29be313e5ec599ee640dd8ef7e70 SHA256 ef15d43db09d59fdce6d46343ac38a3d996924dfce3287ba63c76e6be93b70e1 -EBUILD glimpse-4.17.4.ebuild 1159 RMD160 6045b242a6665ba901383d97a80467650908720e SHA1 30ffca356e8d2b198b22bf80d1d51fefe8b9bc67 SHA256 eea6ccdc0ff783a07b8a83094d293cdbf83d420d57a60d3b090b58235e7f370a -MD5 30f08858f1738a3c6f6504361bbebd47 glimpse-4.17.4.ebuild 1159 -RMD160 6045b242a6665ba901383d97a80467650908720e glimpse-4.17.4.ebuild 1159 -SHA256 eea6ccdc0ff783a07b8a83094d293cdbf83d420d57a60d3b090b58235e7f370a glimpse-4.17.4.ebuild 1159 -EBUILD glimpse-4.18.0.ebuild 1198 RMD160 100b8d5052c2b44dbadc3a95f12017288f7546ae SHA1 c5055f2663aa92e5c21b778593328724398e69e4 SHA256 77ad156cd2f529a2b3c9efc4e6f3325e0ba2e976ded6ae6b93cb8311e26ac4d4 -MD5 e72e78ed8bf4cbc9f51e726fdd70e695 glimpse-4.18.0.ebuild 1198 -RMD160 100b8d5052c2b44dbadc3a95f12017288f7546ae glimpse-4.18.0.ebuild 1198 -SHA256 77ad156cd2f529a2b3c9efc4e6f3325e0ba2e976ded6ae6b93cb8311e26ac4d4 glimpse-4.18.0.ebuild 1198 +EBUILD glimpse-4.17.4.ebuild 1129 RMD160 0e6e1f734fbb7796f43ef3fefa710e8fd24600a5 SHA1 cb57ba599e656d27e95e3678482832a9b97167ff SHA256 96baf8fcf69204e33021a5ffd8e4fed875a970b070ecab530952d85a614bbd23 +MD5 95bc18485a886bf798b25d25561ee70e glimpse-4.17.4.ebuild 1129 +RMD160 0e6e1f734fbb7796f43ef3fefa710e8fd24600a5 glimpse-4.17.4.ebuild 1129 +SHA256 96baf8fcf69204e33021a5ffd8e4fed875a970b070ecab530952d85a614bbd23 glimpse-4.17.4.ebuild 1129 EBUILD glimpse-4.18.5.ebuild 1220 RMD160 16072754eb26d8b4d1df216ec8381db529e22484 SHA1 31b6ef292cf64601f5ad9669aa544c17a0309651 SHA256 c8934dc9240dee92f5653056f5c4d1b7341f0f3518b95b8de9bfffdb9ccea63f MD5 2870d20d226c1ac0653519bbd87a1059 glimpse-4.18.5.ebuild 1220 RMD160 16072754eb26d8b4d1df216ec8381db529e22484 glimpse-4.18.5.ebuild 1220 SHA256 c8934dc9240dee92f5653056f5c4d1b7341f0f3518b95b8de9bfffdb9ccea63f glimpse-4.18.5.ebuild 1220 -MISC ChangeLog 3461 RMD160 a58b1683e694aee048b074ba5d0d4e15c5caae68 SHA1 29a53f3f6a075f389ebac1ab455a287b2849f741 SHA256 e0e051fa9d2c708fde56b73a3a9f555d3d56381e79d4378a268c068d24a534c1 -MD5 3f5bfb7667a3fd0a131b777546b74f67 ChangeLog 3461 -RMD160 a58b1683e694aee048b074ba5d0d4e15c5caae68 ChangeLog 3461 -SHA256 e0e051fa9d2c708fde56b73a3a9f555d3d56381e79d4378a268c068d24a534c1 ChangeLog 3461 +MISC ChangeLog 3638 RMD160 2307cafeac53c718e8a4d4c10f3487492d211f33 SHA1 da8e19adc6c890f91b0a8385a55602a773f16262 SHA256 4c8d13da093b0a03e2a1e525e9c0d45fa068f844a411f0b1b39f891b6e03a299 +MD5 b33908cf8b77b5a950179d300b3157f1 ChangeLog 3638 +RMD160 2307cafeac53c718e8a4d4c10f3487492d211f33 ChangeLog 3638 +SHA256 4c8d13da093b0a03e2a1e525e9c0d45fa068f844a411f0b1b39f891b6e03a299 ChangeLog 3638 MISC metadata.xml 300 RMD160 78a4001e90c80121589e17a7cb8764c857365e24 SHA1 e7ef96db2b9acdd8cbcb6b19e40bef20da6067d3 SHA256 0cf62ea28ee39872a67b83cab572152d12b7a8f50d766b16782a44d4c0560edd MD5 e7931fe03535f2b6636e6136d0d5ea70 metadata.xml 300 RMD160 78a4001e90c80121589e17a7cb8764c857365e24 metadata.xml 300 @@ -32,9 +23,6 @@ SHA256 0cf62ea28ee39872a67b83cab572152d12b7a8f50d766b16782a44d4c0560edd metadata MD5 6f9c462d9eef6b35af38a99e96af9028 files/digest-glimpse-4.17.4 244 RMD160 4907e849602df13bc6eba3b6b95ac8a750f3d645 files/digest-glimpse-4.17.4 244 SHA256 7c2760cefdbda4ab46f18ccb69e93e57fcf8138b539fd772694698cca4b9dda6 files/digest-glimpse-4.17.4 244 -MD5 1750fcbffd24cd6b7d27ce39727aeebe files/digest-glimpse-4.18.0 244 -RMD160 db5d5dc6b047dbbca258b8be985168129101681a files/digest-glimpse-4.18.0 244 -SHA256 ffc5204ec511f0c948e3eb088002a76d87a49a397ebe5c78ac6be2b7a0730daa files/digest-glimpse-4.18.0 244 MD5 7d23468562a43fca21c6004b8787ec66 files/digest-glimpse-4.18.5 244 RMD160 b34f07820d1915f85873766aa15986cefa612c6c files/digest-glimpse-4.18.5 244 SHA256 bb05ea5a37f48ec4e8ad80c55644cca7675908d22105787eb392eb67e1ff6cbe files/digest-glimpse-4.18.5 244 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 -+# 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 - #include - #include --#if defined(__STRICT_ANSI__) -+#if defined(__STRICT_ANSI__) || (defined(__GNUC__) && __GNUC__ >= 3) - #include - #else - #include ---- 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/ -} -- 2.26.2