gentoo resync : 18.11.2018

4 files changed, 6 insertions, 171 deletions

diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 0ecf939eeec8..7829c1384887 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,14 +1,9 @@
 AUX repoman-2.3.0-bug-586864.patch 1034 BLAKE2B a2641d1c47907ec6069c490de30aabdcb654fefbff36665899463f2bd4fab343f254ab54038b5756c32b8df9058f270e9ef17c743898bdfec6b65847dae2f443 SHA512 463bd5f0255165faf0c60faa327c29d9eb1a6f9ccdf41369879485f234e1bf9d2713332c115b36088ac9227a56ca154786b3955b2d6e8ffdf7bdc3f10a5a762e
-DIST repoman-2.3.0-bug-586864.patch 1074 BLAKE2B f29ed4b9b66540bf765cd9bdf46ed10d99845ca141df4ad9701d94d8283343bb2e9101cf44e10ed2dc2dd11d02c5dea68e113f624db82d420dac5e846dd44c59 SHA512 b48112a623a4844e5783f229ee0208f729b99ab46128d19735a76633efee17deb81342b5dc8fa67f4f4f5a851509c04c8d2f2ba2cbd992a9d26e61da4ed5f7e8
-DIST repoman-2.3.0.tar.bz2 75285 BLAKE2B 980fadf2247869358f76f6708117b8a9591763e9cae8fdeed8fe4cbc6915d0fd4473381a0eed99c16fc67394fda996c12b9784b7511ebe07267496e39d683258 SHA512 960c63caed12f7c89d374ecceb39677b62d588bf75cc8da1857641c60310061188f4c2fd7177c93a4e8f20cf00a423426f2a70666320f263158531a618a7ff9c
 DIST repoman-2.3.10.tar.bz2 87545 BLAKE2B 67e1e514eebd50516aeaea2708ebe4c9d69cbf61add5fa19a31681f085a6dd8c39695cb63d9b4cd23caa955c85669148fce3c31c08b913e31839ff186e3b3ecc SHA512 498ce493661eb5939a5f1345337e11a84e97fc11a0556f2660bd8900f0cb0f6340a401e5728c4557248dd54bcdc0a7d2c72dbb23eea3acb35e053d7359c0e535
 DIST repoman-2.3.11.tar.bz2 86807 BLAKE2B f5bf8e9b7bac7816ee9b1139d0e0d30e99fc06da4fb742e430c237d9be0e6261bcf5d8f3412f1c20a34e2766c5acc86176b4731f20adc9554de9949bd5622a5d SHA512 331614554bb7ba49b8b63b8612642426fb458aa84de78bb9958be85d03e43d662fc094ecd2472a6f06c6b4f0368ec0542083b04c25f7d8b6aabb432cd2b32367
-DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3acfd1842854b33fa8c0a64fa636a0b278b4fd3010b7070a7e2f00ae841ea331925ca20175e7c7e571082195d3d1 SHA512 490078d4621073e448d037373617911093bc4c3262961c4da00f201f880069c0b70c019abd86c15954ff0c547b0ea49434ee97cd972c2baff82f7cfed1a987b3
-DIST repoman-2.3.9.tar.bz2 86432 BLAKE2B 8b60e9ee2705e8fe5d6ab569120f96ca452327c70b95a3b2fff291d4e5c6e446a5bbfa9256b5b0ed18a4e54662bb1b60f4a1e80a8a0c07d276a42fe756ec30e2 SHA512 7b492db9b46f8ebb681ec7dec6dee4a40ce5f95809d505e8b74058c391d16dacdb0171befad64f0281c0168316fcc9d7ec09c7b37742b87b890593ac610329a7
-EBUILD repoman-2.3.0-r1.ebuild 2503 BLAKE2B 3c6b8981076ccbaa0c270c4a5a5e60382892d9793b47b163ac40ad965be32106e508cd9f8c020fe28c67778d36b8cf35653bef11c159d8fe7a663186a5cfdec0 SHA512 b79135e052cf2b1106e3ebda0dfd63b37f1fe5d2869b0a97149180f1e64f21f4543e4a1f0478531019e46d602232f15c13f49d9f5e51a07c97865223ae8b866d
+DIST repoman-2.3.12.tar.bz2 86737 BLAKE2B b27d89b0fe62d52607c55b1cf1d5662699d1e46ad7ef85553d642be8fb915435f1748914b9d63febb7dddd67bd5623f72ba4aa9ca7634af98f85634af91a74c1 SHA512 64bede0e1deb7d2a8c4c702d6845e84f8937cbfb54f6f35d88a10b13c961f28948f17c9e1d623bf0f663b22f98dc4e8f514c200fb4f1b93d7535addd5efa1342
 EBUILD repoman-2.3.10.ebuild 1952 BLAKE2B e14b21a2bd636bff2104dcf56d91e99a5cf0ab1deaf6ccdd3c4c30a482f0780a37f005c80d14d74cb27d2ce523e1c7c6db6eaa8e6501178506053c38f4dcb5f6 SHA512 e053f9decb8bc1e4bc9a2df878ee227f5bfde2fa325eaa137a24b2ce070a8abe6fa6144e01b737da188bcb20d5d7b69133adff27296e7a77292f3761e9dba0fd
 EBUILD repoman-2.3.11.ebuild 1946 BLAKE2B 2286b77ccd4d1bd546e84ea0c50bb3ba12ea30c5b3a38ea98649bb74cbae82910c79ab0501087f12fa36fca9696c269b5610b082e462b765e3bc493c838030f9 SHA512 d866b6bdef1c4da28eb7368862b725e87c4bcf052b4df083e2c0a1631ed928814c9bdbda3022258fdb25a5b5c2fbbf13e235a617ab64d2d2e59d666795956469
