gentoo resync : 29.01.2021

8 files changed, 31 insertions, 13 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 266574fa0cd2..2476bf116533 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 65853b01a5ec..3cbdf46c1981 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -21,5 +21,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
-EBUILD cvs-1.12.12-r12.ebuild 2932 BLAKE2B 553077d0ba067ad20889166d8d48c28f3b6af31b8bf71168d36a90adad0f5915b91c7cd9eea7dafc763da0526bcdb0bfd62bde24b36ad8f64897d49fa0e9c2a8 SHA512 32f91db8de48d05cd00580346ba1f066f843b98b353e56cca29a83e94a9e47b64e4c2f286c087cb2ce79c630dc4a2b58da65941298df2e828eea79afa7d1eac9
+EBUILD cvs-1.12.12-r13.ebuild 2955 BLAKE2B 0a8da34cb7ff3485ac3cc7212661c197e223b5ba5b39a5bbad8c4cbfcbe9a1af3473beb4536a2d5a9aa2b23930b42939af25f6dda95ca10d1cc7aa2d4c462fd6 SHA512 292f2d6645603d6150260f10a49d014f8156290b5d59e8b67d17247b85c49f278084e853ad4064e63f7b1182d26d86bfe7abdba54f82f4299aaebd98bcea6c81
 MISC metadata.xml 238 BLAKE2B 7cfdf56d73fb2842fdc430be958eda28a1feca63fb12e3b4eca388a268c9b9dfb80100d649503f333242d60084dd8b0ed7340ed5fcdbc25f2b6cda956d13a603 SHA512 ae7619f8ee8ed9bf4db2e5f53bedddc7b3653066c7dd5de3aa79623e340fdafc579a5821ed6ba49aefa52de33bf1901d082e23f4ce1e8b5ee791ae9a526a5d6a
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r13.ebuild
index 17ca2255bd2c..1767d29d5beb 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r13.ebuild
@@ -93,5 +93,7 @@ src_install() {
 		newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
 	fi
 
-	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+	if use pam; then
+		newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+	fi
 }
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index 7ef7f1807707..b448aa908a1d 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,6 +1,6 @@
 DIST git-lfs-2.11.0.tar.gz 2839623 BLAKE2B e9d0e8ea37f19617a4f727abdc93c3c937052ad98b6ac40de27ced6b250789701797d04f1bf795b259e83155e5d8a1ca122dbf8b40503c2c41d6d891a3ecf096 SHA512 2117b425864a36f773c14d34c78999636d836646184cf8d89045ef6de90cbded873d4de4613ecfafb0fa2ea8ae068e11f5ae22eed6af01715b5fac9be70f033b
-DIST git-lfs-2.12.1.tar.gz 2848245 BLAKE2B 745a1ad252b925074a9ddfd9f899098dfca0b672b176178675652d910737f76c2c55aa502d0a544ad36a7eee00a464e12b9bb178ccd1fb118c2a96b362de80d1 SHA512 728bf414910a9a9106ea6769b939aae9ec25976e686399d0612e8ff99131a6571641b4121cb123ad6c32fc6dd59674ca50416a48e4771924b27062326df78ce0
+DIST git-lfs-2.13.1.tar.gz 2526962 BLAKE2B 3f3af1c0f976a17c108159fff15a065600f32af2a31d459fcd4b9e64d8e77aa8569aa81c932f38713ff6bafdb636aae464a2044f2664d124ca7de0a7157da969 SHA512 48397ed0ae976544c80df59df1991b0f35606d0a3ed9eb0aef66857e5bf2974e8ad5677be98b53433628d26f9e5135e9f28b15c8789cc6a4ed091946b79e6fce
 EBUILD git-lfs-2.11.0.ebuild 1392 BLAKE2B d6e33aa99c265dd3e2fd889c5bd9a70b751e15cc9757343e1e1bd7bec432e8015611e7b3009d1cd291eaa6b69e0a6fb7581d50f744f1a164d52936095ee5c03d SHA512 497ae5f9fa85cc412cb1708f13e75acaafc4087c5243aee8bdc9ff4567756cd60602cda6092ea1f98fe560a7ae9a6a05f69ffbb862136d2782b2850d8512ad15
