gentoo resync : 28.04.2021

4 files changed, 10 insertions, 62 deletions

diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index 20280ba6f535..d3e3729d6fbd 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,9 +1,7 @@
 AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
 AUX the_silver_searcher-fno-common.patch 3785 BLAKE2B 860a2ee021e29e3c1729363a574eab5e58d02922634cf778729f70631396e4dbae0ba968d8d7828fefca7dbd618138dab3ad7094727a851ba254a460f216cf13 SHA512 14352a4e44a7a07d832a2192be2f22aa7446984d90dafc8d637610b9a13f79adb91e1489a4439a25ec453b29b18d696e41797bee77f4465e2fe9a864a8f12459
-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
-EBUILD the_silver_searcher-2.0.0.ebuild 988 BLAKE2B ad8291bda658214118139b25e298b994f308d93a99d5aead2a3937f34533bba0ea382f1ecd00817670171cfd97f94d768680fcbb7e1b73a3b332b83f06eb8ca8 SHA512 ff4ef60e0e27173d65fd50579a66b21a93cebe98417dbc86e7db898d5059a89f5a717ea799a27ec7469895cb9e0c604a2999db742d63f90f1739a1e448430d5e
-EBUILD the_silver_searcher-2.1.0.ebuild 1049 BLAKE2B 6764ac8a4a66826a6db93de31fc60cb7e5fe5719b662c25e5d2e3888bf460cf2177d7a24fc1ff5bbe71f88c8043ccfaf958c10e5c6dadd9c94a1ba71f38ef2e1 SHA512 e5b2d03888ae5a07dbc2b708a828a48f8237922af123b108db0816e01db9c252e49b436e6e7de4dd840bc4c2bfc5c54dd87ef9804ff1b0e8a07ed6a604c64d8f
-EBUILD the_silver_searcher-2.2.0.ebuild 1049 BLAKE2B 6764ac8a4a66826a6db93de31fc60cb7e5fe5719b662c25e5d2e3888bf460cf2177d7a24fc1ff5bbe71f88c8043ccfaf958c10e5c6dadd9c94a1ba71f38ef2e1 SHA512 e5b2d03888ae5a07dbc2b708a828a48f8237922af123b108db0816e01db9c252e49b436e6e7de4dd840bc4c2bfc5c54dd87ef9804ff1b0e8a07ed6a604c64d8f
+DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126
+EBUILD the_silver_searcher-2.2.0.ebuild 1047 BLAKE2B 546d64df5130376827e3556a4c1ab8487d1c580f21682c4d0e954cff92d186f154d0f156cec508f65e7d77170230ce7cda7ca8128a4c62c8f59c3594d09b9950 SHA512 d0c7ccc383ea8ca8da7a81071106d6d9b2948292b65e3685406b1502fb16d6fec04527fb0887e6d9b97dc824e86358353173dbd06f03ed384794250f18ee89fa
+EBUILD the_silver_searcher-2.2.0_p20201217.ebuild 1079 BLAKE2B 84c10dac5ae7de65605d90b82cc92d3dedfbf04769e27fbdbf7f142123be061c3accb02cd1570cdc899808ed88981990a4f43ec70d5f242a7e521284513ae1d8 SHA512 c85b10b692e2887191d0bdd52d454cf9fff62c948af1f78b663d146528f6d775c0146863f584d1ad49665beb35bb3f1c7a9c3008ef4f2e0248c9fe25a8fb360a
 MISC metadata.xml 343 BLAKE2B 21afa71f55c3a250d73910c6f8a96fcb5164b921758c8969b8fad8ac95e45f86d114742738d6f6f192a33be057b28440390b52719ee71755c3ba04a4f1a0cc0d SHA512 a2dd33c75fde978e49227132e7579e8c3d3b77989228f34f43e5611fafb6999320991f4bdb683426a30595771d2afebc5487487b890a9f399df086fe3946a39b
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 6e62890da072..000000000000
--- 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.2.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
index 9643faccd4af..5b4b3e89acdc 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 )"
 
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.2.0_p20201217.ebuild
index 9643faccd4af..1094502e22e0 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools bash-completion-r1
+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/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -28,7 +30,6 @@ DOCS="README.md"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-lzma.patch
-	"${FILESDIR}"/${PN}-fno-common.patch
 )
 
 src_prepare() {