gentoo resync : 01.10.2020

5 files changed, 6 insertions, 5 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2be2d94b4c3d..b5dea2ef2b19 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index 821581371f16..26471bba93f6 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -2,5 +2,5 @@ AUX fossil-2.10-check-lib64-for-tcl.patch 445 BLAKE2B a8282820edafb15ae6542b9f13
 DIST fossil-src-2.11.1.tar.gz 5850806 BLAKE2B 640807055100888d6bfea13539efb02190f07db5edcec58025952e464d50d4bd13992e5e8f5e515b01f52eaa3409d7a536bd4b48aecb5fdcf6214e47dc4963ed SHA512 055306c0d5c2f9b536ace6385ed79b5ced56d77dfc8e08b38f51075e97dfebfffca10aa7e17d2b22b9945c71b12eb131d49f3651e2890820dc9cb04719cd0265
 DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
 EBUILD fossil-2.11.1.ebuild 1803 BLAKE2B b54945558e0ea1c47fb53bba1791c336502b4313944f1e2b136233090de7fff386bbb34fd767fd4ebbae9dd8e1e7a9f82184772f06fb57d1a4f3fd8c26ce7c6e SHA512 904b64bcd8c4d6ea15133ada565655751388fefd455e795725f883707fb41e6d9db4237307c4d725b10a78a289e997c40dcca5970fa53219eddfb7f8629c7fdc
-EBUILD fossil-2.12.1.ebuild 1772 BLAKE2B f8e40756b2d16d777dc5ab01d929afd2971155b6b1a2b91ada335251603173c60ecac34819e201dca4c32176f18b706ad4794cce1f3cfeddf4380726a6b4345d SHA512 b9d9b337f3a4b83c1e256ff2d295352b16e2d2df1f7bbceba788ff259ab2711329eabba46df65384df986e9696dce6fb663d2487cdc4547fd257a2c14c3867e9
+EBUILD fossil-2.12.1.ebuild 1770 BLAKE2B 3548fe9df8fbf06ff7257886e863f0599ae612d50e3784606468de2cd46df172f6471100b07bcd37782ffddb91d8e36b722d5e7e412d4ef6fbf3e24e30bd5fdc SHA512 d8170066fbf5355645d160e2476a84a3ea1a0f068177e06ec1181cefdc087f5ad4d866d6670385cfd1aa8bee580909d760db11f089f1898e8f374c7f006eb7a0
 MISC metadata.xml 1165 BLAKE2B c370f1370c7250945135e56514558acd016742f6d8a9c51e98b9533e094b47dbdc07808abbb1341ad1e987dac6f5f13d2e2f0fef45587935accf082c15227330 SHA512 6ef05c3722bb110e403294b002c253eb1ae4f29a4f5306dccee3abd52ce61c8ae04ed2255f551298d94b8b99d96c799f05bd6df7a9d4e9af08e4c10ce306d0ab
diff --git a/dev-vcs/fossil/fossil-2.12.1.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index 1073f6c6472c..71d847dfb53c 100644
--- a/dev-vcs/fossil/fossil-2.12.1.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index d98540db7d38..099179042687 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -4,5 +4,5 @@ DIST svn2git-1.0.18.tar.gz 53514 BLAKE2B 1e40318e484df4eee9ab3586b73cc6a7d9599f8
 EBUILD svn2git-1.0.16.ebuild 1034 BLAKE2B ddbb36477b2dbd88f52598c46dfe6c357a3ee03f17ba668897a11cdf1da6b2d11bbaa160526b7ece14437883ba7583a596f3f9c66f5fdf65c693d76427a7b8b7 SHA512 61d9606dc51ba6efd15b615d6573a357a73b84c01303c6b561b6f3f09aed6db4e9698231b86622913a97118b8a85c36df71b238ee5a2bb0390475c13c7c68d1e
 EBUILD svn2git-1.0.17.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
 EBUILD svn2git-1.0.18.ebuild 1034 BLAKE2B bf4bc2dd9ccd89a21f5161275c5d4b6536c3824cb0f4f8218b0603ee24f01d2d0d87f63aac37bd47b6f673946d688aff9e6888aa6f51c333db683567cab49b03 SHA512 f0993c376ae1c3949cc00a51d09112eca009230d8a671dd37cc30b385a474f19d3ac135a3f3b22f1e789d5498f6ebbaafa19d169a3df32e295f67c31cdf2f230
-EBUILD svn2git-9999.ebuild 1021 BLAKE2B a503c85adb6f2b39ac0483dd3f7032b45a181b6b8306c390c76857138630864a28da68f18f9075183ad098217a7a8c888fe60ad4dd1df86918dd5790fdd9b667 SHA512 9fd102538666531b4f689f9eac4ad4ca0dcc7abf4d20692b1ab0abd0b47ff941060c03afc733e09f994618ca5478cc6d662b7324c74e9be0662b6e9c1619f9ab
+EBUILD svn2git-9999.ebuild 1038 BLAKE2B 059a84ce943445d0779faf33c7c370c238f23de5917c6a7fdbabff1b835a87be854f99094eed0f801a13409ff94ec08c93f126020fa5d8223b6e70081d40099f SHA512 79e71b22e1df2c6a9e94d262bd2851507cc5fe284706e65e24dfa83be2364e9434a33067a4ddbe10b4a4a4841b2452c2eea4285dbbbf08fa859d59b6b98cae65
 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index 7f86d838d122..71f0f843766f 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop qmake-utils
 [[ "${PV}" == "9999" ]] && inherit git-r3
@@ -9,6 +9,7 @@ inherit desktop qmake-utils
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
 if [[ "${PV}" == "9999" ]]; then
+	EGIT_SUBMODULES=()
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
 else
 	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"