gentoo resync : 25.11.2020

5 files changed, 77 insertions, 11 deletions

diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 0ee35e53858f..cac1afbe69e8 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,6 +1,8 @@
 DIST repoman-2.3.23.tar.bz2 87108 BLAKE2B c1190433bd8aedf59e1ddf192dd14cca13e3bdae7367decd6bf64a79021f54a63f21ec49d5737b90c46be3894f4d3ff11bf5bd2868c9ebf65e44b4eb3bb4eee0 SHA512 9d01fadc5820501a9bfb9c1b6d9634ecbc14aacdc448bb440d1e37d47f7e4bcdea8269f8ba90e3783d84f31121870a9d7b165f58b78f0d0f0f4e822a25687d1b
 DIST repoman-3.0.1.tar.bz2 88134 BLAKE2B 270eb8c6220360d32076a402795df9bb1c7ce7ca6509707fc2b9307ca94b59131da3100b51519bed2f76dde703782db6ed74a052b51ea48c690e6558ceb9d24f SHA512 2da130a5dba547390151620f7e944de45e0a880165ab138000870661778f54c6f6c2e0eb61bab961a0cf17642a96fc8a2e5e508bb16cc1adfcf103074838196c
-EBUILD repoman-2.3.23.ebuild 1968 BLAKE2B 73858d208a8664ade18846502077c7d612b00cd17cd4d075ef0fdba27933f1654a039b1ffb7a3812de8be6b00623e52da004bbcf6c4e91fca2899a421ded3c76 SHA512 1d1ab128783bc184c40565e27bdf9d878fdf9e8a8918c9a823b1cde4fae8b070ef39e65430de2acd7857301302c415fc7f9eaa8382667c994f833c090efa6a48
-EBUILD repoman-3.0.1.ebuild 1966 BLAKE2B 5ba6c949afc14e8e64d4266211ee056692efb471f2dacde9312d0eb528e414ce662dcca99cc9407dd77203a85ccc93278362bec3bd64f32fe8be2eef60ab88a6 SHA512 243d1ddde363813e591e22f53177df59d200324e2861beb6aa036c6c4dd9bd9a78fe2eea1ecb82106cf94d8796e65a9e1301e07d10bfafb0c3e847603589ff77
-EBUILD repoman-9999.ebuild 1974 BLAKE2B 006e49015b7b252a4105f4f5f4c2bdbe2e828a44004c93a2a263be178793d245346b2eabf9688ac8c69f33066f393550aeec18fd5b1a90c52f0dac533743a503 SHA512 b568772c42fc7cd3ba1ea6daae580c3ca3c0fd5aebea530d3c47e3762f66deae9f8b4ac09a22412ec3dfb6372cc112e0851ac3d69da4649abd9d0fbc73bd5190
+DIST repoman-3.0.2.tar.bz2 88258 BLAKE2B 32c4d6750fd225cf9fc071be0ffbb38563ffdaf50f1f1ac7247ce3733bd781cd699052101df8b6565fd3d32ec6d9a54efb611b815a722b7954d8100ce01de146 SHA512 fd5b4549a0b108ed1ad37fc0766fc73db127bba8b023a74566ee0167e2a9c56c8597b83ead16522aaf84f158a9a5d0d59e4b5bcc908e6024724c087c837e1fa2
+EBUILD repoman-2.3.23.ebuild 1969 BLAKE2B 58a32ecf2b478a72158c99813f12c6b82ad55288da0f2e33cad10d880ca91e05e8e4cea6596ca2bf9b564bcfd899eaf5b5859c7c12b363acf3960eda99f7a56b SHA512 4cc51f60d3d683c3670c5ddeeef8eb7632d0a3e3bf7672b72d1871564d7531b697820a4df02e715683245d1ae42d1fbb1dfd7fffbc59d88a6132126cf49ec9dd
+EBUILD repoman-3.0.1.ebuild 1973 BLAKE2B 7a4ec001d01a13d3c4c307c3123a585e4b8c6ed10c2abd4b22b411b128080ec6f3bb61ff45497a77382435a685e9bd886b18f72b9e36c782d6b502f8b60f399a SHA512 6a0cbd1e0b7e20fbbacb5d64de14bdc4337f83207ae2617a2f53d60b0ec8a63c9a709f7ffe283cade3024175bc071f43a69f7e22ff472508b9fae915e469950b
+EBUILD repoman-3.0.2.ebuild 1973 BLAKE2B 7a4ec001d01a13d3c4c307c3123a585e4b8c6ed10c2abd4b22b411b128080ec6f3bb61ff45497a77382435a685e9bd886b18f72b9e36c782d6b502f8b60f399a SHA512 6a0cbd1e0b7e20fbbacb5d64de14bdc4337f83207ae2617a2f53d60b0ec8a63c9a709f7ffe283cade3024175bc071f43a69f7e22ff472508b9fae915e469950b
+EBUILD repoman-9999.ebuild 1982 BLAKE2B b26bb32e1634ad535bd257e4d706a1ee5e3372ebb91dca98ed1e6fd4e382ae0aa1010fa3f67a7b7a315e0e4c3ca973fcfc8244a1e831a720e13ca1d174bb825b SHA512 69ae45762bc10bb322df77623f364632b76f1a1a6e8e2794f3bdce9f555005b5ceccb2726e5b7a9444d86018e7e7b7c49ad511a619f9a30b3c8f40976a737b73
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.23.ebuild b/app-portage/repoman/repoman-2.3.23.ebuild
index 9dfe116e98f2..aaaa98275085 100644
--- a/app-portage/repoman/repoman-2.3.23.ebuild
+++ b/app-portage/repoman/repoman-2.3.23.ebuild
@@ -50,7 +50,7 @@ python_install() {
 }
 
 pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog ""
 		elog "This release of repoman is from the new portage/repoman split"
 		elog "release code base."
