gentoo resync : 28.04.2021

7 files changed, 7 insertions, 172 deletions

diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index d7e0e0706141..9ea83af2d99a 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,12 +1,3 @@
-AUX vgrep-2.5.0-remove-sudo.patch 293 BLAKE2B ea7e903326134859f2d278d568fd02dd13c75442fb27d9261105638bf6597c5fed819ceb834b50edf57925bb614b57716e3c2ae035bd7552584f27276cde9395 SHA512 8879a73a4afa8b2058409311e6b4a8862f853b6eba1edaa158aefaccef58da32f1067c61f359dc6e5fa8223d4c11a3df126b81c366739c6c0ea5412e4388d29e
-DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb001ff8b410ad54691ec6bf39f41c535fd25bdd5d93fdf89b4e4b49acf4dfa9a8956653e5c5e2ce39bd7da8d484 SHA512 0fa65151ae40f7fefc4e5b1af8e6ea332b50b1136849ec0902dd110786ca14204441e27c65a036b08fa56bf04a6325d8aa8ef2d4d02cdb0e0fe219896e24d694
-DIST vgrep-2.3.3.tar.gz 1149769 BLAKE2B 59f15e0f2d9fd069b4926cb26a0517cb1d201dccce53d7c6b3ec1954693a3286396e8d4d72e2c3bcc4bb8e70083ba1ea349dfc4bec244caa112fcc2289063c25 SHA512 b745ec24bb5c329a3d0e4e756e54432f3acf9c24f9492339b69850d5a8e688074323d7e56c584e59f3aedf3a41b84997497791512dae2950424eaed56d6b7329
-DIST vgrep-2.4.0.tar.gz 1196159 BLAKE2B f8b6b8166feb17ddeea7978ff14fd729ee395feb9658cbfc838f978f33169c7ca15dcd4008af54582aca25a0803924c508da11603d02e42d1e597a5813f78c3b SHA512 c614b52fe7fa720d3d2bb57830805c1ebb7c47db549aadda9309676b9c286447e693e51f74f969ccd0450934510bfe79c1603717022dd69c9f7f2709cbfd4465
-DIST vgrep-2.5.0.tar.gz 1355064 BLAKE2B 7a724fed16ec4589ace159dd5dcbea8e4450393f2c356430d9e8e87b799191b06137e20f2d0c32c53b71ff79d5abaa5551f6254ef6989631d9f6b9d771a5fe18 SHA512 95ee8ff1ca705cec8deaabf8e20d39df23dbac1ab797d025ca253904bcb7f4cbedda3ef052d006064c8d652c06b50cc3e5e532108b23a95511ee7b85b8abb3d4
 DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
-EBUILD vgrep-2.3.1.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
-EBUILD vgrep-2.3.3.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
-EBUILD vgrep-2.4.0.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
-EBUILD vgrep-2.5.0.ebuild 741 BLAKE2B b84a646cab1567983482132464b41a6adfaa29963a36e2bc3381efd8c0ba4164217e03b2df9d9ea2c2852368f26eabaf3d3cc230a6cbbae175ed3e26a73716e4 SHA512 191ebb96d53388ce332a205d2dcc4070a6b676b8c2c4f5a4489f47458cbaec8eff83d5191a477fb83880be1598afa0e1f17bd0078e1a25674896bda39cdbdacb
-EBUILD vgrep-2.5.1.ebuild 684 BLAKE2B b4f4d2c4d18340ebe2f481055097975ac3479a5303b0d2d0b4b55aa87e7876ec6c4f3619064afb4916b3bf408863cf2d632ac18d413a91385adf3a8eaf4a5934 SHA512 4fa96a4333593bc247ad8c072d3b75845a5f343da687e09c923f86d5bea3da2d1ea953b225ba327d24f099a7c4ad69de6b49de5b4954dfea836095d393944d8e
+EBUILD vgrep-2.5.1.ebuild 645 BLAKE2B 00198ae16ad677349172aa644376ec3057d6e813575c28558ece7aa39ffde63a383bfe69111ce9cf25465cb66f0dfd4b12b4ab1cf1c3bc0cec17626db3b52367 SHA512 42caca3b8423f3189005c74d6bb52aae5f86d62e4b98293887fc5bfce5af4e50c0e6764064006a8ba46ff61977f06b070dc414cebe2a1515a2269e49fb0e5d5e
 MISC metadata.xml 394 BLAKE2B 52d95eb8f47c5002203258b8077e0104423472b1f4bdae387fa8194b5056fd4986a9b795d0bbaa7939497ce45ff2ee0ca90e1c44ebeaf31b40725b36ddf1390a SHA512 9f44f00b50a654d27819e20172dc338d3dac8abcdac3933df88153156871612e1c414dcc5b0590795eb58c972302c3b54546b7dbbd539ca60737bcfa5a8989f3
