gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /dev-util/buildbot
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
6 files changed, 0 insertions, 530 deletions
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 114ed5cb84a7..3a4da2068b49 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,18 +1,11 @@
-AUX Add-gentoo-to-the-VERSION_ID-check-exclusion.patch 1137 BLAKE2B 0ced9724aafd4511542248846364011fc022b06016a329225c3203e4e932db0932d60ece526b095b60a30acfce0e700d8bfedaccf8d30c75b3c38a9e85b51814 SHA512 6e774541b8b2b229eb29171f78a46cd93f6c01056d410e0423ca757f5e5b956a4e29bb4a7b0c38d281e3afe126423e65bde8e367657fb663cb01ebc8c6f2c622
-AUX buildbot-2.8.0.fakedb.patch 358 BLAKE2B ad4066e76acd5ab17c487c7d56f388fb6d0d4fc147656fb7c3df36519e93a11d1f7f97cfb3c7e16c299d92a83fe71b24bb45d8ffaab106ca8d2b711d8f7802fe SHA512 1a3389cf5de1a43294a5eefe967246fd52d796627b92b2d6ab28de4b3394786945743cf76fbda1699e8291ed639fe2f7616db13b16fb369554798793cb5ecd81
 AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
 AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
 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
 AUX pypugjs-2.8.0.patch 3633 BLAKE2B de243262e4631e7ce3b3208d4f3acc7c7857375c4e938809d18ed65c1dcd2aa8abbdf0339fe278a329bc734220a21cf85f772b81e0284d42cf3c66599902a0e1 SHA512 c847026d0658d61ac617b7471a09fc0ae4f70fdf82bd1c79d460c0dfc9beb060081073b260aed2cdb5f2092746146dbe12787589f311bce6857a2769ccfa1e13
-AUX pypugjs.patch 3631 BLAKE2B 168c865da59c947a00f4025108ff9fdedba55a9ce3a588e7fbe3f77d10dc88434baf8690edc4e5318d87c7823a551f2d796fd47b42cb0facb8cddfa29f6354bb SHA512 1ea242249f44ed1ea958e2771ce14f7cbeac6bbaec4e7bf803a38e2e386d604efbfe1158bbb0151d29a8891f55142ca0a0191063051f2ec56c3c3f053ccb2d8e
-DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669
 DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
-DIST buildbot-2.8.0.tar.gz 3162882 BLAKE2B 19789f1fe9f572c978a1843a98cd01d752a614d89eb29f2de9db750808d1f96d7893b39d703f37cc0e81e022267c08603c86d59a5902d65194e236f7170d6b30 SHA512 18af8fe1bda6f7014f514bfd112ccf9837194c0e42cbdabaaa6c6202660670964421feff3e92e9dca4cf960f69a4bde9b3666287b54ef7e912284a0471dcc2b6
 DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
-EBUILD buildbot-2.7.0.ebuild 6974 BLAKE2B 0a847a75805dd0342a55f46640c4f01f9982eefa2cc1aeb00b15c85a5bad0a958761bcc9f508f03545be943e51e2896493c590c69f50e64691480b1916413ff2 SHA512 1e63016e5593a2135c92b2072181fb714d16bc383d88d9fc9513c30ab5a60af6b2bf6d94b2f5c25bfeba31b119ff4e45ab7f5291d950fa373a03e4c1caf6f315
-EBUILD buildbot-2.8.0.ebuild 7458 BLAKE2B 5c5c805eb70bb4eccd7f7283951a6e0c39d0bec01b79866ff8bebcee043ce086faae455feffc722a82373390092edb3a79a0cbc522111fb2b160aec0fdce13f7 SHA512 36ce0b760b6b7705fb8ea1149c1580529bfce1ae1d9ea07ece8b8aa642439f3726ddf79f35e9494b531b533bf0fe98e82d018409f658ba696efb54ea73e91754
 EBUILD buildbot-2.8.2-r1.ebuild 7150 BLAKE2B ce82918388f2e96e42448bfab5e1ce342ba5399d6cef53d0143132413bc4740622c8902431d4f603ea2b8c6c6c73be682e15ac07b4da12892654f779fc417602 SHA512 ecbd1a1a60a7492e0390006360e790aff3df2b454131da427876595748b6f0d0afd4caab5aef993aed1e38b54271e04626c340830c35cdf7b450a70be019cf37
 EBUILD buildbot-9999.ebuild 7065 BLAKE2B 582634c656ab3f3b211c0894c3be6b7e96804fd4ce88fc0a3d640c5f40a4a01ee436cab144541ae3f0208b4ac8122ad5b0aff8605fc40b29b20e759e1bfa8aec SHA512 5f3182f5aed253d0605234d53879ef99fd23938033c50a86d5a3a96424a595720f4bbd91dcc2059954b0917f1c18624de345cbd6bc484df1f0b7178a67710a52
 MISC metadata.xml 1359 BLAKE2B 33a6b0f21ad4255f28bc527fb18a384889eb34b2ddc5df5cfa03cc4b1960712b91c787706b95913154300b8e82a5879703dd90d0bf4d796cd6b8bb2a7c4b71cd SHA512 ded6f9cd25bef2df1431b71d5ffc9f0aa3efe9d2f7433cee7800fc27e1f6f76ad64cda9bbc4d3eb3fe0f44dbd7414c75b029f78307925dab5ed06df3d52d86e7
