* [gentoo-commits] repo/gentoo:master commit in: app-misc/glimpse/, app-misc/glimpse/files/
@ 2017-05-07 0:26 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2017-05-07 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 553821f0e0fec7a3a99ddf9599536034593ed118
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun May 7 00:23:11 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun May 7 00:23:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553821f0
app-misc/glimpse: new EAPI=6 revision with ISC license.
Gentoo-Bug: 614676
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../glimpse/files/glimpse-4.18.6-makefile.patch | 42 ++++++++++++++++++++++
...mpse-4.18.6.ebuild => glimpse-4.18.6-r1.ebuild} | 19 +++++-----
2 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch
new file mode 100644
index 00000000000..a6f3b430d62
--- /dev/null
+++ b/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch
@@ -0,0 +1,42 @@
+--- a/Makefile.in 2006-03-10 20:42:12.000000000 -0500
++++ b/Makefile.in.new 2010-08-12 21:12:41.000000000 -0400
+@@ -52,7 +52,7 @@
+ PROGAGREP = agrep/agrep
+ OPTIMIZEFLAGS = -O2
+ INCLUDEFLAGS = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include
+-CFLAGS = $(INCLUDEFLAGS) $(DEFS)
++CFLAGS = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS)
+
+ OBJS = get_filename.o \
+ get_index.o \
+@@ -78,7 +78,7 @@
+ $(INDEXDIR)/memlook.c \
+ $(INDEXDIR)/io.c
+
+-all: build-sub @TARGET@
++all: build-sub
+ Sall: $(PROG) $(PROGSERVER) $(PROGINDEX)
+ agrep: $(PROGAGREP)
+ NOTSall: $(NOTSPROG) $(NOTSPROGSERVER)
+@@ -87,6 +87,7 @@
+ for d in $(SUBDIRS) ; do \
+ ( cd $$d; $(MAKE) ); \
+ done
++ $(MAKE) @TARGET@
+
+ # Check target
+
+@@ -105,11 +106,11 @@
+
+ install-man:
+ for d in $(MANUAL) ; do \
+- $(INSTALL_MAN) $$d $(mandir) ; \
++ $(INSTALL_MAN) $$d $(mandir)/man1/ ; \
+ done
+
+ installdirs: mkinstalldirs
+- $(srcdir)/mkinstalldirs $(bindir) $(mandir)
++ $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/
+
+ clean:
+ for d in $(SUBDIRS); do \
diff --git a/app-misc/glimpse/glimpse-4.18.6.ebuild b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
similarity index 78%
rename from app-misc/glimpse/glimpse-4.18.6.ebuild
rename to app-misc/glimpse/glimpse-4.18.6-r1.ebuild
index 240fc0ca51d..d4069ba809c 100644
--- a/app-misc/glimpse/glimpse-4.18.6.ebuild
+++ b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
@@ -1,15 +1,15 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
-inherit flag-o-matic eutils
+inherit flag-o-matic
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"
+LICENSE="ISC"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="static"
@@ -17,6 +17,8 @@ IUSE="static"
RDEPEND="!dev-libs/tre
!app-text/agrep"
+PATCHES=( "${FILESDIR}/${PN}-4.18.6-makefile.patch" )
+
src_prepare() {
sed -i \
-e "s:CC=.*:CC=$(tc-getCC):" \
@@ -38,19 +40,20 @@ src_prepare() {
{agrep,compress,index}/Makefile.in \
|| die "LDFLAGS sed failed"
- epatch "${FILESDIR}"/${PN}-4.18.5-makefile.patch
+ default
}
src_configure() {
use static && append-ldflags -static
-
- econf || die
+ default
}
src_compile() {
- emake OPTIMIZEFLAGS="${CFLAGS}" || die
+ # The OPTIMIZEFLAGS variable is our own, patched in...
+ emake OPTIMIZEFLAGS="${CFLAGS}"
}
src_install() {
- einstall || die
+ # The build system is buggy; we get sandbox violations without this.
+ emake prefix="${ED}/usr" install
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/glimpse/, app-misc/glimpse/files/
@ 2017-11-06 17:51 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2017-11-06 17:51 UTC (permalink / raw
To: gentoo-commits
commit: aacf403277b716c169a5d2952d5d70ba10b4d8b5
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 6 17:50:00 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 17:50:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aacf4032
app-misc/glimpse: remove glimpse-4.18.5.ebuild.
The glimpse-4.18.5 ebuild was EAPI=0 and was waiting to be killed. It
was not quite "unused," since it was the last version that was stable
on sparc, but these days sparc is an unstable arch. There is still an
unstable ~sparc keyword on the remaining ebuild.
Closes: https://bugs.gentoo.org/617680
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-misc/glimpse/Manifest | 1 -
.../glimpse/files/glimpse-4.18.5-makefile.patch | 42 -----------------
app-misc/glimpse/glimpse-4.18.5.ebuild | 54 ----------------------
3 files changed, 97 deletions(-)
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest
index 32d8385fa63..5087deb81d3 100644
--- a/app-misc/glimpse/Manifest
+++ b/app-misc/glimpse/Manifest
@@ -1,2 +1 @@
-DIST glimpse-4.18.5.tar.gz 402754 SHA256 ef15d43db09d59fdce6d46343ac38a3d996924dfce3287ba63c76e6be93b70e1 SHA512 74cdc44f3eff6da62456f5ff6cf13172386bf73175e05258965ca15408bb77839b7e8bfc07e16c1cd4b4ebfaf499097ee24aac5ec77427390ed7e6e9ae3343de WHIRLPOOL a99a39168848869cf88a7664528f10b110c9b5f71c5859a3f9861599cfd0a887d512ae97f4b2fa84da1415fbe0df236259f16cbdad2c1ddfc85569424f162422
DIST glimpse-4.18.6.tar.gz 812595 SHA256 0c21d27d6a3fe37dacdc66ef9194623f5a94b2f5d221dff8f187f69f629beade SHA512 884daf2057f46bbe29ad2c3e9000e18a3fcc5101abdcb5193dcf66e5da650e2528a6d2cef05ab4176243f381ba03f533cba989cad329697808d97a61f1b42d3a WHIRLPOOL 9b6ecf23ed3a15f53d9324de0a271722a3d8a6b153d146388a25a2e3878ffda537e16ec3d7a2903dd964acfc889352bf89fb28c8a99309793ceefa215b2f4ae6
diff --git a/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch
deleted file mode 100644
index 86064099adf..00000000000
--- a/app-misc/glimpse/files/glimpse-4.18.5-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.in 2006-03-10 20:42:12.000000000 -0500
-+++ Makefile.in.new 2010-08-12 21:12:41.000000000 -0400
-@@ -52,7 +52,7 @@
- PROGAGREP = agrep/agrep
- OPTIMIZEFLAGS = -O2
- INCLUDEFLAGS = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include
--CFLAGS = $(INCLUDEFLAGS) $(DEFS)
-+CFLAGS = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS)
-
- OBJS = get_filename.o \
- get_index.o \
-@@ -78,7 +78,7 @@
- $(INDEXDIR)/memlook.c \
- $(INDEXDIR)/io.c
-
--all: build-sub @TARGET@
-+all: build-sub
- Sall: $(PROG) $(PROGSERVER) $(PROGINDEX)
- agrep: $(PROGAGREP)
- NOTSall: $(NOTSPROG) $(NOTSPROGSERVER)
-@@ -87,6 +87,7 @@
- for d in $(SUBDIRS) ; do \
- ( cd $$d; $(MAKE) ); \
- done
-+ $(MAKE) @TARGET@
-
- # Check target
-
-@@ -105,11 +106,11 @@
-
- install-man:
- for d in $(MANUAL) ; do \
-- $(INSTALL_MAN) $$d $(mandir) ; \
-+ $(INSTALL_MAN) $$d $(mandir)/man1/ ; \
- done
-
- installdirs: mkinstalldirs
-- $(srcdir)/mkinstalldirs $(bindir) $(mandir)
-+ $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/
-
- clean:
- for d in $(SUBDIRS); do \
diff --git a/app-misc/glimpse/glimpse-4.18.5.ebuild b/app-misc/glimpse/glimpse-4.18.5.ebuild
deleted file mode 100644
index b91dcc1c0f1..00000000000
--- a/app-misc/glimpse/glimpse-4.18.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="alpha amd64 ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="static"
-
-RDEPEND="!dev-libs/tre
- !dev-ruby/amatch
- !app-text/agrep"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- 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 \
- libtemplate/{template,util}/Makefile.in \
- || die "inserting OPTIMIZEFLAGS failed"
- sed -i \
- -e 's:$(mandir):&/man1/:' \
- agrep/Makefile.in \
- || die "adding man1 to man install dir failed"
-
- sed -i \
- -e '/^LDFLAGS/d' \
- {agrep,compress,index}/Makefile.in \
- || die "LDFLAGS sed failed"
-
- epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
- use static && append-ldflags -static
-
- econf || die
- emake OPTIMIZEFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
- einstall || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-06 17:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-06 17:51 [gentoo-commits] repo/gentoo:master commit in: app-misc/glimpse/, app-misc/glimpse/files/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2017-05-07 0:26 Michael Orlitzky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox