Bump

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

20 files changed, 398 insertions, 17 deletions

diff --git a/dev-python/twisted-conch/ChangeLog b/dev-python/twisted-conch/ChangeLog
index bb2191f1fd18..332bb04fbe41 100644
--- a/dev-python/twisted-conch/ChangeLog
+++ b/dev-python/twisted-conch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-conch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.79 2012/02/25 02:00:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.80 2012/03/22 07:04:01 patrick Exp $
+
+*twisted-conch-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-conch-12.0.0.ebuild:
+  Bump
 
   25 Feb 2012; Patrick Lauer <patrick@gentoo.org> twisted-conch-11.1.0.ebuild:
   Fixing accidental double asterisk
diff --git a/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild b/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild
new file mode 100644
index 000000000000..bbe6328b71af
--- /dev/null
+++ b/dev-python/twisted-conch/twisted-conch-12.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+MY_PACKAGE="Conch"
+
+inherit twisted versionator
+
+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)*
+	dev-python/pyasn1
+	dev-python/pycrypto"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/conch twisted/plugins"
+
+src_prepare() {
+	distutils_src_prepare
+
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_checkKeyAsRoot/_&/" -i twisted/conch/test/test_checkers.py
+		sed -e "s/test_getPrivateKeysAsRoot/_&/" -i twisted/conch/test/test_openssh_compat.py
+	fi
+}
diff --git a/dev-python/twisted-lore/ChangeLog b/dev-python/twisted-lore/ChangeLog
index fecd4ec65bb5..b5be737773d1 100644
--- a/dev-python/twisted-lore/ChangeLog
+++ b/dev-python/twisted-lore/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-lore
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.56 2011/12/27 07:06:25 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.57 2012/03/22 07:04:45 patrick Exp $
+
+*twisted-lore-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-lore-12.0.0.ebuild:
+  Bump
 
 *twisted-lore-11.1.0 (27 Dec 2011)
 
diff --git a/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild b/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild
new file mode 100644
index 000000000000..6850d9b1479e
--- /dev/null
+++ b/dev-python/twisted-lore/twisted-lore-12.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Lore"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/lore twisted/plugins"
diff --git a/dev-python/twisted-mail/ChangeLog b/dev-python/twisted-mail/ChangeLog
index 50623088a856..c4df20eaabee 100644
--- a/dev-python/twisted-mail/ChangeLog
+++ b/dev-python/twisted-mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-mail
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.67 2011/12/27 07:11:00 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.68 2012/03/22 07:05:29 patrick Exp $
+
+*twisted-mail-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-mail-12.0.0.ebuild:
+  Bump
 
 *twisted-mail-11.1.0 (27 Dec 2011)
 
diff --git a/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild b/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild
new file mode 100644
index 000000000000..0a28798f17a9
--- /dev/null
+++ b/dev-python/twisted-mail/twisted-mail-12.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Mail"
+
+inherit twisted versionator
+
+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)*
+	=dev-python/twisted-names-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/mail twisted/plugins"
diff --git a/dev-python/twisted-names/ChangeLog b/dev-python/twisted-names/ChangeLog
index db2246cceb8b..71a170f6f7a8 100644
--- a/dev-python/twisted-names/ChangeLog
+++ b/dev-python/twisted-names/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-names
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/ChangeLog,v 1.65 2011/12/27 07:09:41 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/ChangeLog,v 1.66 2012/03/22 07:06:12 patrick Exp $
+
+*twisted-names-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-names-12.0.0.ebuild:
+  Bump
 
 *twisted-names-11.1.0 (27 Dec 2011)
 
diff --git a/dev-python/twisted-names/twisted-names-12.0.0.ebuild b/dev-python/twisted-names/twisted-names-12.0.0.ebuild
new file mode 100644
index 000000000000..8c871f35e565
--- /dev/null
+++ b/dev-python/twisted-names/twisted-names-12.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Names"
+
+inherit twisted versionator
+
+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)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/names twisted/plugins"
diff --git a/dev-python/twisted-news/ChangeLog b/dev-python/twisted-news/ChangeLog
index 0ce48bb51f13..30570a1bc614 100644
--- a/dev-python/twisted-news/ChangeLog
+++ b/dev-python/twisted-news/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-news
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/ChangeLog,v 1.54 2011/12/27 07:13:30 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/ChangeLog,v 1.55 2012/03/22 07:06:57 patrick Exp $
+
+*twisted-news-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-news-12.0.0.ebuild:
+  Bump
 
 *twisted-news-11.1.0 (27 Dec 2011)
 
