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 3B3AC138330 for ; Wed, 12 Oct 2016 22:08:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C026E0C56; Wed, 12 Oct 2016 22:07:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 06FD9E0C56 for ; Wed, 12 Oct 2016 22:07:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC5D534114E for ; Wed, 12 Oct 2016 22:07:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FD412F4 for ; Wed, 12 Oct 2016 22:07:53 +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: <1476310054.ea7c2fa057f5f61a497e3bf60838ee72384b026b.dolsen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/buildbot/buildbot-0.9.0_p1.ebuild dev-util/buildbot/buildbot-0.9.0_rc3.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: ea7c2fa057f5f61a497e3bf60838ee72384b026b X-VCS-Branch: master Date: Wed, 12 Oct 2016 22:07:53 +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: 71ea5a42-4654-45e5-ac12-c1ab31509fbd X-Archives-Hash: aa6ec28ee8026fd1e040f2188290ecf3 commit: ea7c2fa057f5f61a497e3bf60838ee72384b026b Author: Brian Dolbec gentoo org> AuthorDate: Wed Oct 12 21:58:49 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Oct 12 22:07:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7c2fa0 dev-util/buildbot: Update the twisted dep order to prefer the new twisted pkg With the new twisted pkg now in the tree, prefer the new pkg. There will be no new releases of the split pkgs. Package-Manager: portage-2.3.2 dev-util/buildbot/buildbot-0.9.0_p1.ebuild | 16 ++++++++-------- dev-util/buildbot/buildbot-0.9.0_rc3.ebuild | 16 ++++++++-------- dev-util/buildbot/buildbot-9999.ebuild | 27 +++++++++------------------ 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild index bbe1768..c6c4f43 100644 --- a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild +++ b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild @@ -30,8 +30,8 @@ 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/twisted-web-14.0.1[${PYTHON_USEDEP}] ) >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] @@ -43,18 +43,18 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] ) irc? ( dev-python/txrequests[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] ) ) mail? ( - || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] ) ) manhole? ( - || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] ) ) dev-python/future[${PYTHON_USEDEP}] @@ -68,12 +68,12 @@ DEPEND="${RDEPEND} >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] || ( + >=dev-python/twisted-16.0.0[${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.0.0[${PYTHON_USEDEP}] ) dev-python/moto[${PYTHON_USEDEP}] dev-python/boto3[${PYTHON_USEDEP}] diff --git a/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild b/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild index e21160d..df43d3a 100644 --- a/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild +++ b/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild @@ -30,8 +30,8 @@ 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/twisted-web-14.0.1[${PYTHON_USEDEP}] ) >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] @@ -43,18 +43,18 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] ) irc? ( dev-python/txrequests[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] ) ) mail? ( - || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] ) ) manhole? ( - || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] ) ) dev-python/future[${PYTHON_USEDEP}] @@ -68,12 +68,12 @@ DEPEND="${RDEPEND} >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] || ( + >=dev-python/twisted-16.0.0[${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.0.0[${PYTHON_USEDEP}] ) dev-python/moto[${PYTHON_USEDEP}] dev-python/boto3[${PYTHON_USEDEP}] diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index 1d53a34..9bf2d9d 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -30,9 +30,10 @@ 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/twisted-web-14.0.1[${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}] crypt? ( @@ -42,32 +43,22 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] ) irc? ( dev-python/txrequests[${PYTHON_USEDEP}] - || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] ) ) mail? ( - || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] ) ) manhole? ( - || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] - >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] + >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] ) ) dev-python/future[${PYTHON_USEDEP}] >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - || ( - ( !=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - ) - ( || ( =dev-python/txaio-2.2.2[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} @@ -77,12 +68,12 @@ DEPEND="${RDEPEND} >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] || ( + >=dev-python/twisted-16.0.0[${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.0.0[${PYTHON_USEDEP}] ) dev-python/moto[${PYTHON_USEDEP}] dev-python/boto3[${PYTHON_USEDEP}]