From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-util/buildbot/Manifest | 4 +- dev-util/buildbot/buildbot-2.8.2-r1.ebuild | 203 ++++++++++++++++++++++++++++ dev-util/buildbot/buildbot-2.8.2.ebuild | 210 ----------------------------- dev-util/buildbot/buildbot-9999.ebuild | 11 +- 4 files changed, 207 insertions(+), 221 deletions(-) create mode 100644 dev-util/buildbot/buildbot-2.8.2-r1.ebuild delete mode 100644 dev-util/buildbot/buildbot-2.8.2.ebuild (limited to 'dev-util/buildbot') diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index 14aa89c15d2b..114ed5cb84a7 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -13,6 +13,6 @@ DIST buildbot-2.8.0.tar.gz 3162882 BLAKE2B 19789f1fe9f572c978a1843a98cd01d752a61 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.ebuild 7414 BLAKE2B 8d4647eb94f2adc5492b562943f060087e665594a50b0e0d05d2fe2eeef49f0ae56dd250e65301735d0623c4b88f6b00981507d236e8a23f33f9f5b64d5e616c SHA512 f814f7c19ac342706467fce52c11c51f694bf9dc2c7ffcdbde0d69da8e74eb7683b81f71eabdbec4aaf504016b423ffd7ae9cb126f543657313ce50c1d59a966 -EBUILD buildbot-9999.ebuild 7329 BLAKE2B f53e6293558eae28a68340d8a44bcff355f0498396f350548d6362bd87098da7b0e8279fa9e241ac99a4021b6963264e1905fab3c12e6d00f9124755e256c878 SHA512 e7de2a20e0c287e3646ed1161f34272319ac676e2c90649310dff28a46d026dca2c4ed8dc727ee6d876c925c2586afab8aec261496070602cb9a9c59e61bac2e +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.8.2-r1.ebuild b/dev-util/buildbot/buildbot-2.8.2-r1.ebuild new file mode 100644 index 000000000000..6a93195514d8 --- /dev/null +++ b/dev-util/buildbot/buildbot-2.8.2-r1.ebuild @@ -0,0 +1,203 @@ +# 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},crypt?] + >=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/pyopenssl-16.0.0[${PYTHON_USEDEP}] + dev-python/idna[${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/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}] + )" + +S=${WORKDIR}/${MY_P} + +distutils_enable_tests setup.py + +PATCHES=( + "${FILESDIR}/pypugjs-2.8.0.patch" +) + +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/buildbot-2.8.2.ebuild b/dev-util/buildbot/buildbot-2.8.2.ebuild deleted file mode 100644 index 3a8aa883913f..000000000000 --- a/dev-util/buildbot/buildbot-2.8.2.ebuild +++ /dev/null @@ -1,210 +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/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/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/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/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index 25ce6693e4eb..aab7babe0e90 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -29,7 +29,7 @@ RESTRICT="!test? ( test )" RDEPEND=" acct-user/buildbot >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?] >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] @@ -41,9 +41,8 @@ RDEPEND=" >=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}] -