| 1 |
commit: ea7c2fa057f5f61a497e3bf60838ee72384b026b |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 12 21:58:49 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 12 22:07:34 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7c2fa0 |
| 7 |
|
| 8 |
dev-util/buildbot: Update the twisted dep order to prefer the new twisted pkg |
| 9 |
|
| 10 |
With the new twisted pkg now in the tree, prefer the new pkg. |
| 11 |
There will be no new releases of the split pkgs. |
| 12 |
|
| 13 |
Package-Manager: portage-2.3.2 |
| 14 |
|
| 15 |
dev-util/buildbot/buildbot-0.9.0_p1.ebuild | 16 ++++++++-------- |
| 16 |
dev-util/buildbot/buildbot-0.9.0_rc3.ebuild | 16 ++++++++-------- |
| 17 |
dev-util/buildbot/buildbot-9999.ebuild | 27 +++++++++------------------ |
| 18 |
3 files changed, 25 insertions(+), 34 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild |
| 21 |
index bbe1768..c6c4f43 100644 |
| 22 |
--- a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild |
| 23 |
+++ b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild |
| 24 |
@@ -30,8 +30,8 @@ IUSE="crypt doc examples irc mail manhole test" |
| 25 |
|
| 26 |
RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 27 |
|| ( |
| 28 |
- >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 29 |
>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 30 |
+ >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 31 |
) |
| 32 |
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
| 33 |
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] |
| 34 |
@@ -43,18 +43,18 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 35 |
) |
| 36 |
irc? ( |
| 37 |
dev-python/txrequests[${PYTHON_USEDEP}] |
| 38 |
- || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 39 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 40 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 41 |
+ >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 42 |
) |
| 43 |
) |
| 44 |
mail? ( |
| 45 |
- || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 46 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 47 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 48 |
+ >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 49 |
) |
| 50 |
) |
| 51 |
manhole? ( |
| 52 |
- || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] |
| 53 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 54 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 55 |
+ >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] |
| 56 |
) |
| 57 |
) |
| 58 |
dev-python/future[${PYTHON_USEDEP}] |
| 59 |
@@ -68,12 +68,12 @@ DEPEND="${RDEPEND} |
| 60 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 61 |
dev-python/mock[${PYTHON_USEDEP}] |
| 62 |
|| ( |
| 63 |
+ >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 64 |
( |
| 65 |
>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 66 |
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 67 |
>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 68 |
) |
| 69 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 70 |
) |
| 71 |
dev-python/moto[${PYTHON_USEDEP}] |
| 72 |
dev-python/boto3[${PYTHON_USEDEP}] |
| 73 |
|
| 74 |
diff --git a/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild b/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild |
| 75 |
index e21160d..df43d3a 100644 |
| 76 |
--- a/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild |
| 77 |
+++ b/dev-util/buildbot/buildbot-0.9.0_rc3.ebuild |
| 78 |
@@ -30,8 +30,8 @@ IUSE="crypt doc examples irc mail manhole test" |
| 79 |
|
| 80 |
RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 81 |
|| ( |
| 82 |
- >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 83 |
>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 84 |
+ >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 85 |
) |
| 86 |
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
| 87 |
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] |
| 88 |
@@ -43,18 +43,18 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 89 |
) |
| 90 |
irc? ( |
| 91 |
dev-python/txrequests[${PYTHON_USEDEP}] |
| 92 |
- || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 93 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 94 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 95 |
+ >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 96 |
) |
| 97 |
) |
| 98 |
mail? ( |
| 99 |
- || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 100 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 101 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 102 |
+ >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 103 |
) |
| 104 |
) |
| 105 |
manhole? ( |
| 106 |
- || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] |
| 107 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 108 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 109 |
+ >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] |
| 110 |
) |
| 111 |
) |
| 112 |
dev-python/future[${PYTHON_USEDEP}] |
| 113 |
@@ -68,12 +68,12 @@ DEPEND="${RDEPEND} |
| 114 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 115 |
dev-python/mock[${PYTHON_USEDEP}] |
| 116 |
|| ( |
| 117 |
+ >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 118 |
( |
| 119 |
>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 120 |
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 121 |
>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 122 |
) |
| 123 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 124 |
) |
| 125 |
dev-python/moto[${PYTHON_USEDEP}] |
| 126 |
dev-python/boto3[${PYTHON_USEDEP}] |
| 127 |
|
| 128 |
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild |
| 129 |
index 1d53a34..9bf2d9d 100644 |
| 130 |
--- a/dev-util/buildbot/buildbot-9999.ebuild |
| 131 |
+++ b/dev-util/buildbot/buildbot-9999.ebuild |
| 132 |
@@ -30,9 +30,10 @@ IUSE="crypt doc examples irc mail manhole test" |
| 133 |
|
| 134 |
RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 135 |
|| ( |
| 136 |
- >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 137 |
>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 138 |
+ >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 139 |
) |
| 140 |
+ >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
| 141 |
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] |
| 142 |
>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] |
| 143 |
crypt? ( |
| 144 |
@@ -42,32 +43,22 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 145 |
) |
| 146 |
irc? ( |
| 147 |
dev-python/txrequests[${PYTHON_USEDEP}] |
| 148 |
- || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 149 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 150 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 151 |
+ >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 152 |
) |
| 153 |
) |
| 154 |
mail? ( |
| 155 |
- || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 156 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 157 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 158 |
+ >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 159 |
) |
| 160 |
) |
| 161 |
manhole? ( |
| 162 |
- || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] |
| 163 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 164 |
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 165 |
+ >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] |
| 166 |
) |
| 167 |
) |
| 168 |
dev-python/future[${PYTHON_USEDEP}] |
| 169 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 170 |
- || ( |
| 171 |
- ( !<dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
| 172 |
- >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
| 173 |
- ) |
| 174 |
- ( || ( <dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
| 175 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
| 176 |
- ) |
| 177 |
- dev-python/autobahn[${PYTHON_USEDEP}] |
| 178 |
- ) |
| 179 |
- ) |
| 180 |
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] |
| 181 |
" |
| 182 |
DEPEND="${RDEPEND} |
| 183 |
@@ -77,12 +68,12 @@ DEPEND="${RDEPEND} |
| 184 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 185 |
dev-python/mock[${PYTHON_USEDEP}] |
| 186 |
|| ( |
| 187 |
+ >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 188 |
( |
| 189 |
>=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
| 190 |
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
| 191 |
>=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
| 192 |
) |
| 193 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 194 |
) |
| 195 |
dev-python/moto[${PYTHON_USEDEP}] |
| 196 |
dev-python/boto3[${PYTHON_USEDEP}] |
Archives