gentoo resync : 15.01.2020

5 files changed, 69 insertions, 7 deletions

diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index f0687c0c7b19..bf4bfd9bb3e0 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,6 +1,8 @@
 AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 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
-EBUILD the_silver_searcher-2.0.0.ebuild 921 BLAKE2B a894dcf2551666d64fe272312b66d471467d19c75f3ded366639aec84064c96b4f42ec5e2e0c561d75c328642bf877fff767171272400987ef80dce8844fe150 SHA512 1b44f0ff304973c569e994972c1a2d0f81c2be0393f7883f3125b8f217360462cfb6c133a79cbb45a9766cd1ddd1f29ce4d598321c1fc02b094136bc24f297b4
-EBUILD the_silver_searcher-2.1.0.ebuild 993 BLAKE2B 3b0cebde2a8b2ea61587d5bd01acc580dbed12182e1a037113d398b5f962bae9175f888f0463bdfefcc76e77ce44894c576bd70b74e2ced5818e310b1d8ddc8e SHA512 5cb04b75de6b34bc2b26ec738084fa606287967211cc9890bcc55ec3506b995afba9dd53e5419e3af611400bb2198e69cf32172b8d9dd0227877d9b6bc086cb6
-MISC metadata.xml 263 BLAKE2B 3d3cb735ca3d3b8c9ea8ca6b1d9adcb3739a33cce36af48db9e95b673c5e1d7b749148ceb39c57c74819d18f33f510abc41354c0c0c2a502afd611e3a2b0ecdc SHA512 96e459d527c00e92aab5ea5ebe3d078d8b505a3e9d9ab92878132f58d82cad6b1d3199d95cc96bb67ed9a9ea05a06ff31666feeac0fd2bcb71f2035d5e00eee5
+DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814 SHA512 b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
+EBUILD the_silver_searcher-2.0.0.ebuild 938 BLAKE2B 330c2b8aa97db09698e066d58972f12d007c4827d78a88d0d727ec837aae8166c67f387b8566bf484b16c6e8114564386ae43bd2447585f74f97d21fbfd5f590 SHA512 86652ef0807858107f43ab1134cc323f4826c352590b318b42357ce4e46a86aa72b238ebfe3fe075b6dffee4ed12211c648d54a0b5a6ca64ec0026151e3c70ea
+EBUILD the_silver_searcher-2.1.0.ebuild 1010 BLAKE2B d5beee0a626a06341c13f64a34fc5175cc040d30666351b944289d2cad4418943c32082ff80d31d2cfd4456b2c7570cf2ab2466052d6b71709fd74b2df311b30 SHA512 9c0b82db7481d7d26e575c3465db09936b35440a3a214c5a022157ed5e2ade93153d8e4062cea08c9e6fce77e2ffe15f3f30e09d97c728c56978aa4323dfce30
+EBUILD the_silver_searcher-2.2.0.ebuild 1010 BLAKE2B d5beee0a626a06341c13f64a34fc5175cc040d30666351b944289d2cad4418943c32082ff80d31d2cfd4456b2c7570cf2ab2466052d6b71709fd74b2df311b30 SHA512 9c0b82db7481d7d26e575c3465db09936b35440a3a214c5a022157ed5e2ade93153d8e4062cea08c9e6fce77e2ffe15f3f30e09d97c728c56978aa4323dfce30
+MISC metadata.xml 343 BLAKE2B 21afa71f55c3a250d73910c6f8a96fcb5164b921758c8969b8fad8ac95e45f86d114742738d6f6f192a33be057b28440390b52719ee71755c3ba04a4f1a0cc0d SHA512 a2dd33c75fde978e49227132e7579e8c3d3b77989228f34f43e5611fafb6999320991f4bdb683426a30595771d2afebc5487487b890a9f399df086fe3946a39b
diff --git a/sys-apps/the_silver_searcher/metadata.xml b/sys-apps/the_silver_searcher/metadata.xml
index aeaf98a5fa65..8395d00a1c03 100644
--- a/sys-apps/the_silver_searcher/metadata.xml
+++ b/sys-apps/the_silver_searcher/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>wraeth@gentoo.org</email>
+    <name>Sam Jorna</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">ggreer/the_silver_searcher</remote-id>
   </upstream>
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 21b02d12de35..d993a7bb70b8 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"
 
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 f8bf1e852265..f6cfa25db0a5 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"
@@ -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"
 
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 000000000000..f6cfa25db0a5
--- /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
+}