From ea7c2fa057f5f61a497e3bf60838ee72384b026b Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Wed, 12 Oct 2016 14:58:49 -0700 Subject: [PATCH] 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 bbe176816ffe..c6c4f434678e 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 e21160dc5b3c..df43d3a60d01 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 1d53a34a8a5f..9bf2d9d13b69 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}] -- 2.26.2