From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1610877-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7E42D158041
for <garchives@archives.gentoo.org>; Thu, 14 Mar 2024 06:22:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E02FBE29FF;
Thu, 14 Mar 2024 06:22:46 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C4668E29FF
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Mar 2024 06:22:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 03CD433BE26
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Mar 2024 06:22:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5709D151E
for <gentoo-commits@lists.gentoo.org>; Thu, 14 Mar 2024 06:22:43 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1710397281.154380dcf16c4bf4ebd592b62aa4f34eb1d05fec.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/buildbot-worker/Manifest dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
X-VCS-Directories: dev-util/buildbot-worker/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 154380dcf16c4bf4ebd592b62aa4f34eb1d05fec
X-VCS-Branch: master
Date: Thu, 14 Mar 2024 06:22:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e7d23aaa-9533-4c0a-ad3b-30936db96c60
X-Archives-Hash: 46ce9d0805b4c7658d80e454daacf6d2
commit: 154380dcf16c4bf4ebd592b62aa4f34eb1d05fec
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Mar 10 16:55:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 06:21:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154380dc
dev-util/buildbot-worker: drop 3.6.1-r2, 3.9.0
Drop old. This is the remaining holdout for dev-python/future.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/buildbot-worker/Manifest | 2 -
.../buildbot-worker-3.6.1-r2.ebuild | 137 ---------------------
.../buildbot-worker/buildbot-worker-3.9.0.ebuild | 136 --------------------
3 files changed, 275 deletions(-)
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 891908e051f6..da92f508f42f 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,5 +1,3 @@
DIST buildbot-worker-3.11.0-remove_py27.tar.gz 7134 BLAKE2B 8c92f8425b9a8d60e46228aab6aef49352090c931e21818d684167100f0c5c184e5e4e6aabdbb420bfe0b124d572194b33889deccf123b934754ad4e75037af0 SHA512 d9158e7936336d6147c0938ea212da55775ffe1c431b94b1b89274113fa45cbd62b7042737bac8a6580e268aca823fa072ee3d3bb49bad97aa99bd56995d7134
DIST buildbot-worker-3.11.0.tar.gz 131028 BLAKE2B 644e10f1d90c75a9f20439bc902764d9f69b16781d710e56bf4cad40d30f06f137d6a00d4c450c1589909ca93c98ff9a0cd6e1363a8feff58a4832e0096aada7 SHA512 73f42495bd252e75cd984d3222663260079887caadff29b69c23f188a1f3208fc6e2acfa38553fb5615ba1c3d4996655c96faa16ba0eb7335c6290ce3ce58679
DIST buildbot-worker-3.11.1.tar.gz 131129 BLAKE2B d8466c086261c612e976586b4589ca20617f5b9a7b69ccf276500fd351caead1425ae24897c4db242024de53f83c98b869dd9035bc366d9ee0376290307922a0 SHA512 c4560f69a15434cf93a43521bd1bbb568937a6ad8be338bca9089c9f449c3d0c5b8f000abf06a5fcfe4ebf5b206a9c81417a91cee633b67ca89ee67497a8368a
-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
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild
deleted file mode 100644
index a183fea6f648..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.6.1-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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-python/autobahn-0.16.0[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
- dev-python/future[${PYTHON_USEDEP}]
- !<dev-util/buildbot-1.0.0
-"
-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-3.9.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
deleted file mode 100644
index 0c9ed819598a..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-3.9.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2024 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/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."
-}