-EBUILD git-lfs-2.12.1.ebuild 1533 BLAKE2B e946cc14e7954b40e712bc8afeafbd5227f37aa5f2b6b9c1bf966845b914a81212ded0a6d2158ce770f207fc5fcd39280a13cd1a809c2414e2c854bcbb83fd3d SHA512 2a196f4170676e72faadfcb489e4e152a4cdc28ba4bb21c38b2c11f91731d7136f32a511b5abecc32b37d3adbca04ed0c32991232f9d23503363f806bb19f8c7
-EBUILD git-lfs-9999.ebuild 1533 BLAKE2B e946cc14e7954b40e712bc8afeafbd5227f37aa5f2b6b9c1bf966845b914a81212ded0a6d2158ce770f207fc5fcd39280a13cd1a809c2414e2c854bcbb83fd3d SHA512 2a196f4170676e72faadfcb489e4e152a4cdc28ba4bb21c38b2c11f91731d7136f32a511b5abecc32b37d3adbca04ed0c32991232f9d23503363f806bb19f8c7
+EBUILD git-lfs-2.13.1.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
+EBUILD git-lfs-9999.ebuild 1574 BLAKE2B a4115ded4f732b9a9e4d2c16ce0ccb75ee553ff311433aaa56e9a4f799b6a69db0360526dbb1b610805063b756a4de3f717db6a7b0025da41033684dc13aca72 SHA512 7ccef2d1bedb5bff04bc8cb73d3f8c797790173278d6bcccacb82e2072b6203859114d7525990dbb897a30281c44642ef626d321e1d28a893806a5adc7a97e69
 MISC metadata.xml 558 BLAKE2B 307387b4326dd3982b949f3dc06f69efa31fcd70cbb03b1c68a5557965fdc14bb32f638a644c951ec06bf979baf8046228bf0820c9dac96a3d984c3cec3b32eb SHA512 8ae42faa56a37e9ebbd3c6fba90e4e87b44f8022ffb2bc3fb2eb7128c5bf7c34497c7a13c73252db5b5096135ed153a61c74382a54870c32c36eba7af23f7cbe
diff --git a/dev-vcs/git-lfs/git-lfs-2.12.1.ebuild b/dev-vcs/git-lfs/git-lfs-2.13.1.ebuild
index f5a948c8f4fd..641f9c79a60b 100644
--- a/dev-vcs/git-lfs/git-lfs-2.12.1.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.13.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
@@ -25,6 +25,14 @@ RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"
 
