dev-python/twisted: move blockers to RDEPEND

diff --git a/dev-python/twisted-conch/twisted-conch-13.0.0-r1.ebuild b/dev-python/twisted-conch/twisted-conch-13.0.0-r1.ebuild
index 0ac3a01acc28c9343bbf28052ab03ac07724e349..502b455d81b02220a48d02ae7e6b759ba45a6ef8 100644 (file)
--- a/dev-python/twisted-conch/twisted-conch-13.0.0-r1.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-13.0.0-r1.ebuild
@@ -13,12 +13,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/pyasn1[${PYTHON_USEDEP}]
        dev-python/pycrypto[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 python_prepare_all() {
        if [[ "${EUID}" -eq 0 ]]; then

diff --git a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
index 0ac3a01acc28c9343bbf28052ab03ac07724e349..502b455d81b02220a48d02ae7e6b759ba45a6ef8 100644 (file)
--- a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
@@ -13,12 +13,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/pyasn1[${PYTHON_USEDEP}]
        dev-python/pycrypto[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 python_prepare_all() {
        if [[ "${EUID}" -eq 0 ]]; then

diff --git a/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild b/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild
index 8b3254d1f3e5171277cc65739e15bfcadcaa76b6..4fc34ee84f52169e808fa00f1a5e8f614d989b42 100644 (file)
--- a/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-15.1.0.ebuild
@@ -13,8 +13,9 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/pyasn1[${PYTHON_USEDEP}]
        dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
index 8b3254d1f3e5171277cc65739e15bfcadcaa76b6..4fc34ee84f52169e808fa00f1a5e8f614d989b42 100644 (file)
--- a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
@@ -13,8 +13,9 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/pyasn1[${PYTHON_USEDEP}]
        dev-python/pycrypto[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild b/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
index 9ad0618b6f8d3d702063db0b0a488a70690f15ff..bca82a6434c3e59b297f44a846bfac1db9d885cc 100644 (file)
--- a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
+++ b/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
@@ -14,12 +14,13 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE="crypt gtk serial"
 
 DEPEND="
-       !dev-python/twisted
        dev-python/zope-interface[${PYTHON_USEDEP}]
        crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
        gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
        serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 PATCHES=(
        # Give a load-sensitive test a better chance of succeeding.

diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
index a76b78a81c55e52a8049e991357323e11daac31f..f6679b00a8eed901ae91292f69bce6fa8e005abc 100644 (file)
--- a/dev-python/twisted-core/twisted-core-13.2.0.ebuild
+++ b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
@@ -14,12 +14,13 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="crypt gtk serial"
 
 DEPEND="
-       !dev-python/twisted
        >=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
        crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
        gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
        serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 PATCHES=(
        # Give a load-sensitive test a better chance of succeeding.

diff --git a/dev-python/twisted-core/twisted-core-15.1.0.ebuild b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
index 93f7667a2cb3d1e502e075f928278f18d1cd0d68..78aad2ec8b17cda5df6eb3bf86741ffcf671e885 100644 (file)
--- a/dev-python/twisted-core/twisted-core-15.1.0.ebuild
+++ b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
@@ -19,9 +19,9 @@ RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
        gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
        serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
 DEPEND="
-       !dev-python/twisted
        test? ( ${RDEPEND} )
 "
+RDEPEND+=" !dev-python/twisted"
 
 PATCHES=(
        # Give a load-sensitive test a better chance of succeeding.

diff --git a/dev-python/twisted-core/twisted-core-15.2.1.ebuild b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
index 4e7645a7af9702ba5bbb589fa91c74c3c03765d8..1ee03465cba4b2fb253a5bd576fcb82e5f490bf9 100644 (file)
--- a/dev-python/twisted-core/twisted-core-15.2.1.ebuild
+++ b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
@@ -19,9 +19,9 @@ RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
        gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
        serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
 DEPEND="
-       !dev-python/twisted
        test? ( ${RDEPEND} )
 "
+RDEPEND+=" !dev-python/twisted"
 
 PATCHES=(
        # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.

diff --git a/dev-python/twisted-lore/twisted-lore-13.0.0-r1.ebuild b/dev-python/twisted-lore/twisted-lore-13.0.0-r1.ebuild
index c97c51e227d0a766be797786a63c878f5d6b960c..7447698b93fed37dfe39d0d28acf59b402836e96 100644 (file)
--- a/dev-python/twisted-lore/twisted-lore-13.0.0-r1.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-13.0.0-r1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
index c97c51e227d0a766be797786a63c878f5d6b960c..7447698b93fed37dfe39d0d28acf59b402836e96 100644 (file)
--- a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild b/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
index 6fbb0d69d338d73b9040ce1287dbe3f4abb31eea..13c7d7cd16cc8f29f30fbb8a0a1ed352b3e2ad4f 100644 (file)
--- a/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
index 6fbb0d69d338d73b9040ce1287dbe3f4abb31eea..13c7d7cd16cc8f29f30fbb8a0a1ed352b3e2ad4f 100644 (file)
--- a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-mail/twisted-mail-13.0.0-r1.ebuild b/dev-python/twisted-mail/twisted-mail-13.0.0-r1.ebuild
index 05503a1ce227b3635f658319d8edbfa679b057a5..a14dbdc1bcf478b631ee108065776de4d411834c 100644 (file)
--- a/dev-python/twisted-mail/twisted-mail-13.0.0-r1.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-13.0.0-r1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ia64-hp
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
index 05503a1ce227b3635f658319d8edbfa679b057a5..a14dbdc1bcf478b631ee108065776de4d411834c 100644 (file)
--- a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ia64-hp
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild b/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild
index cc6eb74e30e2c7dcd57747e0fa5fa3325880615a..628bce7a20daaac24db63eb4efd57b3682cc35b0 100644 (file)
--- a/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-15.1.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild b/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
index cc6eb74e30e2c7dcd57747e0fa5fa3325880615a..628bce7a20daaac24db63eb4efd57b3682cc35b0 100644 (file)
--- a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-names/twisted-names-13.0.0-r1.ebuild b/dev-python/twisted-names/twisted-names-13.0.0-r1.ebuild
index 1ceb3beaf678f95821add349dc870ba307a4829a..013a20611054edc9ea4ba8a2846261de8d67871e 100644 (file)
--- a/dev-python/twisted-names/twisted-names-13.0.0-r1.ebuild
+++ b/dev-python/twisted-names/twisted-names-13.0.0-r1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-int
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-names/twisted-names-13.2.0.ebuild b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
index 1ceb3beaf678f95821add349dc870ba307a4829a..013a20611054edc9ea4ba8a2846261de8d67871e 100644 (file)
--- a/dev-python/twisted-names/twisted-names-13.2.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-int
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-names/twisted-names-15.1.0.ebuild b/dev-python/twisted-names/twisted-names-15.1.0.ebuild
index a470c24ac2f1e29c4638fc3158d22893ef4b83a4..47d676eeebb7bce9e0dc41c3b0890a7f85decb06 100644 (file)
--- a/dev-python/twisted-names/twisted-names-15.1.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-15.1.0.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-names/twisted-names-15.2.1.ebuild b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
index 78a5c54c941abb1000433079a411e4caabcfca87..d48734e80ff48dd74426af546647abe70b97582f 100644 (file)
--- a/dev-python/twisted-names/twisted-names-15.2.1.ebuild
+++ b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-i
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-news/twisted-news-13.0.0-r1.ebuild b/dev-python/twisted-news/twisted-news-13.0.0-r1.ebuild
index 4a94def2c48acf2851f311c74173ae857afd8464..fd73a4b4edaeedf5d051ddb5efec5ec1f268616c 100644 (file)
--- a/dev-python/twisted-news/twisted-news-13.0.0-r1.ebuild
+++ b/dev-python/twisted-news/twisted-news-13.0.0-r1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-news/twisted-news-13.2.0.ebuild b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
index 4a94def2c48acf2851f311c74173ae857afd8464..fd73a4b4edaeedf5d051ddb5efec5ec1f268616c 100644 (file)
--- a/dev-python/twisted-news/twisted-news-13.2.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-news/twisted-news-15.1.0.ebuild b/dev-python/twisted-news/twisted-news-15.1.0.ebuild
index f2af1d3bcaca62d4bb96482565e69c443d06a9b2..64618dbcd9d97ed884d252fb45eefe0d049349e2 100644 (file)
--- a/dev-python/twisted-news/twisted-news-15.1.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-15.1.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-news/twisted-news-15.2.1.ebuild b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
index f2af1d3bcaca62d4bb96482565e69c443d06a9b2..64618dbcd9d97ed884d252fb45eefe0d049349e2 100644 (file)
--- a/dev-python/twisted-news/twisted-news-15.2.1.ebuild
+++ b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-pair/twisted-pair-13.0.0-r1.ebuild b/dev-python/twisted-pair/twisted-pair-13.0.0-r1.ebuild
index 16ebe999ef25170c495f1ed5a3d9c888a0b74d0e..63783000ae3c3426367358ab72414a56481cba6c 100644 (file)
--- a/dev-python/twisted-pair/twisted-pair-13.0.0-r1.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-13.0.0-r1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
index 16ebe999ef25170c495f1ed5a3d9c888a0b74d0e..63783000ae3c3426367358ab72414a56481cba6c 100644 (file)
--- a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild b/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild
index 43458fe55000d7418bf84ee6b11c712b34e0c651..2db54cc3ec8d0cdbbd29e3b77d03a8eccdd97fa5 100644 (file)
--- a/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-15.1.0.ebuild
@@ -13,10 +13,11 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 # https://twistedmatrix.com/trac/ticket/7433
 PATCHES=( "${FILESDIR}"/14.0.0-tests.patch )

diff --git a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
index 43458fe55000d7418bf84ee6b11c712b34e0c651..2db54cc3ec8d0cdbbd29e3b77d03a8eccdd97fa5 100644 (file)
--- a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
@@ -13,10 +13,11 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 # https://twistedmatrix.com/trac/ticket/7433
 PATCHES=( "${FILESDIR}"/14.0.0-tests.patch )

diff --git a/dev-python/twisted-runner/twisted-runner-13.0.0-r1.ebuild b/dev-python/twisted-runner/twisted-runner-13.0.0-r1.ebuild
index 12bb42410771f91764a9a3e67cc90014c74cd34f..df20ba4c811ac80bf13c02001ed7c30d7273ea77 100644 (file)
--- a/dev-python/twisted-runner/twisted-runner-13.0.0-r1.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-13.0.0-r1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
index 12bb42410771f91764a9a3e67cc90014c74cd34f..df20ba4c811ac80bf13c02001ed7c30d7273ea77 100644 (file)
--- a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild b/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild
index 93d6d33cdbbb082e6f82c161587b626543b842b0..3e74dcf6016c8eb0d0ba3fa0e423b27bf9ea958e 100644 (file)
--- a/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-15.1.0.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
index 93d6d33cdbbb082e6f82c161587b626543b842b0..3e74dcf6016c8eb0d0ba3fa0e423b27bf9ea958e 100644 (file)
--- a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild b/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild
index ab9f1dd662f1db1923d9fe63be1e41d8455d62a0..e30c41d1d1b0549aa34dc18a6ab54b2c29579f71 100644 (file)
--- a/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild
+++ b/dev-python/twisted-web/twisted-web-13.0.0-r1.ebuild
@@ -13,10 +13,11 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE="soap"
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 python_prepare_all() {
        if [[ "${EUID}" -eq 0 ]]; then

diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
index 674840c28e901a040d0c98e38e2218d3a513bbeb..ab18fee2d83e49fda42d243475b7e93828f439a4 100644 (file)
--- a/dev-python/twisted-web/twisted-web-13.2.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
@@ -14,11 +14,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-f
 IUSE="soap"
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/pyopenssl[${PYTHON_USEDEP}]
        soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 python_prepare_all() {
        if [[ "${EUID}" -eq 0 ]]; then

diff --git a/dev-python/twisted-web/twisted-web-15.1.0.ebuild b/dev-python/twisted-web/twisted-web-15.1.0.ebuild
index 4bb97ff34685e31bc838154e68ba01716628894b..3f8a1576bb24403ec1f1192e4282177465dc3955 100644 (file)
--- a/dev-python/twisted-web/twisted-web-15.1.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-15.1.0.ebuild
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x8
 IUSE="soap"
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/pyopenssl[${PYTHON_USEDEP}]
        soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 python_prepare_all() {
        if [[ "${EUID}" -eq 0 ]]; then

diff --git a/dev-python/twisted-web/twisted-web-15.2.1.ebuild b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
index 5035760681e1cb408c8cbb720858c9a8e7b762ae..29f34756bd71f3e1938d5c8a7178f2cb8e5d9f81 100644 (file)
--- a/dev-python/twisted-web/twisted-web-15.2.1.ebuild
+++ b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
@@ -14,11 +14,12 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-f
 IUSE="soap"
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        dev-python/pyopenssl[${PYTHON_USEDEP}]
        soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"
 
 python_prepare_all() {
        if [[ "${EUID}" -eq 0 ]]; then

diff --git a/dev-python/twisted-words/twisted-words-13.0.0-r1.ebuild b/dev-python/twisted-words/twisted-words-13.0.0-r1.ebuild
index d1c4b1fbe995a9523e113871700566a08eb64539..52f55cd095ba90198ae3bffff4416e59c2f7a001 100644 (file)
--- a/dev-python/twisted-words/twisted-words-13.0.0-r1.ebuild
+++ b/dev-python/twisted-words/twisted-words-13.0.0-r1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-words/twisted-words-13.2.0.ebuild b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
index d1c4b1fbe995a9523e113871700566a08eb64539..52f55cd095ba90198ae3bffff4416e59c2f7a001 100644 (file)
--- a/dev-python/twisted-words/twisted-words-13.2.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-words/twisted-words-15.1.0.ebuild b/dev-python/twisted-words/twisted-words-15.1.0.ebuild
index cfd88a7166333e24d7c30815ed7467d80a41a966..3bdb7e5fdb56f920b2323a45c2a0a1081caf707d 100644 (file)
--- a/dev-python/twisted-words/twisted-words-15.1.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-15.1.0.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted-words/twisted-words-15.2.1.ebuild b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
index cfd88a7166333e24d7c30815ed7467d80a41a966..3bdb7e5fdb56f920b2323a45c2a0a1081caf707d 100644 (file)
--- a/dev-python/twisted-words/twisted-words-15.2.1.ebuild
+++ b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
@@ -13,7 +13,8 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
 IUSE=""
 
 DEPEND="
-       !dev-python/twisted
        =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !dev-python/twisted
+"

diff --git a/dev-python/twisted/twisted-16.2.0.ebuild b/dev-python/twisted/twisted-16.2.0.ebuild
index 7f47bfc43ef51b6fe1e1894d9b0be795d2cd7ed6..88b2a5bda8bc48f61b76548ed062af5414267c85 100644 (file)
--- a/dev-python/twisted/twisted-16.2.0.ebuild
+++ b/dev-python/twisted/twisted-16.2.0.ebuild
@@ -31,14 +31,18 @@ RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
        )
        serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
        soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-"
-DEPEND="
-       !dev-python/twisted-core
        !dev-python/twisted-conch
+       !dev-python/twisted-core
+       !dev-python/twisted-lore
        !dev-python/twisted-mail
        !dev-python/twisted-names
-       !dev-python/twisted-words
+       !dev-python/twisted-news
+       !dev-python/twisted-pair
+       !dev-python/twisted-runner
        !dev-python/twisted-web
+       !dev-python/twisted-words
+"
+DEPEND="
        test? (
                dev-python/gmpy[${PYTHON_USEDEP}]
                dev-python/pyasn1[${PYTHON_USEDEP}]

diff --git a/dev-python/twisted/twisted-16.4.1.ebuild b/dev-python/twisted/twisted-16.4.1.ebuild
index ff816b602dd81d07a1e590e47bab186b9d066e99..37640ea857862c5d28b3b1f70b5c3ea13516f1f1 100644 (file)
--- a/dev-python/twisted/twisted-16.4.1.ebuild
+++ b/dev-python/twisted/twisted-16.4.1.ebuild
@@ -38,14 +38,18 @@ RDEPEND=">=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
                >=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
                <dev-python/priority-2.0[${PYTHON_USEDEP}]
        )
-"
-DEPEND="
-       !dev-python/twisted-core
        !dev-python/twisted-conch
+       !dev-python/twisted-core
+       !dev-python/twisted-lore
        !dev-python/twisted-mail
        !dev-python/twisted-names
-       !dev-python/twisted-words
+       !dev-python/twisted-news
+       !dev-python/twisted-pair
+       !dev-python/twisted-runner
        !dev-python/twisted-web
+       !dev-python/twisted-words
+"
+DEPEND="
        test? (
                dev-python/gmpy[${PYTHON_USEDEP}]
                dev-python/pyasn1[${PYTHON_USEDEP}]