Removing version 2.9.3 vulnerable to CVE-2007-0240

Package-Manager: portage-2.1.4.5

5 files changed, 10 insertions, 330 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 77c2dbf7ca63..a1bbdd69e819 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.141 2008/07/08 06:30:50 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.142 2008/10/22 19:31:55 tupone Exp $
+
+  22 Oct 2008; <tupone@gentoo.org> -files/i18n-1.0.0.patch,
+  -files/2.9/zope-2.9.4_logerror.patch, -zope-2.9.3.ebuild:
+  Removing version 2.9.3 vulnerable to CVE-2007-0240: Hotfix for cross-site
+  scripting vulnerability
 
   08 Jul 2008; Tupone Alfredo <tupone@gentoo.org>
   -files/2.7.8/i18n-1.0.0.patch, -files/2.6.4/zope.confd,
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 444a4d957cd6..fcbde4e70316 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,14 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2.9/zope-2.9.4_logerror.patch 3323 RMD160 789e17da8df910db6a7382cacf480754f0f320f6 SHA1 ee8696b545d36290fb9cb9fbbf3d32bbacd2fa81 SHA256 be6a0c7a8a2ae73938f75e07013c96f18df5dbde1f380049a54c61b62959b70d
-AUX i18n-1.0.0.patch 8080 RMD160 f35b6d3ce90be84c66c8bd1fd5a85d6a8bf87ac3 SHA1 589964578f903b33b51db66fe33db886bcb3ad16 SHA256 8c90ef9363d6334a329aa2b476b37cc74e8471fb9985088db05221caf34edd74
 AUX zope.initd 1317 RMD160 39fa98ed8cbc703cd77238d345328430e39bddd4 SHA1 6215743f7d108fa3e668cf24d748ad19d68faeab SHA256 1a3a03ef186fbdfd566023cf3fbb311f03214c51021b3af628b3233704838506
 DIST Zope-2.10.3-final.tgz 7094367 RMD160 70835b3c510b95a61174050a8ffe68a58114f02a SHA1 a5bdf04ac3ca5ee8c9d437347d956487e172cfd2 SHA256 79233c797c77edf447f1903c93a2accbb227b3af2159a99d731607aa2e274350
 DIST Zope-2.10.4-final.tgz 7231146 RMD160 8985bf9006fedc87cdfcf5032239890b2950988e SHA1 a1a4f8c664765489d6c4e588ea928a53230e0894 SHA256 5d0174e3a1c84f2ccef5fb0979c041eeea0e2fda8f21b35a37b1a382870ff89f
 DIST Zope-2.10.5-final.tgz 7236917 RMD160 028656274059c385d7f6f1b5e6ff09017696c440 SHA1 e23b9bdce30c799a91ef375759e11dff43b796b8 SHA256 4ffabdf2decdf993b0ac46a2363982fb6d2233e09135e9f30cfcd2b114e35f95
 DIST Zope-2.10.6-final.tgz 7277894 RMD160 f0f62d8e4e23041c3fc77179310561678a4458cc SHA1 d0689fd3a0eac8fbb0f44a81c3c1427660f4c76d SHA256 3946b72e53ea86c54a50499dd526b5408f1bacd06d7434e77e708fa89931b190
-DIST Zope-2.9.3.tgz 8010113 RMD160 a4aa2303400efa17ec0d225b501c5282c454705b SHA1 c852139f8060bef7592e6c877e1dd0e90b95837b SHA256 2c60f25266663d676c1c8c2c6864a038a1b675ff8879cec40fbc72f72efc0bfa
 DIST Zope-2.9.7-final.tgz 6945646 RMD160 a7237959d43031459423c700f5224f999d2ad050 SHA1 1bfb73201389b7c7f099b12777ab7d855722db21 SHA256 736a5a883e0ed5c57787ae33b71878761ce9abf6184b30fdb1585985b167e617
 DIST Zope-2.9.8-final.tgz 7006672 RMD160 90c2bd0621445d6bcbf02335338b40e42ea65841 SHA1 98aa743751fb7c411c3f5157a0c31242ac9cb3bb SHA256 75ea88e30233363fccd5f8ecbce7d889daf017d6e731f209827b9a453e2548bc
 DIST Zope-2.9.9-final.tgz 7052458 RMD160 1818a1bb77bf300c113d10551a7896108bc6c8e3 SHA1 decf69899c3d80cf13330373b1cf92351b490fb7 SHA256 d608258b712daa02e627ccc8d61313410d4927e0eb3b3f3b5d65fe4e080adbee