diff --git a/dev-python/twisted-news/twisted-news-12.0.0.ebuild b/dev-python/twisted-news/twisted-news-12.0.0.ebuild
new file mode 100644
index 000000000000..f7b539a9ec30
--- /dev/null
+++ b/dev-python/twisted-news/twisted-news-12.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="News"
+
+inherit twisted versionator
+
+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)*
+	=dev-python/twisted-mail-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/news twisted/plugins"
diff --git a/dev-python/twisted-pair/ChangeLog b/dev-python/twisted-pair/ChangeLog
index 84f404acda1e..3225cb7e1f72 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/ChangeLog,v 1.14 2011/12/27 07:52:16 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/ChangeLog,v 1.15 2012/03/22 07:07:38 patrick Exp $
+
+*twisted-pair-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-pair-12.0.0.ebuild:
+  Bump
 
 *twisted-pair-11.1.0 (27 Dec 2011)
 
diff --git a/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild b/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild
new file mode 100644
index 000000000000..1739cf08ef5f
--- /dev/null
+++ b/dev-python/twisted-pair/twisted-pair-12.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Pair"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted low-level networking"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*
+	dev-python/eunuchs"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/pair"
diff --git a/dev-python/twisted-runner/ChangeLog b/dev-python/twisted-runner/ChangeLog
index c8357002e215..dce6f7c895d6 100644
--- a/dev-python/twisted-runner/ChangeLog
+++ b/dev-python/twisted-runner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-runner
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/ChangeLog,v 1.56 2012/01/02 00:59:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/ChangeLog,v 1.57 2012/03/22 07:08:35 patrick Exp $
+
+*twisted-runner-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-runner-12.0.0.ebuild:
+  Bump
 
   02 Jan 2012; Mike Gilbert <floppym@gentoo.org> twisted-runner-11.0.0.ebuild,
   twisted-runner-11.1.0.ebuild:
diff --git a/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild b/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild
new file mode 100644
index 000000000000..be1bab5c185d
--- /dev/null
+++ b/dev-python/twisted-runner/twisted-runner-12.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 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 $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Runner"
+
+inherit twisted versionator
+
+DESCRIPTION="Twisted Runner is a process management library and inetd replacement."
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/runner"
+
+src_install() {
+	twisted_src_install
+	python_clean_installation_image
+}
diff --git a/dev-python/twisted-web/ChangeLog b/dev-python/twisted-web/ChangeLog
index 71cc05b34541..4b2ffb563b8f 100644
--- a/dev-python/twisted-web/ChangeLog
+++ b/dev-python/twisted-web/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-web
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.76 2011/12/27 07:03:04 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.77 2012/03/22 07:09:20 patrick Exp $
+
+*twisted-web-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-web-12.0.0.ebuild:
+  Bump
 
 *twisted-web-11.1.0 (27 Dec 2011)
 
diff --git a/dev-python/twisted-web/twisted-web-12.0.0.ebuild b/dev-python/twisted-web/twisted-web-12.0.0.ebuild
new file mode 100644
index 000000000000..61bd082959fe
--- /dev/null
+++ b/dev-python/twisted-web/twisted-web-12.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 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.1 2012/03/22 07:09:20 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Web"
+
+inherit twisted versionator
+
+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)*
+	soap? ( dev-python/soappy )"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/plugins twisted/web"
+
+src_prepare() {
+	distutils_src_prepare
+
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
+		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
+	fi
+}
diff --git a/dev-python/twisted-words/ChangeLog b/dev-python/twisted-words/ChangeLog
index 555441b6c90b..e7fb90e187db 100644
--- a/dev-python/twisted-words/ChangeLog
+++ b/dev-python/twisted-words/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted-words
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.71 2012/01/02 01:03:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.72 2012/03/22 07:10:05 patrick Exp $
+
+*twisted-words-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-words-12.0.0.ebuild:
+  Bump
 
   02 Jan 2012; Mike Gilbert <floppym@gentoo.org> twisted-words-11.0.0.ebuild,
   twisted-words-11.1.0.ebuild:
