diff --git a/python-pypi/system-config-printer/DETAILS
b/python-pypi/system-config-printer/DETAILS
index 03e174c..f59c116 100755
--- a/python-pypi/system-config-printer/DETAILS
+++ b/python-pypi/system-config-printer/DETAILS
@@ -1,5 +1,5 @@
SPELL=system-config-printer
- VERSION=1.0.11
+ VERSION=1.0.12
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/python-pypi/system-config-printer/HISTORY
b/python-pypi/system-config-printer/HISTORY
index 7a77e48..3f37b21 100644
--- a/python-pypi/system-config-printer/HISTORY
+++ b/python-pypi/system-config-printer/HISTORY
@@ -1,3 +1,6 @@
+2008-12-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.12
+
2008-11-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.11
diff --git a/python-pypi/twisted-core/BUILD b/python-pypi/twisted-core/BUILD
index b79be97..27ba77d 100755
--- a/python-pypi/twisted-core/BUILD
+++ b/python-pypi/twisted-core/BUILD
@@ -1,2 +1 @@
-cd $SOURCE_DIRECTORY/TwistedCore* &&
-default_build
+true
diff --git a/python-pypi/twisted-core/DEPENDS
b/python-pypi/twisted-core/DEPENDS
index f9ea180..9b71a4d 100755
--- a/python-pypi/twisted-core/DEPENDS
+++ b/python-pypi/twisted-core/DEPENDS
@@ -1,2 +1 @@
-depends python &&
-depends zopeinterface
+depends twisted
diff --git a/python-pypi/twisted-core/DETAILS
b/python-pypi/twisted-core/DETAILS
index 9ba0497..bd66c7f 100755
--- a/python-pypi/twisted-core/DETAILS
+++ b/python-pypi/twisted-core/DETAILS
@@ -1,51 +1,8 @@
SPELL=twisted-core
- VERSION=2.5.0
- SOURCE=Twisted-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/Twisted-$VERSION
-
SOURCE_URL[0]=http://tmrc.mit.edu/mirror/twisted/Twisted/${VERSION%.*}/$SOURCE
-
SOURCE_HASH=sha512:d19e735b43365671540a0a4cfa28700723a38958f25947dfc4e463f9351e9682275dc708029bf0eaa1f848083a0a5f41554107a40ac1572b07c58d00de75ee08
- WEB_SITE=http://twistedmatrix.com/
- ENTERED=20071118
- LICENSE[0]=MIT
- SHORT="Event-driven networking framework written in Python"
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
cat << EOF
--A Development Tool
-
-Twisted is a framework, written in Python, for writing networked
-applications. It includes implementations of a number of commonly used
-network services such as a web server, an IRC chat server, a mail server,
-a relational database interface and an object broker. Developers can
-build applications using all of these services as well as custom services
-that they write themselves. Twisted also includes a user authentication
-system that controls access to services and provides services with user
-context information to implement their own security models.
-
-Twisted provides important features needed for networking programming,
-both at the high and low levels:
- * Pluggable event loops allowing the developer to take advantage of
- platform-specific capabilities.
- * Abstractions of protocols and transports.
- * Through Twisted Spread, mechanisms for network encoding of data (in
- Python, Java, ELisp, and other languages), to a full-blown distributed
- object system.
-
--An Integrated Environment
-
-Twisted is an integration point for network services that were previously
-unable to interoperate. Services within a Twisted server can communicate
-with each other and share information providing a very integrated
-programming environment that can re-use large amounts of infrastructure
-across multiple network mediums (such as chat, web, and mail).
-
-As well as servers, Twisted supports several different kinds of clients
-and GUIs. This means that the client can re-use large portions of the
-server's code, improving test coverage and reliability while reducing
-code size.
-
--An Application Suite
-
-Twisted is a collection of servers and clients, which can be used either
-by developers of new applications or directly. For example an easy to
-run web server is available out of the box as an application for the
-desktop user, but it is also a framework for developers to use.
+deprecated spell [replaced by twisted]
EOF
+
diff --git a/python-pypi/twisted-core/DOWNLOAD
b/python-pypi/twisted-core/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/twisted-core/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/twisted-core/HISTORY
b/python-pypi/twisted-core/HISTORY
index a868b56..28ddfe6 100644
--- a/python-pypi/twisted-core/HISTORY
+++ b/python-pypi/twisted-core/HISTORY
@@ -1,68 +1,4 @@
-2008-01-13 Vlad Glagolev <stealth AT sourcemage.org>
- * BUILD: default_build_python
- * INSTALL: default_install_python
-
-2007-02-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.5.0
- * BUILD, INSTALL: generalise component version
-
-2006-11-18 George Sherwood <george AT beernabeer.com>
- * ALL: Created new spell twisted-core from twisted
-
-2006-11-08 Flavien Bridault <vlaaad AT sourcemage.org>
- * TRIGGERS: Removed, python upgrades are now handled in the python
spell
-
-2006-09-19 Anton Brondz <dinolinux AT sourcemage.org>
- * DETAILS: removed BUILD_API=2
- * BUILD: added, fixes bug #13088
- * INSTALL: added, fixes bug #13088
-
-2006-08-18 Bearcat M. Sandor <bearcat AT feline-soul.com>
- * DETAILS: updated to 2.4.0
-
-2005-12-05 Sergey Lipnevich <sergey AT sourcemage.org>
- * BUILD,INSTALL: remove and use the default.
-
-2005-11-29 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-04-24 Sergey Lipnevich <sergey AT sourcemage.org>
- * DETAILS: upgrade to 2.0.0; license and source URL changed;
- * INSTALL: simplify by using bash "alternate value" trick;
- * DEPENDS: needs zopeinterface.
-
-2005-02-28 Eric Sandall <sandalle AT sourcemage.org>
- * CONFLICTS: Removed conflicting spell
-
-2005-01-26 David Brown <dmlb2000 AT excite.com>
- * INSTALL: updated to check INSTALL_ROOT then use it
-
-2005-01-18 Unet <unet AT sourcemage.org>
- * INSTALL: Use INSTALL_ROOT
-
-2004-12-16 Eric Sandall <sandalle AT sourcemage.org>
- * Renamed to twisted
- * DETAILS: Renamed to twisted
- Changed LICENSE to LICENSE[0]
- Shortened SHORT
- Updated UPDATED
- * DEPENDS,TRIGGERS: Python renamed to python
- * CONFLICTS: Auto-conflicts with Twisted
-
-2004-08-30 David Braaten <xiticix47 AT hotmail.com>
- * DETAILS: version 1.3.0. BUILD_API=2.
- * BUILD: api2 edits.
- * INSTALL: created.
- * DEPENDS: it is a python lib, so added depends Python.
-
-2004-04-15 Unet <audio AT sourcemage.org>
- * DETAILS: Updated to 1.2.0
-
-2003-04-08 M.L. <mlubrano AT sourcemage.org>
- * Added $OPTS in BUILD.
-
-2002-03-28 Eric Schabell <eric AT schabell.com>
- * Added MAINTAINER line.
-
-2002-03-13 Eric Schabell <eric AT schabell.com>
- * Added this History file.
+2008-12-02 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0
+ PATCHLEVEL=9999
+ spell deprecated [replaced by twisted]
diff --git a/python-pypi/twisted-core/INSTALL
b/python-pypi/twisted-core/INSTALL
index f809568..27ba77d 100755
--- a/python-pypi/twisted-core/INSTALL
+++ b/python-pypi/twisted-core/INSTALL
@@ -1,2 +1 @@
-cd $SOURCE_DIRECTORY/TwistedCore* &&
-default_install
+true
diff --git a/python-pypi/twisted-core/PRE_BUILD
b/python-pypi/twisted-core/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/python-pypi/twisted-core/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/python-pypi/twisted-core/TRIGGERS
b/python-pypi/twisted-core/TRIGGERS
new file mode 100755
index 0000000..97a1b60
--- /dev/null
+++ b/python-pypi/twisted-core/TRIGGERS
@@ -0,0 +1 @@
+on_cast twisted-core dispel_self
diff --git a/python-pypi/twisted/BUILD b/python-pypi/twisted/BUILD
deleted file mode 100755
index 8621fdc..0000000
--- a/python-pypi/twisted/BUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-cd $SOURCE_DIRECTORY/TwistedConch* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedLore* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedMail* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedMail* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedNames* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedNews* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedRunner* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedWeb* &&
-default_build &&
-
-cd $SOURCE_DIRECTORY/TwistedWords* &&
-default_build
diff --git a/python-pypi/twisted/CONFLICTS b/python-pypi/twisted/CONFLICTS
new file mode 100755
index 0000000..7f26509
--- /dev/null
+++ b/python-pypi/twisted/CONFLICTS
@@ -0,0 +1 @@
+conflicts twisted-core
diff --git a/python-pypi/twisted/DEPENDS b/python-pypi/twisted/DEPENDS
index c1b5bb3..8e69d6f 100755
--- a/python-pypi/twisted/DEPENDS
+++ b/python-pypi/twisted/DEPENDS
@@ -1,3 +1,5 @@
depends python &&
depends pycrypto &&
-depends twisted-core
+depends setuptools &&
+depends pyopenssl &&
+depends zopeinterface
diff --git a/python-pypi/twisted/DETAILS b/python-pypi/twisted/DETAILS
index a02a3ce..560c2da 100755
--- a/python-pypi/twisted/DETAILS
+++ b/python-pypi/twisted/DETAILS
@@ -1,9 +1,9 @@
SPELL=twisted
- VERSION=2.5.0
+ VERSION=8.1.0
+
SOURCE_HASH=sha512:d8606c7aa0b5050d7fa184306241b01ca6b250511c93ebf8b9415c877a9b6bba11c7b36f72d91d1a2f7cad6612d2830b85c5af43306a57dabbd71ced5a279358
SOURCE=Twisted-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Twisted-$VERSION