gentoo auto-resync : 25:08:2023 - 03:53:16

4 files changed, 153 insertions, 6 deletions

diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 6ae309f3761f..62fddef105f1 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -6,6 +6,8 @@ AUX buildbot_worker.target 149 BLAKE2B 93902e53b76a09aac472280df295fd4aafe19aca6
 AUX buildbot_worker_at.service 343 BLAKE2B 6fed117fe1e5478ef3d2fb1bfeac92fd9b9e9b50c6d184b05f13a8847acc74d461eb4ea7797c01366c1c340950dbd07e06683897095b992c3d01e263dd7b7192 SHA512 41c250e31ad0fdbb13830ed4ae0563572ac7edd7c037728cbad943e1d3f82559c41529993edddb922d46c20f7eaa7e7781f5ed1c548f7ed07bb7520e5e3019f8
 AUX buildbot_worker_at.service.conf 154 BLAKE2B 20323a777b44200c5a73278a10804169c64e07a5c2fc8695eb49339d1ba415b06324db6ae3084aa4fa6cfd1a684e4f41fb4b73436fa4305314faf9e5da485a9c SHA512 5fd61d4436652a927af9788799bb9f8b7a66baadc0bf486c9bbe171a5cd9ec8457719bdda45f911d5b0620db8fb4c494c75e2b2fd69951ee4dc83119dd7d6628
 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
+DIST buildbot-worker-3.9.0.tar.gz 125913 BLAKE2B e053cd150cf21cc0e5dfb2d49c186c49d340670429b760ce9f697aa97a245d0e6a12f0ea84eb1256a610891042096877c89244b1f2862bf74160502170f9124c SHA512 08b74d6f019ca85f65c598a34c81bc47fdf873abad17205072788d938fcd5450f80aa6ca9d324edc01893947f4ac8e2968889dd73be854a82b4ea54e4730613b
 EBUILD buildbot-worker-3.6.1-r2.ebuild 5191 BLAKE2B 67702aedccac19aaabed0aaf9857caa1b12746ee50fea70e33580f87f36466f508a7981cbf1f36933c9d3ca2dea399f8282953920cc72d154610ae405ad81004 SHA512 6b1cfc2c6905279ad45d8d1fd3111f716351bef2d887f9adc71eb65c36ec01333199c0d8e0ba6340498bac766d705fa92bead0fc5b4b0a488065822e4c71daf2
-EBUILD buildbot-worker-9999.ebuild 4938 BLAKE2B b2afc823d259ef4f97725b4db785e80d6080cd5295aef79b1cd10471a06e1f122caf12c7b66617e7871fcc4f3543a228db48fa37e102546c8be0b9215daff1c7 SHA512 e18fe5b541e3506134ea678d7e81f8d0a80b37ae2b6163e08db57eeed767c7e81b4693ec6e81d5f3bf8844d84a952f3f4c46a7c2a0f6d9b5b93ff53dfc725fc0
-MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
+EBUILD buildbot-worker-3.9.0.ebuild 5192 BLAKE2B a64ab78e69f0168aacc555cd0844230c751be873c30dd57031a404a63cac2488c3fe94b7fba32e89ee9b642677dfe1d2741dc8844fb1e30b4ffe3b1f9da64b22 SHA512 d2cdd5c03bb00a52ad981c6a90a39c79b627e36787a53cce3d98a37e7980ff4feecca52b1ca24d252f5855f3f8a1ec870a9f091c77ce2dd2c4779fc6677ee403
+EBUILD buildbot-worker-9999.ebuild 5177 BLAKE2B 1a24a9eff0a97860ef0c6c666e9465dc0b59f4edc5c9d56c6fee4d7043a808ac0f4466aff0b16da5e7b27ef23fa89ca8cfc6716af5c750ec55c041b2df6958a2 SHA512 bc8c7a7095a39f8bf4405ab986a1c6cf3e707ec4bbfbfa219d36677f1ef9090d027663b77b41223a223d556a7ad72c6224222556084aad5adcf88681713f1adc
+MISC metadata.xml 589 BLAKE2B 97e4047671ab199256b50061698e8c9030e2d6618436b4338080adae1f5d53572215d7c6edfd3878c0d42ddc8f9a5b70acb4fbdc8fdfee37d96d6e70e931f752 SHA512 87a93213d11d2fadef014e9c71185539e850d49e31b79a45de75f78dc4238e62d22a04d4356ea5afee061223865acecd3e29846705b8a9e7e2fe2292f9f23ea6
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
new file mode 100644
index 000000000000..7c7f0082d67e
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..11} )
+inherit readme.gentoo-r1 systemd distutils-r1 pypi
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	!<dev-util/buildbot-1.0.0
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+to support starting buildbot_worker through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+Set up your build worker following the documentation, make sure the
+resulting directories are owned by the \"buildbot\" user and point
+\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+The scripts can	run as a different user if desired."
+
+src_prepare() {
+	# Remove shipped windows start script
+	sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \
+		-i setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+	systemd_dounit "${FILESDIR}/buildbot_worker.target"
+	systemd_newunit "${FILESDIR}/buildbot_worker_at.service" "buildbot_worker@.service"
+	systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" "buildbot_worker@.service"
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker 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 buildbot_worker 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/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_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="${buildworker_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
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${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 buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index d399f27dd277..d641ad6870ee 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
-inherit readme.gentoo-r1 git-r3 distutils-r1
+inherit readme.gentoo-r1 systemd distutils-r1
 
 DESCRIPTION="BuildBot Worker (slave) Daemon"
 HOMEPAGE="https://buildbot.net/
@@ -21,13 +21,13 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
+	!<dev-util/buildbot-1.0.0
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
-	!<dev-util/buildbot-1.0.0
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
@@ -57,12 +57,16 @@ python_test() {
 }
 
 python_install_all() {
+
 	distutils-r1_python_install_all
 
 	doman docs/buildbot-worker.1
 
 	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
 	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+	systemd_dounit "${FILESDIR}/buildbot_worker.target"
+	systemd_newunit "${FILESDIR}/buildbot_worker_at.service" "buildbot_worker@.service"
+	systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" "buildbot_worker@.service"
 
 	dodir /var/lib/buildbot_worker
 	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
diff --git a/dev-util/buildbot-worker/metadata.xml b/dev-util/buildbot-worker/metadata.xml
index 8987b1c0b79c..866f0d75fdbb 100644
--- a/dev-util/buildbot-worker/metadata.xml
+++ b/dev-util/buildbot-worker/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zorry@gentoo.org</email>
+		<name>Magnus Granberg</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>devel@buildbot.net</email>