-EBUILD repoman-2.3.6.ebuild 1843 BLAKE2B 7423ea5e4fe5e895912bf383fc4e319c08abd5ea0995c497baef8bb8291516691e92124156681d860c3963966db8ecba48efb364de8256860b9c09aa1ef72bbb SHA512 d8dda4aaf8518c40bf2fc6dda958fd6218cd604a4102f9d1aff9c9b7ed0cdd6314dad10a11ab5e38ce455cebb12eaa20d99e21dd3ae2495182411a6f7abe7acd
-EBUILD repoman-2.3.9.ebuild 2165 BLAKE2B 9dc5c9f83b489e59770411eb09b1706145eb931ced4ea11f70df8bded8b8ae01cc5d0fd817dcb24765abf71738f84bece86ad189ba5db2a2ec94ceeabbf92bd1 SHA512 a77bf9f1c9d5e13bd1d6459afde097187f2ab3c596fca467f63cb2090ae5d48c8f634f9d20accb750e2f674214a8c69609b3e2a80b254df4fc36b4622c560d19
+EBUILD repoman-2.3.12.ebuild 1958 BLAKE2B 3b07f84e738e20027799bcb3faf4985b5b3040699051380ce8b8b640289a37cee9b97fc46a3a3b3e2559aaddde5b70d86b4e7f8626dff5721d2b450d5e7e89c6 SHA512 2486405267eb1de83802c9ecc817fe0f31d1e9825c92991bd0064e5908c4e0069e5ed2fb0b44bf7e8092cf4163a9b14f00c425bc72174a39dc393fbb4898f734
 EBUILD repoman-9999.ebuild 1982 BLAKE2B 2da48849d7f710be3930ae5882f420d25e9e9aa07a5d94cb77e658b0914cfe94ec2b3bcb174bfbb8a9739a55732f4fea02ca85afe8516dcdaf89627bdefcf0be SHA512 e9ee663fd2019db232df7cba9b0842f654f64c7b83dacd991a9844c1736651ff74ce2096979035ca2b29e6e9ddbbf01891c35206b77bb4ca0f077c7354e65f6e
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild
deleted file mode 100644
index 0cfe176939b0..000000000000
--- a/app-portage/repoman/repoman-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=(
-	pypy
-	python3_3 python3_4 python3_5 python3_6
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/python-exec:2"
-
-RDEPEND="
-	dev-lang/python-exec:2
-	!<sys-apps/portage-2.3.0_rc
-	>=dev-python/lxml-3.6.0
-	"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/repoman"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://gitweb.gentoo.org/proj/portage.git/patch/?id=ef33db45a0c1d462411d4ced1857a322c0ab28f6 -> repoman-2.3.0-bug-586864.patch"
-
-python_prepare_all() {
-	epatch "${DISTDIR}/repoman-2.3.0-bug-586864.patch"
-	distutils-r1_python_prepare_all
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f -print0)
-	fi
-}
-
-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" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	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 ""
-}
diff --git a/app-portage/repoman/repoman-2.3.9.ebuild b/app-portage/repoman/repoman-2.3.12.ebuild
index bfc9375dc61a..3273c5884deb 100644
--- a/app-portage/repoman/repoman-2.3.9.ebuild
+++ b/app-portage/repoman/repoman-2.3.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 PYTHON_REQ_USE='bzip2(+)'
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	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 s390 sh 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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"
@@ -25,18 +25,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=sys-apps/portage-2.3.27[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.3.43[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed 's:FileNotFoundError:EnvironmentError:' -i pym/repoman/config.py || die
-	sed 's:file\.size\.fatal:file.size-fatal:' -i pym/repoman/modules/scan/fetch/fetches.py || die
-	distutils-r1_src_prepare
-}
-
 python_test() {
 	esetup.py test
 }
diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild
deleted file mode 100644
index dc60ecf6859d..000000000000
--- a/app-portage/repoman/repoman-2.3.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-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 ~mips ppc ppc64 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-2.3.14[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.6.0[${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() {
-	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 ""
-}