Move dev-python/twisted to dev-python/twisted-core.

(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

141 files changed, 468 insertions, 332 deletions

diff --git a/dev-python/axiom/ChangeLog b/dev-python/axiom/ChangeLog
index 83dfb6a2dbc0..315d6181797b 100644
--- a/dev-python/axiom/ChangeLog
+++ b/dev-python/axiom/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/axiom
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/ChangeLog,v 1.40 2013/05/12 18:32:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/ChangeLog,v 1.41 2013/08/03 09:45:38 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> axiom-0.6.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   12 May 2013; Mike Gilbert <floppym@gentoo.org> axiom-0.6.0.ebuild:
   Remove dependency on pysqlite.
diff --git a/dev-python/axiom/axiom-0.6.0.ebuild b/dev-python/axiom/axiom-0.6.0.ebuild
index 729129227d4a..158a4a27c19d 100644
--- a/dev-python/axiom/axiom-0.6.0.ebuild
+++ b/dev-python/axiom/axiom-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/axiom-0.6.0.ebuild,v 1.14 2013/05/12 18:32:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/axiom-0.6.0.ebuild,v 1.15 2013/08/03 09:45:38 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -27,7 +27,7 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-python/epsilon-0.6
-	>=dev-python/twisted-2.4
+	>=dev-python/twisted-core-2.4
 	>=dev-python/twisted-conch-0.7.0-r1"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/carbon/ChangeLog b/dev-python/carbon/ChangeLog
index 54872acbb765..cec4015ac18b 100644
--- a/dev-python/carbon/ChangeLog
+++ b/dev-python/carbon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/carbon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/ChangeLog,v 1.4 2013/05/09 15:50:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/ChangeLog,v 1.5 2013/08/03 09:45:48 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> carbon-0.9.9-r2.ebuild,
+  carbon-0.9.10.ebuild, carbon-0.9.10-r1.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *carbon-0.9.10-r1 (09 May 2013)
 
diff --git a/dev-python/carbon/carbon-0.9.10-r1.ebuild b/dev-python/carbon/carbon-0.9.10-r1.ebuild
index 2d5a1ea8cc86..81938e887a9b 100644
--- a/dev-python/carbon/carbon-0.9.10-r1.ebuild
+++ b/dev-python/carbon/carbon-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.10-r1.ebuild,v 1.1 2013/05/09 15:50:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.10-r1.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/whisper[${PYTHON_USEDEP}]
 	dev-python/txAMQP[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/carbon/carbon-0.9.10.ebuild b/dev-python/carbon/carbon-0.9.10.ebuild
index e8a32e1f9c2b..e0f9a7f5af13 100644
--- a/dev-python/carbon/carbon-0.9.10.ebuild
+++ b/dev-python/carbon/carbon-0.9.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.10.ebuild,v 1.1 2012/06/22 15:23:20 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.10.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/whisper
 	dev-python/txAMQP"
 
diff --git a/dev-python/carbon/carbon-0.9.9-r2.ebuild b/dev-python/carbon/carbon-0.9.9-r2.ebuild
index 8338a61d564f..721e6aad8990 100644
--- a/dev-python/carbon/carbon-0.9.9-r2.ebuild
+++ b/dev-python/carbon/carbon-0.9.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.9-r2.ebuild,v 1.1 2012/03/22 07:59:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.9-r2.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="3"
 
@@ -20,7 +20,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/txAMQP"
 
 src_prepare() {
diff --git a/dev-python/epsilon/ChangeLog b/dev-python/epsilon/ChangeLog
index a9b5af3012b8..c16d69f87968 100644
--- a/dev-python/epsilon/ChangeLog
+++ b/dev-python/epsilon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/epsilon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/ChangeLog,v 1.28 2012/10/12 08:15:00 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/ChangeLog,v 1.29 2013/08/03 09:45:36 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> epsilon-0.6.0.ebuild,
+  epsilon-0.6.0-r1.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   12 Oct 2012; Patrick Lauer <patrick@gentoo.org> epsilon-0.6.0-r1.ebuild,
   epsilon-0.6.0.ebuild:
diff --git a/dev-python/epsilon/epsilon-0.6.0-r1.ebuild b/dev-python/epsilon/epsilon-0.6.0-r1.ebuild
index cc893ad02d74..c46dd6c54c41 100644
--- a/dev-python/epsilon/epsilon-0.6.0-r1.ebuild
+++ b/dev-python/epsilon/epsilon-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/epsilon-0.6.0-r1.ebuild,v 1.2 2012/10/12 08:15:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/epsilon-0.6.0-r1.ebuild,v 1.3 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -27,7 +27,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-python/twisted-2.4"
+DEPEND=">=dev-python/twisted-core-2.4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/epsilon/epsilon-0.6.0.ebuild b/dev-python/epsilon/epsilon-0.6.0.ebuild
index 41502db4fbf4..e79de4d75d05 100644
--- a/dev-python/epsilon/epsilon-0.6.0.ebuild
+++ b/dev-python/epsilon/epsilon-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/epsilon-0.6.0.ebuild,v 1.14 2012/10/12 08:15:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epsilon/epsilon-0.6.0.ebuild,v 1.15 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -27,7 +27,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=dev-python/twisted-2.4"
+DEPEND=">=dev-python/twisted-core-2.4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/foolscap/ChangeLog b/dev-python/foolscap/ChangeLog
index de453a230607..f1dddd0ba641 100644
--- a/dev-python/foolscap/ChangeLog
+++ b/dev-python/foolscap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/foolscap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/ChangeLog,v 1.44 2012/09/15 01:48:40 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/ChangeLog,v 1.45 2013/08/03 09:45:47 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> foolscap-0.6.0.ebuild,
+  foolscap-0.6.1.ebuild, foolscap-0.6.3.ebuild, foolscap-0.6.4.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   15 Sep 2012; Anthony G. Basile <blueness@gentoo.org> foolscap-0.6.4.ebuild:
   Stable ppc ppc64, bug #429030
diff --git a/dev-python/foolscap/foolscap-0.6.0.ebuild b/dev-python/foolscap/foolscap-0.6.0.ebuild
index 14130e873c47..c81656420cd6 100644
--- a/dev-python/foolscap/foolscap-0.6.0.ebuild
+++ b/dev-python/foolscap/foolscap-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.0.ebuild,v 1.8 2012/08/26 18:50:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.0.ebuild,v 1.9 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
-RDEPEND=">=dev-python/twisted-2.4.0
+RDEPEND=">=dev-python/twisted-core-2.4.0
 	dev-python/twisted-web
 	ssl? ( dev-python/pyopenssl )"
 DEPEND="${DEPEND}
diff --git a/dev-python/foolscap/foolscap-0.6.1.ebuild b/dev-python/foolscap/foolscap-0.6.1.ebuild
index a098d97c52b2..f4c34b446f2f 100644
--- a/dev-python/foolscap/foolscap-0.6.1.ebuild
+++ b/dev-python/foolscap/foolscap-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.1.ebuild,v 1.6 2012/08/26 18:50:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.1.ebuild,v 1.7 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
-RDEPEND=">=dev-python/twisted-2.4.0
+RDEPEND=">=dev-python/twisted-core-2.4.0
 	dev-python/twisted-web
 	ssl? ( dev-python/pyopenssl )"
 DEPEND="${DEPEND}
diff --git a/dev-python/foolscap/foolscap-0.6.3.ebuild b/dev-python/foolscap/foolscap-0.6.3.ebuild
index 8085f5cd5980..370d87d0a5ff 100644
--- a/dev-python/foolscap/foolscap-0.6.3.ebuild
+++ b/dev-python/foolscap/foolscap-0.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.3.ebuild,v 1.2 2012/08/26 18:50:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.3.ebuild,v 1.3 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
-RDEPEND=">=dev-python/twisted-2.4.0
+RDEPEND=">=dev-python/twisted-core-2.4.0
 	dev-python/twisted-web
 	ssl? ( dev-python/pyopenssl )"
 DEPEND="${DEPEND}
diff --git a/dev-python/foolscap/foolscap-0.6.4.ebuild b/dev-python/foolscap/foolscap-0.6.4.ebuild
index adb487092927..6c4c242dadbc 100644
--- a/dev-python/foolscap/foolscap-0.6.4.ebuild
+++ b/dev-python/foolscap/foolscap-0.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.4.ebuild,v 1.6 2012/09/15 01:48:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.4.ebuild,v 1.7 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc ssl"
 
-RDEPEND=">=dev-python/twisted-2.4.0
+RDEPEND=">=dev-python/twisted-core-2.4.0
 	dev-python/twisted-web
 	ssl? ( dev-python/pyopenssl )"
 DEPEND="${DEPEND}
diff --git a/dev-python/kiwi/ChangeLog b/dev-python/kiwi/ChangeLog
index 0be2463e72cd..518f61f12af5 100644
--- a/dev-python/kiwi/ChangeLog
+++ b/dev-python/kiwi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/kiwi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/ChangeLog,v 1.25 2013/07/05 04:44:09 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/ChangeLog,v 1.26 2013/08/03 09:45:42 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> kiwi-1.9.34.ebuild,
+  kiwi-1.9.35.ebuild, kiwi-1.9.36.ebuild, kiwi-1.9.36.2.ebuild,
+  kiwi-1.9.37.ebuild, kiwi-1.9.38.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *kiwi-1.9.38-r1 (05 Jul 2013)
 
diff --git a/dev-python/kiwi/kiwi-1.9.34.ebuild b/dev-python/kiwi/kiwi-1.9.34.ebuild
index 5d3c4e7ddd83..54d6335e9539 100644
--- a/dev-python/kiwi/kiwi-1.9.34.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.34.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.34.ebuild,v 1.1 2012/05/20 00:09:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.34.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pep8
 		dev-python/pyflakes
-		dev-python/twisted
+		dev-python/twisted-core
 	)
 "
 
diff --git a/dev-python/kiwi/kiwi-1.9.35.ebuild b/dev-python/kiwi/kiwi-1.9.35.ebuild
index ed6525efd61b..f336526d065e 100644
--- a/dev-python/kiwi/kiwi-1.9.35.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.35.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.35.ebuild,v 1.1 2012/10/09 09:44:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.35.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pep8
 		dev-python/pyflakes
-		dev-python/twisted
+		dev-python/twisted-core
 	)
 "
 
diff --git a/dev-python/kiwi/kiwi-1.9.36.2.ebuild b/dev-python/kiwi/kiwi-1.9.36.2.ebuild
index cf40d4ca1c5d..726c2c40d84c 100644
--- a/dev-python/kiwi/kiwi-1.9.36.2.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.36.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.36.2.ebuild,v 1.1 2013/01/22 06:02:43 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.36.2.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pep8
 		dev-python/pyflakes
-		dev-python/twisted
+		dev-python/twisted-core
 	)
 "
 
