commit:     f02a962ac82d910fc293795721bca2368ac0028c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 02:23:39 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 02:24:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02a962a

dev-util/buildbot: Update the 0.9.0_rc1 and 9999 versions with changes made in 
0.8.12-r2

Clean up the files/ directory, remove the no longer needed .9 versions of the 
files.

Package-Manager: portage-2.3.0

 dev-util/buildbot/buildbot-0.9.0_rc1.ebuild    | 161 --------------------
 dev-util/buildbot/buildbot-0.9.1_rc1-r1.ebuild | 201 +++++++++++++++++++++++++
 dev-util/buildbot/buildbot-9999.ebuild         | 120 ++++++++++-----
 dev-util/buildbot/files/buildbot9.service      |  14 --
 dev-util/buildbot/files/buildmaster.confd.9    |  10 --
 dev-util/buildbot/files/buildmaster.initd.9    |  54 -------
 6 files changed, 281 insertions(+), 279 deletions(-)

diff --git a/dev-util/buildbot/buildbot-0.9.0_rc1.ebuild 
b/dev-util/buildbot/buildbot-0.9.0_rc1.ebuild
deleted file mode 100644
index fcaba40..0000000
--- a/dev-util/buildbot/buildbot-0.9.0_rc1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git";
-
-[[ ${PV} == *9999 ]] && inherit git-r3
-inherit readme.gentoo-r1 user systemd distutils-r1
-
-MY_PV="${PV/_p/p}"
-MY_V="0.9.0rc1"
-MY_P="${PN}-${MY_V}"
-
-DESCRIPTION="BuildBot build automation system"
-HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot 
http://pypi.python.org/pypi/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"
-fi
-
-IUSE="crypt doc examples irc mail manhole test"
-
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-       || (
-               >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
-               >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-       )
-       >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-       crypt? (
-               >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-               dev-python/idna[${PYTHON_USEDEP}]
-               dev-python/service_identity[${PYTHON_USEDEP}]
-       )
-       irc? (
-               || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
-                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
-               )
-       )
-       mail? (
-               || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
-                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
-               )
-       )
-       manhole? (
-               || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}]
-                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
-               )
-       )
-       dev-python/future[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-       >=dev-python/autobahn-0.10.2[${PYTHON_USEDEP}]
-       <dev-python/autobahn-0.13.0[${PYTHON_USEDEP}]
-       >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-       "
-DEPEND="${RDEPEND}
-       >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-       doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] )
-       test? (
-               >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
-               dev-python/mock[${PYTHON_USEDEP}]
-               || (
-                       (
-                               
>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
-                               
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
-                               
>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
-                       )
-                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
-               )
-               dev-python/moto[${PYTHON_USEDEP}]
-               dev-python/boto3[${PYTHON_USEDEP}]
-               dev-python/ramlfications[${PYTHON_USEDEP}]
-               dev-python/pyjade[${PYTHON_USEDEP}]
-               dev-python/txgithub[${PYTHON_USEDEP}]
-               dev-python/txrequests[${PYTHON_USEDEP}]
-       )"
-
-# still yet to be added deps
-# doc? (     'sphinxcontrib-blockdiag',
-#            'sphinxcontrib-spelling',
-#            'pyenchant',
-#            'docutils>=0.8',
-#            'sphinx-jinja',)
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-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,
-               set up your build master following the documentation, make sure 
the
-               resulting directories are owned by the \"buildbot\" user and 
point
-               \"${EROOT}etc/conf.d/buildmaster\" at the right location. The 
scripts can
-               run as a different user if desired. If you need to run more 
than one
-               build master, just copy the scripts."
-}
-
-# docs generation is broken  might need a separate ebuild
-#python_compile_all() {
-       #if use doc; then
-               #einfo "Generation of documentation"
-               ##'man' target is currently broken
-               #emake -C docs html
-       #fi
-#}
-
-python_install_all() {
-       distutils-r1_python_install_all
-
-       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.9 buildmaster
-       newinitd "${FILESDIR}"/buildmaster.initd.9 buildmaster
-       systemd_dounit "${FILESDIR}/${PN}9".service
-
-       # In case of multiple masters, it's possible to edit web files
-       # so all master can share the changes. So protect them!
-       # If something else need to be protected, please open a bug
-       # on http://bugs.gentoo.org
-       local cp
-       add_config_protect() {
-               cp+=" $(python_get_sitedir)/${PN}/status/web"
-       }
-       python_foreach_impl add_config_protect
-       echo "CONFIG_PROTECT=\"${cp}\"" \
-               > 85${PN} || die
-       doenvd 85${PN}
-
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       readme.gentoo_print_elog
-       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."
-}

