[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/, sys-apps/the_silver_searcher/files/

2024-06-16 Thread Sam James
commit: 4aaecc02ba23581ee2fdb50d3f8b9d2480da5f6e
Author: Eli Schwartz  gmail  com>
AuthorDate: Sun Jun 16 19:41:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 17 01:46:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aaecc02

sys-apps/the_silver_searcher: fix compatibility with bash-completion 2.12

Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../0001-bash-completion-port-to-v2-API.patch  | 58 
 .../the_silver_searcher-2.2.0_p20201217-r3.ebuild  | 63 ++
 2 files changed, 121 insertions(+)

diff --git 
a/sys-apps/the_silver_searcher/files/0001-bash-completion-port-to-v2-API.patch 
b/sys-apps/the_silver_searcher/files/0001-bash-completion-port-to-v2-API.patch
new file mode 100644
index ..151e8a1274b4
--- /dev/null
+++ 
b/sys-apps/the_silver_searcher/files/0001-bash-completion-port-to-v2-API.patch
@@ -0,0 +1,58 @@
+From eca81ee573f30f8eb790d33db1c86d2970f7fc4a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz 
+Date: Sun, 16 Jun 2024 15:35:30 -0400
+Subject: [PATCH] bash-completion: port to v2 API
+
+Fixes: #1537
+Signed-off-by: Eli Schwartz 
+---
+ ag.bashcomp.sh | 16 +++-
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/ag.bashcomp.sh b/ag.bashcomp.sh
+index 5637ce4..e03f580 100644
+--- a/ag.bashcomp.sh
 b/ag.bashcomp.sh
+@@ -1,11 +1,9 @@
+ _ag() {
+-  local lngopt shtopt split=false
+-  local cur prev
++  local cur prev words cword split
++  local lngopt shtopt
+ 
+   COMPREPLY=()
+-  cur=$(_get_cword "=")
+-  prev="${COMP_WORDS[COMP_CWORD-1]}"
+-
++  _init_completion -s || return 0
+   _expand || return 0
+ 
+   lngopt='
+@@ -96,12 +94,10 @@ _ag() {
+   types=$(ag --list-file-types |grep -- '--')
+ 
+   # these options require an argument
+-  if [[ "${prev}" == -[ABCGgm] ]] ; then
++  if [[ "${prev}" = -[ABCGgm] ]] ; then
+ return 0
+   fi
+ 
+-  _split_longopt && split=true
+-
+   case "${prev}" in
+ --ignore-dir) # directory completion
+   _filedir -d
+@@ -117,7 +113,9 @@ _ag() {
+   return 0;;
+   esac
+ 
+-  $split && return 0
++  if [[ ${split} = true ]]; then
++  return 0
++  fi
+ 
+   case "${cur}" in
+ -*)
+-- 
+2.44.2
+

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild
new file mode 100644
index ..93ac9f8cc8f8
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 flag-o-matic vcs-snapshot
+
+COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux ~x64-macos"
+IUSE="lzma test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? (
+   dev-util/cram
+   dev-vcs/git
+   )"
+
+DOCS="README.md"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.1.0-lzma.patch
+   "${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch
+   # https://github.com/ggreer/the_silver_searcher/issues/1537
+   # broken with >=app-shells/bash-completion-2.12
+   "${FILESDIR}"/0001-bash-completion-port-to-v2-API.patch
+)
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   # false positive TEXTRELs on riscv
+   # https://bugs.gentoo.org/797355
+   append-flags -fPIC
+
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/, sys-apps/the_silver_searcher/files/

2024-04-05 Thread Marek Szuba
commit: b448e9d8d8a7fa8333d04f16429862b99f61e912
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr  5 22:26:19 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr  5 22:26:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b448e9d8

sys-apps/the_silver_searcher: fix the no-LFS64 patch

According to the documentation glibc still defaults to 32-bit file
offsets on 32-bit arches, therefore tell autoconf to check if it needs
to explicitly set this to 64.

Straight-to-stable revbump on the off chance someone has emerged the
ebuild using the previous version of the patch on a 32-bit system. And
that's enough of messing with this without the usual ~arch revisions.

Signed-off-by: Marek Szuba  gentoo.org>

 .../files/the_silver_searcher-2.2.0-no_lfs64.patch| 11 +++
 ...1.ebuild => the_silver_searcher-2.2.0_p20201217-r2.ebuild} |  0
 2 files changed, 11 insertions(+)

diff --git 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
index 62925a7fb1f0..7468a47a0568 100644
--- 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
+++ 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
@@ -1,6 +1,17 @@
 LFS64 interfaces are now generally considered deprecated, and are no longer
 available in MUSL since version 1.2.4.
 
+--- a/configure.ac
 b/configure.ac
+@@ -12,6 +12,8 @@
+ AC_PREREQ([2.59])
+ AC_PROG_GREP
+ 
++AC_SYS_LARGEFILE
++
+ m4_ifdef(
+ [AM_SILENT_RULES],
+ [AM_SILENT_RULES([yes])])
 --- a/src/zfile.c
 +++ b/src/zfile.c
 @@ -4,7 +4,7 @@

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild
similarity index 100%
rename from 
sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
rename to 
sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r2.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/files/, sys-apps/the_silver_searcher/

2024-04-03 Thread Marek Szuba
commit: 9f74a7f6ec5679c8361e93ee8c4dc92dc140
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr  3 17:39:38 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr  3 17:41:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f74a7f6

sys-apps/the_silver_searcher: phase out LFS64 interfaces

Closes: https://bugs.gentoo.org/908582
Signed-off-by: Marek Szuba  gentoo.org>

 .../files/the_silver_searcher-2.2.0-no_lfs64.patch | 41 ++
 .../the_silver_searcher-2.2.0_p20201217-r1.ebuild  |  3 +-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
new file mode 100644
index ..62925a7fb1f0
--- /dev/null
+++ 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch
@@ -0,0 +1,41 @@
+LFS64 interfaces are now generally considered deprecated, and are no longer
+available in MUSL since version 1.2.4.
+
+--- a/src/zfile.c
 b/src/zfile.c