diff --git a/dev-python/kiwi/kiwi-1.9.36.ebuild b/dev-python/kiwi/kiwi-1.9.36.ebuild
index 60538c91cee3..1cd04876a38c 100644
--- a/dev-python/kiwi/kiwi-1.9.36.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.36.ebuild,v 1.3 2012/12/11 17:06:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.36.ebuild,v 1.4 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pep8
 		dev-python/pyflakes
-		dev-python/twisted
+		dev-python/twisted-core
 	)
 "
 
diff --git a/dev-python/kiwi/kiwi-1.9.37.ebuild b/dev-python/kiwi/kiwi-1.9.37.ebuild
index 057a170cf926..8ba113b19f9f 100644
--- a/dev-python/kiwi/kiwi-1.9.37.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.37.ebuild,v 1.1 2013/04/03 05:57:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.37.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pep8
 		dev-python/pyflakes
-		dev-python/twisted
+		dev-python/twisted-core
 	)
 "
 
diff --git a/dev-python/kiwi/kiwi-1.9.38.ebuild b/dev-python/kiwi/kiwi-1.9.38.ebuild
index f9283a1defa6..21d4fb80edca 100644
--- a/dev-python/kiwi/kiwi-1.9.38.ebuild
+++ b/dev-python/kiwi/kiwi-1.9.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.38.ebuild,v 1.1 2013/04/16 09:24:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kiwi/kiwi-1.9.38.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pep8
 		dev-python/pyflakes
-		dev-python/twisted
+		dev-python/twisted-core
 	)
 "
 
diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog
index a21f334d07ad..bfe68bdb3327 100644
--- a/dev-python/ldaptor/ChangeLog
+++ b/dev-python/ldaptor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ldaptor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.38 2013/01/27 07:30:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.39 2013/08/03 09:45:40 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> ldaptor-0.0.43.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   27 Jan 2013; Ian Delaney <idella4@gentoo.org> +files/ldaptor-prem_test.patch,
   ldaptor-0.0.43.ebuild:
diff --git a/dev-python/ldaptor/ldaptor-0.0.43.ebuild b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
index 5fc80451bfe2..3a11097bec1c 100644
--- a/dev-python/ldaptor/ldaptor-0.0.43.ebuild
+++ b/dev-python/ldaptor/ldaptor-0.0.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.43.ebuild,v 1.18 2013/01/27 07:30:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.43.ebuild,v 1.19 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -22,7 +22,7 @@ KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="doc samba web"
 
 DEPEND="virtual/pyparsing
-	>=dev-python/twisted-2
+	>=dev-python/twisted-core-2
 	dev-python/twisted-mail
 	dev-python/twisted-names
 	doc? (
diff --git a/dev-python/mantissa/ChangeLog b/dev-python/mantissa/ChangeLog
index 23da2500accd..813a52e84692 100644
--- a/dev-python/mantissa/ChangeLog
+++ b/dev-python/mantissa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/mantissa
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mantissa/ChangeLog,v 1.18 2013/06/09 17:19:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mantissa/ChangeLog,v 1.19 2013/08/03 09:45:49 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> mantissa-0.7.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   09 Jun 2013; Mike Gilbert <floppym@gentoo.org> mantissa-0.7.0.ebuild:
   Depend on virtual/python-imaging.
diff --git a/dev-python/mantissa/mantissa-0.7.0.ebuild b/dev-python/mantissa/mantissa-0.7.0.ebuild
index c1df9dbe2696..28b6f47f6976 100644
--- a/dev-python/mantissa/mantissa-0.7.0.ebuild
+++ b/dev-python/mantissa/mantissa-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mantissa/mantissa-0.7.0.ebuild,v 1.8 2013/06/09 17:19:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mantissa/mantissa-0.7.0.ebuild,v 1.9 2013/08/03 09:45:49 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -32,7 +32,7 @@ DEPEND=">=dev-python/axiom-0.5.7
 	virtual/python-imaging
 	>=dev-python/nevow-0.9.5
 	>=dev-python/pytz-2005m
-	>=dev-python/twisted-8.0.1
+	>=dev-python/twisted-core-8.0.1
 	dev-python/twisted-mail
 	>=dev-python/vertex-0.2.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/morbid/ChangeLog b/dev-python/morbid/ChangeLog
index ee543571443a..f8fc7acc62c9 100644
--- a/dev-python/morbid/ChangeLog
+++ b/dev-python/morbid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/morbid
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/morbid/ChangeLog,v 1.10 2010/06/25 19:56:02 arfrever Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/morbid/ChangeLog,v 1.11 2013/08/03 09:45:37 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> morbid-0.8.7.3.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   25 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   morbid-0.8.7.3.ebuild:
diff --git a/dev-python/morbid/morbid-0.8.7.3.ebuild b/dev-python/morbid/morbid-0.8.7.3.ebuild
index fd7b5c906338..8d76c2345f68 100644
--- a/dev-python/morbid/morbid-0.8.7.3.ebuild
+++ b/dev-python/morbid/morbid-0.8.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/morbid/morbid-0.8.7.3.ebuild,v 1.5 2010/12/26 14:49:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/morbid/morbid-0.8.7.3.ebuild,v 1.6 2013/08/03 09:45:37 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/stomper
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/twisted-web"
 DEPEND="${RDEPEND}
 	dev-python/setuptools"
diff --git a/dev-python/nevow/ChangeLog b/dev-python/nevow/ChangeLog
index c1c67dedb03d..90a5c7731c20 100644
--- a/dev-python/nevow/ChangeLog
+++ b/dev-python/nevow/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/nevow
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/ChangeLog,v 1.47 2012/10/12 08:16:28 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/ChangeLog,v 1.48 2013/08/03 09:45:48 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> nevow-0.10.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   12 Oct 2012; Patrick Lauer <patrick@gentoo.org> nevow-0.10.0.ebuild:
   Restricting python-2.5
diff --git a/dev-python/nevow/nevow-0.10.0.ebuild b/dev-python/nevow/nevow-0.10.0.ebuild
index aa2c6def6dc4..8a67737fffe1 100644
--- a/dev-python/nevow/nevow-0.10.0.ebuild
+++ b/dev-python/nevow/nevow-0.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.10.0.ebuild,v 1.13 2012/10/12 08:16:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.10.0.ebuild,v 1.14 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux"
 IUSE="doc"
 
-DEPEND=">=dev-python/twisted-2.5
+DEPEND=">=dev-python/twisted-core-2.5
 	>=dev-python/twisted-web-8.1.0
 	net-zope/zope-interface"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/nose/ChangeLog b/dev-python/nose/ChangeLog
index 9696e2e1d7e3..bc2e418fed31 100644
--- a/dev-python/nose/ChangeLog
+++ b/dev-python/nose/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/nose
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.116 2013/07/02 07:43:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/ChangeLog,v 1.117 2013/08/03 09:45:39 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> nose-1.1.2.ebuild,
+  nose-1.1.2-r1.ebuild, nose-1.2.1.ebuild, nose-1.2.1_p2012.ebuild,
+  nose-1.3.0.ebuild, nose-9999.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   02 Jul 2013; Agostino Sarubbo <ago@gentoo.org> nose-1.3.0.ebuild:
   Stable for sh, wrt bug #473672
diff --git a/dev-python/nose/nose-1.1.2-r1.ebuild b/dev-python/nose/nose-1.1.2-r1.ebuild
index e28b0b919425..472e264de949 100644
--- a/dev-python/nose/nose-1.1.2-r1.ebuild
+++ b/dev-python/nose/nose-1.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.2-r1.ebuild,v 1.14 2013/02/26 14:56:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.2-r1.ebuild,v 1.15 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ RDEPEND="coverage? ( dev-python/coverage[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 DOCS=( AUTHORS )
 
diff --git a/dev-python/nose/nose-1.1.2.ebuild b/dev-python/nose/nose-1.1.2.ebuild
index ae82bf0ffd02..a8bc102d3129 100644
--- a/dev-python/nose/nose-1.1.2.ebuild
+++ b/dev-python/nose/nose-1.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.2.ebuild,v 1.10 2012/05/09 00:06:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.1.2.ebuild,v 1.11 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -20,7 +20,7 @@ RDEPEND="coverage? ( dev-python/coverage )
 	dev-python/setuptools"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 DOCS="AUTHORS"
 
diff --git a/dev-python/nose/nose-1.2.1.ebuild b/dev-python/nose/nose-1.2.1.ebuild
index 6c68b5065ea6..6f125e0aec48 100644
--- a/dev-python/nose/nose-1.2.1.ebuild
+++ b/dev-python/nose/nose-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1.ebuild,v 1.3 2013/03/02 12:40:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1.ebuild,v 1.4 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 DOCS=( AUTHORS )
 
diff --git a/dev-python/nose/nose-1.2.1_p2012.ebuild b/dev-python/nose/nose-1.2.1_p2012.ebuild
index c1ed6d6d09b1..ca92c6a9b051 100644
--- a/dev-python/nose/nose-1.2.1_p2012.ebuild
+++ b/dev-python/nose/nose-1.2.1_p2012.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1_p2012.ebuild,v 1.2 2013/03/02 12:40:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.2.1_p2012.ebuild,v 1.3 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 DOCS=( AUTHORS )
 
diff --git a/dev-python/nose/nose-1.3.0.ebuild b/dev-python/nose/nose-1.3.0.ebuild
index 947d0095cc90..680a19e483b9 100644
--- a/dev-python/nose/nose-1.3.0.ebuild
+++ b/dev-python/nose/nose-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.0.ebuild,v 1.14 2013/07/02 07:43:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-1.3.0.ebuild,v 1.15 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted
+	test? ( dev-python/twisted-core
 		dev-python/unittest2 )"
 
 DOCS=( AUTHORS )
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index 5c737386afdf..1e7d03a15e21 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-9999.ebuild,v 1.2 2013/01/08 18:40:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nose/nose-9999.ebuild,v 1.3 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI=5
 
@@ -26,7 +26,7 @@ RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-0.6 )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 #if LIVE
 SRC_URI=
