removed old versions

Package-Manager: portage-2.1_pre1

15 files changed, 8 insertions, 1090 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 638485583feb..6f7e0396b2bb 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.88 2005/12/24 16:35:35 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.89 2005/12/24 17:16:49 radek Exp $
+
+  24 Dec 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -files/2.7.4/i18n-1.0.0.patch, -files/2.7.6/i18n-1.0.0.patch,
+  -files/2.8.1/i18n-1.0.0.patch, -zope-2.7.5.ebuild, -zope-2.7.6.ebuild,
+  -zope-2.8.0.ebuild, -zope-2.8.1.ebuild, -zope-2.8.2.ebuild:
+  removed old versions
 
 *zope-3.1.0 (24 Dec 2005)
 
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 56eb11f37a01..d8856ce145bf 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,19 +1,11 @@
-MD5 54abaff75f545340cab78c298d07c82b ChangeLog 14064
+MD5 c94592638b1e7abeb0f739c0558c7652 ChangeLog 14341
 MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.6.4/zope.confd 950
 MD5 4d278d26bb7be7693f7213861a9d3805 files/2.6.4/zope.initd 3791
-MD5 c97d6dc27b456ae0fbfdf8ee5627ac1b files/2.7.4/i18n-1.0.0.patch 7630
-MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.6/i18n-1.0.0.patch 7634
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.7/i18n-1.0.0.patch 7634
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.8/i18n-1.0.0.patch 7634
-MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.8.1/i18n-1.0.0.patch 7634
 MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
-MD5 515774f7b0464e0ce8c3283141c676c7 files/digest-zope-2.7.5 66
-MD5 8bf817c4c3e6ad2b06e92a95c6ffd7e0 files/digest-zope-2.7.6 66
 MD5 5d8e83203542dfc8d07354dcdd682134 files/digest-zope-2.7.7 66
 MD5 dd38699498b0cab29b7eb5df48c4674a files/digest-zope-2.7.8 66
-MD5 17edb3696d5d99b37864d9bb7cc23d21 files/digest-zope-2.8.0 69
-MD5 47255f0bd3319908dc8ee081f6c8cf17 files/digest-zope-2.8.1 66
-MD5 e1516616e08b645a062860a4903fa4fe files/digest-zope-2.8.2 69
 MD5 f26477bbd15c975a265ea05f285e728e files/digest-zope-2.8.3 66
 MD5 d1db47dc244cba7522bfb1babe93f3f0 files/digest-zope-2.8.4 66
 MD5 af9f7a9e66ce59bf1a8a901402f6ed5e files/digest-zope-3.1.0 60
@@ -21,13 +13,8 @@ MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
 MD5 610f19a06033d3b55b76c7fd2d1d464d files/zope.initd 1317
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 5416407eff85546578bb4e7c61f45d5e zope-2.6.4-r1.ebuild 5629
-MD5 42625ed029875b4d13c9af34f02aa7ed zope-2.7.5.ebuild 3334
-MD5 e3ebbd463da7c5b7f7cacd4d79323c46 zope-2.7.6.ebuild 3335
 MD5 8664a857f90291f6bd82968b54b23e0d zope-2.7.7.ebuild 3332
 MD5 7d64d093b4a5953de46ae0c53f831649 zope-2.7.8.ebuild 3329
-MD5 03dd7525a3392e245889fba308edc438 zope-2.8.0.ebuild 3362
-MD5 a51712c4e56687605942d3c914c60d31 zope-2.8.1.ebuild 3512
-MD5 6e4ba5b7bd92b20ad3f28cb7e3158deb zope-2.8.2.ebuild 3515
 MD5 0ce3afe5cd3f944a3fa984afa74a43af zope-2.8.3.ebuild 3512
 MD5 38de27b03b7128af70fed16cee33afd0 zope-2.8.4.ebuild 3512
 MD5 162738f59837ebb6450a04f7a066c9ab zope-3.1.0.ebuild 3236