diff --git a/dev-python/twisted-words/twisted-words-12.0.0.ebuild b/dev-python/twisted-words/twisted-words-12.0.0.ebuild
new file mode 100644
index 000000000000..cff7fd8777d6
--- /dev/null
+++ b/dev-python/twisted-words/twisted-words-12.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 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.1 2012/03/22 07:10:05 patrick Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Words"
+
+inherit twisted versionator
+
+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)*
+	=dev-python/twisted-web-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+PYTHON_MODNAME="twisted/plugins twisted/words"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Delete documentation for no longer available "im" script.
+	rm -fr doc/man
+}
diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index b5e81aef662d..2cfe23c50adf 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/twisted
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.152 2011/12/29 04:17:11 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.153 2012/03/22 07:03:15 patrick Exp $
+
+*twisted-12.0.0 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +twisted-12.0.0.ebuild:
+  Bump
 
   29 Dec 2011; Mike Gilbert <floppym@gentoo.org> twisted-11.1.0.ebuild:
   Fix line wrapping.
diff --git a/dev-python/twisted/twisted-12.0.0.ebuild b/dev-python/twisted/twisted-12.0.0.ebuild
new file mode 100644
index 000000000000..2c0e323aa927
--- /dev/null
+++ b/dev-python/twisted/twisted-12.0.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-12.0.0.ebuild,v 1.1 2012/03/22 07:03:15 patrick Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+MY_PACKAGE="Core"
+
+inherit eutils twisted versionator
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="crypt gtk serial"
+
+DEPEND="net-zope/zope-interface
+	crypt? ( >=dev-python/pyopenssl-0.10 )
+	gtk? ( dev-python/pygtk:2 )
+	serial? ( dev-python/pyserial )"
+RDEPEND="${DEPEND}"
+
+DOCS="CREDITS NEWS README"
+
+src_prepare(){
+	distutils_src_prepare
+
+	# Give a load-sensitive test a better chance of succeeding.
+	epatch "${FILESDIR}/${PN}-2.1.0-echo-less.patch"
+
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	epatch "${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+}
+
+src_test() {
+	testing() {
+		local exit_status="0"
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install --root="${T}/tests" --no-compile || die "Installation of tests failed with $(python_get_implementation_and_version)"
+
+		pushd "${T}/tests${EPREFIX}$(python_get_sitedir)" > /dev/null || die
+
+		# Skip broken tests.
+		sed -e "s/test_buildAllTarballs/_&/" -i twisted/python/test/test_release.py || die "sed failed"
+
+		# http://twistedmatrix.com/trac/ticket/5375
+		sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py || die "sed failed"
+
+		# Prevent it from pulling in plugins from already installed twisted packages.
+		rm -f twisted/plugins/__init__.py
+
+		# An empty file doesn't work because the tests check for doc strings in all packages.
+		echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+		if ! PYTHONPATH="." "${T}/tests${EPREFIX}/usr/bin/trial" twisted; then
+			if [[ -n "${TWISTED_DEBUG_TESTS}" ]]; then
+				die "Tests failed with $(python_get_implementation_and_version)"
+			else
+				exit_status="1"
+			fi
+		fi
+
+		popd > /dev/null || die
+		rm -fr "${T}/tests"
+		return "${exit_status}"
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+	python_clean_installation_image
+
+	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/trial"
+
+	postinstallational_preparation() {
+		touch "${ED}$(python_get_sitedir)/Twisted-${PV}-py$(python_get_version).egg-info"
+
+		# Delete dropin.cache to avoid collisions.
+		# dropin.cache is regenerated in pkg_postinst().
+		rm -f "${ED}$(python_get_sitedir)/twisted/plugins/dropin.cache"
+	}
+	python_execute_function -q postinstallational_preparation
+
+	# Don't install index.xhtml page.
+	doman doc/man/*.?
+	insinto /usr/share/doc/${PF}
+	doins -r $(find doc -mindepth 1 -maxdepth 1 -not -name man)
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}