@@ -18,18 +15,17 @@ EBUILD zope-2.10.3.ebuild 2393 RMD160 90aec40395507bd93ac9e28d25b40001860aa5ce S
 EBUILD zope-2.10.4.ebuild 2393 RMD160 5d4efa3b05ff745e70db5653a688d3e4a4ca1a11 SHA1 a18a9c2e0369da195ae354375b0943c3e5073f3d SHA256 88f0581cdca7f77099aa57bb72fec07ead4801a36f9bd66dd09121d416a99191
 EBUILD zope-2.10.5.ebuild 2318 RMD160 2a93b25247d1d3dec4aed65fc17a8af7dcc2ba16 SHA1 124623d0eb8d5c9ca089e5ac26d63753b0fd6864 SHA256 953f669d27fb3ab552122369ad6f8ad5667934e29a2b1a881f5e9c669774fb8c
 EBUILD zope-2.10.6.ebuild 2317 RMD160 2a778fffe6efc5511ae534ed32eb217bfb8053b1 SHA1 c4f1d2c07b105b393d0e9030b5a8f79fa2a6623c SHA256 80eb1850d3747fe2096872a0c5b9589fcbeafda94ac30d1f4a8287433366874b
-EBUILD zope-2.9.3.ebuild 2268 RMD160 fbe0f1bd82111047367bfe5fefbd197db4e0c13b SHA1 59c06cabf0740754ce79a4117dfd50667f7526cc SHA256 6bd7481cfef883cb783c070c30a4a56290d4a3bcec995ac691218d6fed0a04a0
 EBUILD zope-2.9.7.ebuild 2392 RMD160 d3d920a0a4ad53fba7215844da2ab4d0e846f8af SHA1 833d9b0a034e7529ee5e7e63d73803f64abf3c57 SHA256 8e58d357e2b082faedd21b2732954bdc1f1263c890968467e528d9bf9ef5b43f
 EBUILD zope-2.9.8.ebuild 2387 RMD160 8b1225983f3ffce48cd2a7ad59093f6104e5146f SHA1 13573bcdfff81b91aefe0e358361cec71146f321 SHA256 3a4f9a5c9b1d3bdf8980e7edcef22f13bb31d64c4268b51113e1db75ccc3bb3c
 EBUILD zope-2.9.9.ebuild 2392 RMD160 cc5f1ec9ec87ea5748117c7007c348d05d80f491 SHA1 4ba3d7d08b437b05a310b6688e3cc0d0d46f918e SHA256 d47ac758908ceaac383989f47e04547183c3a0f5735f3edda953717ee664da83
 EBUILD zope-3.2.2.ebuild 3624 RMD160 e74adaedc41a265b71fd583d87b6f33b34448c0a SHA1 5632e19dc545b80c4ebe734119d81c39fe2b101e SHA256 82e0e16be113e8e2c7f4ca11ef1fa3dc24b96ca4a65161909c4c58999779d57d
 EBUILD zope-3.3.1.ebuild 3421 RMD160 8b926f994115b5d7ab47cf5388105ab28865b134 SHA1 2a393f55fc0aa58b22fbb49034df9eb8d7c1e249 SHA256 f2c54158bfd1bc1104dfd33b7128827b56057bfa0bd97f4843415d600190dbda