diff --git a/dev-util/buildbot/buildbot-0.9.1_rc1-r1.ebuild 
b/dev-util/buildbot/buildbot-0.9.1_rc1-r1.ebuild
new file mode 100644
index 0000000..be6322c
--- /dev/null
+++ b/dev-util/buildbot/buildbot-0.9.1_rc1-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 )
+
+EGIT_REPO_URI="https://github.com/buildbot/${PN}.git";
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user systemd distutils-r1
+
+MY_PV="${PV/_p/p}"
+MY_V="0.9.0rc1"
+MY_P="${PN}-${MY_V}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot 
http://pypi.python.org/pypi/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"
+fi
+
+IUSE="crypt doc examples irc mail manhole test"
+
+RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+       || (
+               >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
+               >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+       )
+       >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+       >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+       crypt? (
+               >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+               dev-python/idna[${PYTHON_USEDEP}]
+               dev-python/service_identity[${PYTHON_USEDEP}]
+       )
+       irc? (
+               || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
+                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
+               )
+       )
+       mail? (
+               || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
+                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
+               )
+       )
+       manhole? (
+               || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}]
+                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
+               )
+       )
+       dev-python/future[${PYTHON_USEDEP}]
+       >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+       >=dev-python/autobahn-0.10.2[${PYTHON_USEDEP}]
+       <dev-python/autobahn-0.13.0[${PYTHON_USEDEP}]
+       >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+       "
+DEPEND="${RDEPEND}
+       >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+       doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] )
+       test? (
+               >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+               dev-python/mock[${PYTHON_USEDEP}]
+               || (
+                       (
+                               
>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}]
+                               
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}]
+                               
>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}]
+                       )
+                       <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
+               )
+               dev-python/moto[${PYTHON_USEDEP}]
+               dev-python/boto3[${PYTHON_USEDEP}]
+               dev-python/ramlfications[${PYTHON_USEDEP}]
+               dev-python/pyjade[${PYTHON_USEDEP}]
+               dev-python/txgithub[${PYTHON_USEDEP}]
+               dev-python/txrequests[${PYTHON_USEDEP}]
+       )"
+
+# still yet to be added deps
+# doc? (     'sphinxcontrib-blockdiag',
+#            'sphinxcontrib-spelling',
+#            'pyenchant',
+#            'docutils>=0.8',
+#            'sphinx-jinja',)
+
+S=${WORKDIR}/${MY_P}
+[[ ${PV} == *9999 ]] && S=${S}/master
+
+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" 
"[email protected]"
+       systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" 
"[email protected]"
+
+       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 [email protected]"
+               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-9999.ebuild 
b/dev-util/buildbot/buildbot-9999.ebuild
index 8a0d136..05d4446 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -98,63 +98,103 @@ 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,
-               set up your build master following the documentation, make sure 
the
-               resulting directories are owned by the \"buildbot\" user and 
point
-               \"${EROOT}etc/conf.d/buildmaster\" at the right location. The 
scripts can
-               run as a different user if desired. If you need to run more 
than one
-               build master, just copy the scripts."
+               execute \"emerge --config =${CATEGORY}/${PF}\" to create a new 
instance.
+               The scripts can run as a different user if desired."
 }
 
