commit: 8c026fd7466c1941d5096b88d142b70d4cef3752 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Tue May 16 01:51:15 2017 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Tue May 16 02:07:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c026fd7
dev-util/buildbot-worker: Version bump, adds py3.5 capability Clean older versions. Package-Manager: Portage-2.3.5, Repoman-2.3.2_p30 dev-util/buildbot-worker/Manifest | 6 +- .../buildbot-worker/buildbot-worker-0.9.1.ebuild | 66 --------------- .../buildbot-worker-0.9.2-r1.ebuild | 93 ---------------------- .../buildbot-worker-0.9.3-r1.ebuild | 79 ------------------ .../buildbot-worker/buildbot-worker-0.9.4.ebuild | 2 +- ....9.0_p1.ebuild => buildbot-worker-0.9.7.ebuild} | 25 +++--- .../buildbot-worker/buildbot-worker-9999.ebuild | 10 +-- 7 files changed, 22 insertions(+), 259 deletions(-) diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest index 1203b2027c8..d0e45ef0565 100644 --- a/dev-util/buildbot-worker/Manifest +++ b/dev-util/buildbot-worker/Manifest @@ -1,6 +1,2 @@ -DIST buildbot-worker-0.9.0.post1.tar.gz 95780 SHA256 9da22fdf23462680a37d3995cde75410f204d3cb417491363e3f6561fc9011b9 SHA512 50eb98ad4f870f15b1cc34113db139b3b290bef377b4f66ac7c023590f277c102b8776e3a009f296209cf524377c10f60435b18f47cc39d6c27af04778d3296e WHIRLPOOL 1dd5d4274281fe4f582b5e7b83a99693c41282cb2a5262b8899319d3a1e95888417174b8db4ed9f8dcd52ee66785adac98f0d2ecc8abc158a661dfdfa6cd33da -DIST buildbot-worker-0.9.1.tar.gz 65852 SHA256 1d8ec4fd51e7a3a7dd4de7c512b282c221951cbacc6b2eaf15a157f371a0e902 SHA512 cf5749c6fd67fb72cd7043392efb502608cd2d11374cd43af351904a1b4e82d790338e5f745b47465b5cbf9501d2454d983648a70246c6ae55603ba51261a0d0 WHIRLPOOL e576879f141688e3f79e3cf746491bcc106cb4851f14d4960b10be45b7b01c33c6850fb856d6f083d8510ff78f73016e11250e9ef8864e33bace1834c315dafc -DIST buildbot-worker-0.9.2.tar.gz 66043 SHA256 3d05791ac0c556e3e4fe0ef78911ce47eab4fcbb0b5a51a436234ba49b9c236e SHA512 146c2f2b0c44f5c349459edbe61b448e88f9e42eb1c3b7769a0a07260533e4ad40d2d7bc3df2ebecd355d636834108debe8c2d165a9cdc6d849a537cf5743cc4 WHIRLPOOL f786c3a7ac486a2421877082da08a73079b7655ec0941a9509663983c03874bc8b5c12cb990628d0684db757d493528fab9ea3d99d09c22f2d2bbf606c69d0b5 -DIST buildbot-worker-0.9.3.tar.gz 98622 SHA256 57b319a34d0118933e7b2488ee29732bc78c55be978fe34a90ef30f208b8d39c SHA512 a0b6b441eeb71e322a5009d6aa0049cbddc4bd4fc78c14cfd362f80d35385b3ffcf5546614b5920c7cdd574df195f5c510b4acdb925c37ad7e6823f7ab62df33 WHIRLPOOL c349bf7ed402fb90318f89135005976b0dbb8c8fc57679b1d5958ce0fdc52fc7f006aeccc9a3119cdd8c66912a8e6fd7e079471461181effd17d75ce9b16ddba DIST buildbot-worker-0.9.4.tar.gz 100889 SHA256 129e0d3fa9ee34f0f227487b6d1645820d2d4853099a1b0aed56587d3acab965 SHA512 7d055b7b005ebf1cc8033fb86f5321a9d80e0505c1a8b28b9ba3945323f157d34f34066ee9513e82b05c63af099d6030bf42d6f44533859b4e01983f1114462b WHIRLPOOL 8f2b95a476e93beaba5305137bb1d219a9aff59e8bb4450d6352babe799bb0166c299e7c8ea69e53c467e7e58be2681ddba4ae74ad8ba945221e1059906e5fc1 -DIST buildbot_worker-9-tests.tar.xz 29512 SHA256 9966f1e368fae1ff05a4cdd801167b33fbad620acba79db21a5c28132dec61a3 SHA512 55aa3a5061ba0c9246e5029201a3565c6b20b198ccbf7ad3cad29599bdb8f883e8f33290f0f6fdb2e4a7c04f9132e32d762df8241cda8f689d407bb75d048122 WHIRLPOOL 9200d3676bf9fa56f36cc0bfc229250f6619512574696bde460ea0410462ac9fe030c5222145599ea1a792003c3ab0a8fc729c2294274e85665da47c81d03fb9 +DIST buildbot-worker-0.9.7.tar.gz 96416 SHA256 a41b4e0c7329821a0d85ee0e6edbde3db403676c62e59a6f436a048a008ac268 SHA512 84ccaf0472553f8422b342163e44e55481f6691338df38db6b1be74f0a79c13e2a52be56df632491662ab79648cd5034ce04d906bbedb01030e4fa96f1689ef9 WHIRLPOOL 70379e6f34ea30aef0e0008fd098a53ba144696f1416ac77c3756018bc371646d2261a28589ad5131f7be7de930189bd771b4a82de27343441543da5c683e122 diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.1.ebuild deleted file mode 100644 index 3820017b297..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-0.9.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo user distutils-r1 - -DESCRIPTION="BuildBot Slave Daemon" -HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; - -MY_V="0.9.1" -MY_P="${PN}-${MY_V}" -[[ ${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="test" - -RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-core-8.0.0[${PYTHON_USEDEP}] - ) - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-0.9.0_rc1" -DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" -[[ ${PV} == *9999 ]] && S=${S}/slave - -pkg_setup() { - enewuser buildbot - - 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, - 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\" at the right location. The scripts can - run as a different user if desired. If you need to run more than one - build worker, just copy the scripts." -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/buildbot-worker.1 - - newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker - newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker - systemd_dounit "${FILESDIR}/buildbot_worker.service" - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild deleted file mode 100644 index a14d8457709..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-0.9.2-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo user distutils-r1 - -DESCRIPTION="BuildBot Slave Daemon" -HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; - -MY_V="${PV/_p/p}" -MY_P="${PN}-${MY_V}" -if [[ ${PV} != *9999 ]]; then - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz - http://dev.gentoo.org/~dolsen/distfiles/buildbot_worker-9-tests.tar.xz"; -fi - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi -IUSE="test" - -RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-core-8.0.0[${PYTHON_USEDEP}] - ) - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-0.9.0_rc1 -" -DEPEND="${RDEPEND} - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/setuptools_trial[${PYTHON_USEDEP}] - ) -" - -S="${WORKDIR}/${MY_P}" -[[ ${PV} == *9999 ]] && S=${S}/slave - -pkg_setup() { - enewuser buildbot - - 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, - 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\" at the right location. The scripts can - run as a different user if desired. If you need to run more than one - build worker, just copy the scripts." -} - -src_unpack() { - unpack ${MY_P}.tar.gz - cd ${MY_P} - unpack buildbot_worker-9-tests.tar.xz -} - -src_prepare() { - epatch "${FILESDIR}"/buildbot-worker-0.9.Addmissedtests.patch - } - -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/buildbot-worker.1 - - newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker - newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - ewarn "The 0.9.2 and 0.9.3 original ebuilds had a mistake naming the" - ewarn "conf.d and init.d files as 'buildslave', when it should have been" - ewarn "'buildbot_worker' as it is in the previous 0.9 versions." - ewarn "Only the 0.8 and previous versions should use the name 'buildslave'" -} diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild deleted file mode 100644 index 076a00851b8..00000000000 --- a/dev-util/buildbot-worker/buildbot-worker-0.9.3-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo user distutils-r1 - -DESCRIPTION="BuildBot Slave Daemon" -HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; - -MY_V="${PV/_p/p}" -MY_P="${PN}-${MY_V}" -[[ ${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="test" - -RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-core-8.0.0[${PYTHON_USEDEP}] - ) - dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-0.9.0_rc1 -" -DEPEND="${RDEPEND} - test? ( - dev-python/mock[${PYTHON_USEDEP}] - dev-python/setuptools_trial[${PYTHON_USEDEP}] - ) -" - -S="${WORKDIR}/${MY_P}" -[[ ${PV} == *9999 ]] && S=${S}/slave - -pkg_setup() { - enewuser buildbot - - 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, - 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\" at the right location. The scripts can - run as a different user if desired. If you need to run more than one - build worker, just copy the scripts." -} - -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - -python_install_all() { - distutils-r1_python_install_all - - doman docs/buildbot-worker.1 - - newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker - newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - ewarn "conf.d and init.d files as 'buildslave', when it should have been" - ewarn "'buildbot_worker' as it is in the previous 0.9 versions." - ewarn "Only the 0.8 and previous versions should use the name 'buildslave'" -} diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild index 2fb8e3b40be..309d72c4734 100644 --- a/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild +++ b/dev-util/buildbot-worker/buildbot-worker-0.9.4.ebuild @@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; inherit readme.gentoo user distutils-r1 DESCRIPTION="BuildBot Slave Daemon" -HOMEPAGE="http://buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-worker"; +HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; MY_V="${PV/_p/p}" MY_P="${PN}-${MY_V}" diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.7.ebuild similarity index 78% rename from dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild rename to dev-util/buildbot-worker/buildbot-worker-0.9.7.ebuild index 8ff16bc2f0e..fcdfadfbed6 100644 --- a/dev-util/buildbot-worker/buildbot-worker-0.9.0_p1.ebuild +++ b/dev-util/buildbot-worker/buildbot-worker-0.9.7.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="5" -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python2_7 python3_5 ) EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; @@ -10,9 +10,9 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; inherit readme.gentoo user distutils-r1 DESCRIPTION="BuildBot Slave Daemon" -HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave"; +HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; -MY_V="0.9.0.post1" +MY_V="${PV/_p/p}" MY_P="${PN}-${MY_V}" [[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" @@ -26,13 +26,15 @@ fi IUSE="test" RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-core-8.0.0[${PYTHON_USEDEP}] - ) + >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-0.9.0_rc1" +" DEPEND="${RDEPEND} - test? ( dev-python/mock[${PYTHON_USEDEP}] )" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/setuptools_trial[${PYTHON_USEDEP}] + ) +" S="${WORKDIR}/${MY_P}" [[ ${PV} == *9999 ]] && S=${S}/slave @@ -49,6 +51,12 @@ pkg_setup() { build worker, just copy the scripts." } +python_test() { + distutils_install_for_testing + + esetup.py test || die "Tests failed under ${EPYTHON}" +} + python_install_all() { distutils-r1_python_install_all @@ -56,7 +64,6 @@ python_install_all() { newconfd "${FILESDIR}/buildbot_worker.confd" buildbot_worker newinitd "${FILESDIR}/buildbot_worker.initd" buildbot_worker - systemd_dounit "${FILESDIR}/buildbot_worker.service" readme.gentoo_create_doc } diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild index 2fb8e3b40be..d31e83a8d6a 100644 --- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild +++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="5" -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python2_7 python3_5 ) EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; @@ -10,7 +10,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"; inherit readme.gentoo user distutils-r1 DESCRIPTION="BuildBot Slave Daemon" -HOMEPAGE="http://buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-worker"; +HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot-worker"; MY_V="${PV/_p/p}" MY_P="${PN}-${MY_V}" @@ -26,11 +26,9 @@ fi IUSE="test" RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] - >=dev-python/twisted-core-8.0.0[${PYTHON_USEDEP}] - ) + >=dev-python/twisted-17.1.0[${PYTHON_USEDEP}] dev-python/future[${PYTHON_USEDEP}] - !<dev-util/buildbot-0.9.0_rc1 + !<dev-util/buildbot-0.9.7 " DEPEND="${RDEPEND} test? (
