From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A532D1396D0 for ; Thu, 10 Aug 2017 22:00:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC1D61FC014; Thu, 10 Aug 2017 22:00:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77EE01FC002 for ; Thu, 10 Aug 2017 22:00:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F4533416CA for ; Thu, 10 Aug 2017 22:00:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1791746F for ; Thu, 10 Aug 2017 22:00:20 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1502402406.29142fb582cf5658e3ddd01f85e1d3038c6bbd5e.dolsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/buildbot/Manifest dev-util/buildbot/buildbot-0.8.10.ebuild dev-util/buildbot/buildbot-0.9.10.ebuild dev-util/buildbot/buildbot-9999.ebuild X-VCS-Directories: dev-util/buildbot/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 29142fb582cf5658e3ddd01f85e1d3038c6bbd5e X-VCS-Branch: master Date: Thu, 10 Aug 2017 22:00:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d2d2692d-175f-4db2-8422-b246eb76c636 X-Archives-Hash: f4141b94eb30237ab65d531234b8da31 commit: 29142fb582cf5658e3ddd01f85e1d3038c6bbd5e Author: Brian Dolbec gentoo org> AuthorDate: Thu Aug 10 21:53:09 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Aug 10 22:00:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29142fb5 dev-util/buildbot: Version bump, clean oldest -0.8 release Package-Manager: Portage-2.3.6, Repoman-2.3.1 dev-util/buildbot/Manifest | 2 +- dev-util/buildbot/buildbot-0.8.10.ebuild | 97 ---------------------- ...buildbot-9999.ebuild => buildbot-0.9.10.ebuild} | 12 ++- dev-util/buildbot/buildbot-9999.ebuild | 1 - 4 files changed, 11 insertions(+), 101 deletions(-) diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index a0e595b72df..21102ff942a 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -1,5 +1,5 @@ -DIST buildbot-0.8.10.tar.gz 4822307 SHA256 c4964d2ebd81cb80a14cb058fb2aab0572a1d8d86672d514e775b42deb08a5f4 SHA512 e148a1670a56837587d858d1697fe117661cbbfedab42bf7be905f9e8e4266e4ff0170b0cd81aed61234d30497a05427061c3084033f09811d0bc306b200661b WHIRLPOOL 26397b6f914266201aba4feb4df7353facad4fd0f51bdf7e35cf25205c45eadcf83f24c265e540b13d327750ce9561362be6a5aa237152cf1298d970c504f76c DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8 +DIST buildbot-0.9.10.tar.gz 3112750 SHA256 8c5ed75f3f16f4ff0f2c9e3f9b091acb5e6e1c0ef68ffa8f687a55413a833143 SHA512 95b489d5f7d0bc00ae5f71cd056b36fe689c4dc9408a7a0e4b1b45e036c9074832c8e3755981520a8c85a791b50f7f40765962c12a71887198dc0bbd0140d0e0 WHIRLPOOL 8d62d0aecdea4122709693ce48c72d5dbac2e946a6923a7ea41842dc759369a678e21a8abb0b4ff825e1ba559a9d490bcc4ff56fc5568a4f7f2d94b4f6c5f027 DIST buildbot-0.9.4.docs.tar.xz 69224 SHA256 69fc33762a885568b02c42954a64d62d28bcb750b3aed011c3da8a9f84c13371 SHA512 906e551e0db32c8a0b4010b3b8b00c4776e3d1b7d7381e4dc0ccf01d361184e4605c3ab0ecaf4e42207bd73c3e72f8a570a4d4c29db72f4d68241abf48741d7e WHIRLPOOL 95f263e0b9ab22a649118f362d866b08cbdf62511f2a1f9bd6a7265103f174e35d0c8d86ad6a3b7dd5fd0b4277d60dbd25801c5e6f7e414e7fa634c241dae987 DIST buildbot-0.9.4.tar.gz 3020851 SHA256 068161cd9ada10b87f40117c768a37ce796ebf5e7bf08f224f4c7ded88cd7472 SHA512 938a94192560b989a277d9650c50781d7e7c116bc5e2010ccb2e655df757de0ee254369531b2f432c835c0285c724e52d999a393d0ce1b104d4b9dcc5c6687da WHIRLPOOL 0ffe61b82ee93b78cdb3cb74ef96d5a3547e0fcab9ec8093b59a7212c5e2a1ad16eff046306bffcc0ea63b2e0bf2df1e54b5a0874dc78e27744db2088ccac804 DIST buildbot-0.9.7.tar.gz 3092434 SHA256 8fcbf0e6536e5d60407f59d14f96d5f8386cd91846a4fa47b4336d71551a9e33 SHA512 3fd2b488cabac37e297bb1a475cdb115f261324a22ec4d6fbcf8dc5bfb6ee135fab3763998433be8795581d476f69e2adb6f42d248bf2131a42eecfc1667202a WHIRLPOOL 427d4c1c452f767550a3d2731b2e34480c399dcf50e57d4fb69f0a350f381e3e7ecc47d712fc8fbb99afcf8b230c7bd3afe8437ec3b24bf9ddbf7d35b4d1caad diff --git a/dev-util/buildbot/buildbot-0.8.10.ebuild b/dev-util/buildbot/buildbot-0.8.10.ebuild deleted file mode 100644 index 87e8bcf233e..00000000000 --- a/dev-util/buildbot/buildbot-0.8.10.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit distutils-r1 readme.gentoo systemd user - -MY_PV="${PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="BuildBot build automation system" -HOMEPAGE="http://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/buildbot" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="doc examples irc mail manhole test" - -RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] - dev-python/twisted-core[${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.7.10-r999[${PYTHON_USEDEP}] - ~dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}] - irc? ( dev-python/twisted-words[${PYTHON_USEDEP}] ) - mail? ( dev-python/twisted-mail[${PYTHON_USEDEP}] ) - manhole? ( dev-python/twisted-conch[${PYTHON_USEDEP}] )" -DEPEND="${DEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/twisted-mail[${PYTHON_USEDEP}] - dev-python/twisted-web[${PYTHON_USEDEP}] - dev-python/twisted-words[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/${MY_P}" - -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." -} - -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}"/${PN}.service - - 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-9999.ebuild b/dev-util/buildbot/buildbot-0.9.10.ebuild similarity index 96% copy from dev-util/buildbot/buildbot-9999.ebuild copy to dev-util/buildbot/buildbot-0.9.10.ebuild index ed83f831994..faf2365417b 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-0.9.10.ebuild @@ -10,7 +10,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_PV="${PV/_p/.post}" MY_P="${PN}-${MY_PV}" DESCRIPTION="BuildBot build automation system" @@ -46,7 +46,6 @@ RDEPEND=" >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] " @@ -89,6 +88,15 @@ pkg_setup() { The scripts can run as a different user if desired." } +python_prepare_all() { + # Disable distribution version test. + sed \ + -e 's/self.assertNotIn("unknown", distro\[1\])//' \ + -i buildbot/test/unit/test_buildbot_net_usage_data.py || die + + distutils-r1_python_prepare_all +} + src_compile() { distutils-r1_src_compile diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index ed83f831994..d3239e23f64 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -46,7 +46,6 @@ RDEPEND=" >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] dev-python/pyjwt[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] "