+DOCS=(
+	CHANGELOG.md
+	CODE-OF-CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	SECURITY.md
+)
+
 src_compile() {
 	# Flags -w, -s: Omit debugging information to reduce binary size,
 	# see https://golang.org/cmd/link/.
@@ -41,7 +49,7 @@ src_compile() {
 
 src_install() {
 	dobin git-lfs
-	dodoc {CHANGELOG,CODE-OF-CONDUCT,CONTRIBUTING,README}.md
+	einstalldocs
 	use doc && doman docs/man/*.1
 }
 
diff --git a/dev-vcs/git-lfs/git-lfs-9999.ebuild b/dev-vcs/git-lfs/git-lfs-9999.ebuild
index f5a948c8f4fd..641f9c79a60b 100644
--- a/dev-vcs/git-lfs/git-lfs-9999.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-9999.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
@@ -25,6 +25,14 @@ RDEPEND="dev-vcs/git"
 
 RESTRICT+=" !test? ( test )"
 
+DOCS=(
+	CHANGELOG.md
+	CODE-OF-CONDUCT.md
+	CONTRIBUTING.md
+	README.md
+	SECURITY.md
+)
+
 src_compile() {
 	# Flags -w, -s: Omit debugging information to reduce binary size,
 	# see https://golang.org/cmd/link/.
@@ -41,7 +49,7 @@ src_compile() {
 
 src_install() {
 	dobin git-lfs
-	dodoc {CHANGELOG,CODE-OF-CONDUCT,CONTRIBUTING,README}.md
+	einstalldocs
 	use doc && doman docs/man/*.1
 }
 
diff --git a/dev-vcs/stgit/Manifest b/dev-vcs/stgit/Manifest
index 172444cbdcdf..70da38b6ab27 100644
--- a/dev-vcs/stgit/Manifest
+++ b/dev-vcs/stgit/Manifest
@@ -2,5 +2,5 @@ AUX stgit-0.16-man-linkfix.patch 429 BLAKE2B 11cd98b7a58a55fed445be700bc492a4fd9
 DIST stgit-0.21.tar.gz 319605 BLAKE2B 92bb879d8b8804c8a1b2ca8038d010a0b5118970a4482d87d6bc295992849511c33acb46f376034af6609d42c0323d692bff0ea9bf217cc860e53915fb3c982e SHA512 394c2b30596819f1376bd7432be6923a8dad73f58f049022fe64d1520fd75418665af8069aac98843df051f7fbefbb367762ad4ba57f13bf747819035c7d63ee
 DIST stgit-0.23.tar.gz 303836 BLAKE2B 018e0caf74a3c449a71362e3694b2ddf030f5ee23e3212a98b378b7118bae9fd15d0e4ab2a2a746a12b34e46aa2edb86657a4a7125f3c5ca8aa0142fe3d73534 SHA512 b3c9b5c0833cb7e5137faf0df48af6a11b9508b994cdf55b587567d1c146fd4ae29e7beb6d1a34b3f87e5b3854af035dd7e5ca35338c20740e91da7b47c4568d
 EBUILD stgit-0.21.ebuild 1883 BLAKE2B aedcb46f09e670914d19905483f6974b36196a9d746490a9368376d06d83786754b96513ade7df8203e02286745135e8a127d7bed043f5ecd8ca84620eb50528 SHA512 f1f2a8a7ec098783ccf6061eb51a38e47adac3f5c66b473c7f8b886306951eb5f5efc6455c4460278b590ae70976a8d376ccda34be886c5cedb335cdd02d3d30
-EBUILD stgit-0.23.ebuild 1862 BLAKE2B bd4b77224a144354c2556784eed7b087b14f10677c5fe1630f7dcf28f65e00d1b63bfd530cf881379d2a8333cc14f6e73ab048e74e1b1bb747a9b18ac3f61142 SHA512 75f2df0395d5fe29f7787ccc3921a845c6cad1878c3789bcab206ed9f404da49fea571af81260e03dc0c4d8feddcbc42c8fc9b5f27f6b8f389f832958405c3b8
+EBUILD stgit-0.23.ebuild 1857 BLAKE2B 2b62ed7f79b64ce41a7dad284e4edb088faec9a27f76d9ad3024164b7498cd91bf01ad279f2ce5bfcfae9df88d92c7000d9a7110368438aef6d7788daf1db582 SHA512 eeb59a78a407a991d2c31598f588e664c0a005fae990fbd30dbc41106c860f36ad842c84641a76ef68d45c358f1422f1ac3490925725dfb884f7812c989a25fe
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/dev-vcs/stgit/stgit-0.23.ebuild b/dev-vcs/stgit/stgit-0.23.ebuild
index 65c2f4791666..bf3048b2701e 100644
--- a/dev-vcs/stgit/stgit-0.23.ebuild
+++ b/dev-vcs/stgit/stgit-0.23.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Manage a stack of patches using GIT as a backend"
-HOMEPAGE="http://www.procode.org/stgit/"
+HOMEPAGE="https://stacked-git.github.io"
 UPSTREAM_VER=
 [[ -n ${UPSTREAM_VER} ]] && \
 	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ctmarinas/stgit/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=">=dev-vcs/git-1.6.3.3"