[arch-commits] Commit in twisted/trunk (4771.diff PKGBUILD)

[Ionut Biru]

    Date: Monday, June 6, 2011 @ 10:53:30
  Author: ibiru
Revision: 126682

update to 11.0.0

Modified:
  twisted/trunk/PKGBUILD
Deleted:
  twisted/trunk/4771.diff

-----------+
 4771.diff |   22 ----------------------
 PKGBUILD  |   31 ++++++++++++++++---------------
 2 files changed, 16 insertions(+), 37 deletions(-)

Deleted: 4771.diff
===================================================================
--- 4771.diff	2011-06-06 13:33:21 UTC (rev 126681)
+++ 4771.diff	2011-06-06 14:53:30 UTC (rev 126682)
@@ -1,22 +0,0 @@
-Index: twisted/words/protocols/jabber/jstrports.py
-===================================================================
---- twisted/words/protocols/jabber/jstrports.py (revision 30346)
-+++ twisted/words/protocols/jabber/jstrports.py (working copy)
-@@ -6,7 +6,7 @@
- """ A temporary placeholder for client-capable strports, until we
- sufficient use cases get identified """
- 
--from twisted.application import strports
-+from twisted.internet.endpoints import _parse
- 
- def _parseTCPSSL(factory, domain, port):
-     """ For the moment, parse TCP or SSL connections the same """
-@@ -22,7 +22,7 @@
- 
- 
- def parse(description, factory):
--    args, kw = strports._parse(description)
-+    args, kw = _parse(description)
-     return (args[0].upper(),) + _funcs[args[0]](factory, *args[1:], **kw)
- 
- def client(description, factory):

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-06 13:33:21 UTC (rev 126681)
+++ PKGBUILD	2011-06-06 14:53:30 UTC (rev 126682)
@@ -4,8 +4,8 @@
 # Contributor:  Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=twisted
-pkgver=10.2.0
-pkgrel=3
+pkgver=11.0.0
+pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python."
 arch=('i686' 'x86_64')
 url="http://twistedmatrix.com/"
@@ -14,20 +14,21 @@
 optdepends=('python2-pyopenssl'
             'python-soappy:for twisted.web.soap')
 install=twisted.install
-source=(http://tmrc.mit.edu/mirror/twisted/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2
-        4771.diff)
-md5sums=('73da62c793269eade8121da336b01ba5'
-         '087ed6149abca43919dcece24ba222ab')
+source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-${pkgver}.tar.bz2)
+md5sums=('d7f94a1609a1b8f3b8c8d0146d4cfe54')
+
 build() {
-  cd "${srcdir}/Twisted-${pkgver}"
-  #http://twistedmatrix.com/trac/ticket/4771
-  patch -Np0 -i ${srcdir}/4771.diff
+    cd "${srcdir}/Twisted-${pkgver}"
+    python2 setup.py build
+}
 
-  python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+package() {
+    cd "${srcdir}/Twisted-${pkgver}"
+    python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1
+    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
-  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
+    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
+    sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+        -i ${pkgdir}/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
 }