diff --git a/dev-python/paisley/ChangeLog b/dev-python/paisley/ChangeLog
index 4fd623695d5c..c5e315348c93 100644
--- a/dev-python/paisley/ChangeLog
+++ b/dev-python/paisley/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/paisley
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paisley/ChangeLog,v 1.15 2011/09/12 08:23:55 djc Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paisley/ChangeLog,v 1.16 2013/08/03 09:45:45 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> paisley-0.3.1.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   12 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> metadata.xml:
   Remove myself as maintainer.
diff --git a/dev-python/paisley/paisley-0.3.1.ebuild b/dev-python/paisley/paisley-0.3.1.ebuild
index dd9ccd8d98bf..e110642158e9 100644
--- a/dev-python/paisley/paisley-0.3.1.ebuild
+++ b/dev-python/paisley/paisley-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paisley/paisley-0.3.1.ebuild,v 1.4 2011/06/24 18:54:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paisley/paisley-0.3.1.ebuild,v 1.5 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,6 +20,6 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="dev-python/simplejson
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/twisted-web"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyfire/ChangeLog b/dev-python/pyfire/ChangeLog
index 6ed7b0af6738..471de868e0bc 100644
--- a/dev-python/pyfire/ChangeLog
+++ b/dev-python/pyfire/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyfire
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfire/ChangeLog,v 1.2 2012/10/17 08:53:06 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfire/ChangeLog,v 1.3 2013/08/03 09:45:50 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> pyfire-0.3.4.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   17 Oct 2012; Patrick Lauer <patrick@gentoo.org> pyfire-0.3.4.ebuild:
   Restricting python 2.5
diff --git a/dev-python/pyfire/pyfire-0.3.4.ebuild b/dev-python/pyfire/pyfire-0.3.4.ebuild
index ba4bee3fd82d..88e9c20a890a 100644
--- a/dev-python/pyfire/pyfire-0.3.4.ebuild
+++ b/dev-python/pyfire/pyfire-0.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfire/pyfire-0.3.4.ebuild,v 1.2 2012/10/17 08:53:06 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfire/pyfire-0.3.4.ebuild,v 1.3 2013/08/03 09:45:50 mgorny Exp $
 
 EAPI=4
 
@@ -24,5 +24,5 @@ IUSE=""
 DEPEND="dev-python/setuptools"
 RDEPEND="
 	dev-python/pyopenssl
-	dev-python/twisted
+	dev-python/twisted-core
 "
diff --git a/dev-python/pynotifier/ChangeLog b/dev-python/pynotifier/ChangeLog
index 2fa81b41ea3a..fbf4f2a0d950 100644
--- a/dev-python/pynotifier/ChangeLog
+++ b/dev-python/pynotifier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pynotifier
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pynotifier/ChangeLog,v 1.21 2013/07/01 14:48:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pynotifier/ChangeLog,v 1.22 2013/08/03 09:45:37 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> pynotifier-0.7.0-r1.ebuild,
+  pynotifier-0.7.0-r2.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   01 Jul 2013; Ian Delaney <idella4@gentoo.org> pynotifier-0.7.0-r2.ebuild:
   correction to dep
diff --git a/dev-python/pynotifier/pynotifier-0.7.0-r1.ebuild b/dev-python/pynotifier/pynotifier-0.7.0-r1.ebuild
index 13370df4eac5..4b2de335d009 100644
--- a/dev-python/pynotifier/pynotifier-0.7.0-r1.ebuild
+++ b/dev-python/pynotifier/pynotifier-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pynotifier/pynotifier-0.7.0-r1.ebuild,v 1.6 2011/10/24 05:37:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pynotifier/pynotifier-0.7.0-r1.ebuild,v 1.7 2013/08/03 09:45:37 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE="qt4 gtk"
 
 DEPEND=""
-RDEPEND="dev-python/twisted
+RDEPEND="dev-python/twisted-core
 	gtk? ( dev-python/pygobject:2 )
 	qt4? ( dev-python/PyQt4[X] )"
 
diff --git a/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild b/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild
index 643c5b3afb04..8b1e416206ce 100644
--- a/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild
+++ b/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild,v 1.2 2013/07/01 14:48:29 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pynotifier/pynotifier-0.7.0-r2.ebuild,v 1.3 2013/08/03 09:45:37 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="qt4 gtk"
 
 DEPEND=""
-RDEPEND="dev-python/twisted
+RDEPEND="dev-python/twisted-core
 	gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
 	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/pyosd/ChangeLog b/dev-python/pyosd/ChangeLog
index 5c642afb8d83..43a0f183fa7f 100644
--- a/dev-python/pyosd/ChangeLog
+++ b/dev-python/pyosd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyosd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/ChangeLog,v 1.21 2012/05/19 20:20:27 floppym Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/ChangeLog,v 1.22 2013/08/03 09:45:50 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> pyosd-0.2.14.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   19 May 2012; Mike Gilbert <floppym@gentoo.org> pyosd-0.2.14.ebuild:
   Update HOMEPAGE and SRC_URI. #402045 by Florian Berger.