diff --git a/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch b/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch
deleted file mode 100644
index 25764d199b45..000000000000
--- a/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/vrothberg/vgrep/issues/130
-
---- a/Makefile
-+++ b/Makefile
-@@ -113,7 +113,8 @@ install: install-docs
- 
- .PHONY: install-docs
- install-docs: docs
--	sudo cp docs/*.1 ${MAN_DIR}/man1/
-+	mkdir -p ${MAN_DIR}/man1/
-+	cp docs/*.1 ${MAN_DIR}/man1/
- 
- .PHONY: uninstall
- uninstall:
- 
diff --git a/app-text/vgrep/vgrep-2.3.1.ebuild b/app-text/vgrep/vgrep-2.3.1.ebuild
deleted file mode 100644
index f50049ccd32f..000000000000
--- a/app-text/vgrep/vgrep-2.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit go-module
-
-DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
-HOMEPAGE="https://github.com/vrothberg/vgrep"
-SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Uses golangci-lint
-RESTRICT="test"
-
-DOCS=( README.md )
-
-# go binary
-QA_PRESTRIPPED="usr/bin/vgrep"
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	local prefix="${D}/usr"
-	mkdir -p "${prefix}"/bin || die
-
-	emake PREFIX="${prefix}" install
-}
diff --git a/app-text/vgrep/vgrep-2.3.3.ebuild b/app-text/vgrep/vgrep-2.3.3.ebuild
deleted file mode 100644
index f50049ccd32f..000000000000
--- a/app-text/vgrep/vgrep-2.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit go-module
-
-DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
-HOMEPAGE="https://github.com/vrothberg/vgrep"
-SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Uses golangci-lint
-RESTRICT="test"
-
-DOCS=( README.md )
-
-# go binary
-QA_PRESTRIPPED="usr/bin/vgrep"
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	local prefix="${D}/usr"
-	mkdir -p "${prefix}"/bin || die
-
-	emake PREFIX="${prefix}" install
-}
diff --git a/app-text/vgrep/vgrep-2.4.0.ebuild b/app-text/vgrep/vgrep-2.4.0.ebuild
deleted file mode 100644
index f50049ccd32f..000000000000
--- a/app-text/vgrep/vgrep-2.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit go-module
-
-DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
-HOMEPAGE="https://github.com/vrothberg/vgrep"
-SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Uses golangci-lint
-RESTRICT="test"
-
-DOCS=( README.md )
-
-# go binary
-QA_PRESTRIPPED="usr/bin/vgrep"
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	local prefix="${D}/usr"
-	mkdir -p "${prefix}"/bin || die
-
-	emake PREFIX="${prefix}" install
-}
diff --git a/app-text/vgrep/vgrep-2.5.0.ebuild b/app-text/vgrep/vgrep-2.5.0.ebuild
deleted file mode 100644
index 3875d5478206..000000000000
--- a/app-text/vgrep/vgrep-2.5.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit go-module
-
-DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
-HOMEPAGE="https://github.com/vrothberg/vgrep"
-SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# Uses golangci-lint
-RESTRICT="test"
-
-BDEPEND="dev-go/go-md2man"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}"/vgrep-2.5.0-remove-sudo.patch )
-
-# go binary
-QA_PRESTRIPPED="usr/bin/vgrep"
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	local prefix="${D}/usr"
-	mkdir -p "${prefix}"/bin || die
-
-	emake PREFIX="${prefix}" install
-}
diff --git a/app-text/vgrep/vgrep-2.5.1.ebuild b/app-text/vgrep/vgrep-2.5.1.ebuild
index 6b7efaf86cf6..bc38ee195178 100644
--- a/app-text/vgrep/vgrep-2.5.1.ebuild
+++ b/app-text/vgrep/vgrep-2.5.1.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"
@@ -11,25 +11,20 @@ SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
-# Uses golangci-lint
-RESTRICT="test"
+# golangci-lint is required to run tests which is not yet packaged
+RESTRICT="strip test"
 
 BDEPEND="dev-go/go-md2man"
 
 DOCS=( README.md )
 
-# go binary
-QA_PRESTRIPPED="usr/bin/vgrep"
-
 src_compile() {
 	emake build
 }
 
 src_install() {
-	local prefix="${D}/usr"
-	mkdir -p "${prefix}"/bin || die
-
-	emake PREFIX="${prefix}" install
+	emake PREFIX="${D}/usr" install
+	einstalldocs
 }