diff --git a/net-zope/zope/files/2.7.4/i18n-1.0.0.patch b/net-zope/zope/files/2.7.4/i18n-1.0.0.patch
deleted file mode 100644
index 169d755ca78a..000000000000
--- a/net-zope/zope/files/2.7.4/i18n-1.0.0.patch
+++ /dev/null
@@ -1,176 +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
---- DocumentWithImages.py       2005-01-14 21:34:31.789944304 +0100
-+++ DocumentWithImages.py       2005-01-14 21:33:58.362026120 +0100
-@@ -30,7 +30,7 @@
-
-     def doc_img(
-         self, s,
--        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)').search,
-+        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
-         ):
-
-
-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/files/2.7.6/i18n-1.0.0.patch b/net-zope/zope/files/2.7.6/i18n-1.0.0.patch
deleted file mode 100644
index f901451fce0c..000000000000
--- a/net-zope/zope/files/2.7.6/i18n-1.0.0.patch
+++ /dev/null
@@ -1,176 +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
---- DocumentWithImages.py       2005-01-14 21:34:31.789944304 +0100
-+++ DocumentWithImages.py       2005-01-14 21:33:58.362026120 +0100
-@@ -30,7 +30,7 @@
-
-     def doc_img(
-         self, s,
--        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
-+        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
-         ):
-
-
-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/files/2.8.1/i18n-1.0.0.patch b/net-zope/zope/files/2.8.1/i18n-1.0.0.patch
deleted file mode 100644
index f901451fce0c..000000000000
--- a/net-zope/zope/files/2.8.1/i18n-1.0.0.patch
+++ /dev/null
@@ -1,176 +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
---- DocumentWithImages.py       2005-01-14 21:34:31.789944304 +0100
-+++ DocumentWithImages.py       2005-01-14 21:33:58.362026120 +0100
-@@ -30,7 +30,7 @@
-
-     def doc_img(
-         self, s,
--        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
-+        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
-         ):
-
-
-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/files/digest-zope-2.7.5 b/net-zope/zope/files/digest-zope-2.7.5
deleted file mode 100644
index 2be172ad11b1..000000000000
--- a/net-zope/zope/files/digest-zope-2.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b5c5823c62370d9f7325c6014a49d8b Zope-2.7.5-final.tgz 2885871
diff --git a/net-zope/zope/files/digest-zope-2.7.6 b/net-zope/zope/files/digest-zope-2.7.6
deleted file mode 100644
index e081314d20bc..000000000000
--- a/net-zope/zope/files/digest-zope-2.7.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f781d13a0cc917e517d4521270691394 Zope-2.7.6-final.tgz 2895957
diff --git a/net-zope/zope/files/digest-zope-2.8.0 b/net-zope/zope/files/digest-zope-2.8.0
deleted file mode 100644
index db33e7a87113..000000000000
--- a/net-zope/zope/files/digest-zope-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f734fa4c55f36b5038f36be9a6d4e61e Zope-2.8.0-final.tar.gz 5315876
diff --git a/net-zope/zope/files/digest-zope-2.8.1 b/net-zope/zope/files/digest-zope-2.8.1
deleted file mode 100644
index c6943a72a415..000000000000
--- a/net-zope/zope/files/digest-zope-2.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ec441a35175bb8d8c557b7d3c63f6f6 Zope-2.8.1-final.tgz 5343921
diff --git a/net-zope/zope/files/digest-zope-2.8.2 b/net-zope/zope/files/digest-zope-2.8.2
deleted file mode 100644
index b5495d1008c7..000000000000
--- a/net-zope/zope/files/digest-zope-2.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ce41fce6deb1739fec5c4abcd8ab834 Zope-2.8.2-final.tar.gz 8227937
diff --git a/net-zope/zope/zope-2.7.5.ebuild b/net-zope/zope/zope-2.7.5.ebuild
deleted file mode 100644
index 1bfb1a7d9d3b..000000000000
--- a/net-zope/zope/zope-2.7.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.5.ebuild,v 1.5 2005/07/09 16:06:46 swegener Exp $
-
-inherit eutils
-
-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}-final.tgz"
-LICENSE="ZPL"
-SLOT="${PV}"
-
-KEYWORDS="~alpha amd64 ~ppc sparc x86"
-IUSE="unicode"
-
-RDEPEND="=dev-lang/python-2.3*"
-python='python2.3'
-
-DEPEND="${RDEPEND}
-virtual/libc
->=sys-apps/sed-4.0.5"
-
-S="${WORKDIR}/Zope-${PV}-final"
-ZUID=zope
-ZGID=zope
-ZS_DIR=${ROOT%/}/usr/lib
-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_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
-	emake || die "Failed to compile."
-}
-
-src_install() {
-	dodoc README.txt
-	dodoc doc/*.txt
-	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
-
-	# Patched StructuredText will accept source text formatted in utf-8 encoding, 
-	# apply all formattings and output utf-8 encoded text.
-	# if you want to use this option you need to set your
-	# system python encoding to utf-8 (create the file sitecustomize.py inside
-	# your site-packages, add the following lines
-	# 	import sys
-	# 	sys.setdefaultencoding('utf-8')
-	# If this is a problem, let me know right away. --batlogg@gentoo.org
-	# I wondering if we need a USE flag for this and wheter we can set the
-	# sys.encoding automtically
-	# so i defined a use flag
-
-	if use unicode; then
-		einfo "Patching structured text"
-		einfo "make sure you have set the system python encoding to utf-8"
-		einfo "create the file sitecustomize.py inside your site-packages"
-	 	einfo "import sys"
-		einfo "sys.setdefaultencoding('utf8')"
-		cd ${S}/lib/python/StructuredText/
-		epatch ${FILESDIR}/2.7.4/i18n-1.0.0.patch
-		sleep 15
-		cd ${S}
-	fi
-
-	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
-	skel=${D}${ZSERVDIR}/skel
-	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
-	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${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 /bin/false /var/lib/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
-}
-
diff --git a/net-zope/zope/zope-2.7.6.ebuild b/net-zope/zope/zope-2.7.6.ebuild
deleted file mode 100644
index 25eff453e03e..000000000000
--- a/net-zope/zope/zope-2.7.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.6.ebuild,v 1.4 2005/07/09 16:06:46 swegener Exp $
-
-inherit eutils
-
-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}-final.tgz"
-LICENSE="ZPL"
-SLOT="${PV}"
-
-KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
-IUSE="unicode"
-
-RDEPEND="=dev-lang/python-2.3*"
-python='python2.3'
-
-DEPEND="${RDEPEND}
-virtual/libc
->=sys-apps/sed-4.0.5"
-
-S="${WORKDIR}/Zope-${PV}-final"
-ZUID=zope
-ZGID=zope
-ZS_DIR=${ROOT%/}/usr/lib
-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_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
-	emake || die "Failed to compile."
-}
-
-src_install() {
-	dodoc README.txt
-	dodoc doc/*.txt
-	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
-
-	# Patched StructuredText will accept source text formatted in utf-8 encoding, 
-	# apply all formattings and output utf-8 encoded text.
-	# if you want to use this option you need to set your
-	# system python encoding to utf-8 (create the file sitecustomize.py inside
-	# your site-packages, add the following lines
-	# 	import sys
-	# 	sys.setdefaultencoding('utf-8')
-	# If this is a problem, let me know right away. --batlogg@gentoo.org
-	# I wondering if we need a USE flag for this and wheter we can set the
-	# sys.encoding automtically
-	# so i defined a use flag
-
-	if use unicode; then
-		einfo "Patching structured text"
-		einfo "make sure you have set the system python encoding to utf-8"
-		einfo "create the file sitecustomize.py inside your site-packages"
-	 	einfo "import sys"
-		einfo "sys.setdefaultencoding('utf8')"
-		cd ${S}/lib/python/StructuredText/
-		epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
-		sleep 15
-		cd ${S}
-	fi
-
-	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
-	skel=${D}${ZSERVDIR}/skel
-	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
-	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${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 /bin/false /var/lib/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
-}
-
diff --git a/net-zope/zope/zope-2.8.0.ebuild b/net-zope/zope/zope-2.8.0.ebuild
deleted file mode 100644
index dc02e5cb7f22..000000000000
--- a/net-zope/zope/zope-2.8.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.0.ebuild,v 1.3 2005/08/23 19:48:57 batlogg Exp $
-
-inherit eutils
-
-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}-final.tar.gz"
-LICENSE="ZPL"
-SLOT="${PV}"
-
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
-IUSE="unicode"
-
-RDEPEND="=dev-lang/python-2.3*"
-python='python2.3'
-
-DEPEND="${RDEPEND}
-virtual/libc
->=sys-apps/sed-4.0.5"
-
-S="${WORKDIR}/Zope-${PV}-final"
-ZUID=zope
-ZGID=zope
-ZS_DIR=${ROOT%/}/usr/lib
-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_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
-	emake || die "Failed to compile."
-}
-
-src_install() {
-	dodoc README.txt
-	dodoc doc/*.txt
-	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
-	docinto ZEO ; dodoc doc/ZEO/*
-
-	# Patched StructuredText will accept source text formatted in utf-8 encoding, 
-	# apply all formattings and output utf-8 encoded text.
-	# if you want to use this option you need to set your
-	# system python encoding to utf-8 (create the file sitecustomize.py inside
-	# your site-packages, add the following lines
-	# 	import sys
-	# 	sys.setdefaultencoding('utf-8')
-	# If this is a problem, let me know right away. --batlogg@gentoo.org
-	# I wondering if we need a USE flag for this and wheter we can set the
-	# sys.encoding automtically
-	# so i defined a use flag
-
-	if use unicode; then
-		einfo "Patching structured text"
-		einfo "make sure you have set the system python encoding to utf-8"
-		einfo "create the file sitecustomize.py inside your site-packages"
-	 	einfo "import sys"
-		einfo "sys.setdefaultencoding('utf8')"
-		cd ${S}/lib/python/StructuredText/
-		epatch ${FILESDIR}/2.7.6/i18n-1.0.0.patch
-		sleep 15
-		cd ${S}
-	fi
-
-	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
-	skel=${D}${ZSERVDIR}/skel
-	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
-	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${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/lib/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
-}
-
diff --git a/net-zope/zope/zope-2.8.1.ebuild b/net-zope/zope/zope-2.8.1.ebuild
deleted file mode 100644
index bb4da23e6cca..000000000000
--- a/net-zope/zope/zope-2.8.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.1.ebuild,v 1.4 2005/09/18 12:22:29 blubb 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}-final.tgz"
-LICENSE="ZPL"
-SLOT="${PV}"
-
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
-IUSE="unicode"
-
-RDEPEND="=dev-lang/python-2.3*"
-python='python2.3'
-
-DEPEND="${RDEPEND}
-virtual/libc
->=sys-apps/sed-4.0.5"
-
-S="${WORKDIR}/Zope-${PV}-final"
-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_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
-	emake || die "Failed to compile."
-}
-
-src_install() {
-	dodoc README.txt
-	dodoc doc/*.txt
-	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
-	docinto ZEO ; dodoc doc/ZEO/*
-
-	# Patched StructuredText will accept source text formatted in utf-8 encoding, 
-	# apply all formattings and output utf-8 encoded text.
-	# if you want to use this option you need to set your
-	# system python encoding to utf-8 (create the file sitecustomize.py inside
-	# your site-packages, add the following lines
-	# 	import sys
-	# 	sys.setdefaultencoding('utf-8')
-	# If this is a problem, let me know right away. --batlogg@gentoo.org
-	# I wondering if we need a USE flag for this and wheter we can set the
-	# sys.encoding automtically
-	# so i defined a use flag
-
-	if use unicode; then
-		einfo "Patching structured text"
-		einfo "make sure you have set the system python encoding to utf-8"
-		einfo "create the file sitecustomize.py inside your site-packages"
-	 	einfo "import sys"
-		einfo "sys.setdefaultencoding('utf8')"
-		# stx i18n support borked. --batlogg@gentoo.org
-		ewarn "sorry, the Structured Text patch doesn't work yet for zope-2.8."
-		#cd ${S}/lib/python/StructuredText/
-		#epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
-		sleep 15
-		cd ${S}
-	fi
-
-	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
-	skel=${D}${ZSERVDIR}/skel
-	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
-	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${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
-}
-
diff --git a/net-zope/zope/zope-2.8.2.ebuild b/net-zope/zope/zope-2.8.2.ebuild
deleted file mode 100644
index 3d0e88f13077..000000000000
--- a/net-zope/zope/zope-2.8.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.2.ebuild,v 1.1 2005/10/17 22:05:29 radek 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}-final.tar.gz"
-LICENSE="ZPL"
-SLOT="${PV}"
-
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
-IUSE="unicode"
-
-RDEPEND="=dev-lang/python-2.3*"
-python='python2.3'
-
-DEPEND="${RDEPEND}
-virtual/libc
->=sys-apps/sed-4.0.5"
-
-S="${WORKDIR}/Zope-${PV}-final"
-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_unpack() {
-	unpack ${A}
-	cd ${S}
-}
-
-src_compile() {
-	./configure --ignore-largefile --prefix=. --with-python=/usr/bin/python2.3 || die "Failed to configure."
-	emake || die "Failed to compile."
-}
-
-src_install() {
-	dodoc README.txt
-	dodoc doc/*.txt
-	docinto PLATFORMS ; dodoc doc/PLATFORMS/*
-	docinto ZEO ; dodoc doc/ZEO/*
-
-	# Patched StructuredText will accept source text formatted in utf-8 encoding, 
-	# apply all formattings and output utf-8 encoded text.
-	# if you want to use this option you need to set your
-	# system python encoding to utf-8 (create the file sitecustomize.py inside
-	# your site-packages, add the following lines
-	# 	import sys
-	# 	sys.setdefaultencoding('utf-8')
-	# If this is a problem, let me know right away. --batlogg@gentoo.org
-	# I wondering if we need a USE flag for this and wheter we can set the
-	# sys.encoding automtically
-	# so i defined a use flag
-
-	if use unicode; then
-		einfo "Patching structured text"
-		einfo "make sure you have set the system python encoding to utf-8"
-		einfo "create the file sitecustomize.py inside your site-packages"
-	 	einfo "import sys"
-		einfo "sys.setdefaultencoding('utf8')"
-		# stx i18n support borked. --batlogg@gentoo.org
-		ewarn "sorry, the Structured Text patch doesn't work yet for zope-2.8."
-		#cd ${S}/lib/python/StructuredText/
-		#epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
-		sleep 15
-		cd ${S}
-	fi
-
-	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
-	skel=${D}${ZSERVDIR}/skel
-	# <radek@gentoo.org> from 2.7.4 release i think that we can use the same
-	# file for every one, and not separate it by PV
-	cp ${FILESDIR}/zope.initd ${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
-}
-