gentoo resync : 05.02.2020

7 files changed, 9 insertions, 161 deletions

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index c9581d29440d..ae576936e19d 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -4,13 +4,11 @@ AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1c
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
-DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556ab1c0fa1433bbe76475513a7482619b05c28038e956e8724b99a806aec371961302914567fd36caccfe342daa6aaa SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645
 DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
 DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815
 DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830
-EBUILD buildbot-0.8.12-r3.ebuild 5511 BLAKE2B a21ff7c34a35f810a90d9b28664c23f3c22fafbee7c6beb059dbd84a2b875991304648c4a1b71e1b82cd964bc9da7ec9727609c0ed316d143e1ade0c19f29128 SHA512 7b533e30b3359024029f6e379d41e63c9b0722fc8483c5c0badcff0050bd9c9b6451aa644db4aa0c02223d7041e530943432842ef7308d5d712e69cf0c3812a7
-EBUILD buildbot-0.9.12-r1.ebuild 6454 BLAKE2B 4a7e2f95cf3c4e173d958c55058256e548450c77ef89e49518768df12e449e3a1263181a37dbbe99ba6a7d3188b4a8bccc169271e61450950921dc05dd98c2c7 SHA512 044f8f41521bc6536466d7dfffdc3d63824de4047304d7d2952679fc117d1d92db7b23999220809769dee215f7dd83f90cf434f857023c319eb0a94fa8dcbcee
-EBUILD buildbot-1.1.2.ebuild 6568 BLAKE2B ce9a7d886eb84f904d7be4e7b6e31692afd8ca13d3ae6b3cb9ccd59736fa3768faf150d0b648b64eebfe452d08b7d202f126f651545ddedcd028046b068a2c04 SHA512 1d300338000695255f1cf89c48f914f2ff0f9f1ae897bc7afe3bf3baa5c97fc61ad555d3fd7570e2a42507fc87629b85b198ccbd5360bf8ff2d6388578db0f02
-EBUILD buildbot-1.3.0.ebuild 7221 BLAKE2B 2090fec727e4677e35bd1b2318319f869084de2b1ecb2b6f214ba1243ca2960cb6f131cec36f91745e5aa064a1d2b6e91a7ea504da462fcbe85332eaf87f6264 SHA512 7ef5c7c522ad4a710a7b4685250b602a07408443711d1ecf26f377566286f43bfbafc9f192e9b81cadacc7a105b45176b4a632d01e7ebcd032082f1b9f0dff53
-EBUILD buildbot-9999.ebuild 7221 BLAKE2B 2090fec727e4677e35bd1b2318319f869084de2b1ecb2b6f214ba1243ca2960cb6f131cec36f91745e5aa064a1d2b6e91a7ea504da462fcbe85332eaf87f6264 SHA512 7ef5c7c522ad4a710a7b4685250b602a07408443711d1ecf26f377566286f43bfbafc9f192e9b81cadacc7a105b45176b4a632d01e7ebcd032082f1b9f0dff53
-MISC metadata.xml 1427 BLAKE2B 61fb937ec5b16eccfbca293455b8f1dbc8b98f489eeb150a0209b32bf53d79b3ea12841a2bd2a39d9b120009e897469e40aaa189fab33e67e9ef6a396353acd9 SHA512 eec1f2c30d650ae90c80266ffac401e432c75605422110511d40162635da39f3428e33bb04ef58de8124830e34434d2e8b582600d75ffed0bfa8d8e25e2ad1a6
+EBUILD buildbot-0.9.12-r1.ebuild 6444 BLAKE2B ceacfcbc66a0fb1e927cacbd456ef023145c475ff42ff64eaa603e1db295bec38cb7939bf577410234f16e3a851c2a41d99863f4efdced715e7d2ebdd015e3ed SHA512 8857547742c7ebe0f8fd5a5919a0e1cb5fcfd34cc35f6fd5c56f7305fd2db9bc72e5d805077ae3f041dd1b16d8825c69cd0062c6dd181db5d781512269266f10
+EBUILD buildbot-1.1.2.ebuild 6558 BLAKE2B c20fe0973f6cec4336f3d60a2c94f71ccae7cc5cc819549bc0e84f748f307d4e2e0bc5dd864a612b6dfd4ae9b3ab3f7ca9693e407dca414882ecb1d20e15078a SHA512 477c80abc713c6e62754fae6f071eeb0401f719a72c491a3a5932be8364ccc80fb2c1fc47c8093f558974a00151b8db3bfa34f3c4a088dec75d5d59ff4e6e63a
+EBUILD buildbot-1.3.0.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9
+EBUILD buildbot-9999.ebuild 7211 BLAKE2B 60ed79646218a10214ca297391319e5ba3f5124065883ba0e0a71cfb38eba76316554a6150c966ec83f09826430e2e83d28d1285e58dd75af731781121629549 SHA512 245c9956385d2752e5a54e880671a685d90d20f6854c4ffcb916b2d8f60b402c4490b2365f8cff2ab7c000b9e61065f142140c2a452f7cb9834b9744624179f9
+MISC metadata.xml 1281 BLAKE2B df69e4162a683d530c69307ea6b29362ad99f6a54af5ff977f67268e580d95cfc1924fb236f61da1c2106246e42563f66c8605d0ef779952cce57e75326a3416 SHA512 b5b7d4e08078e2541ce37ce17623dec45819029081dc9108789e964c2575b5868ea27b2d5eaa13a96b038a8a667ce7ebf18df6e73fc54eeacd609f79df36b9bc
diff --git a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild b/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
deleted file mode 100644
index f4f29f9274c4..000000000000
--- a/dev-util/buildbot/buildbot-0.8.12-r3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 readme.gentoo systemd user
-
-MY_PV="${PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="doc examples irc mail manhole test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]
-	<=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-	irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] )
-	mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] )
-	manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )"
-DEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/twisted-mail[${PYTHON_USEDEP}]
-		dev-python/twisted-web[${PYTHON_USEDEP}]
-		dev-python/twisted-words[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewuser buildbot
-
-	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
-		to support starting buildbot through Gentoo's init system. To use this,
-		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
-		The scripts can	run as a different user if desired."
-}
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r contrib docs/examples
-	fi
-
-	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
-	systemd_dounit "${FILESDIR}/buildmaster.target"
-	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
-	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		ewarn
-		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
-		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
-		ewarn "is now the common base directory for all instances. If you are migrating from an older"
-		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
-		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
-		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
-		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
-		ewarn "    rc-update add buildmaster.myinstance default"
-		ewarn "    /etc/init.d/buildmaster.myinstance start"
-		ewarn "Systems using systemd can do the following:"
-		ewarn "    systemctl enable buildmaster@myinstance.service"
-		ewarn "    systemctl enable buildmaster.target"
-		ewarn "    systemctl start buildmaster.target"
-		elog
-		elog "Upstream recommends the following when upgrading:"
-		elog "Each time you install a new version of Buildbot, you should run the"
-		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
-		elog "This will add files and fix (or at least detect) incompatibilities between"
-		elog "your old config and the new code."
-	fi
-	elog
-	elog "In order to create a new instance of buildmaster, execute:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config() {
-	local buildmaster_path="/var/lib/buildmaster"
-	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
-	einfo "Press Control-C to abort."
-
-	einfo "Enter the name for the new instance: "
-	read instance_name
-	[[ -z "${instance_name}" ]] && die "Invalid instance name"
-
-	local instance_path="${buildmaster_path}/${instance_name}"
-	if [[ -e "${instance_path}" ]]; then
-		eerror "The instance with the specified name already exists:"
-		eerror "${instance_path}"
-		die "Instance already exists"
-	fi
-
-	local buildbot="/usr/bin/buildbot"
-	if [[ ! -d "${buildmaster_path}" ]]; then
-		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
-	fi
-	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
-	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
-	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
-		|| die "Moving sample configuration failed"
-	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
-		|| die "Unable to create link to init file"
-
-	einfo "Successfully created a buildmaster instance at ${instance_path}."
-	einfo "To change the default settings edit the master.cfg file in this directory."
-}
diff --git a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
index e59e4df328db..c56a3675fcf9 100644
--- a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
index bdd4428972b3..38a9ae82e1e8 100644
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-1.3.0.ebuild
index 38b52878a2e9..d59c41b23e9b 100644
--- a/dev-util/buildbot/buildbot-1.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 38b52878a2e9..d59c41b23e9b 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index 6bb44137e07a..16f4ac623ef9 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -19,8 +19,6 @@
 	<use>
 		<flag name="docker">Add support for worker docker command steps</flag>
 		<flag name="irc">Add support for status delivery through an ircbot.</flag>
-		<flag name="mail">Add support for watching a maildir for commits.</flag>
-		<flag name="manhole">Add support for manhole (debug over ssh)</flag>
 	</use>
 	<upstream>
 		<maintainer>