diff --git a/app-portage/repoman/repoman-3.0.1.ebuild b/app-portage/repoman/repoman-3.0.1.ebuild
index 7d7c4645d606..b110bd4e8bca 100644
--- a/app-portage/repoman/repoman-3.0.1.ebuild
+++ b/app-portage/repoman/repoman-3.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -50,7 +50,7 @@ python_install() {
 }
 
 pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog ""
 		elog "This release of repoman is from the new portage/repoman split"
 		elog "release code base."
diff --git a/app-portage/repoman/repoman-3.0.2.ebuild b/app-portage/repoman/repoman-3.0.2.ebuild
new file mode 100644
index 000000000000..b110bd4e8bca
--- /dev/null
+++ b/app-portage/repoman/repoman-3.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE='bzip2(+)'
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
+	S="${WORKDIR}/${P}/repoman"
+else
+	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "This release of repoman is from the new portage/repoman split"
+		elog "release code base."
+		elog "This new repoman code base is still being developed.  So its API's"
+		elog "are not to be considered stable and are subject to change."
+		elog "The code released has been tested and considered ready for use."
+		elog "This however does not guarantee it to be completely bug free."
+		elog "Please report any bugs you may encounter."
+		elog ""
+	fi
+}
diff --git a/app-portage/repoman/repoman-9999.ebuild b/app-portage/repoman/repoman-9999.ebuild
index ac8c1532d0ef..aa73aeae5448 100644
--- a/app-portage/repoman/repoman-9999.ebuild
+++ b/app-portage/repoman/repoman-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage.git"
 	S="${WORKDIR}/${P}/repoman"
 else
-	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=sys-apps/portage-2.3.0_rc[${PYTHON_USEDEP}]
+	>=sys-apps/portage-3.0.4[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
@@ -50,7 +50,7 @@ python_install() {
 }
 
 pkg_postinst() {
-	if [[ -z {REPLACING_VERSIONS} ]]; then
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog ""
 		elog "This release of repoman is from the new portage/repoman split"
 		elog "release code base."