diff --git a/dev-util/buildbot/buildbot-2.7.0.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild
deleted file mode 100644
index 01fd9b609492..000000000000
--- a/dev-util/buildbot/buildbot-2.7.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-fi
-
-IUSE="crypt docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		<dev-python/idna-2.9[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-		crypt? (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-			<dev-python/idna-2.9[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		)
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-if [[ ${PV} != *9999 ]]; then
-	PATCHES=(
-		"${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch"
-		"${FILESDIR}/pypugjs.patch"
-	)
-fi
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	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_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r 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"
-	local log_path="/var/log/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}"
-	local instance_log_path="${log_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: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"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log 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-2.8.0.ebuild b/dev-util/buildbot/buildbot-2.8.0.ebuild
deleted file mode 100644
index 1de7b0513a29..000000000000
--- a/dev-util/buildbot/buildbot-2.8.0.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit readme.gentoo-r1 systemd distutils-r1
-
-MY_PV="${PV/_p/.post}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-
-IUSE="crypt doc docker examples irc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-user/buildbot
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		<dev-python/idna-2.9[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
-	docker? (
-		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-2.1.0[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pypugjs[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
-		dev-python/lz4[${PYTHON_USEDEP}]
-		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/setuptools_trial[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
-		crypt? (
-			>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
-			>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-			<dev-python/idna-2.9[${PYTHON_USEDEP}]
-			dev-python/service_identity[${PYTHON_USEDEP}]
-		)
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-		"${FILESDIR}/pypugjs-2.8.0.patch"
-		"${FILESDIR}/buildbot-2.8.0.fakedb.patch"
-)
-
-distutils_enable_tests setup.py
-
-pkg_setup() {
-	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
-		HTML_DOCS=( docs/_build/html/ )
-		# TODO: install man pages
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r 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"
-	local log_path="/var/log/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}"
-	local instance_log_path="${log_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: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"
-
-	if [[ ! -d "${instance_log_path}" ]]; then
-		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
-		chown --recursive buildbot:buildbot "${instance_log_path}" \
-			|| die "Setting permissions for instance failed"
-	fi
-	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
-		|| die "Unable to create link to log 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/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch
deleted file mode 100644
index 16fc0a133e10..000000000000
--- a/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f8d6fe39570a698d80d821a440219f5cd79d8314 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 5 Mar 2019 11:21:14 -0800
-Subject: [PATCH] test_buildbot_net_usage.py: Add "gentoo" to the VERSION_ID check exclusion
-
-Make the exclusions test into a list (slight speed improvement, easier to extend) and add "gentoo".
-
-Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
----
- buildbot/test/unit/test_buildbot_net_usage_data.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/buildbot/test/unit/test_buildbot_net_usage_data.py
-index c347956..e422c55 100644
---- a/buildbot/test/unit/test_buildbot_net_usage_data.py
-+++ b/buildbot/test/unit/test_buildbot_net_usage_data.py
-@@ -150,5 +150,5 @@ class Tests(unittest.TestCase):
-         self.assertEqual(len(distro), 2)
-         self.assertNotIn("unknown", distro[0])
-         # Rolling distributions like Arch Linux (arch) does not have VERSION_ID
--        if distro[0] != "arch":
-+        if distro[0] not in ["arch", "gentoo"]:
-             self.assertNotIn("unknown", distro[1])
---
-libgit2 0.99.0
-
diff --git a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch b/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch
deleted file mode 100644
index 2ce217b0d2e4..000000000000
--- a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py	2020-06-01 15:14:03.169026527 -0700
-+++ b/setup.py	2020-06-01 15:17:38.619177059 -0700
-@@ -194,6 +194,7 @@
-         "buildbot.test",
-         "buildbot.test.util",
-         "buildbot.test.fake",
-+        "buildbot.test.fakedb",
-         "buildbot.test.fuzz",
-         "buildbot.test.integration",
-         "buildbot.test.integration.interop",
diff --git a/dev-util/buildbot/files/pypugjs.patch b/dev-util/buildbot/files/pypugjs.patch
deleted file mode 100644
index 3ac99502b5d5..000000000000
--- a/dev-util/buildbot/files/pypugjs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 25 Apr 2020 11:53:06 -0700
-Subject: [PATCH] Initial pyjade port to pypugjs
-
----
- common/code_spelling_ignore_words.txt        |  1 +
- master/buildbot/test/unit/test_www_config.py |  8 ++++----
- master/buildbot/www/config.py                | 10 +++++-----
- master/docs/manual/configuration/www.rst     | 10 ++++++----
- master/docs/spelling_wordlist.txt            |  2 +-
- master/setup.py                              |  4 ++--
- requirements-ci.txt                          |  2 +-
- 7 files changed, 20 insertions(+), 17 deletions(-)
-
-diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py
-index 23a108e..a8c24ec 100644
---- a/buildbot/test/unit/test_www_config.py
-+++ b/buildbot/test/unit/test_www_config.py
-@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
-     def test_parseCustomTemplateDir(self):
-         exp = {'views/builds.html': '<div>\n</div>'}
-         try:
--            # we make the test work if pyjade is present or note
--            # It is better than just skip if pyjade is not there
--            import pyjade  # pylint: disable=import-outside-toplevel
--            [pyjade]
-+            # we make the test work if pypugjs is present or note
-+            # It is better than just skip if pypugjs is not there
-+            import pypugjs  # pylint: disable=import-outside-toplevel
-+            [pypugjs]
-             exp.update({'plugin/views/plugin.html':
-                         '<div class="myclass"><pre>this is customized</pre></div>'})
-         except ImportError:
-diff --git a/buildbot/www/config.py b/buildbot/www/config.py
-index a021299..50bae4d 100644
---- config.py	2020-02-27 13:34:10.000000000 -0800
-+++ config2.py	2020-05-11 17:26:44.587026761 -0700
-@@ -61,12 +61,12 @@
-         res = {}
-         allowed_ext = [".html"]
-         try:
--            import pyjade   # pylint: disable=import-outside-toplevel
-+            import pypugjs   # pylint: disable=import-outside-toplevel
-             allowed_ext.append(".jade")
-         except ImportError:  # pragma: no cover
--            log.msg("pyjade not installed. Ignoring .jade files from %s" %
-+            log.msg("pypugjs not installed. Ignoring .jade files from %s" %
-                     (template_dir,))
--            pyjade = None
-+            pypugjs = None
-         for root, dirs, files in os.walk(template_dir):
-             if root == template_dir:
-                 template_name = posixpath.join("views", "%s.html")
-@@ -86,9 +86,9 @@
-                 elif ext == ".jade":
-                     with open(fn) as f:
-                         jade = f.read()
--                        parser = pyjade.parser.Parser(jade)
-+                        parser = pypugjs.parser.Parser(jade)
-                         block = parser.parse()
--                        compiler = pyjade.ext.html.Compiler(
-+                        compiler = pypugjs.ext.html.Compiler(
-                             block, pretty=False)
-                         html = compiler.compile()
-                 res[template_name % (basename,)] = html
-diff --git a/setup.py b/master/setup.py
-index 8fca506..1f32a74 100755
---- a/setup.py
-+++ b/setup.py
-@@ -490,8 +490,8 @@ test_deps = [
-     # http client libraries
-     'treq',
-     'txrequests',
--    # pyjade required for custom templates tests
--    'pyjade',
-+    # pypugjs required for custom templates tests
-+    'pypugjs',
-     # boto3 and moto required for running EC2 tests
-     'boto3',
-     'moto',
---
-libgit2 0.99.0
-
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /dev-util/buildbot
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)