projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a492637)
dev-util/buildbot: Update the twisted dep order to prefer the new twisted pkg
authorBrian Dolbec <dolsen@gentoo.org>
Wed, 12 Oct 2016 21:58:49 +0000 (14:58 -0700)
committerBrian Dolbec <dolsen@gentoo.org>
Wed, 12 Oct 2016 22:07:34 +0000 (15:07 -0700)
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 patch | blob | history
dev-util/buildbot/buildbot-0.9.0_rc3.ebuild patch | blob | history
dev-util/buildbot/buildbot-9999.ebuild patch | blob | history

diff --git a/dev-util/buildbot/buildbot-0.9.0_p1.ebuild b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild
index bbe176816ffe83e9d6525c32448cd53e8584591c..c6c4f434678ebaed00cb679b0300357a6a5c37d5 100644 (file)
--- 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 e21160dc5b3cb987ae634d4a5b14d9689068984c..df43d3a60d014a51468b479f00523bb7b9ff5952 100644 (file)
--- 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 1d53a34a8a5f17c8c479e33d3aed4b2c5e503f70..9bf2d9d13b69bc07e13d556738319f1c69e69d07 100644 (file)
--- 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/twisted-16.3.0[${PYTHON_USEDEP}]
-                       >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-               )
-               ( || ( <dev-python/twisted-16.3.0[${PYTHON_USEDEP}]
-                               dev-python/twisted-core[${PYTHON_USEDEP}]
-                       )
-                       dev-python/autobahn[${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}]
Unnamed repository; edit this file 'description' to name the repository.