diff --git a/dev-python/pyosd/pyosd-0.2.14.ebuild b/dev-python/pyosd/pyosd-0.2.14.ebuild
index 15f2afdf6648..0be33fc03ce3 100644
--- a/dev-python/pyosd/pyosd-0.2.14.ebuild
+++ b/dev-python/pyosd/pyosd-0.2.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/pyosd-0.2.14.ebuild,v 1.11 2012/05/19 20:20:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/pyosd-0.2.14.ebuild,v 1.12 2013/08/03 09:45:50 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -37,6 +37,6 @@ src_install() {
 pkg_postinst() {
 	distutils_pkg_postinst
 
-	elog "If you want to run the included daemon, you will need to install dev-python/twisted."
+	elog "If you want to run the included daemon, you will need to install dev-python/twisted-core."
 	elog "Also note that the volume plugin requires media-sound/aumix."
 }
diff --git a/dev-python/pyutil/ChangeLog b/dev-python/pyutil/ChangeLog
index 26710b638def..cdafbdb56e48 100644
--- a/dev-python/pyutil/ChangeLog
+++ b/dev-python/pyutil/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyutil
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyutil/ChangeLog,v 1.1 2013/08/01 01:37:06 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyutil/ChangeLog,v 1.2 2013/08/03 09:45:46 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> pyutil-1.9.7.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *pyutil-1.9.7 (01 Aug 2013)
 
diff --git a/dev-python/pyutil/pyutil-1.9.7.ebuild b/dev-python/pyutil/pyutil-1.9.7.ebuild
index 88ba6cbc5290..eb53b6f98344 100644
--- a/dev-python/pyutil/pyutil-1.9.7.ebuild
+++ b/dev-python/pyutil/pyutil-1.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyutil/pyutil-1.9.7.ebuild,v 1.1 2013/08/01 01:37:06 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyutil/pyutil-1.9.7.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI=5
 
@@ -16,9 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# dev-python/twisted[${PYTHON_USEDEP}]
+# dev-python/twisted-core[${PYTHON_USEDEP}]
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/twisted
+	dev-python/twisted-core
 	virtual/python-argparse[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/scrapy/ChangeLog b/dev-python/scrapy/ChangeLog
index 9ff8b9ade649..44eea7a41130 100644
--- a/dev-python/scrapy/ChangeLog
+++ b/dev-python/scrapy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/scrapy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.13 2013/06/09 17:32:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/ChangeLog,v 1.14 2013/08/03 09:45:47 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> scrapy-0.14.4.ebuild,
+  scrapy-0.16.4.ebuild, scrapy-0.17.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   09 Jun 2013; Mike Gilbert <floppym@gentoo.org> scrapy-0.14.4.ebuild,
   scrapy-0.16.4.ebuild, scrapy-0.17.0.ebuild:
diff --git a/dev-python/scrapy/scrapy-0.14.4.ebuild b/dev-python/scrapy/scrapy-0.14.4.ebuild
index 0014ea449e47..9d6924b80949 100644
--- a/dev-python/scrapy/scrapy-0.14.4.ebuild
+++ b/dev-python/scrapy/scrapy-0.14.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.4.ebuild,v 1.4 2013/06/09 17:32:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.14.4.ebuild,v 1.5 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI="4"
 
@@ -38,7 +38,7 @@ RDEPEND="dev-libs/libxml2[python]
 	ssl? ( dev-python/pyopenssl )
 	dev-python/setuptools
 	dev-python/simplejson
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/twisted-conch
 	dev-python/twisted-mail
 	dev-python/twisted-web
diff --git a/dev-python/scrapy/scrapy-0.16.4.ebuild b/dev-python/scrapy/scrapy-0.16.4.ebuild
index 3d6f5190439e..92826479eb9a 100644
--- a/dev-python/scrapy/scrapy-0.16.4.ebuild
+++ b/dev-python/scrapy/scrapy-0.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.16.4.ebuild,v 1.2 2013/06/09 17:32:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.16.4.ebuild,v 1.3 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ RDEPEND="dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/twisted-conch
 	dev-python/twisted-mail
 	dev-python/twisted-web
diff --git a/dev-python/scrapy/scrapy-0.17.0.ebuild b/dev-python/scrapy/scrapy-0.17.0.ebuild
index e08144539140..3536e11d0291 100644
--- a/dev-python/scrapy/scrapy-0.17.0.ebuild
+++ b/dev-python/scrapy/scrapy-0.17.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.17.0.ebuild,v 1.2 2013/06/09 17:32:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scrapy/scrapy-0.17.0.ebuild,v 1.3 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI=5
 
@@ -32,7 +32,7 @@ RDEPEND="dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
 	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/twisted
+	dev-python/twisted-core
 	dev-python/twisted-conch
 	dev-python/twisted-mail
 	dev-python/twisted-web
diff --git a/dev-python/testoob/ChangeLog b/dev-python/testoob/ChangeLog
index 75cf9f0f7817..745ccf769f04 100644
--- a/dev-python/testoob/ChangeLog
+++ b/dev-python/testoob/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/testoob
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testoob/ChangeLog,v 1.22 2012/05/22 09:26:30 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testoob/ChangeLog,v 1.23 2013/08/03 09:45:51 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> testoob-1.15.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> testoob-1.15.ebuild:
   Remove masked dev-python/4suite dependency because it's optional according to
diff --git a/dev-python/testoob/testoob-1.15.ebuild b/dev-python/testoob/testoob-1.15.ebuild
index 49b3790dea0c..d016bec92b2c 100644
--- a/dev-python/testoob/testoob-1.15.ebuild
+++ b/dev-python/testoob/testoob-1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/testoob/testoob-1.15.ebuild,v 1.6 2012/05/22 09:26:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/testoob/testoob-1.15.ebuild,v 1.7 2013/08/03 09:45:51 mgorny Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ IUSE="pdf threads"
 
 DEPEND=""
 RDEPEND="pdf? ( dev-python/reportlab )
-	threads? ( dev-python/twisted )"
+	threads? ( dev-python/twisted-core )"
 RESTRICT_PYTHON_ABIS="3.*"
 
 DOCS="docs/*"
diff --git a/dev-python/twisted-conch/ChangeLog b/dev-python/twisted-conch/ChangeLog
index 4c601cf0cd2c..208b7192132b 100644
--- a/dev-python/twisted-conch/ChangeLog
+++ b/dev-python/twisted-conch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-conch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.85 2013/04/08 06:42:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.86 2013/08/03 09:45:44 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-conch-10.2.0.ebuild,
+  twisted-conch-11.0.0.ebuild, twisted-conch-11.1.0.ebuild,
+  twisted-conch-12.0.0.ebuild, twisted-conch-12.2.0.ebuild,
+  twisted-conch-12.3.0.ebuild, twisted-conch-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-conch-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-conch/twisted-conch-10.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-10.2.0.ebuild
index 1bd7dd9552ea..f678f70fe85f 100644
--- a/dev-python/twisted-conch/twisted-conch-10.2.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-10.2.0.ebuild,v 1.10 2012/10/05 14:45:03 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-10.2.0.ebuild,v 1.11 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted SSHv2 implementation"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/pyasn1
 	>=dev-python/pycrypto-1.9_alpha6"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-conch/twisted-conch-11.0.0.ebuild b/dev-python/twisted-conch/twisted-conch-11.0.0.ebuild
index 6db7f6cc2ee6..be68c4d40250 100644
--- a/dev-python/twisted-conch/twisted-conch-11.0.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-11.0.0.ebuild,v 1.10 2012/10/05 14:45:03 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-11.0.0.ebuild,v 1.11 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted SSHv2 implementation"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/pyasn1
 	dev-python/pycrypto"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-conch/twisted-conch-11.1.0.ebuild b/dev-python/twisted-conch/twisted-conch-11.1.0.ebuild
index 1b038ea18db8..21442a005a34 100644
--- a/dev-python/twisted-conch/twisted-conch-11.1.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-11.1.0.ebuild,v 1.3 2012/02/25 02:00:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-11.1.0.ebuild,v 1.4 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted SSHv2 implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/pyasn1
 	dev-python/pycrypto"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild b/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild
index bbe6328b71af..38b95cc8adc3 100644
--- a/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild,v 1.1 2012/03/22 07:04:01 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild,v 1.2 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted SSHv2 implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/pyasn1
 	dev-python/pycrypto"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-conch/twisted-conch-12.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-12.2.0.ebuild
index 6e38cb780702..f3f12fd931cd 100644
--- a/dev-python/twisted-conch/twisted-conch-12.2.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-12.2.0.ebuild,v 1.2 2012/10/08 19:30:06 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-12.2.0.ebuild,v 1.3 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted SSHv2 implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/pyasn1
 	dev-python/pycrypto"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-conch/twisted-conch-12.3.0.ebuild b/dev-python/twisted-conch/twisted-conch-12.3.0.ebuild
index acabb8da2191..55e9c8de5394 100644
--- a/dev-python/twisted-conch/twisted-conch-12.3.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-12.3.0.ebuild,v 1.1 2013/01/14 03:55:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-12.3.0.ebuild,v 1.2 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted SSHv2 implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/pyasn1
 	dev-python/pycrypto"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-conch/twisted-conch-13.0.0.ebuild b/dev-python/twisted-conch/twisted-conch-13.0.0.ebuild
index 0286f96ef02f..20c738d1ae64 100644
--- a/dev-python/twisted-conch/twisted-conch-13.0.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-13.0.0.ebuild,v 1.1 2013/04/08 06:42:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-13.0.0.ebuild,v 1.2 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted SSHv2 implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/pyasn1
 	dev-python/pycrypto"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted-lore/ChangeLog b/dev-python/twisted-lore/ChangeLog
index a9e65cd600d6..eca340568d90 100644
--- a/dev-python/twisted-lore/ChangeLog
+++ b/dev-python/twisted-lore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-lore
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.62 2013/04/08 06:44:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.63 2013/08/03 09:45:45 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-lore-10.2.0.ebuild,
+  twisted-lore-11.0.0.ebuild, twisted-lore-11.1.0.ebuild,
+  twisted-lore-12.0.0.ebuild, twisted-lore-12.2.0.ebuild,
+  twisted-lore-12.3.0.ebuild, twisted-lore-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-lore-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-lore/twisted-lore-10.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-10.2.0.ebuild
index 11cb8c6fc1aa..4bd5eadd7c2c 100644
--- a/dev-python/twisted-lore/twisted-lore-10.2.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-10.2.0.ebuild,v 1.7 2012/10/05 14:45:16 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-10.2.0.ebuild,v 1.8 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/twisted-web"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-lore/twisted-lore-11.0.0.ebuild b/dev-python/twisted-lore/twisted-lore-11.0.0.ebuild
index 9a8c9da4b750..0168460ddddf 100644
--- a/dev-python/twisted-lore/twisted-lore-11.0.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-11.0.0.ebuild,v 1.7 2012/10/05 14:45:16 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-11.0.0.ebuild,v 1.8 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-lore/twisted-lore-11.1.0.ebuild b/dev-python/twisted-lore/twisted-lore-11.1.0.ebuild
index f1f1d93d48cf..6463c1d1cca4 100644
--- a/dev-python/twisted-lore/twisted-lore-11.1.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-11.1.0.ebuild,v 1.1 2011/12/27 07:06:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-11.1.0.ebuild,v 1.2 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild b/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild
index 6850d9b1479e..96dd8d7a8151 100644
--- a/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild,v 1.1 2012/03/22 07:04:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild,v 1.2 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-lore/twisted-lore-12.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-12.2.0.ebuild
index c043654e5de5..73c3940683d9 100644
--- a/dev-python/twisted-lore/twisted-lore-12.2.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-12.2.0.ebuild,v 1.2 2012/10/08 19:30:22 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-12.2.0.ebuild,v 1.3 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-lore/twisted-lore-12.3.0.ebuild b/dev-python/twisted-lore/twisted-lore-12.3.0.ebuild
index 14208a90f1f7..36ec2a8e6141 100644
--- a/dev-python/twisted-lore/twisted-lore-12.3.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-12.3.0.ebuild,v 1.1 2013/01/14 03:55:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-12.3.0.ebuild,v 1.2 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-lore/twisted-lore-13.0.0.ebuild b/dev-python/twisted-lore/twisted-lore-13.0.0.ebuild
index 33024a0618cb..4250c7588b02 100644
--- a/dev-python/twisted-lore/twisted-lore-13.0.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-13.0.0.ebuild,v 1.1 2013/04/08 06:44:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-13.0.0.ebuild,v 1.2 2013/08/03 09:45:45 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted documentation system"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-mail/ChangeLog b/dev-python/twisted-mail/ChangeLog
index 21c4f75414c0..b03c887d6afb 100644
--- a/dev-python/twisted-mail/ChangeLog
+++ b/dev-python/twisted-mail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-mail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.73 2013/04/08 06:47:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.74 2013/08/03 09:45:44 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-mail-10.2.0.ebuild,
+  twisted-mail-11.0.0.ebuild, twisted-mail-11.1.0.ebuild,
+  twisted-mail-12.0.0.ebuild, twisted-mail-12.2.0.ebuild,
+  twisted-mail-12.3.0.ebuild, twisted-mail-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-mail-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-mail/twisted-mail-10.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-10.2.0.ebuild
index 3b42792c960d..21e70d2c0d41 100644
--- a/dev-python/twisted-mail/twisted-mail-10.2.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-10.2.0.ebuild,v 1.8 2012/10/05 14:45:31 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-10.2.0.ebuild,v 1.9 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted Mail library, server and client"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-mail/twisted-mail-11.0.0.ebuild b/dev-python/twisted-mail/twisted-mail-11.0.0.ebuild
index 529cbe2770a0..ff784c2220ff 100644
--- a/dev-python/twisted-mail/twisted-mail-11.0.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-11.0.0.ebuild,v 1.9 2012/10/05 14:45:31 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-11.0.0.ebuild,v 1.10 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted Mail library, server and client"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-mail/twisted-mail-11.1.0.ebuild b/dev-python/twisted-mail/twisted-mail-11.1.0.ebuild
index b3de6245e834..e15af43e2904 100644
--- a/dev-python/twisted-mail/twisted-mail-11.1.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-11.1.0.ebuild,v 1.1 2011/12/27 07:11:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-11.1.0.ebuild,v 1.2 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted Mail library, server and client"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild b/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild
index 0a28798f17a9..2a3d3176205b 100644
--- a/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild,v 1.1 2012/03/22 07:05:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild,v 1.2 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted Mail library, server and client"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-mail/twisted-mail-12.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-12.2.0.ebuild
index 5f8babd78c8e..c1524671bc6b 100644
--- a/dev-python/twisted-mail/twisted-mail-12.2.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-12.2.0.ebuild,v 1.2 2012/10/08 19:30:35 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-12.2.0.ebuild,v 1.3 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted Mail library, server and client"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-mail/twisted-mail-12.3.0.ebuild b/dev-python/twisted-mail/twisted-mail-12.3.0.ebuild
index a65ddc661138..beca6f1b9df2 100644
--- a/dev-python/twisted-mail/twisted-mail-12.3.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-12.3.0.ebuild,v 1.1 2013/01/14 03:56:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-12.3.0.ebuild,v 1.2 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted Mail library, server and client"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-mail/twisted-mail-13.0.0.ebuild b/dev-python/twisted-mail/twisted-mail-13.0.0.ebuild
index f0c7abc83824..8bb9a7ad386e 100644
--- a/dev-python/twisted-mail/twisted-mail-13.0.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-13.0.0.ebuild,v 1.1 2013/04/08 06:47:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-13.0.0.ebuild,v 1.2 2013/08/03 09:45:44 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted Mail library, server and client"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-names/ChangeLog b/dev-python/twisted-names/ChangeLog
index 288bb281bfd5..930d020ce3dd 100644
--- a/dev-python/twisted-names/ChangeLog
+++ b/dev-python/twisted-names/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-names
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/ChangeLog,v 1.71 2013/04/08 06:49:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/ChangeLog,v 1.72 2013/08/03 09:45:46 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-names-10.2.0.ebuild,
+  twisted-names-11.0.0.ebuild, twisted-names-11.1.0.ebuild,
+  twisted-names-12.0.0.ebuild, twisted-names-12.2.0.ebuild,
+  twisted-names-12.3.0.ebuild, twisted-names-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-names-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-names/twisted-names-10.2.0.ebuild b/dev-python/twisted-names/twisted-names-10.2.0.ebuild
index 3eee2f32cc5f..485b8b74b200 100644
--- a/dev-python/twisted-names/twisted-names-10.2.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-10.2.0.ebuild,v 1.8 2012/10/05 14:45:45 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-10.2.0.ebuild,v 1.9 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted DNS implementation"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-names/twisted-names-11.0.0.ebuild b/dev-python/twisted-names/twisted-names-11.0.0.ebuild
index a82dfaa3e869..9dfa27c8c86a 100644
--- a/dev-python/twisted-names/twisted-names-11.0.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-11.0.0.ebuild,v 1.9 2012/10/05 14:45:45 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-11.0.0.ebuild,v 1.10 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted DNS implementation"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-names/twisted-names-11.1.0.ebuild b/dev-python/twisted-names/twisted-names-11.1.0.ebuild
index 4e496d278682..2edd6021dcc8 100644
--- a/dev-python/twisted-names/twisted-names-11.1.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-11.1.0.ebuild,v 1.1 2011/12/27 07:09:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-11.1.0.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted DNS implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-names/twisted-names-12.0.0.ebuild b/dev-python/twisted-names/twisted-names-12.0.0.ebuild
index 8c871f35e565..fb51cd1f590c 100644
--- a/dev-python/twisted-names/twisted-names-12.0.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-12.0.0.ebuild,v 1.1 2012/03/22 07:06:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-12.0.0.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted DNS implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-names/twisted-names-12.2.0.ebuild b/dev-python/twisted-names/twisted-names-12.2.0.ebuild
index 3ff5ad2f0d80..20b48f0d8bc1 100644
--- a/dev-python/twisted-names/twisted-names-12.2.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-12.2.0.ebuild,v 1.2 2012/10/08 19:30:49 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-12.2.0.ebuild,v 1.3 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted DNS implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-names/twisted-names-12.3.0.ebuild b/dev-python/twisted-names/twisted-names-12.3.0.ebuild
index 75649f626c23..79450c5423d9 100644
--- a/dev-python/twisted-names/twisted-names-12.3.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-12.3.0.ebuild,v 1.1 2013/01/14 03:57:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-12.3.0.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted DNS implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-names/twisted-names-13.0.0.ebuild b/dev-python/twisted-names/twisted-names-13.0.0.ebuild
index 64fd0e0f8766..8db84ec09435 100644
--- a/dev-python/twisted-names/twisted-names-13.0.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-13.0.0.ebuild,v 1.1 2013/04/08 06:49:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-13.0.0.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="A Twisted DNS implementation"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-news/ChangeLog b/dev-python/twisted-news/ChangeLog
index 99dba369515b..d80c3a0430ae 100644
--- a/dev-python/twisted-news/ChangeLog
+++ b/dev-python/twisted-news/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-news
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/ChangeLog,v 1.60 2013/04/08 06:52:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/ChangeLog,v 1.61 2013/08/03 09:45:48 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-news-10.2.0.ebuild,
+  twisted-news-11.0.0.ebuild, twisted-news-11.1.0.ebuild,
+  twisted-news-12.0.0.ebuild, twisted-news-12.2.0.ebuild,
+  twisted-news-12.3.0.ebuild, twisted-news-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-news-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-news/twisted-news-10.2.0.ebuild b/dev-python/twisted-news/twisted-news-10.2.0.ebuild
index 6576eb5ec10c..fba8d7187a49 100644
--- a/dev-python/twisted-news/twisted-news-10.2.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-10.2.0.ebuild,v 1.7 2012/10/05 14:45:58 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-10.2.0.ebuild,v 1.8 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted News is an NNTP server and programming library."
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-news/twisted-news-11.0.0.ebuild b/dev-python/twisted-news/twisted-news-11.0.0.ebuild
index 7db863d2eeda..676817beb655 100644
--- a/dev-python/twisted-news/twisted-news-11.0.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-11.0.0.ebuild,v 1.7 2012/10/05 14:45:58 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-11.0.0.ebuild,v 1.8 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted News is an NNTP server and programming library."
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-news/twisted-news-11.1.0.ebuild b/dev-python/twisted-news/twisted-news-11.1.0.ebuild
index 3b5295608ad6..5ac311f0fca5 100644
--- a/dev-python/twisted-news/twisted-news-11.1.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-11.1.0.ebuild,v 1.1 2011/12/27 07:13:30 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-11.1.0.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted News is an NNTP server and programming library."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-news/twisted-news-12.0.0.ebuild b/dev-python/twisted-news/twisted-news-12.0.0.ebuild
index f7b539a9ec30..a42ec46c2532 100644
--- a/dev-python/twisted-news/twisted-news-12.0.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-12.0.0.ebuild,v 1.1 2012/03/22 07:06:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-12.0.0.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted News is an NNTP server and programming library."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-news/twisted-news-12.2.0.ebuild b/dev-python/twisted-news/twisted-news-12.2.0.ebuild
index 4af03e4a3221..06431a322bc5 100644
--- a/dev-python/twisted-news/twisted-news-12.2.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-12.2.0.ebuild,v 1.2 2012/10/08 19:31:03 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-12.2.0.ebuild,v 1.3 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted News is an NNTP server and programming library."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-news/twisted-news-12.3.0.ebuild b/dev-python/twisted-news/twisted-news-12.3.0.ebuild
index 6bcc5b3fff38..75a690437531 100644
--- a/dev-python/twisted-news/twisted-news-12.3.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-12.3.0.ebuild,v 1.1 2013/01/14 03:57:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-12.3.0.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted News is an NNTP server and programming library."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-news/twisted-news-13.0.0.ebuild b/dev-python/twisted-news/twisted-news-13.0.0.ebuild
index 80f0c6ac750f..6d4d4d7f11fd 100644
--- a/dev-python/twisted-news/twisted-news-13.0.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-13.0.0.ebuild,v 1.1 2013/04/08 06:52:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-13.0.0.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted News is an NNTP server and programming library."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-pair/ChangeLog b/dev-python/twisted-pair/ChangeLog
index e9e34aefad84..18cd8e1f20dd 100644
--- a/dev-python/twisted-pair/ChangeLog
+++ b/dev-python/twisted-pair/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-pair
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/ChangeLog,v 1.19 2013/04/08 06:54:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/ChangeLog,v 1.20 2013/08/03 09:45:42 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-pair-11.1.0.ebuild,
+  twisted-pair-12.0.0.ebuild, twisted-pair-12.2.0.ebuild,
+  twisted-pair-12.3.0.ebuild, twisted-pair-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-pair-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-pair/twisted-pair-11.1.0.ebuild b/dev-python/twisted-pair/twisted-pair-11.1.0.ebuild
index c784f281fafe..7ffd7e788707 100644
--- a/dev-python/twisted-pair/twisted-pair-11.1.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-11.1.0.ebuild,v 1.2 2011/12/27 07:55:56 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-11.1.0.ebuild,v 1.3 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted low-level networking"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/eunuchs"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild b/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild
index 1739cf08ef5f..f96b48dbcfa3 100644
--- a/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild,v 1.1 2012/03/22 07:07:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted low-level networking"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/eunuchs"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-pair/twisted-pair-12.2.0.ebuild b/dev-python/twisted-pair/twisted-pair-12.2.0.ebuild
index 4e76257ab94c..d8b60814bde4 100644
--- a/dev-python/twisted-pair/twisted-pair-12.2.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-12.2.0.ebuild,v 1.2 2012/10/08 19:31:09 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-12.2.0.ebuild,v 1.3 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted low-level networking"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/eunuchs"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-pair/twisted-pair-12.3.0.ebuild b/dev-python/twisted-pair/twisted-pair-12.3.0.ebuild
index cff30fa55036..7007ae46e4a5 100644
--- a/dev-python/twisted-pair/twisted-pair-12.3.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-12.3.0.ebuild,v 1.1 2013/01/14 03:58:28 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-12.3.0.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted low-level networking"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/eunuchs"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-pair/twisted-pair-13.0.0.ebuild b/dev-python/twisted-pair/twisted-pair-13.0.0.ebuild
index 94973f3ab656..b8af4113b537 100644
--- a/dev-python/twisted-pair/twisted-pair-13.0.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-13.0.0.ebuild,v 1.1 2013/04/08 06:54:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-13.0.0.ebuild,v 1.2 2013/08/03 09:45:42 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted low-level networking"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	dev-python/eunuchs"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-runner/ChangeLog b/dev-python/twisted-runner/ChangeLog
index 9cd91f715127..eb65e7208c89 100644
--- a/dev-python/twisted-runner/ChangeLog
+++ b/dev-python/twisted-runner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-runner
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/ChangeLog,v 1.62 2013/04/08 06:56:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/ChangeLog,v 1.63 2013/08/03 09:45:36 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-runner-10.2.0.ebuild,
+  twisted-runner-11.0.0.ebuild, twisted-runner-11.1.0.ebuild,
+  twisted-runner-12.0.0.ebuild, twisted-runner-12.2.0.ebuild,
+  twisted-runner-12.3.0.ebuild, twisted-runner-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-runner-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-runner/twisted-runner-10.2.0.ebuild b/dev-python/twisted-runner/twisted-runner-10.2.0.ebuild
index 611ef688a8ee..d358915aaebe 100644
--- a/dev-python/twisted-runner/twisted-runner-10.2.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-10.2.0.ebuild,v 1.8 2012/10/05 14:46:17 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-10.2.0.ebuild,v 1.9 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Runner is a process management library and inetd replacemen
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/runner"
diff --git a/dev-python/twisted-runner/twisted-runner-11.0.0.ebuild b/dev-python/twisted-runner/twisted-runner-11.0.0.ebuild
index 35b7df5ae50d..00ce05b80856 100644
--- a/dev-python/twisted-runner/twisted-runner-11.0.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-11.0.0.ebuild,v 1.9 2012/10/05 14:46:17 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-11.0.0.ebuild,v 1.10 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Runner is a process management library and inetd replacemen
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/runner"
diff --git a/dev-python/twisted-runner/twisted-runner-11.1.0.ebuild b/dev-python/twisted-runner/twisted-runner-11.1.0.ebuild
index 97a102f79bb2..d53964cd63bc 100644
--- a/dev-python/twisted-runner/twisted-runner-11.1.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-11.1.0.ebuild,v 1.3 2012/01/02 00:59:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-11.1.0.ebuild,v 1.4 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Runner is a process management library and inetd replacemen
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/runner"
diff --git a/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild b/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild
index be1bab5c185d..ff67faf4c2a2 100644
--- a/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild,v 1.1 2012/03/22 07:08:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild,v 1.2 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Runner is a process management library and inetd replacemen
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/runner"
diff --git a/dev-python/twisted-runner/twisted-runner-12.2.0.ebuild b/dev-python/twisted-runner/twisted-runner-12.2.0.ebuild
index a69b7517341a..571efa930d17 100644
--- a/dev-python/twisted-runner/twisted-runner-12.2.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-12.2.0.ebuild,v 1.2 2012/10/08 19:31:22 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-12.2.0.ebuild,v 1.3 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Runner is a process management library and inetd replacemen
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/runner"
diff --git a/dev-python/twisted-runner/twisted-runner-12.3.0.ebuild b/dev-python/twisted-runner/twisted-runner-12.3.0.ebuild
index d5e13a838bca..fe9b360dadd1 100644
--- a/dev-python/twisted-runner/twisted-runner-12.3.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-12.3.0.ebuild,v 1.1 2013/01/14 03:59:08 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-12.3.0.ebuild,v 1.2 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Runner is a process management library and inetd replacemen
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/runner"
diff --git a/dev-python/twisted-runner/twisted-runner-13.0.0.ebuild b/dev-python/twisted-runner/twisted-runner-13.0.0.ebuild
index 9404773440cc..284d9118bd23 100644
--- a/dev-python/twisted-runner/twisted-runner-13.0.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-13.0.0.ebuild,v 1.1 2013/04/08 06:56:42 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-13.0.0.ebuild,v 1.2 2013/08/03 09:45:36 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Runner is a process management library and inetd replacemen
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
 PYTHON_MODNAME="twisted/runner"
diff --git a/dev-python/twisted-web/ChangeLog b/dev-python/twisted-web/ChangeLog
index 7c6de4312be5..e64f2c9dd5a9 100644
--- a/dev-python/twisted-web/ChangeLog
+++ b/dev-python/twisted-web/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/twisted-web
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.83 2013/04/08 06:59:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.84 2013/08/03 09:45:40 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twisted-web-10.2.0.ebuild,
+  twisted-web-11.0.0.ebuild, twisted-web-11.1.0.ebuild,
+  twisted-web-12.0.0.ebuild, twisted-web-12.2.0.ebuild,
+  twisted-web-12.3.0.ebuild, twisted-web-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-web-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-web/twisted-web-10.2.0.ebuild b/dev-python/twisted-web/twisted-web-10.2.0.ebuild
index a34d8ca61901..670d183df628 100644
--- a/dev-python/twisted-web/twisted-web-10.2.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-10.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-10.2.0.ebuild,v 1.9 2012/10/05 14:46:31 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-10.2.0.ebuild,v 1.10 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	soap? ( dev-python/soappy )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-web/twisted-web-11.0.0.ebuild b/dev-python/twisted-web/twisted-web-11.0.0.ebuild
index 7486b9e015e7..325309573190 100644
--- a/dev-python/twisted-web/twisted-web-11.0.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-11.0.0.ebuild,v 1.9 2012/10/05 14:46:31 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-11.0.0.ebuild,v 1.10 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	soap? ( dev-python/soappy )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-web/twisted-web-11.1.0.ebuild b/dev-python/twisted-web/twisted-web-11.1.0.ebuild
index a0ef6aefb9bf..320ec8cf7a11 100644
--- a/dev-python/twisted-web/twisted-web-11.1.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-11.1.0.ebuild,v 1.1 2011/12/27 07:03:04 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-11.1.0.ebuild,v 1.2 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	soap? ( dev-python/soappy )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-web/twisted-web-12.0.0.ebuild b/dev-python/twisted-web/twisted-web-12.0.0.ebuild
index 2effdca2890f..61369eb98314 100644
--- a/dev-python/twisted-web/twisted-web-12.0.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-12.0.0.ebuild,v 1.2 2012/05/13 20:48:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-12.0.0.ebuild,v 1.3 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	soap? ( dev-python/soappy )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-web/twisted-web-12.2.0.ebuild b/dev-python/twisted-web/twisted-web-12.2.0.ebuild
index 275c030639eb..e2f2adeaed67 100644
--- a/dev-python/twisted-web/twisted-web-12.2.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-12.2.0.ebuild,v 1.2 2012/10/08 19:31:36 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-12.2.0.ebuild,v 1.3 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	soap? ( dev-python/soappy )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-web/twisted-web-12.3.0.ebuild b/dev-python/twisted-web/twisted-web-12.3.0.ebuild
index 956e9063dae8..ddc99ee30383 100644
--- a/dev-python/twisted-web/twisted-web-12.3.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-12.3.0.ebuild,v 1.1 2013/01/14 03:59:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-12.3.0.ebuild,v 1.2 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	soap? ( dev-python/soappy )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-web/twisted-web-13.0.0.ebuild b/dev-python/twisted-web/twisted-web-13.0.0.ebuild
index 5d31dc8e252a..be3c346fb82f 100644
--- a/dev-python/twisted-web/twisted-web-13.0.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-13.0.0.ebuild,v 1.1 2013/04/08 06:59:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-13.0.0.ebuild,v 1.2 2013/08/03 09:45:40 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted web server, programmable in Python"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="soap"
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	soap? ( dev-python/soappy )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-words/ChangeLog b/dev-python/twisted-words/ChangeLog
index cf77ad30b913..8d7fef025ed9 100644
--- a/dev-python/twisted-words/ChangeLog
+++ b/dev-python/twisted-words/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/twisted-words
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.78 2013/04/08 07:01:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.79 2013/08/03 09:45:43 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org>
+  twisted-words-10.2.0-r1.ebuild, twisted-words-11.0.0.ebuild,
+  twisted-words-11.1.0.ebuild, twisted-words-12.0.0.ebuild,
+  twisted-words-12.2.0.ebuild, twisted-words-12.3.0.ebuild,
+  twisted-words-13.0.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twisted-words-13.0.0 (08 Apr 2013)
 
diff --git a/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild b/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild
index ece5e5554b0b..8195052e2d12 100644
--- a/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild
+++ b/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild,v 1.5 2012/10/05 14:46:45 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-10.2.0-r1.ebuild,v 1.6 2013/08/03 09:45:43 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1)*
 	=dev-python/twisted-web-$(get_version_component_range 1)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-words/twisted-words-11.0.0.ebuild b/dev-python/twisted-words/twisted-words-11.0.0.ebuild
index f7ada7364c86..d0d8f76b0265 100644
--- a/dev-python/twisted-words/twisted-words-11.0.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-11.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-11.0.0.ebuild,v 1.11 2012/10/05 14:46:45 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-11.0.0.ebuild,v 1.12 2013/08/03 09:45:43 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-words/twisted-words-11.1.0.ebuild b/dev-python/twisted-words/twisted-words-11.1.0.ebuild
index d182b53c20e5..577cb27afdbb 100644
--- a/dev-python/twisted-words/twisted-words-11.1.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-11.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-11.1.0.ebuild,v 1.3 2012/01/02 01:03:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-11.1.0.ebuild,v 1.4 2013/08/03 09:45:43 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-words/twisted-words-12.0.0.ebuild b/dev-python/twisted-words/twisted-words-12.0.0.ebuild
index 1c85f7494f13..4010cbfd3ef9 100644
--- a/dev-python/twisted-words/twisted-words-12.0.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-12.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-12.0.0.ebuild,v 1.2 2012/03/24 22:22:59 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-12.0.0.ebuild,v 1.3 2013/08/03 09:45:43 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-words/twisted-words-12.2.0.ebuild b/dev-python/twisted-words/twisted-words-12.2.0.ebuild
index 0a30d8e7dec5..ec2dc8e57d47 100644
--- a/dev-python/twisted-words/twisted-words-12.2.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-12.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-12.2.0.ebuild,v 1.2 2012/10/08 19:31:50 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-12.2.0.ebuild,v 1.3 2013/08/03 09:45:43 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-words/twisted-words-12.3.0.ebuild b/dev-python/twisted-words/twisted-words-12.3.0.ebuild
index 9232ffc854ad..38f79f54b83c 100644
--- a/dev-python/twisted-words/twisted-words-12.3.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-12.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-12.3.0.ebuild,v 1.1 2013/01/14 04:00:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-12.3.0.ebuild,v 1.2 2013/08/03 09:45:43 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twisted-words/twisted-words-13.0.0.ebuild b/dev-python/twisted-words/twisted-words-13.0.0.ebuild
index fd13914ccb2f..427daad56f26 100644
--- a/dev-python/twisted-words/twisted-words-13.0.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-13.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-13.0.0.ebuild,v 1.1 2013/04/08 07:01:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-13.0.0.ebuild,v 1.2 2013/08/03 09:45:43 mgorny Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ DESCRIPTION="Twisted Words contains Instant Messaging implementations."
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
 
-DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+DEPEND="=dev-python/twisted-core-$(get_version_component_range 1-2)*
 	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/twistedsnmp/ChangeLog b/dev-python/twistedsnmp/ChangeLog
index 9cb1390a6299..95f289e093e5 100644
--- a/dev-python/twistedsnmp/ChangeLog
+++ b/dev-python/twistedsnmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/twistedsnmp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/ChangeLog,v 1.6 2009/11/28 17:54:40 arfrever Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/ChangeLog,v 1.7 2013/08/03 09:45:50 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> twistedsnmp-0.3.13.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *twistedsnmp-0.3.13 (28 Nov 2009)
 
diff --git a/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild b/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild
index d22f49382751..6b41fbb0eae9 100644
--- a/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild
+++ b/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild,v 1.2 2009/11/28 18:14:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/twistedsnmp-0.3.13.ebuild,v 1.3 2013/08/03 09:45:50 mgorny Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="=dev-python/pysnmp-3*
-	>=dev-python/twisted-1.3"
+	>=dev-python/twisted-core-1.3"
 DEPEND="${RDEPEND}"
 RESTRICT_PYTHON_ABIS="3.*"
 
diff --git a/dev-python/txAMQP/ChangeLog b/dev-python/txAMQP/ChangeLog
index 26fb9e9b7cc2..0b8cb765aa5b 100644
--- a/dev-python/txAMQP/ChangeLog
+++ b/dev-python/txAMQP/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/txAMQP
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/ChangeLog,v 1.5 2013/03/10 08:24:39 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/ChangeLog,v 1.6 2013/08/03 09:45:40 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> txAMQP-0.6.1.ebuild,
+  txAMQP-0.6.2.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   10 Mar 2013; Ian Delaney <idella4@gentoo.org> -txAMQP-0.4.ebuild:
   drop old
diff --git a/dev-python/txAMQP/txAMQP-0.6.1.ebuild b/dev-python/txAMQP/txAMQP-0.6.1.ebuild
index 336ff6eb0198..f15349680f32 100644
--- a/dev-python/txAMQP/txAMQP-0.6.1.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.6.1.ebuild,v 1.2 2013/01/05 11:37:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.6.1.ebuild,v 1.3 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,4 +17,4 @@ IUSE=""
 
 DEPEND="${DEPEND}"
 RDEPEND="${RDEPEND}
-	dev-python/twisted"
+	dev-python/twisted-core"
diff --git a/dev-python/txAMQP/txAMQP-0.6.2.ebuild b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
index dbc73127f85a..05cc96279a3a 100644
--- a/dev-python/txAMQP/txAMQP-0.6.2.ebuild
+++ b/dev-python/txAMQP/txAMQP-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.6.2.ebuild,v 1.1 2013/03/10 08:13:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/txAMQP/txAMQP-0.6.2.ebuild,v 1.2 2013/08/03 09:45:39 mgorny Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2} pypy{1_9,2_0} )
@@ -16,4 +16,4 @@ SLOT="0"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/twisted"
+RDEPEND="dev-python/twisted-core"
diff --git a/dev-python/urwid/ChangeLog b/dev-python/urwid/ChangeLog
index 9e9c85049588..7a2cd9be31f7 100644
--- a/dev-python/urwid/ChangeLog
+++ b/dev-python/urwid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/urwid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/ChangeLog,v 1.60 2013/03/14 19:25:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/ChangeLog,v 1.61 2013/08/03 09:45:46 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> urwid-0.9.9.1.ebuild,
+  urwid-1.0.2.ebuild, urwid-1.1.0.ebuild, urwid-1.1.1.ebuild,
+  urwid-1.1.1-r1.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
 *urwid-1.1.1-r1 (14 Mar 2013)
 
