1 |
commit: 553821f0e0fec7a3a99ddf9599536034593ed118 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 7 00:23:11 2017 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 7 00:23:26 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553821f0 |
7 |
|
8 |
app-misc/glimpse: new EAPI=6 revision with ISC license. |
9 |
|
10 |
Gentoo-Bug: 614676 |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
.../glimpse/files/glimpse-4.18.6-makefile.patch | 42 ++++++++++++++++++++++ |
15 |
...mpse-4.18.6.ebuild => glimpse-4.18.6-r1.ebuild} | 19 +++++----- |
16 |
2 files changed, 53 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch b/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..a6f3b430d62 |
21 |
--- /dev/null |
22 |
+++ b/app-misc/glimpse/files/glimpse-4.18.6-makefile.patch |
23 |
@@ -0,0 +1,42 @@ |
24 |
+--- a/Makefile.in 2006-03-10 20:42:12.000000000 -0500 |
25 |
++++ b/Makefile.in.new 2010-08-12 21:12:41.000000000 -0400 |
26 |
+@@ -52,7 +52,7 @@ |
27 |
+ PROGAGREP = agrep/agrep |
28 |
+ OPTIMIZEFLAGS = -O2 |
29 |
+ INCLUDEFLAGS = -I$(INDEXDIR) -I$(AGREPDIR) -I$(TEMPLATEDIR)/include |
30 |
+-CFLAGS = $(INCLUDEFLAGS) $(DEFS) |
31 |
++CFLAGS = $(INCLUDEFLAGS) $(DEFS) $(OPTIMIZEFLAGS) |
32 |
+ |
33 |
+ OBJS = get_filename.o \ |
34 |
+ get_index.o \ |
35 |
+@@ -78,7 +78,7 @@ |
36 |
+ $(INDEXDIR)/memlook.c \ |
37 |
+ $(INDEXDIR)/io.c |
38 |
+ |
39 |
+-all: build-sub @TARGET@ |
40 |
++all: build-sub |
41 |
+ Sall: $(PROG) $(PROGSERVER) $(PROGINDEX) |
42 |
+ agrep: $(PROGAGREP) |
43 |
+ NOTSall: $(NOTSPROG) $(NOTSPROGSERVER) |
44 |
+@@ -87,6 +87,7 @@ |
45 |
+ for d in $(SUBDIRS) ; do \ |
46 |
+ ( cd $$d; $(MAKE) ); \ |
47 |
+ done |
48 |
++ $(MAKE) @TARGET@ |
49 |
+ |
50 |
+ # Check target |
51 |
+ |
52 |
+@@ -105,11 +106,11 @@ |
53 |
+ |
54 |
+ install-man: |
55 |
+ for d in $(MANUAL) ; do \ |
56 |
+- $(INSTALL_MAN) $$d $(mandir) ; \ |
57 |
++ $(INSTALL_MAN) $$d $(mandir)/man1/ ; \ |
58 |
+ done |
59 |
+ |
60 |
+ installdirs: mkinstalldirs |
61 |
+- $(srcdir)/mkinstalldirs $(bindir) $(mandir) |
62 |
++ $(srcdir)/mkinstalldirs $(bindir) $(mandir)/man1/ |
63 |
+ |
64 |
+ clean: |
65 |
+ for d in $(SUBDIRS); do \ |
66 |
|
67 |
diff --git a/app-misc/glimpse/glimpse-4.18.6.ebuild b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild |
68 |
similarity index 78% |
69 |
rename from app-misc/glimpse/glimpse-4.18.6.ebuild |
70 |
rename to app-misc/glimpse/glimpse-4.18.6-r1.ebuild |
71 |
index 240fc0ca51d..d4069ba809c 100644 |
72 |
--- a/app-misc/glimpse/glimpse-4.18.6.ebuild |
73 |
+++ b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild |
74 |
@@ -1,15 +1,15 @@ |
75 |
# Copyright 1999-2017 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
|
78 |
-EAPI="5" |
79 |
+EAPI=6 |
80 |
|
81 |
-inherit flag-o-matic eutils |
82 |
+inherit flag-o-matic |
83 |
|
84 |
DESCRIPTION="A index/query system to search a large set of files quickly" |
85 |
HOMEPAGE="http://webglimpse.net/" |
86 |
SRC_URI="http://webglimpse.net/trial/${P}.tar.gz" |
87 |
|
88 |
-LICENSE="glimpse" |
89 |
+LICENSE="ISC" |
90 |
SLOT="0" |
91 |
KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
92 |
IUSE="static" |
93 |
@@ -17,6 +17,8 @@ IUSE="static" |
94 |
RDEPEND="!dev-libs/tre |
95 |
!app-text/agrep" |
96 |
|
97 |
+PATCHES=( "${FILESDIR}/${PN}-4.18.6-makefile.patch" ) |
98 |
+ |
99 |
src_prepare() { |
100 |
sed -i \ |
101 |
-e "s:CC=.*:CC=$(tc-getCC):" \ |
102 |
@@ -38,19 +40,20 @@ src_prepare() { |
103 |
{agrep,compress,index}/Makefile.in \ |
104 |
|| die "LDFLAGS sed failed" |
105 |
|
106 |
- epatch "${FILESDIR}"/${PN}-4.18.5-makefile.patch |
107 |
+ default |
108 |
} |
109 |
|
110 |
src_configure() { |
111 |
use static && append-ldflags -static |
112 |
- |
113 |
- econf || die |
114 |
+ default |
115 |
} |
116 |
|
117 |
src_compile() { |
118 |
- emake OPTIMIZEFLAGS="${CFLAGS}" || die |
119 |
+ # The OPTIMIZEFLAGS variable is our own, patched in... |
120 |
+ emake OPTIMIZEFLAGS="${CFLAGS}" |
121 |
} |
122 |
|
123 |
src_install() { |
124 |
- einstall || die |
125 |
+ # The build system is buggy; we get sandbox violations without this. |
126 |
+ emake prefix="${ED}/usr" install |
127 |
} |