dev-python/twisted: move blockers to RDEPEND

This commit is contained in:
Mike Gilbert
2016-11-09 21:44:37 -05:00
parent 622e7892e0
commit 6ec7fd1505
42 changed files with 132 additions and 86 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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 )

View File

@@ -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 )

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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
"

View File

@@ -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}]

View File

@@ -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}]