diff --git a/dev-python/urwid/urwid-0.9.9.1.ebuild b/dev-python/urwid/urwid-0.9.9.1.ebuild
index 5ab9eeb7f205..4bc560773792 100644
--- a/dev-python/urwid/urwid-0.9.9.1.ebuild
+++ b/dev-python/urwid/urwid-0.9.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.9.9.1.ebuild,v 1.5 2012/11/05 22:10:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.9.9.1.ebuild,v 1.6 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux ~ia64-linux
 IUSE="examples test"
 
 DEPEND="dev-python/setuptools
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 RDEPEND=""
 RESTRICT_PYTHON_ABIS="3.*"
 
diff --git a/dev-python/urwid/urwid-1.0.2.ebuild b/dev-python/urwid/urwid-1.0.2.ebuild
index 83650b3606ab..cfb3108e7d31 100644
--- a/dev-python/urwid/urwid-1.0.2.ebuild
+++ b/dev-python/urwid/urwid-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.0.2.ebuild,v 1.6 2012/11/05 22:10:00 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.0.2.ebuild,v 1.7 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="4"
 PYTHON_USE_WITH="ncurses"
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-interix ~amd64-linux
 IUSE="examples test"
 
 DEPEND="dev-python/setuptools
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
diff --git a/dev-python/urwid/urwid-1.1.0.ebuild b/dev-python/urwid/urwid-1.1.0.ebuild
index 4e53373a0090..d7582a6fe814 100644
--- a/dev-python/urwid/urwid-1.1.0.ebuild
+++ b/dev-python/urwid/urwid-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.0.ebuild,v 1.3 2012/11/24 02:04:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.0.ebuild,v 1.4 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="4"
 PYTHON_USE_WITH="ncurses"