-MISC ChangeLog 22091 RMD160 d594ba992c47feab2f035ac462b4fd77ea7335d6 SHA1 3d382388a3d38ecbe2685e936bb4c118286033c6 SHA256 8b6a40357659e1629381103bb48f5f30f5321b35105a6c06831cf40a677d9182
+MISC ChangeLog 22314 RMD160 5e34bcd5ad21744e0b4518c30595dabe4bd9f621 SHA1 f1e332976989bd51ee93580f4673726994ad9cf5 SHA256 4b273d982be54075eae67a7798615f726b435f97e7b39cc77ed350c6a779980a
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhzCaAACgkQVrx5UrvSjsd1sACdG2k85U3cL6mjgATb2RdMimGs
-G/kAoJbVcNEB/tPEJJAgSl98P8vwBR1E
-=7OXq
+iEYEARECAAYFAkj/f7UACgkQzoOVAyZjACRd/QCePYvoUQhz+uRwJ9KwYV17s0nM
+QaUAn1gm0DeIZMz2IquLiW8+4+aF/FBm
+=ogzr
 -----END PGP SIGNATURE-----
diff --git a/net-zope/zope/files/2.9/zope-2.9.4_logerror.patch b/net-zope/zope/files/2.9/zope-2.9.4_logerror.patch
deleted file mode 100644
index b0c04eae745c..000000000000
--- a/net-zope/zope/files/2.9/zope-2.9.4_logerror.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur Zope-2.9.4-final-orig/lib/python/App/RefreshFuncs.py Zope-2.9.4-final/lib/python/App/RefreshFuncs.py
---- Zope-2.9.4-final-orig/lib/python/App/RefreshFuncs.py	2006-07-20 05:31:19.000000000 +0000
-+++ Zope-2.9.4-final/lib/python/App/RefreshFuncs.py	2006-08-25 11:15:28.000000000 +0000
-@@ -140,7 +140,7 @@
-     exc = sys.exc_info()
-     try:
-         logger.error('Exception while refreshing %s'
--                      % productid, error=exc)
-+                      % productid, exc_info=exc)
-         if hasattr(exc[0], '__name__'):
-             error_type = exc[0].__name__
-         else:
-diff -Naur Zope-2.9.4-final-orig/lib/python/OFS/ObjectManager.py Zope-2.9.4-final/lib/python/OFS/ObjectManager.py
---- Zope-2.9.4-final-orig/lib/python/OFS/ObjectManager.py	2006-07-20 05:31:20.000000000 +0000
-+++ Zope-2.9.4-final/lib/python/OFS/ObjectManager.py	2006-08-25 11:15:42.000000000 +0000
-@@ -675,7 +675,7 @@
-                 stat=marshal.loads(v.manage_FTPstat(REQUEST))
-             except:
-                 logger.error("Failed to stat file '%s'" % k,
--                             error=sys.exc_info())
-+                             exc_info=sys.exc_info())
-                 stat=None
-             if stat is not None:
-                 out=out+((k,stat),)
-diff -Naur Zope-2.9.4-final-orig/lib/python/Shared/DC/ZRDB/Connection.py Zope-2.9.4-final/lib/python/Shared/DC/ZRDB/Connection.py
---- Zope-2.9.4-final-orig/lib/python/Shared/DC/ZRDB/Connection.py	2006-07-20 05:31:21.000000000 +0000
-+++ Zope-2.9.4-final/lib/python/Shared/DC/ZRDB/Connection.py	2006-08-25 11:10:27.000000000 +0000
-@@ -71,7 +71,7 @@
-             try: self.connect(self.connection_string)
-             except:
-                 logger.error('Error connecting to relational database.',
--                             error=exc_info())
-+                             exc_info=exc_info())
- 
-     def title_and_id(self):
-         s=Connection.inheritedAttribute('title_and_id')(self)
-@@ -151,7 +151,7 @@
-                 self._v_database_connection.close()
-         except:
-             logger.error('Error closing relational database connection.',
--                         error=exc_info())
-+                         exc_info=exc_info())
-         self._v_connected=''
-         if REQUEST is not None:
-             return self.manage_main(self, REQUEST)
-diff -Naur Zope-2.9.4-final-orig/lib/python/ZPublisher/BeforeTraverse.py Zope-2.9.4-final/lib/python/ZPublisher/BeforeTraverse.py
---- Zope-2.9.4-final-orig/lib/python/ZPublisher/BeforeTraverse.py	2006-07-20 05:31:19.000000000 +0000
-+++ Zope-2.9.4-final/lib/python/ZPublisher/BeforeTraverse.py	2006-08-25 11:14:32.000000000 +0000
-@@ -105,7 +105,7 @@
-                 cob(container, request)
-             except TypeError:
-                 self.logger.error('%s call %s failed.' % (
--                    `self._hookname`, `cob`), error=sys.exc_info())
-+                    `self._hookname`, `cob`), exc_info=sys.exc_info())
- 
-     def add(self, cob):
-         self._list.append(cob)
-@@ -153,4 +153,4 @@
-             # the programmer may want to raise them deliberately.
-             import sys
-             self.logger.error('Error while invoking hook: "%s"'
--                                % self.name, error=sys.exc_info())
-+                                % self.name, exc_info=sys.exc_info())
diff --git a/net-zope/zope/files/i18n-1.0.0.patch b/net-zope/zope/files/i18n-1.0.0.patch
deleted file mode 100644
index 9cbf0ba65ee2..000000000000
--- a/net-zope/zope/files/i18n-1.0.0.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-? encode.diff
-? i18n-0.9.9.patch
-? i18n-1.0.0.patch
-? i18n.patch
-? run_tests
-? test.diff
-Index: ClassicStructuredText.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/ClassicStructuredText.py,v
-retrieving revision 1.1.1.2
-retrieving revision 1.1.1.1.2.1
-diff -u -r1.1.1.2 -r1.1.1.1.2.1
-Index: DocumentClass.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/DocumentClass.py,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 DocumentClass.py
---- DocumentClass.py	15 Apr 2003 15:13:52 -0000	1.1.1.1
-+++ DocumentClass.py	9 Nov 2003 18:02:30 -0000
-@@ -789,7 +789,7 @@
- 
-     def doc_literal(
-         self, s,
--        expr = re.compile(r"(\W+|^)'([%s%s%s\s]+)'([%s]+|$)" % (letters, digits, literal_punc, phrase_delimiters)).search,):
-+        expr = re.compile(r"(\W+|^)'((?:\w|[%s%s\s])+)'([%s]+|$)" % (digits, literal_punc, phrase_delimiters), re.U).search,):
- 
-         # old expr... failed to cross newlines.
-         #        expr=re.compile(
-@@ -807,7 +807,9 @@
- 
-     def doc_emphasize(
-         self, s,
--        expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
-+        # i18nal variant
-+        expr = re.compile(r'\*((?:\w|[%s\s])+?)\*' % (strongem_punc), re.U).search
-+        #expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
-         #expr = re.compile(r'\s*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*(?!\*|-)' % letters).search       # old expr, inconsistent punctuation
-         ):
- 
-@@ -853,7 +855,7 @@
- 
-     def doc_underline(self,
-                       s,
--                      expr=re.compile(r'_([%s%s%s\s]+)_([\s%s]|$)' % (letters, digits, under_punc,phrase_delimiters)).search):
-+                      expr=re.compile(r'_((?:\w|[%s\s])+)_([\s%s]|$)' % (under_punc,phrase_delimiters), re.U).search):
- 
-         result = expr(s)
-         if result:
-@@ -867,7 +869,7 @@
- 
-     def doc_strong(self,
-                    s,
--                   expr = re.compile(r'\*\*([%s%s%s\s]+?)\*\*' % (letters, digits, strongem_punc)).search
-+                   expr = re.compile(r'\*\*((?:\w|[%s%s\s])+?)\*\*' % (digits, strongem_punc), re.U).search
-                    #expr = re.compile(r'\s*\*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*\*(?!\*|-)' % letters).search, # old expr, inconsistent punc, failed to cross newlines.
-         ):
- 
-@@ -879,7 +881,7 @@
-             return None
- 
-     ## Some constants to make the doc_href() regex easier to read.
--    _DQUOTEDTEXT = r'("[ %s0-9\n\r%s]+")' % (letters,dbl_quoted_punc) ## double quoted text
-+    _DQUOTEDTEXT = r'("[^"]+")'
-     _ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
-     _ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
- 
-@@ -887,12 +889,12 @@
- 
- 
-     def doc_href1(self, s,
--                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
-+                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES, re.U).search
-                    ):
-         return self.doc_href(s, expr)
- 
-     def doc_href2(self, s,
--                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES).search
-+                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES, re.U).search
-                    ):
-         return self.doc_href(s, expr)
- 
-Index: DocumentWithImages.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/DocumentWithImages.py,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- DocumentWithImages.py	15 Apr 2003 15:13:52 -0000	1.1.1.1
-+++ DocumentWithImages.py	15 Apr 2003 15:16:25 -0000	1.2
-@@ -30,12 +30,12 @@
- 
-     def doc_img(
-         self, s,
--        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)').search,
--        expr2=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+):([a-zA-Z0-9_\-.:/;,\n\~]+)').search
-+        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
-+        expr2=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+):([a-zA-Z0-9_\-.:/;,\n\~]+)', re.U).search
-         ):
--
-         r = expr2(s)
-         if r:
-+
- 
-             # Warning: the regex are getting confused when the string after :img:
-             # is an URL containing ":" (Collector #2276)
-Index: HTMLClass.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/HTMLClass.py,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2.2.2
-diff -u -r1.1.1.1 -r1.2.2.2
-Index: ST.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/ST.py,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- ST.py	15 Apr 2003 15:13:53 -0000	1.1.1.1
-+++ ST.py	15 Apr 2003 15:16:25 -0000	1.2
-@@ -115,6 +115,9 @@
-     Structure => [paragraph,[sub-paragraphs]]
-     """
- 
-+    if type(paragraphs) == type(''):
-+        paragraphs = unicode(paragraphs, 'utf-8')
-+
-     currentlevel    = 0
-     currentindent  = 0
-     levels            = {0:0}
-Index: Zwiki.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/Zwiki.py,v
-retrieving revision 1.1.1.2
-retrieving revision 1.1.1.1.2.1
-diff -u -r1.1.1.2 -r1.1.1.1.2.1
-Index: test.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/test.py,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.2.1
-diff -u -r1.1.1.1 -r1.1.2.1
-Index: tests/__init__.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/tests/__init__.py,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.2.1
-diff -u -r1.1.1.1 -r1.1.2.1
-Index: tests/testStructuredText.py
-===================================================================
-RCS file: /var/lib/cvs/nkm/zope/StructuredText/tests/testStructuredText.py,v
-retrieving revision 1.1.1.1
-retrieving revision 1.1.1.1.2.3
-diff -u -r1.1.1.1 -r1.1.1.1.2.3
---- tests/testStructuredText.py	15 Apr 2003 15:13:56 -0000	1.1.1.1
-+++ tests/testStructuredText.py	7 Nov 2003 12:12:32 -0000	1.1.1.1.2.3
-@@ -210,13 +210,22 @@
-         '<code>"literal":http://www.zope.org/.</code>')
- 
- 
--    def XXXtestUnicodeContent(self):
--        # This fails because ST uses the default locale to get "letters"
--        # whereas it should use \w+ and re.U if the string is Unicode.
--        #self._test(u"h\xe9 **y\xe9** xx",
--        #           u"h\xe9 <strong>y\xe9</strong> xx")
--        pass
-+    def testUnicodeContent(self):
-+        self._test(u"h\xe9 **y\xe9** xx",
-+                   u"h\xe9 <strong>y\xe9</strong> xx")
-+        self._test(u"h\xe9 *y\xe9* xx",
-+                   u"h\xe9 <em>y\xe9</em> xx")
-+        self._test(u"h\xe9 _y\xe9_ xx",
-+                   u"h\xe9 <u>y\xe9</u> xx")
-+        self._test(u"h\xe9 'y\xe9' xx",
-+                   u"h\xe9 <code>y\xe9</code> xx")
-+        self._test(u"h\xe9 \"y\xe9\":http://zope.org xx",
-+                   u"h\xe9 <a href=\"http://zope.org\">y\xe9</a> xx")
- 
-+    def testDoNotHang(self):
-+        raw_str = 'UAB "Vita Baltic International" produkcijos asortiment\u0105 papild\u0117 dar trys  specifines nedegumo savybes turin\u010dios porolono ru\u0161ys. \nSpalio m\u0117nes\u012f buvo gauti tarptautiniai sertifikatai, liudijantys, kad porolonai CV 3037, CV 3538 ir CV 2533 atitinka degumo standart\u0173 BS 5852:Part 2: 1982 reikalavimus. Tai labai gera \u017einia bald\u0173 gamintojams, gaminantiems baldus ir \u010diu\u017einius,\nkuri\u0173 gaminiams keliami ypatingi importuotoj\u0173 reikalavimai.'
-+        res_txt = raw_str
-+        self._test(raw_str, res_txt)        
- 
- def test_suite():
-     suite = unittest.TestSuite()
diff --git a/net-zope/zope/zope-2.9.3.ebuild b/net-zope/zope/zope-2.9.3.ebuild
deleted file mode 100644
index 7d39bee5c0d6..000000000000
--- a/net-zope/zope/zope-2.9.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.3.ebuild,v 1.2 2008/05/27 20:59:50 tupone Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
-HOMEPAGE="http://www.zope.org"
-SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}.tgz"
-
-LICENSE="ZPL"
-SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="=dev-lang/python-2.4*"
-
-DEPEND="${RDEPEND}
-virtual/libc
->=sys-apps/sed-4.0.5"
-
-S="${WORKDIR}/Zope-${PV}"
-ZUID=zope
-ZGID=zope
-ZS_DIR=${ROOT%/}/usr/$(get_libdir)
-ZSERVDIR=${ZS_DIR}/${P}
-
-# Narrow the scope of ownership/permissions.
-# Security plan:
-# * ZUID is the superuser for all zope instances.
-# * ZGID is for a single instance's administration.
-# * Other' should not have any access to ${ZSERVDIR},
-#   because they can work through the Zope web interface.
-#   This should protect our code/data better.
-#
-# UPDATE: ${ZSERVDIR} is a lib directory and should be world readable
-# like e.g /usr/lib/python we do not store any user data there,
-# currently removed all custom permission stuff, for ${ZSERVDIR}
-
-src_compile() {
-	./configure  --prefix=. --force --with-python=/usr/bin/python2.4 || die "Failed to execute ./configure ..."
-	emake || die "Failed to compile."
-}
-
-src_install() {
-	dodoc README.txt
-	dodoc Zope/doc/*.txt
-	docinto PLATFORMS ; dodoc Zope/doc/PLATFORMS/*
-	docinto ZEO ; dodoc Zope/doc/ZEO/*
-
-	make install prefix="${D}"${ZSERVDIR}
-	rm -rf "${D}"${ZSERVDIR}/doc
-	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
-
-	# copy the init script skeleton to skel directory of our installation
-	cp "${FILESDIR}"/zope.initd "${D}"/${ZSERVDIR}/skel/zope.initd
-}
-
-pkg_postinst() {
-	# create the zope user and group for backward compatibility
-	enewgroup ${ZGID} 261
-	usermod -g ${ZGID} ${ZUID} 2>&1 >/dev/null || \
-	enewuser ${ZUID} 261 -1 /var/$(get_libdir)/zope  ${ZGID}
-
-	einfo "Be warned that you need at least one zope instance to run zope."
-	einfo "Please emerge zope-config for futher instance management."
-}
-
-pkg_prerm() {
-
-	#need to remove this symlink because portage keeps links to
-	#existing targets
-	rm ${ZSERVDIR}/bin/python
-}