dev-python/twisted-lore: Add a new dev-python/twisted pkg blocker

Package-Manager: portage-2.3.2

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 a3f6e6d52eab6633a43fbdfd1114c4b47c7081d7..c97c51e227d0a766be797786a63c878f5d6b960c 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,6 +12,8 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+DEPEND="
+       !dev-python/twisted
+       =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"

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 a3f6e6d52eab6633a43fbdfd1114c4b47c7081d7..c97c51e227d0a766be797786a63c878f5d6b960c 100644 (file)
--- a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,6 +12,8 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+DEPEND="
+       !dev-python/twisted
+       =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"

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 06b1ed92dd3c1e666077706d3a4992e930c118e8..6fbb0d69d338d73b9040ce1287dbe3f4abb31eea 100644 (file)
--- a/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-15.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,6 +12,8 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+DEPEND="
+       !dev-python/twisted
+       =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"

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 06b1ed92dd3c1e666077706d3a4992e930c118e8..6fbb0d69d338d73b9040ce1287dbe3f4abb31eea 100644 (file)
--- a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,6 +12,8 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+DEPEND="
+       !dev-python/twisted
+       =dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
        =dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"