@@ -22,7 +22,7 @@ IUSE="doc examples test"
 
 DEPEND="dev-python/setuptools
 	doc? ( dev-python/sphinx )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
diff --git a/dev-python/urwid/urwid-1.1.1-r1.ebuild b/dev-python/urwid/urwid-1.1.1-r1.ebuild
index 96e0fc40e897..5abf68567654 100644
--- a/dev-python/urwid/urwid-1.1.1-r1.ebuild
+++ b/dev-python/urwid/urwid-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.1-r1.ebuild,v 1.1 2013/03/14 19:25:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.1-r1.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -19,7 +19,7 @@ IUSE="doc examples test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch )
 
diff --git a/dev-python/urwid/urwid-1.1.1.ebuild b/dev-python/urwid/urwid-1.1.1.ebuild
index 1d1112e0ca7c..dbf5287c27c8 100644
--- a/dev-python/urwid/urwid-1.1.1.ebuild
+++ b/dev-python/urwid/urwid-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.1.ebuild,v 1.1 2012/11/24 02:04:27 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-1.1.1.ebuild,v 1.2 2013/08/03 09:45:46 mgorny Exp $
 
 EAPI="5"
 PYTHON_USE_WITH="ncurses"
@@ -22,7 +22,7 @@ IUSE="doc examples test"
 
 DEPEND="dev-python/setuptools
 	doc? ( dev-python/sphinx )