-# docs generation is broken  might need a separate ebuild
-#python_compile_all() {
-       #if use doc; then
-               #einfo "Generation of documentation"
-               ##'man' target is currently broken
-               #emake -C docs html
-       #fi
-#}
+src_compile() {
+       distutils-r1_src_compile
 
-python_install_all() {
-       distutils-r1_python_install_all
+       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 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.9 buildmaster
-       newinitd "${FILESDIR}"/buildmaster.initd.9 buildmaster
-       systemd_dounit "${FILESDIR}/${PN}9".service
-
-       # In case of multiple masters, it's possible to edit web files
-       # so all master can share the changes. So protect them!
-       # If something else need to be protected, please open a bug
-       # on http://bugs.gentoo.org
-       local cp
-       add_config_protect() {
-               cp+=" $(python_get_sitedir)/${PN}/status/web"
-       }
-       python_foreach_impl add_config_protect
-       echo "CONFIG_PROTECT=\"${cp}\"" \
-               > 85${PN} || die
-       doenvd 85${PN}
+       newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+       newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+       systemd_dounit "${FILESDIR}/buildmaster.target"
+       systemd_newunit "${FILESDIR}/buildmaster_at.service" 
"[email protected]"
+       systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" 
"[email protected]"
 
        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 [email protected]"
+               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 "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."
+       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/files/buildbot9.service 
b/dev-util/buildbot/files/buildbot9.service
deleted file mode 100644
index 371d6e0..0000000
--- a/dev-util/buildbot/files/buildbot9.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=buildbot master daemon
-After=local-fs.target network.target
-
-[Service]
-Type=forking
-User=buildbot
-WorkingDirectory=/var/lib/buildmaster
-ExecStartPre=/usr/bin/buildbot checkconfig /var/lib/buildmaster
-ExecStart=/usr/bin/buildbot start /var/lib/buildmaster
-ExecStop=/usr/bin/buildbot stop /var/lib/buildmaster
-
-[Install]
-WantedBy=multi-user.target

diff --git a/dev-util/buildbot/files/buildmaster.confd.9 
b/dev-util/buildbot/files/buildmaster.confd.9
deleted file mode 100644
index e489d66..0000000
--- a/dev-util/buildbot/files/buildmaster.confd.9
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# Path to the build master's basedir.
-BASEDIR=/var/lib/buildmaster
-
-# User account for the buildmaster.
-# The basedir should be owned by this user.
-USERNAME=buildbot
-
-# Extra options to pass to twistd.
-TWISTD_OPTS=""

diff --git a/dev-util/buildbot/files/buildmaster.initd.9 
b/dev-util/buildbot/files/buildmaster.initd.9
deleted file mode 100644
index d146bff..0000000
--- a/dev-util/buildbot/files/buildmaster.initd.9
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-       need net
-}
-
-checkconfig() {
-       if [ -z "${BASEDIR}" ]; then
-               eerror "BASEDIR not set"
-               return 1
-       fi
-       if [ -z "${USERNAME}" ]; then
-               eerror "USERNAME not set"
-               return 1
-       fi
-       if [ ! -d "${BASEDIR}" ]; then
-               eerror "${BASEDIR} is not a directory"
-               return 1
-       fi
-       if [ ! -e "${BASEDIR}/buildbot.tac" ]; then
-               eerror "${BASEDIR} does not contain buildbot.tac"
-               return 1
-       fi
-}
-
-start() {
-       checkconfig || return 1
-       ebegin "Starting buildmaster in ${BASEDIR}"
-       start-stop-daemon --start -u "${USERNAME}" \
-               --pidfile "${BASEDIR}/buildmaster.pid" \
-               --exec /usr/bin/twistd -- \
-               --no_save \
-               --logfile="${BASEDIR}/twistd.log" \
-               --pidfile="${BASEDIR}/buildmaster.pid" \
-               --python="${BASEDIR}/buildbot.tac"
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping buildmaster in ${BASEDIR}"
-       start-stop-daemon --stop --pidfile "${BASEDIR}/buildmaster.pid"
-       eend $?
-}
-
-reload() {
-       ebegin "Reconfiguring buildmaster in ${BASEDIR}"
-       start-stop-daemon --signal HUP --pidfile \
-               "${BASEDIR}"/buildmaster.pid
-       eend $?
-}

Reply via email to