+@@ -4,7 +4,7 @@
+ #include 
+ 
+ #ifdef __CYGWIN__
+-typedef _off64_t off64_t;
++typedef _off64_t off_t;
+ #endif
+ 
+ #include 
+@@ -331,14 +331,14 @@
+ }
+ 
+ static int
+-zfile_seek(void *cookie_, off64_t *offset_, int whence) {
++zfile_seek(void *cookie_, off_t *offset_, int whence) {
+ struct zfile *cookie = cookie_;
+-off64_t new_offset = 0, offset = *offset_;
++off_t new_offset = 0, offset = *offset_;
+ 
+ if (whence == SEEK_SET) {
+ new_offset = offset;
+ } else if (whence == SEEK_CUR) {
+-new_offset = (off64_t)cookie->logic_offset + offset;
++new_offset = (off_t)cookie->logic_offset + offset;
+ } else {
+ /* SEEK_END not ok */
+ return -1;
+@@ -348,7 +348,7 @@
+ return -1;
+ 
+ /* Backward seeks to anywhere but 0 are not ok */
+-if (new_offset < (off64_t)cookie->logic_offset && new_offset != 0) {
++if (new_offset < (off_t)cookie->logic_offset && new_offset != 0) {
+ return -1;
+ }
+ 

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index 68675d7bc043..1b9f8c8a60bb 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ DOCS="README.md"
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-lzma.patch
+   "${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/files/, sys-apps/the_silver_searcher/

2024-04-03 Thread Marek Szuba
commit: 9759e6bec90d5b6ea839e3e4c0bf2a20bc595896
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr  3 17:40:43 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr  3 17:41:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9759e6be

sys-apps/the_silver_searcher: drop 2.2.0

Signed-off-by: Marek Szuba  gentoo.org>

 sys-apps/the_silver_searcher/Manifest  |   1 -
 .../files/the_silver_searcher-fno-common.patch | 164 -
 .../the_silver_searcher-2.2.0.ebuild   |  54 ---
 3 files changed, 219 deletions(-)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index d0b5e63ea97a..0623405bb37c 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,2 +1 @@
-DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B 
ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814
 SHA512 
b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B 
eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa
 SHA512 
96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126

diff --git 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch
deleted file mode 100644
index 49861018e3ad..
--- a/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch
+++ /dev/null
@@ -1,164 +0,0 @@
 a/src/search.h
-+++ b/src/search.h
-@@ -31,9 +31,9 @@
- #include "uthash.h"
- #include "util.h"
- 
--size_t alpha_skip_lookup[256];
--size_t *find_skip_lookup;
--uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
-+extern size_t alpha_skip_lookup[256];
-+extern size_t *find_skip_lookup;
-+extern uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
- 
- struct work_queue_t {
- char *path;
-@@ -41,12 +41,12 @@
- };
- typedef struct work_queue_t work_queue_t;
- 
--work_queue_t *work_queue;
--work_queue_t *work_queue_tail;
--int done_adding_files;
--pthread_cond_t files_ready;
--pthread_mutex_t stats_mtx;
--pthread_mutex_t work_queue_mtx;
-+extern work_queue_t *work_queue;
-+extern work_queue_t *work_queue_tail;
-+extern int done_adding_files;
-+extern pthread_cond_t files_ready;
-+extern pthread_mutex_t stats_mtx;
-+extern pthread_mutex_t work_queue_mtx;
- 
- 
- /* For symlink loop detection */
-@@ -64,7 +64,7 @@
- UT_hash_handle hh;
- } symdir_t;
- 
--symdir_t *symhash;
-+extern symdir_t *symhash;
- 
- void search_buf(const char *buf, const size_t buf_len,
- const char *dir_full_path);
 a/src/search.c
-+++ b/src/search.c
-@@ -2,6 +2,19 @@
- #include "print.h"
- #include "scandir.h"
- 
-+ size_t alpha_skip_lookup[256];
-+ size_t *find_skip_lookup;
-+ uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
-+
-+ work_queue_t *work_queue;
-+ work_queue_t *work_queue_tail;
-+ int done_adding_files;
-+ pthread_cond_t files_ready;
-+ pthread_mutex_t stats_mtx;
-+ pthread_mutex_t work_queue_mtx;
-+
-+ symdir_t *symhash;
-+
- void search_buf(const char *buf, const size_t buf_len,
- const char *dir_full_path) {
- int binary = -1; /* 1 = yes, 0 = no, -1 = don't know */
 a/src/log.c
-+++ b/src/log.c
-@@ -4,6 +4,8 @@
- #include "log.h"
- #include "util.h"
- 
-+pthread_mutex_t print_mtx;
-+
- static enum log_level log_threshold = LOG_LEVEL_ERR;
- 
- void set_log_level(enum log_level threshold) {
 a/src/log.h
-+++ b/src/log.h
-@@ -9,7 +9,7 @@
- #include 
- #endif
- 
--pthread_mutex_t print_mtx;
-+extern pthread_mutex_t print_mtx;
- 
- enum log_level {
- LOG_LEVEL_DEBUG = 10,
 a/src/options.h
-+++ b/src/options.h
-@@ -91,7 +91,7 @@
- } cli_options;
- 
- /* global options. parse_options gives it sane values, everything else reads 
from it */
--cli_options opts;
-+extern cli_options opts;
- 
- typedef struct option option_t;
- 
 a/src/options.c
-+++ b/src/options.c
-@@ -16,6 +16,8 @@
- #include "print.h"
- #include "util.h"
- 
-+cli_options opts;
-+
- const char *color_line_number = "\033[1;33m"; /* bold yellow */
- const char *color_match = "\033[30;43m";  /* black with yellow background 
*/
- const char *color_path = "\033[1;32m";/* bold green */
 a/src/util.h
-+++ b/src/util.h
-@@ -12,7 +12,7 @@
- #include "log.h"
- #include "options.h"
- 
--FILE *out_fd;
-+extern FILE *out_fd;
- 
- #ifndef TRUE
- #define TRUE 1
-@@ -51,7 +51,7 @@
- } ag_stats;
- 
- 
--ag_stats stats;
-+extern ag_stats stats;
- 
- /* Union to translate between chars and words without violating strict 
aliasing */
- typedef union {
 a/src/util.c
-+++ b/src/util.c
-@

[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2024-04-03 Thread Marek Szuba
commit: f37fb528c9ff702957f64245b3bcf74bab6a3721
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Apr  3 17:08:54 2024 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Apr  3 17:08:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37fb528

sys-apps/the_silver_searcher: add myself as a maintainer

Signed-off-by: Marek Szuba  gentoo.org>

 sys-apps/the_silver_searcher/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-apps/the_silver_searcher/metadata.xml 
b/sys-apps/the_silver_searcher/metadata.xml
index 011f1f15ffb5..0f71fdbbec56 100644
--- a/sys-apps/the_silver_searcher/metadata.xml
+++ b/sys-apps/the_silver_searcher/metadata.xml
@@ -1,8 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-  
-  
-ggreer/the_silver_searcher
-  
+   
+   mare...@gentoo.org
+   Marek Szuba
+   
+   
+   ggreer/the_silver_searcher
+   
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2023-12-15 Thread Arthur Zamarin
commit: fcb9d3900b9bb8f1830cae88b1befb993e26e9ab
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 16 07:05:26 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 16 07:05:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb9d390

sys-apps/the_silver_searcher: Stabilize 2.2.0_p20201217-r1 x86, #920081

Signed-off-by: Arthur Zamarin  gentoo.org>

 .../the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index 99e20081d876..68675d7bc043 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv x86 
~amd64-linux ~x64-macos"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2023-12-15 Thread Sam James
commit: c4e6fb07192fd5e3b986e9688cc8af8f2c17aeee
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 16 06:59:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 16 06:59:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4e6fb07

sys-apps/the_silver_searcher: Stabilize 2.2.0_p20201217-r1 amd64, #920081

Signed-off-by: Sam James  gentoo.org>

 .../the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index b1f5f48499dd..99e20081d876 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux ~x64-macos"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2023-07-08 Thread Benda XU
commit: bf5062d5c5ff8c3c42c8630b4c6b36101d1af2e9
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Jul  9 04:56:11 2023 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Jul  9 05:05:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5062d5

sys-apps/the_silver_searcher: keyword 2.2.0_p20201217-r1 for ~x64-macos

Signed-off-by: Benda Xu  gentoo.org>

 .../the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index eb85f58a5cd2..b1f5f48499dd 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux ~x64-macos"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2023-05-03 Thread WANG Xuerui
commit: 3ea8e3929014a5a85bd93d2ec9e4233a66ec0e94
Author: Yongxiang Liang  gmail  com>
AuthorDate: Tue May  2 00:06:27 2023 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed May  3 16:47:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea8e392

sys-apps/the_silver_searcher: keyword 2.2.0_p20201217-r1 for ~loong

Signed-off-by: Yongxiang Liang  gmail.com>
Signed-off-by: WANG Xuerui  gentoo.org>

 .../the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index fc7e2d49571b..eb85f58a5cd2 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2021-07-03 Thread Sam Jorna
commit: f9577541a2ffa66f62ad5d734bc228d11825effc
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Jul  4 02:58:34 2021 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Jul  4 02:58:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9577541

sys-apps/the_silver_searcher: append -fPIC, #797355

Closes: https://bugs.gentoo.org/797355
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam Jorna  gentoo.org>

 ...0201217.ebuild => the_silver_searcher-2.2.0_p20201217-r1.ebuild} | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
similarity index 87%
rename from 
sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
rename to 
sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index d91cc784c82..fc7e2d49571 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools bash-completion-r1 vcs-snapshot
+inherit autotools bash-completion-r1 flag-o-matic vcs-snapshot
 
 COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
 
@@ -40,6 +40,10 @@ src_prepare() {
 }
 
 src_configure() {
+   # false positive TEXTRELs on riscv
+   # https://bugs.gentoo.org/797355
+   append-flags -fPIC
+
econf \
$(use_enable lzma) \
$(use_enable zlib)



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2021-05-31 Thread Marek Szuba
commit: 2e44d515fc71a5850537d4d4779e9178b0d310cb
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon May 31 21:41:09 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon May 31 21:49:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e44d515

sys-apps/the_silver_searcher: keyword for riscv

Builds, tests and installs fine.

Checked on a BeagleV Starlight.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
index 1094502e22e..d91cc784c82 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2021-04-17 Thread Sam Jorna
commit: 96f4a09c6221ded270d8206acd156407847b0ce4
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Apr 18 01:19:42 2021 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Apr 18 01:20:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f4a09c

sys-apps/the_silver_searcher: bump to 2.2.0_p20201217

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-2.2.0_p20201217.ebuild | 55 ++
 2 files changed, 56 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index d98c5b32ad2..d0b5e63ea97 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1 +1,2 @@
 DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B 
ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814
 SHA512 
b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
+DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B 
eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa
 SHA512 
96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126

diff --git 
a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
new file mode 100644
index 000..1094502e22e
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1 vcs-snapshot
+
+COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="lzma test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? (
+   dev-util/cram
+   dev-vcs/git
+   )"
+
+DOCS="README.md"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.1.0-lzma.patch
+)
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2021-04-16 Thread Sam Jorna
commit: ce7494f5ee070276b56622d45e00befb043ca1e9
Author: Sam Jorna  gentoo  org>
AuthorDate: Sat Apr 17 02:03:25 2021 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sat Apr 17 02:03:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7494f5

sys-apps/the_silver_searcher: clean old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/Manifest  |  2 -
 .../the_silver_searcher-2.0.0.ebuild   | 51 
 .../the_silver_searcher-2.1.0.ebuild   | 54 --
 3 files changed, 107 deletions(-)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index 1ae01b0415d..d98c5b32ad2 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,3 +1 @@
-DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 
1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd
 SHA512 
2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
-DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 
0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944
 SHA512 
9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B 
ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814
 SHA512 
b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
deleted file mode 100644
index 6e62890da07..000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
-IUSE="lzma test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libpcre
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   test? (
-   dev-util/cram
-   dev-vcs/git
-   )"
-
-DOCS="README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
-
-src_prepare() {
-   sed '/^dist_bashcomp/d' -i Makefile.am || die
-
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable lzma) \
-   $(use_enable zlib)
-}
-
-src_test() {
-   cram -v tests/*.t || die "tests failed"
-}
-
-src_install() {
-   default
-   newbashcomp ag.bashcomp.sh ag
-}

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
deleted file mode 100644
index 9643faccd4a..000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="lzma test zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/libpcre
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   test? (
-   dev-util/cram
-   dev-vcs/git
-   )"
-
-DOCS="README.md"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.1.0-lzma.patch
-   "${FILESDIR}"/${PN}-fno-common.patch
-)
-
-src_prepare() {
-   sed '/^dist_bashcomp/d' -i Makefile.am || die
-
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable lzma) \
-   $(use_enable zlib)
-}
-
-src_test() {
-   cram -v tests/*.t || die "tests failed"
-}
-
-src_install() {
-   default
-   newbashcomp ag.bashcomp.sh ag
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2021-04-11 Thread Sam Jorna
commit: 411da9f338c1d423277f10f506b100e880c83924
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Apr 11 13:54:11 2021 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Apr 11 13:54:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411da9f3

sys-apps/the_silver_searcher-2.2.0: amd64 stable

Closes: https://bugs.gentoo.org/782052
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
index 825ce75f20f..5b4b3e89acd 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2021-04-11 Thread Sam Jorna
commit: fc46854d66df8a3a843ca7fd77051b9c41929a57
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Apr 11 13:52:09 2021 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Apr 11 13:52:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc46854d

sys-apps/the_silver_searcher-2.2.0: x86 stable

Gentoo-bug: https://bugs.gentoo.org/782052
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
index 9643faccd4a..825ce75f20f 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/, sys-apps/the_silver_searcher/files/

2020-07-12 Thread Sam Jorna
commit: 4174b1f2bba16be562beadb8926b26fce40a41d1
Author: Sam Jorna  gentoo  org>
AuthorDate: Sun Jul 12 10:19:27 2020 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Sun Jul 12 10:23:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4174b1f2

sys-apps/the_silver_searcher: fix fno-common

Closes: https://bugs.gentoo.org/708532
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam Jorna  gentoo.org>

 .../files/the_silver_searcher-fno-common.patch | 164 +
 .../the_silver_searcher-2.0.0.ebuild   |   4 +-
 .../the_silver_searcher-2.1.0.ebuild   |   7 +-
 .../the_silver_searcher-2.2.0.ebuild   |   7 +-
 4 files changed, 177 insertions(+), 5 deletions(-)

diff --git 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch
new file mode 100644
index 000..49861018e3a
--- /dev/null
+++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch
@@ -0,0 +1,164 @@
+--- a/src/search.h
 b/src/search.h
+@@ -31,9 +31,9 @@
+ #include "uthash.h"
+ #include "util.h"
+ 
+-size_t alpha_skip_lookup[256];
+-size_t *find_skip_lookup;
+-uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
++extern size_t alpha_skip_lookup[256];
++extern size_t *find_skip_lookup;
++extern uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
+ 
+ struct work_queue_t {
+ char *path;
+@@ -41,12 +41,12 @@
+ };
+ typedef struct work_queue_t work_queue_t;
+ 
+-work_queue_t *work_queue;
+-work_queue_t *work_queue_tail;
+-int done_adding_files;
+-pthread_cond_t files_ready;
+-pthread_mutex_t stats_mtx;
+-pthread_mutex_t work_queue_mtx;
++extern work_queue_t *work_queue;
++extern work_queue_t *work_queue_tail;
++extern int done_adding_files;
++extern pthread_cond_t files_ready;
++extern pthread_mutex_t stats_mtx;
++extern pthread_mutex_t work_queue_mtx;
+ 
+ 
+ /* For symlink loop detection */
+@@ -64,7 +64,7 @@
+ UT_hash_handle hh;
+ } symdir_t;
+ 
+-symdir_t *symhash;
++extern symdir_t *symhash;
+ 
+ void search_buf(const char *buf, const size_t buf_len,
+ const char *dir_full_path);
+--- a/src/search.c
 b/src/search.c
+@@ -2,6 +2,19 @@
+ #include "print.h"
+ #include "scandir.h"
+ 
++ size_t alpha_skip_lookup[256];
++ size_t *find_skip_lookup;
++ uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
++
++ work_queue_t *work_queue;
++ work_queue_t *work_queue_tail;
++ int done_adding_files;
++ pthread_cond_t files_ready;
++ pthread_mutex_t stats_mtx;
++ pthread_mutex_t work_queue_mtx;
++
++ symdir_t *symhash;
++
+ void search_buf(const char *buf, const size_t buf_len,
+ const char *dir_full_path) {
+ int binary = -1; /* 1 = yes, 0 = no, -1 = don't know */
+--- a/src/log.c
 b/src/log.c
+@@ -4,6 +4,8 @@
+ #include "log.h"
+ #include "util.h"
+ 
++pthread_mutex_t print_mtx;
++
+ static enum log_level log_threshold = LOG_LEVEL_ERR;
+ 
+ void set_log_level(enum log_level threshold) {
+--- a/src/log.h
 b/src/log.h
+@@ -9,7 +9,7 @@
+ #include 
+ #endif
+ 
+-pthread_mutex_t print_mtx;
++extern pthread_mutex_t print_mtx;
+ 
+ enum log_level {
+ LOG_LEVEL_DEBUG = 10,
+--- a/src/options.h
 b/src/options.h
+@@ -91,7 +91,7 @@
+ } cli_options;
+ 
+ /* global options. parse_options gives it sane values, everything else reads 
from it */
+-cli_options opts;
++extern cli_options opts;
+ 
+ typedef struct option option_t;
+ 
+--- a/src/options.c
 b/src/options.c
+@@ -16,6 +16,8 @@
+ #include "print.h"
+ #include "util.h"
+ 
++cli_options opts;
++
+ const char *color_line_number = "\033[1;33m"; /* bold yellow */
+ const char *color_match = "\033[30;43m";  /* black with yellow background 
*/
+ const char *color_path = "\033[1;32m";/* bold green */
+--- a/src/util.h
 b/src/util.h
+@@ -12,7 +12,7 @@
+ #include "log.h"
+ #include "options.h"
+ 
+-FILE *out_fd;
++extern FILE *out_fd;
+ 
+ #ifndef TRUE
+ #define TRUE 1
+@@ -51,7 +51,7 @@
+ } ag_stats;
+ 
+ 
+-ag_stats stats;
++extern ag_stats stats;
+ 
+ /* Union to translate between chars and words without violating strict 
aliasing */
+ typedef union {
+--- a/src/util.c
 b/src/util.c
+@@ -15,6 +15,10 @@
+ #define getc_unlocked(x) getc(x)
+ #endif
+ 
++FILE *out_fd;
++
++ag_stats stats;
++
+ #define CHECK_AND_RETURN(ptr) \
+ if (ptr == NULL) {\
+ die("Memory allocation failed."); \
+--- a/src/ignore.c
 b/src/ignore.c
+@@ -22,6 +22,8 @@
+ 
+ /* TODO: build a huge-ass list of files we want to ignore by default (build 
cache stuff, pyc files, etc) */
+ 
++ignores *root_ignores;
++
+ const char *evil_hardcoded_ignore_files[] = {
+ ".",
+ "..",
+--- a/src/ignore.h
 b/src/ignore.h
+@@ -29,7 +29,7 @@
+ };
+ typedef struct ignores ignores;
+ 
+-ignores *root_ignores;
++extern ignores *root_ignores;
+ 
+ extern const char *evil_hardcoded_ignore_files[];
+ ex

[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2019-12-16 Thread Sam Jorna
commit: 158e5b8b64f412e86423258bb919502d597bd7da
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Dec 16 09:28:48 2019 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Dec 16 09:29:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=158e5b8b

sys-apps/the_silver_searcher: add missing test dep

Bug: https://bugs.gentoo.org/626548
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
index 21b02d12de3..d993a7bb70b 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
@@ -19,7 +19,10 @@ RDEPEND="dev-libs/libpcre
zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
virtual/pkgconfig
-   test? ( dev-util/cram )"
+   test? (
+   dev-util/cram
+   dev-vcs/git
+   )"
 
 DOCS="README.md"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2019-12-16 Thread Sam Jorna
commit: 8658fd3eaa341cf4e5f7f7cfc73cc545ce42debf
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Dec 16 08:15:10 2019 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Dec 16 08:47:46 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8658fd3e

sys-apps/the_silver_searcher: add self to metadata

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/metadata.xml 
b/sys-apps/the_silver_searcher/metadata.xml
index aeaf98a5fa6..8395d00a1c0 100644
--- a/sys-apps/the_silver_searcher/metadata.xml
+++ b/sys-apps/the_silver_searcher/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-  
+  
+wra...@gentoo.org
+Sam Jorna
+  
   
 ggreer/the_silver_searcher
   



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2019-12-16 Thread Sam Jorna
commit: 242b07ce90a8277147a8414e73a6dfd46033f844
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Dec 16 08:19:38 2019 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Dec 16 08:47:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242b07ce

sys-apps/the_silver_searcher: vbump to 2.2.0

Bug: https://bugs.gentoo.org/683672
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-2.2.0.ebuild   | 51 ++
 2 files changed, 52 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index 722eff7196b..1ae01b0415d 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,2 +1,3 @@
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 
1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd
 SHA512 
2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 
0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944
 SHA512 
9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
+DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B 
ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814
 SHA512 
b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
new file mode 100644
index 000..f6cfa25db0a
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="lzma test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? (
+   dev-util/cram
+   dev-vcs/git
+   )"
+
+DOCS="README.md"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch )
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2019-12-16 Thread Sam Jorna
commit: af85130a7ae0cbb89e453ea2f7531b5ec28afe01
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Dec 16 08:17:45 2019 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Dec 16 08:47:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af85130a

sys-apps/the_silver_searcher: add missing test dep

Bug: https://bugs.gentoo.org/626548
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index f8bf1e85226..73d91a661f6 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -19,7 +19,10 @@ RDEPEND="dev-libs/libpcre
zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
virtual/pkgconfig
-   test? ( dev-util/cram )"
+   test? (
+   dev-util/cram
+   dev-vcs/git
+   )"
 
 DOCS="README.md"
 



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2019-12-16 Thread Sam Jorna
commit: 26ff372c0ba311c7c1a1abe99c565248ad64f27f
Author: Sam Jorna  gentoo  org>
AuthorDate: Mon Dec 16 08:18:38 2019 +
Commit: Sam Jorna  gentoo  org>
CommitDate: Mon Dec 16 08:47:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ff372c

sys-apps/the_silver_searcher: EAPI bump

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sam Jorna  gentoo.org>

 sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index 73d91a661f6..f6cfa25db0a 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools bash-completion-r1
 
 DESCRIPTION="A code-searching tool similar to ack, but faster"



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2018-06-04 Thread Mart Raudsepp
commit: 41e289d21e094a3e6915c80ae883b6a0a0ba6439
Author: Alex Bennée  linaro  org>
AuthorDate: Thu May 17 13:24:55 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Jun  4 18:57:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41e289d2

sys-apps/the_silver_searcher: add ~arm64 keyword

We also ~arm64 dev-util/cram which is used for testing ag.

 sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index 94366537bd7..127b25b8bdc 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd 
~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2018-01-12 Thread Benda XU
commit: 167cb789ffa50e726e83188eb2428ae6125b856b
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Jan 13 03:57:01 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Jan 13 03:57:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167cb789

sys-apps/the_silver_searcher: keyword ~amd64-linux.

Reported-By: Jacob Godserv
Closes: https://bugs.gentoo.org/show_bug.cgi?id=511720
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index 454efcca106..94366537bd7 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd 
~amd64-linux"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/, sys-apps/the_silver_searcher/files/

2018-01-12 Thread Benda XU
commit: 0e097638d594a9296c20670f63de9e0b4d0906b6
Author: Benda Xu  gentoo  org>
AuthorDate: Sat Jan 13 03:54:49 2018 +
Commit: Benda XU  gentoo  org>
CommitDate: Sat Jan 13 03:55:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e097638

sys-apps/the_silver_searcher: fix build when USE=-lzma

Suggested-By: Oleg, Nicolas Porcel
Closes: https://bugs.gentoo.org/629488
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/the_silver_searcher-2.1.0-lzma.patch | 491 +
 .../the_silver_searcher-2.1.0.ebuild   |   4 +-
 2 files changed, 494 insertions(+), 1 deletion(-)

diff --git 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch
new file mode 100644
index 000..21eb7118b20
--- /dev/null
+++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.1.0-lzma.patch
@@ -0,0 +1,491 @@
+From 24995eb239799e52ae09d47b7520d50a3b8b606c Mon Sep 17 00:00:00 2001
+From: Allen Wild 
+Date: Tue, 5 Sep 2017 19:48:49 -0400
+Subject: [PATCH] zfile: fix build when zlib and/or lzma are excluded
+
+Currently, zfile won't build if either zlib.h or lzma.h are missing
+
+  * Add several inline wrapper functions which check cookie->ctype and
+call an inline zlib or lzma implementation function.
+- This cleans up zfile_read at the expense of growing the file and
+  adding 2 layers of function calls. Everything is static and inline
+  so the compiler should be able to optimize sufficiently.
+  * Stub functions are #define'd for the unsupported compression method
+(if applicable)
+  * Use an Automake conditional to only build zfile.c if either
+zlib.h or lzma.h are available, define the symbol USE_FOPENCOOKIE if
+this is the case and check it instead of HAVE_FOPENCOOKIE
+  * Replace tabs in zfile.c with spaces for consistency with the rest of
+the codebase
+
+Fixes: #1147
+---
+ Makefile.am  |   6 +-
+ configure.ac |   5 +
+ src/decompress.h |   2 +-
+ src/search.c |   2 +-
+ src/zfile.c  | 301 ---
+ 5 files changed, 232 insertions(+), 84 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3931c3a7..4d85f54f 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -1,9 +1,13 @@
+ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
+ 
+ bin_PROGRAMS = ag
+-ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c 
src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c 
src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c 
src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c src/zfile.c
++ag_SOURCES = src/ignore.c src/ignore.h src/log.c src/log.h src/options.c 
src/options.h src/print.c src/print_w32.c src/print.h src/scandir.c 
src/scandir.h src/search.c src/search.h src/lang.c src/lang.h src/util.c 
src/util.h src/decompress.c src/decompress.h src/uthash.h src/main.c
+ ag_LDADD = ${PCRE_LIBS} ${LZMA_LIBS} ${ZLIB_LIBS} $(PTHREAD_LIBS)
+ 
++if USE_FOPENCOOKIE
++ag_SOURCES += src/zfile.c src/zfile.h
++endif
++
+ dist_man_MANS = doc/ag.1
+ 
+ bashcompdir = $(pkgdatadir)/completions
+diff --git a/configure.ac b/configure.ac
+index 982cc3b2..5917ecc1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -66,6 +66,11 @@ AC_CHECK_MEMBER([struct dirent.d_namlen], 
[AC_DEFINE([HAVE_DIRENT_DNAMLEN], [],
+ 
+ AC_CHECK_FUNCS(fgetln fopencookie getline realpath strlcpy strndup vasprintf 
madvise posix_fadvise pthread_setaffinity_np pledge)
+ 
++# Only build zfile.c if we need it
++AM_CONDITIONAL([USE_FOPENCOOKIE], [(test "$ac_cv_func_fopencookie" = "yes") &&
++   (test "$ac_cv_header_zlib_h" = "yes" || 
test "$ac_cv_header_lzma_h" = "yes")])
++AM_COND_IF([USE_FOPENCOOKIE], [AC_DEFINE([USE_FOPENCOOKIE], [], [Use 
fopencookie streaming in zfile.c])])
++
+ AC_CONFIG_FILES([Makefile the_silver_searcher.spec])
+ AC_CONFIG_HEADERS([src/config.h])
+ 
+diff --git a/src/decompress.h b/src/decompress.h
+index 9c5592cf..d5c3d582 100644
+--- a/src/decompress.h
 b/src/decompress.h
+@@ -19,7 +19,7 @@ ag_compression_type is_zipped(const void *buf, const int 
buf_len);
+ 
+ void *decompress(const ag_compression_type zip_type, const void *buf, const 
int buf_len, const char *dir_full_path, int *new_buf_len);
+ 
+-#if HAVE_FOPENCOOKIE
++#ifdef USE_FOPENCOOKIE
+ FILE *decompress_open(int fd, const char *mode, ag_compression_type ctype);
+ #endif
+ 
+diff --git a/src/search.c b/src/search.c
+index 14e9d415..84d9423f 100644
+--- a/src/search.c
 b/src/search.c
+@@ -357,7 +357,7 @@ void search_file(const char *file_full_path) {
+ if (opts.search_zip_files) {
+ ag_compression_type zip_type = is_zipped(buf, f_len);
+ if (zip_type != AG_NO_COMPRESSION) {
+-#if HAVE_FOPENCOOKIE
++#ifdef USE_FOPENCOOKIE
+ log_debug("%s is a compressed file. stream searching", 
file_full_path);

[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2017-08-31 Thread Tim Harder
commit: ba0acec43c09ef60adba96756527c088ab06f92a
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 15:35:29 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 15:39:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0acec4

sys-apps/the_silver_searcher: version bump to 2.1.0

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-2.1.0.ebuild   | 45 ++
 2 files changed, 46 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index a5cc6c13b70..b534e29a933 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,3 +1,4 @@
 DIST the_silver_searcher-1.0.2.tar.gz 156870 SHA256 
4cb73a4436fccf2c2cae91479a0167bacaa968a4deca28f3ff9d5abd98f01009 SHA512 
58f06133907cf7d7f229b5153bef96b5e76ae6cbbcdaf7d00b52bd9d6595c006417365c2b8535254f943c2fd5559792953e14cc9ba1041d5dfbe0d5b4a3ba2c5
 WHIRLPOOL 
441613aebcbcf7119506d04020b7f9dd3c46b69e68868ea8db2c29267f4c2b678a0a26a62e55acb5bf3cf4836ef40220e1a3f24fca7fa494ffca1d7b42989bd4
 DIST the_silver_searcher-1.0.3.tar.gz 157093 SHA256 
ce45de7412ee0ae6f22d72e17b81425666e6130da8cb434d5ca8ea42185e514e SHA512 
15d6898c43a144289892d41d7c207bb16224d9f9f05bd237b803160aa04eb89f44239a0ee6ff7e955533ef5f6e11b73d13c1ec07e11ae2a5b3c44e3d5b53f137
 WHIRLPOOL 
ef0ac9b69867afc1423e121d05af1acd8a0de6e57a8f03557d173bbc9d39f82fd978c6d3e5b23e04478c2d37e203eb8eb25f4d17d7a8bed2d0717d8fe7b5ceb2
 DIST the_silver_searcher-2.0.0.tar.gz 160093 SHA256 
ff7243863f22ed73eeab6f7a6d17cfff585a7eaa41d5ab3ae4f5d6db97701d5f SHA512 
2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 WHIRLPOOL 
4c2ca9594d4d7d0cff4141e4bc76c6d150ff58ed301269a7b6348616c75ae33c525eb5ec2534af21e1cf07da5f12d0c121802d0c1a97dce6621e53f90d8508cf
+DIST the_silver_searcher-2.1.0.tar.gz 163139 SHA256 
cb416a0da7fe354a009c482ae709692ed567f8e7d2dad4d242e726dd7ca202f0 SHA512 
9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 WHIRLPOOL 
374ce8e15e4e9eee2175390d9af3d53d88528ee31c57cb97e33b7624bb6c8e344c213ab1dec69228501f1feec10fbd18e28ebb5ee78d95d1b660cf1bd997642f

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
new file mode 100644
index 000..3f4a2aae03c
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma test zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-util/cram )"
+
+DOCS="README.md"
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/, sys-apps/the_silver_searcher/files/

2017-08-31 Thread Tim Harder
commit: 65044f36470c4c310972c72520a7c3250266acfa
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 15:38:25 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 15:39:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65044f36

sys-apps/the_silver_searcher: remove old

 sys-apps/the_silver_searcher/Manifest  |  2 -
 .../files/the_silver_searcher-1.0.1-tests.patch| 17 
 .../the_silver_searcher-1.0.2.ebuild   | 47 --
 .../the_silver_searcher-1.0.3.ebuild   | 45 -
 4 files changed, 111 deletions(-)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index b534e29a933..58ba191ec75 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,4 +1,2 @@
-DIST the_silver_searcher-1.0.2.tar.gz 156870 SHA256 
4cb73a4436fccf2c2cae91479a0167bacaa968a4deca28f3ff9d5abd98f01009 SHA512 
58f06133907cf7d7f229b5153bef96b5e76ae6cbbcdaf7d00b52bd9d6595c006417365c2b8535254f943c2fd5559792953e14cc9ba1041d5dfbe0d5b4a3ba2c5
 WHIRLPOOL 
441613aebcbcf7119506d04020b7f9dd3c46b69e68868ea8db2c29267f4c2b678a0a26a62e55acb5bf3cf4836ef40220e1a3f24fca7fa494ffca1d7b42989bd4
-DIST the_silver_searcher-1.0.3.tar.gz 157093 SHA256 
ce45de7412ee0ae6f22d72e17b81425666e6130da8cb434d5ca8ea42185e514e SHA512 
15d6898c43a144289892d41d7c207bb16224d9f9f05bd237b803160aa04eb89f44239a0ee6ff7e955533ef5f6e11b73d13c1ec07e11ae2a5b3c44e3d5b53f137
 WHIRLPOOL 
ef0ac9b69867afc1423e121d05af1acd8a0de6e57a8f03557d173bbc9d39f82fd978c6d3e5b23e04478c2d37e203eb8eb25f4d17d7a8bed2d0717d8fe7b5ceb2
 DIST the_silver_searcher-2.0.0.tar.gz 160093 SHA256 
ff7243863f22ed73eeab6f7a6d17cfff585a7eaa41d5ab3ae4f5d6db97701d5f SHA512 
2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 WHIRLPOOL 
4c2ca9594d4d7d0cff4141e4bc76c6d150ff58ed301269a7b6348616c75ae33c525eb5ec2534af21e1cf07da5f12d0c121802d0c1a97dce6621e53f90d8508cf
 DIST the_silver_searcher-2.1.0.tar.gz 163139 SHA256 
cb416a0da7fe354a009c482ae709692ed567f8e7d2dad4d242e726dd7ca202f0 SHA512 
9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 WHIRLPOOL 
374ce8e15e4e9eee2175390d9af3d53d88528ee31c57cb97e33b7624bb6c8e344c213ab1dec69228501f1feec10fbd18e28ebb5ee78d95d1b660cf1bd997642f

diff --git 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-1.0.1-tests.patch 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-1.0.1-tests.patch
deleted file mode 100644
index b281594732e..000
--- a/sys-apps/the_silver_searcher/files/the_silver_searcher-1.0.1-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Drop the last test since it has file sorting issues.
-
 the_silver_searcher-1.0.1/tests/empty_match.t
-+++ the_silver_searcher-1.0.1/tests/empty_match.t
-@@ -11,12 +11,3 @@
- A genuine zero-length match should succeed:
-   $ ag "^" nonempty.txt
-   1:foo
--
--Empty files should be listed with --unrestricted --files-with-matches (-ul)
--  $ ag -lu --stats | sed '$d' # Remove the last line about timing which will 
differ
--  empty.txt
--  nonempty.txt
--  2 matches
--  2 files contained matches
--  2 files searched
--  4 bytes searched

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild
deleted file mode 100644
index 9df59dc5451..000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="lzma test zlib"
-
-RDEPEND="dev-libs/libpcre
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   test? ( dev-util/cram )"
-
-DOCS="README.md"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-tests.patch )
-
-src_prepare() {
-   sed '/^dist_bashcomp/d' -i Makefile.am || die
-
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable lzma) \
-   $(use_enable zlib)
-}
-
-src_test() {
-   cram -v tests/*.t || die "tests failed"
-}
-
-src_install() {
-   default
-   newbashcomp ag.bashcomp.sh ag
-}

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.3.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.3.ebuild
deleted file mode 100644
index 3f4a2aae03c..000
--- a/sys-apps/the_silver_searcher/the_silver_sea

[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2017-08-31 Thread Tim Harder
commit: 8900f2b05e492b270a408ffb9f6b551622b812f3
Author: Tim Harder  gentoo  org>
AuthorDate: Thu Aug 31 15:38:06 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu Aug 31 15:39:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8900f2b0

sys-apps/the_silver_searcher: stabilize 2.0.0

 sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
index 3f4a2aae03c..e9a17ad16b6 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2017-06-05 Thread Tim Harder
commit: c6249fe3dae7d3809d4ddfc9d7f8e33f99734dca
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Jun  6 01:46:22 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Jun  6 01:48:39 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6249fe3

sys-apps/the_silver_searcher: version bump to 2.0.0

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-2.0.0.ebuild   | 45 ++
 2 files changed, 46 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index 11bd7f7ba43..a5cc6c13b70 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,2 +1,3 @@
 DIST the_silver_searcher-1.0.2.tar.gz 156870 SHA256 
4cb73a4436fccf2c2cae91479a0167bacaa968a4deca28f3ff9d5abd98f01009 SHA512 
58f06133907cf7d7f229b5153bef96b5e76ae6cbbcdaf7d00b52bd9d6595c006417365c2b8535254f943c2fd5559792953e14cc9ba1041d5dfbe0d5b4a3ba2c5
 WHIRLPOOL 
441613aebcbcf7119506d04020b7f9dd3c46b69e68868ea8db2c29267f4c2b678a0a26a62e55acb5bf3cf4836ef40220e1a3f24fca7fa494ffca1d7b42989bd4
 DIST the_silver_searcher-1.0.3.tar.gz 157093 SHA256 
ce45de7412ee0ae6f22d72e17b81425666e6130da8cb434d5ca8ea42185e514e SHA512 
15d6898c43a144289892d41d7c207bb16224d9f9f05bd237b803160aa04eb89f44239a0ee6ff7e955533ef5f6e11b73d13c1ec07e11ae2a5b3c44e3d5b53f137
 WHIRLPOOL 
ef0ac9b69867afc1423e121d05af1acd8a0de6e57a8f03557d173bbc9d39f82fd978c6d3e5b23e04478c2d37e203eb8eb25f4d17d7a8bed2d0717d8fe7b5ceb2
+DIST the_silver_searcher-2.0.0.tar.gz 160093 SHA256 
ff7243863f22ed73eeab6f7a6d17cfff585a7eaa41d5ab3ae4f5d6db97701d5f SHA512 
2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 WHIRLPOOL 
4c2ca9594d4d7d0cff4141e4bc76c6d150ff58ed301269a7b6348616c75ae33c525eb5ec2534af21e1cf07da5f12d0c121802d0c1a97dce6621e53f90d8508cf

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
new file mode 100644
index 000..3f4a2aae03c
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma test zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-util/cram )"
+
+DOCS="README.md"
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2017-05-04 Thread Tim Harder
commit: 80c8a6ebd4a6744f6a07cbd9c40f5e9038a51dbf
Author: Tim Harder  gentoo  org>
AuthorDate: Thu May  4 08:40:10 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Thu May  4 08:45:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80c8a6eb

sys-apps/the_silver_searcher: version bump to 1.0.3

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-1.0.3.ebuild   | 45 ++
 2 files changed, 46 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index da4f4d58238..11bd7f7ba43 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1 +1,2 @@
 DIST the_silver_searcher-1.0.2.tar.gz 156870 SHA256 
4cb73a4436fccf2c2cae91479a0167bacaa968a4deca28f3ff9d5abd98f01009 SHA512 
58f06133907cf7d7f229b5153bef96b5e76ae6cbbcdaf7d00b52bd9d6595c006417365c2b8535254f943c2fd5559792953e14cc9ba1041d5dfbe0d5b4a3ba2c5
 WHIRLPOOL 
441613aebcbcf7119506d04020b7f9dd3c46b69e68868ea8db2c29267f4c2b678a0a26a62e55acb5bf3cf4836ef40220e1a3f24fca7fa494ffca1d7b42989bd4
+DIST the_silver_searcher-1.0.3.tar.gz 157093 SHA256 
ce45de7412ee0ae6f22d72e17b81425666e6130da8cb434d5ca8ea42185e514e SHA512 
15d6898c43a144289892d41d7c207bb16224d9f9f05bd237b803160aa04eb89f44239a0ee6ff7e955533ef5f6e11b73d13c1ec07e11ae2a5b3c44e3d5b53f137
 WHIRLPOOL 
ef0ac9b69867afc1423e121d05af1acd8a0de6e57a8f03557d173bbc9d39f82fd978c6d3e5b23e04478c2d37e203eb8eb25f4d17d7a8bed2d0717d8fe7b5ceb2

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.3.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.3.ebuild
new file mode 100644
index 000..3f4a2aae03c
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma test zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-util/cram )"
+
+DOCS="README.md"
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2017-01-20 Thread Tim Harder
commit: 8d246f138059e95b095928ef4289e14c9957
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Jan 21 00:45:44 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Jan 21 00:46:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d246f13

sys-apps/the_silver_searcher: stabilize 1.0.2

 sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild
index a926bff..cab52e1 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2017-01-20 Thread Tim Harder
commit: e7eaeb263a1cdf663372a3c26111422525097800
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Jan 21 00:46:14 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Jan 21 00:47:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7eaeb26

sys-apps/the_silver_searcher: remove old

 sys-apps/the_silver_searcher/Manifest  |  3 --
 .../the_silver_searcher-0.32.0.ebuild  | 41 --
 .../the_silver_searcher-0.33.0.ebuild  | 46 -
 .../the_silver_searcher-1.0.1.ebuild   | 48 --
 4 files changed, 138 deletions(-)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index 92447d7..da4f4d5 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,4 +1 @@
-DIST the_silver_searcher-0.32.0.tar.gz 152041 SHA256 
c5b208572e5cfc8a3cf366e8eb337b0c673c2ffa90c1ad90dfdcbe78251ba4cc SHA512 
c5664205844f17d7739742949524d42f7ff403884a1bb13b32c9a14bde76d5129259d26a782057adf340ea1afc0caa6bd7b51d59caf795937389ff88f3a373bc
 WHIRLPOOL 
85b284bf928a4cf5e28014678f01450c1083f15b08837069c4d4097122c84122a558f6175789131198fb003715b7dc030b48957d76cb7e00624d499812ce065f
-DIST the_silver_searcher-0.33.0.tar.gz 153459 SHA256 
351ab79ada811fd08f81296de10a7498ea3c46b681d73696d5a2911edbdc19db SHA512 
7ce2eb32f2ed1f49c53de13f9edb755c43b8915424039c242b4ce947ac9c54094f285fd1018386bdb6bcf3dd088f9d943e0c4d22d82b9b2387a9664fc20a6ca3
 WHIRLPOOL 
f93bbf2dd7f2ddae4e8aaad37ad0994585e3dfcbdaa1df57a225b9af2aa4232f8b45d1c5a1f28c47333097fe16350d0f1b1dffade3371a47f049e4d0517e4848
-DIST the_silver_searcher-1.0.1.tar.gz 156764 SHA256 
a79e6b024c6c756589b0d5ffbffe65983c750a07099d28aa5036d47a9feec86b SHA512 
4d9d7f32a8268112636d9aac33f9b7fb3e2730cec1db70ffe246f2feb7d5c66150d44862f71e3ab02d35b9f0748db09c3e69c9769cda37a2a431af808dbb50c8
 WHIRLPOOL 
888d06fb25b5ffde2289a2e91f7dcc1c97dd2bafdd67dbb32baa84f51178211fa2c3fb07da94b89ed5cbdb412954b62b2e6de2efd5c4ac8fac6b9a7c348a2b76
 DIST the_silver_searcher-1.0.2.tar.gz 156870 SHA256 
4cb73a4436fccf2c2cae91479a0167bacaa968a4deca28f3ff9d5abd98f01009 SHA512 
58f06133907cf7d7f229b5153bef96b5e76ae6cbbcdaf7d00b52bd9d6595c006417365c2b8535254f943c2fd5559792953e14cc9ba1041d5dfbe0d5b4a3ba2c5
 WHIRLPOOL 
441613aebcbcf7119506d04020b7f9dd3c46b69e68868ea8db2c29267f4c2b678a0a26a62e55acb5bf3cf4836ef40220e1a3f24fca7fa494ffca1d7b42989bd4

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild
deleted file mode 100644
index 863c652..
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="lzma zlib"
-
-RDEPEND="dev-libs/libpcre
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-DOCS="README.md"
-
-src_prepare() {
-   sed -i '/^dist_bashcomp/d' Makefile.am || die
-
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable lzma) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   default
-   newbashcomp ag.bashcomp.sh ag
-}

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild
deleted file mode 100644
index 26916e3..
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="lzma test zlib"
-
-RDEPEND="dev-libs/libpcre
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   test? ( dev-util/cram )"
-
-DOCS="README.md"
-
-src_prepare() {
-   sed '/^dist_bashcomp/d' -i Makefile.am || die
-
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable lzma) \
-   $(use_enable zlib)
-}
-
-src_test() {
-   cram -v tests/*.t || die "tests f

[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-12-05 Thread Tim Harder
commit: 95c7df782e6976a2ab5d0a6b1b190d0bb0893c5b
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Dec  6 04:58:14 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Dec  6 04:58:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c7df78

sys-apps/the_silver_searcher: version bump to 1.0.2

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-1.0.2.ebuild   | 48 ++
 2 files changed, 49 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index 47c7392..92447d7 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,3 +1,4 @@
 DIST the_silver_searcher-0.32.0.tar.gz 152041 SHA256 
c5b208572e5cfc8a3cf366e8eb337b0c673c2ffa90c1ad90dfdcbe78251ba4cc SHA512 
c5664205844f17d7739742949524d42f7ff403884a1bb13b32c9a14bde76d5129259d26a782057adf340ea1afc0caa6bd7b51d59caf795937389ff88f3a373bc
 WHIRLPOOL 
85b284bf928a4cf5e28014678f01450c1083f15b08837069c4d4097122c84122a558f6175789131198fb003715b7dc030b48957d76cb7e00624d499812ce065f
 DIST the_silver_searcher-0.33.0.tar.gz 153459 SHA256 
351ab79ada811fd08f81296de10a7498ea3c46b681d73696d5a2911edbdc19db SHA512 
7ce2eb32f2ed1f49c53de13f9edb755c43b8915424039c242b4ce947ac9c54094f285fd1018386bdb6bcf3dd088f9d943e0c4d22d82b9b2387a9664fc20a6ca3
 WHIRLPOOL 
f93bbf2dd7f2ddae4e8aaad37ad0994585e3dfcbdaa1df57a225b9af2aa4232f8b45d1c5a1f28c47333097fe16350d0f1b1dffade3371a47f049e4d0517e4848
 DIST the_silver_searcher-1.0.1.tar.gz 156764 SHA256 
a79e6b024c6c756589b0d5ffbffe65983c750a07099d28aa5036d47a9feec86b SHA512 
4d9d7f32a8268112636d9aac33f9b7fb3e2730cec1db70ffe246f2feb7d5c66150d44862f71e3ab02d35b9f0748db09c3e69c9769cda37a2a431af808dbb50c8
 WHIRLPOOL 
888d06fb25b5ffde2289a2e91f7dcc1c97dd2bafdd67dbb32baa84f51178211fa2c3fb07da94b89ed5cbdb412954b62b2e6de2efd5c4ac8fac6b9a7c348a2b76
+DIST the_silver_searcher-1.0.2.tar.gz 156870 SHA256 
4cb73a4436fccf2c2cae91479a0167bacaa968a4deca28f3ff9d5abd98f01009 SHA512 
58f06133907cf7d7f229b5153bef96b5e76ae6cbbcdaf7d00b52bd9d6595c006417365c2b8535254f943c2fd5559792953e14cc9ba1041d5dfbe0d5b4a3ba2c5
 WHIRLPOOL 
441613aebcbcf7119506d04020b7f9dd3c46b69e68868ea8db2c29267f4c2b678a0a26a62e55acb5bf3cf4836ef40220e1a3f24fca7fa494ffca1d7b42989bd4

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild
new file mode 100644
index ..a926bff
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma test zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-util/cram )"
+
+DOCS="README.md"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.1-tests.patch )
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/, sys-apps/the_silver_searcher/files/

2016-12-03 Thread Tim Harder
commit: 65c48de84e88951210cc36db7c54a21bd47f0d7d
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Dec  4 00:31:24 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Dec  4 00:32:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c48de8

sys-apps/the_silver_searcher: version bump to 1.0.1

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../files/the_silver_searcher-1.0.1-tests.patch| 17 
 .../the_silver_searcher-1.0.1.ebuild   | 48 ++
 3 files changed, 66 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index e572b91..47c7392 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,2 +1,3 @@
 DIST the_silver_searcher-0.32.0.tar.gz 152041 SHA256 
c5b208572e5cfc8a3cf366e8eb337b0c673c2ffa90c1ad90dfdcbe78251ba4cc SHA512 
c5664205844f17d7739742949524d42f7ff403884a1bb13b32c9a14bde76d5129259d26a782057adf340ea1afc0caa6bd7b51d59caf795937389ff88f3a373bc
 WHIRLPOOL 
85b284bf928a4cf5e28014678f01450c1083f15b08837069c4d4097122c84122a558f6175789131198fb003715b7dc030b48957d76cb7e00624d499812ce065f
 DIST the_silver_searcher-0.33.0.tar.gz 153459 SHA256 
351ab79ada811fd08f81296de10a7498ea3c46b681d73696d5a2911edbdc19db SHA512 
7ce2eb32f2ed1f49c53de13f9edb755c43b8915424039c242b4ce947ac9c54094f285fd1018386bdb6bcf3dd088f9d943e0c4d22d82b9b2387a9664fc20a6ca3
 WHIRLPOOL 
f93bbf2dd7f2ddae4e8aaad37ad0994585e3dfcbdaa1df57a225b9af2aa4232f8b45d1c5a1f28c47333097fe16350d0f1b1dffade3371a47f049e4d0517e4848
+DIST the_silver_searcher-1.0.1.tar.gz 156764 SHA256 
a79e6b024c6c756589b0d5ffbffe65983c750a07099d28aa5036d47a9feec86b SHA512 
4d9d7f32a8268112636d9aac33f9b7fb3e2730cec1db70ffe246f2feb7d5c66150d44862f71e3ab02d35b9f0748db09c3e69c9769cda37a2a431af808dbb50c8
 WHIRLPOOL 
888d06fb25b5ffde2289a2e91f7dcc1c97dd2bafdd67dbb32baa84f51178211fa2c3fb07da94b89ed5cbdb412954b62b2e6de2efd5c4ac8fac6b9a7c348a2b76

diff --git 
a/sys-apps/the_silver_searcher/files/the_silver_searcher-1.0.1-tests.patch 
b/sys-apps/the_silver_searcher/files/the_silver_searcher-1.0.1-tests.patch
new file mode 100644
index ..b281594
--- /dev/null
+++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-1.0.1-tests.patch
@@ -0,0 +1,17 @@
+Drop the last test since it has file sorting issues.
+
+--- the_silver_searcher-1.0.1/tests/empty_match.t
 the_silver_searcher-1.0.1/tests/empty_match.t
+@@ -11,12 +11,3 @@
+ A genuine zero-length match should succeed:
+   $ ag "^" nonempty.txt
+   1:foo
+-
+-Empty files should be listed with --unrestricted --files-with-matches (-ul)
+-  $ ag -lu --stats | sed '$d' # Remove the last line about timing which will 
differ
+-  empty.txt
+-  nonempty.txt
+-  2 matches
+-  2 files contained matches
+-  2 files searched
+-  4 bytes searched

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-1.0.1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.1.ebuild
new file mode 100644
index ..a5255e1
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma test zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-util/cram )"
+
+DOCS="README.md"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-11-01 Thread Tim Harder
commit: 37e3dcf853a0e141384209d15c20fc36bd7c21ef
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Nov  1 22:09:58 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Nov  1 22:12:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e3dcf8

sys-apps/the_silver_searcher: stabilize 0.33.0

 sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild
index 34f1aa8..26916e3 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="lzma test zlib"
 
 RDEPEND="dev-libs/libpcre



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-10-01 Thread Tim Harder
commit: 8390bd960d31feee433bde632cdddbfb058e091b
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Oct  2 06:08:39 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Oct  2 06:13:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8390bd96

sys-apps/the_silver_searcher: version bump to 0.33.0

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-0.33.0.ebuild  | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index a0ebdcf..e572b91 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1 +1,2 @@
 DIST the_silver_searcher-0.32.0.tar.gz 152041 SHA256 
c5b208572e5cfc8a3cf366e8eb337b0c673c2ffa90c1ad90dfdcbe78251ba4cc SHA512 
c5664205844f17d7739742949524d42f7ff403884a1bb13b32c9a14bde76d5129259d26a782057adf340ea1afc0caa6bd7b51d59caf795937389ff88f3a373bc
 WHIRLPOOL 
85b284bf928a4cf5e28014678f01450c1083f15b08837069c4d4097122c84122a558f6175789131198fb003715b7dc030b48957d76cb7e00624d499812ce065f
+DIST the_silver_searcher-0.33.0.tar.gz 153459 SHA256 
351ab79ada811fd08f81296de10a7498ea3c46b681d73696d5a2911edbdc19db SHA512 
7ce2eb32f2ed1f49c53de13f9edb755c43b8915424039c242b4ce947ac9c54094f285fd1018386bdb6bcf3dd088f9d943e0c4d22d82b9b2387a9664fc20a6ca3
 WHIRLPOOL 
f93bbf2dd7f2ddae4e8aaad37ad0994585e3dfcbdaa1df57a225b9af2aa4232f8b45d1c5a1f28c47333097fe16350d0f1b1dffade3371a47f049e4d0517e4848

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild
new file mode 100644
index ..34f1aa8
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.33.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma test zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-util/cram )"
+
+DOCS="README.md"
+
+src_prepare() {
+   sed '/^dist_bashcomp/d' -i Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_test() {
+   cram -v tests/*.t || die "tests failed"
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-08-07 Thread Tim Harder
commit: 41ee6ffbdc52cdf0c4920dbb795dd32c0a160e3d
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Aug  7 09:18:13 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Aug  7 09:18:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ee6ffb

sys-apps/the_silver_searcher: remove old

 sys-apps/the_silver_searcher/Manifest  |  1 -
 .../the_silver_searcher-0.31.0.ebuild  | 40 --
 2 files changed, 41 deletions(-)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index 4e05fa9..a0ebdcf 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,2 +1 @@
-DIST the_silver_searcher-0.31.0.tar.gz 150102 SHA256 
61bc827f4557d8108e91cdfc9ba31632e2568b26884c92426417f58135b37da8 SHA512 
61629ee3b11462a978a03879c19cf327cd08d5e669136c85c8f217b5e5ad27f78058c62555f47ae58882451361e09cf8093c7d4f4c4eda160a78f755af50b092
 WHIRLPOOL 
843e9502a4dbbfb5a049b524b2a85156bc57b624e10c875d5438bb6641ea48edee818af3f473d254cb16f188c321c17bc3b6da69aaf0ff081f055c61209302e1
 DIST the_silver_searcher-0.32.0.tar.gz 152041 SHA256 
c5b208572e5cfc8a3cf366e8eb337b0c673c2ffa90c1ad90dfdcbe78251ba4cc SHA512 
c5664205844f17d7739742949524d42f7ff403884a1bb13b32c9a14bde76d5129259d26a782057adf340ea1afc0caa6bd7b51d59caf795937389ff88f3a373bc
 WHIRLPOOL 
85b284bf928a4cf5e28014678f01450c1083f15b08837069c4d4097122c84122a558f6175789131198fb003715b7dc030b48957d76cb7e00624d499812ce065f

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
deleted file mode 100644
index 9345206..000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="lzma zlib"
-
-RDEPEND="dev-libs/libpcre
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-DOCS="README.md"
-
-src_prepare() {
-   sed -i '/^dist_bashcomp/d' Makefile.am || die
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable lzma) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   default
-   newbashcomp ag.bashcomp.sh ag
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-08-07 Thread Tim Harder
commit: a513341a26dec007ea45a3c67defc437b9418422
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Aug  7 09:17:57 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Aug  7 09:18:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a513341a

sys-apps/the_silver_searcher: stabilize 0.32.0

 sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild
index eb64cc5..863c652 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="lzma zlib"
 
 RDEPEND="dev-libs/libpcre



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-08-07 Thread Pacho Ramos
commit: 920a54374c1dbbfbf673ffdf9b6e761d19860ea8
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Aug  7 07:38:23 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Aug  7 07:38:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920a5437

sys-apps/the_silver_searcher: Cleanup per bug #390203

Package-Manager: portage-2.3.0

 sys-apps/the_silver_searcher/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/sys-apps/the_silver_searcher/metadata.xml 
b/sys-apps/the_silver_searcher/metadata.xml
index 176fb4b..e1e8e9c 100644
--- a/sys-apps/the_silver_searcher/metadata.xml
+++ b/sys-apps/the_silver_searcher/metadata.xml
@@ -2,10 +2,6 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   
-jdh...@gentoo.org
-Jeff Horelick
-  
-  
 radher...@gentoo.org
 Tim Harder
   



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-06-18 Thread Tim Harder
commit: 64d14b7c86d4d4e3815be236ce48b8c12dfa6a41
Author: Tim Harder  gentoo  org>
AuthorDate: Sun Jun 19 04:35:50 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sun Jun 19 04:36:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d14b7c

sys-apps/the_silver_searcher: version bump to 0.32.0

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-0.32.0.ebuild  | 41 ++
 2 files changed, 42 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index b95e397..4e05fa9 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1 +1,2 @@
 DIST the_silver_searcher-0.31.0.tar.gz 150102 SHA256 
61bc827f4557d8108e91cdfc9ba31632e2568b26884c92426417f58135b37da8 SHA512 
61629ee3b11462a978a03879c19cf327cd08d5e669136c85c8f217b5e5ad27f78058c62555f47ae58882451361e09cf8093c7d4f4c4eda160a78f755af50b092
 WHIRLPOOL 
843e9502a4dbbfb5a049b524b2a85156bc57b624e10c875d5438bb6641ea48edee818af3f473d254cb16f188c321c17bc3b6da69aaf0ff081f055c61209302e1
+DIST the_silver_searcher-0.32.0.tar.gz 152041 SHA256 
c5b208572e5cfc8a3cf366e8eb337b0c673c2ffa90c1ad90dfdcbe78251ba4cc SHA512 
c5664205844f17d7739742949524d42f7ff403884a1bb13b32c9a14bde76d5129259d26a782057adf340ea1afc0caa6bd7b51d59caf795937389ff88f3a373bc
 WHIRLPOOL 
85b284bf928a4cf5e28014678f01450c1083f15b08837069c4d4097122c84122a558f6175789131198fb003715b7dc030b48957d76cb7e00624d499812ce065f

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild
new file mode 100644
index 000..eb64cc5
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.32.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+DOCS="README.md"
+
+src_prepare() {
+   sed -i '/^dist_bashcomp/d' Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-03-14 Thread Tim Harder
commit: d479cbcaeb6a6396e52984b196205f5f19e3484a
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Mar 15 03:03:36 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Mar 15 03:04:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d479cbca

sys-apps/the_silver_searcher: stabilize 0.31.0

 sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
index 8d5e95c..9345206 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="lzma zlib"
 
 RDEPEND="dev-libs/libpcre



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2016-03-14 Thread Tim Harder
commit: cb7b7608558c17dfb0c359c66459f6d6271854ae
Author: Tim Harder  gentoo  org>
AuthorDate: Tue Mar 15 03:03:59 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Tue Mar 15 03:04:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7b7608

sys-apps/the_silver_searcher: remove old

 sys-apps/the_silver_searcher/Manifest  |  1 -
 .../the_silver_searcher-0.29.1.ebuild  | 40 --
 2 files changed, 41 deletions(-)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index 91ee485..b95e397 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,2 +1 @@
-DIST the_silver_searcher-0.29.1.tar.gz 65821 SHA256 
779eb781751fd3dc07bff3b88f4475ed78eea3fa7b21139d8230d17c31db072a SHA512 
648efe0cd52092ee5d036c7d024c7e2d1ce728c5f80ea9447356f2e31cdbbe96fee67b968a9d66c2b3739f1fc8f6d639452019c6fdeb5996e0d74e9549729fe5
 WHIRLPOOL 
0dd3934daaf42e1414363ae2b4409bb2187a9c6bbfb76c6cc9337c07129c9d744fe71a3c1d9670531ac92fe9ae4793a5bfad35185b6e697ccfc1d571f1055985
 DIST the_silver_searcher-0.31.0.tar.gz 150102 SHA256 
61bc827f4557d8108e91cdfc9ba31632e2568b26884c92426417f58135b37da8 SHA512 
61629ee3b11462a978a03879c19cf327cd08d5e669136c85c8f217b5e5ad27f78058c62555f47ae58882451361e09cf8093c7d4f4c4eda160a78f755af50b092
 WHIRLPOOL 
843e9502a4dbbfb5a049b524b2a85156bc57b624e10c875d5438bb6641ea48edee818af3f473d254cb16f188c321c17bc3b6da69aaf0ff081f055c61209302e1

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.29.1.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.29.1.ebuild
deleted file mode 100644
index 9345206..000
--- a/sys-apps/the_silver_searcher/the_silver_searcher-0.29.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools bash-completion-r1
-
-DESCRIPTION="A code-searching tool similar to ack, but faster"
-HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
-SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="lzma zlib"
-
-RDEPEND="dev-libs/libpcre
-   lzma? ( app-arch/xz-utils )
-   zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-DOCS="README.md"
-
-src_prepare() {
-   sed -i '/^dist_bashcomp/d' Makefile.am || die
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable lzma) \
-   $(use_enable zlib)
-}
-
-src_install() {
-   default
-   newbashcomp ag.bashcomp.sh ag
-}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/

2015-10-03 Thread Matthias Maier
commit: fa9a50929dd09f28cfe8b6530ccc99689da3a411
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Sep 22 01:57:03 2015 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Sat Oct  3 18:50:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9a5092

sys-apps/the_silver_searcher: version bump to 0.31.0

Package-Manager: portage-2.2.21

 sys-apps/the_silver_searcher/Manifest  |  1 +
 .../the_silver_searcher-0.31.0.ebuild  | 40 ++
 2 files changed, 41 insertions(+)

diff --git a/sys-apps/the_silver_searcher/Manifest 
b/sys-apps/the_silver_searcher/Manifest
index fa7b65f..91ee485 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1 +1,2 @@
 DIST the_silver_searcher-0.29.1.tar.gz 65821 SHA256 
779eb781751fd3dc07bff3b88f4475ed78eea3fa7b21139d8230d17c31db072a SHA512 
648efe0cd52092ee5d036c7d024c7e2d1ce728c5f80ea9447356f2e31cdbbe96fee67b968a9d66c2b3739f1fc8f6d639452019c6fdeb5996e0d74e9549729fe5
 WHIRLPOOL 
0dd3934daaf42e1414363ae2b4409bb2187a9c6bbfb76c6cc9337c07129c9d744fe71a3c1d9670531ac92fe9ae4793a5bfad35185b6e697ccfc1d571f1055985
+DIST the_silver_searcher-0.31.0.tar.gz 150102 SHA256 
61bc827f4557d8108e91cdfc9ba31632e2568b26884c92426417f58135b37da8 SHA512 
61629ee3b11462a978a03879c19cf327cd08d5e669136c85c8f217b5e5ad27f78058c62555f47ae58882451361e09cf8093c7d4f4c4eda160a78f755af50b092
 WHIRLPOOL 
843e9502a4dbbfb5a049b524b2a85156bc57b624e10c875d5438bb6641ea48edee818af3f473d254cb16f188c321c17bc3b6da69aaf0ff081f055c61209302e1

diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild 
b/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
new file mode 100644
index 000..8d5e95c
--- /dev/null
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-0.31.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A code-searching tool similar to ack, but faster"
+HOMEPAGE="https://github.com/ggreer/the_silver_searcher";
+SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="lzma zlib"
+
+RDEPEND="dev-libs/libpcre
+   lzma? ( app-arch/xz-utils )
+   zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+DOCS="README.md"
+
+src_prepare() {
+   sed -i '/^dist_bashcomp/d' Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable lzma) \
+   $(use_enable zlib)
+}
+
+src_install() {
+   default
+   newbashcomp ag.bashcomp.sh ag
+}