-	test? ( dev-python/twisted )"
+	test? ( dev-python/twisted-core )"
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
diff --git a/dev-python/vertex/ChangeLog b/dev-python/vertex/ChangeLog
index 4dbaa495ec8c..f989b206067f 100644
--- a/dev-python/vertex/ChangeLog
+++ b/dev-python/vertex/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/vertex
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/ChangeLog,v 1.15 2012/10/17 09:16:30 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/ChangeLog,v 1.16 2013/08/03 09:45:38 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> vertex-0.3.0.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   17 Oct 2012; Patrick Lauer <patrick@gentoo.org> vertex-0.3.0.ebuild:
   Restricting py 2.5
diff --git a/dev-python/vertex/vertex-0.3.0.ebuild b/dev-python/vertex/vertex-0.3.0.ebuild
index 3127785a37e8..d67977e18aaf 100644
--- a/dev-python/vertex/vertex-0.3.0.ebuild
+++ b/dev-python/vertex/vertex-0.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/vertex-0.3.0.ebuild,v 1.7 2012/10/17 09:16:30 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/vertex/vertex-0.3.0.ebuild,v 1.8 2013/08/03 09:45:38 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -30,7 +30,7 @@ IUSE=""
 DEPEND=">=dev-libs/openssl-0.9.7
 	>=dev-python/epsilon-0.5.0
 	>=dev-python/pyopenssl-0.6
-	>=dev-python/twisted-2.4"
+	>=dev-python/twisted-core-2.4"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/webut/ChangeLog b/dev-python/webut/ChangeLog
index 0c2c8682741c..eaf62cbe9a9a 100644
--- a/dev-python/webut/ChangeLog
+++ b/dev-python/webut/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/webut
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webut/ChangeLog,v 1.12 2010/03/13 18:59:15 arfrever Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webut/ChangeLog,v 1.13 2013/08/03 09:45:41 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> webut-0.1.0.2.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   13 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   webut-0.1.0.2.ebuild:
diff --git a/dev-python/webut/webut-0.1.0.2.ebuild b/dev-python/webut/webut-0.1.0.2.ebuild
index 6922539c7f91..b7b7995c1b50 100644
--- a/dev-python/webut/webut-0.1.0.2.ebuild
+++ b/dev-python/webut/webut-0.1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webut/webut-0.1.0.2.ebuild,v 1.12 2010/03/13 18:59:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webut/webut-0.1.0.2.ebuild,v 1.13 2013/08/03 09:45:41 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="examples"
 
 RDEPEND=">=dev-python/nevow-0.9.18
-	>=dev-python/twisted-2
+	>=dev-python/twisted-core-2
 	>=net-zope/zope-interface-3.0.1"
 DEPEND="${RDEPEND}"
 RESTRICT_PYTHON_ABIS="3.*"
diff --git a/dev-python/zsi/ChangeLog b/dev-python/zsi/ChangeLog
index 431176cd0a12..d350e6949d68 100644
--- a/dev-python/zsi/ChangeLog
+++ b/dev-python/zsi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/zsi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/ChangeLog,v 1.24 2013/06/04 12:46:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/ChangeLog,v 1.25 2013/08/03 09:45:47 mgorny Exp $
+
+  03 Aug 2013; Michał Górny <mgorny@gentoo.org> zsi-2.1_alpha1.ebuild,
+  zsi-2.1_alpha1-r1.ebuild:
+  Move dev-python/twisted to dev-python/twisted-core.
 
   04 Jun 2013; Justin Lecher <jlec@gentoo.org> zsi-2.1_alpha1-r1.ebuild:
   Fix for correct usage of new python eclasses
diff --git a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
index 64f97af3bf19..ab079d5f0132 100644
--- a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
+++ b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild,v 1.3 2013/06/04 12:46:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild,v 1.4 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	twisted? (
-		dev-python/twisted
+		dev-python/twisted-core
 		dev-python/twisted-web
 	)"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/zsi/zsi-2.1_alpha1.ebuild b/dev-python/zsi/zsi-2.1_alpha1.ebuild
index 7cc66516ce36..14cecb04be5f 100644
--- a/dev-python/zsi/zsi-2.1_alpha1.ebuild
+++ b/dev-python/zsi/zsi-2.1_alpha1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1.ebuild,v 1.10 2011/12/03 19:37:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1.ebuild,v 1.11 2013/08/03 09:45:47 mgorny Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -21,7 +21,7 @@ IUSE="doc examples twisted"
 
 DEPEND="dev-python/setuptools
 	twisted? (
-		dev-python/twisted
+		dev-python/twisted-core
 		dev-python/twisted-web
 	)"
 RDEPEND="${DEPEND}"