closes #141578 and #145081

Package-Manager: portage-2.1.1_rc1

8 files changed, 234 insertions, 46 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 25c6afab8a33..9f273d117152 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.105 2006/08/20 19:40:32 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.106 2006/08/27 16:59:37 radek Exp $
+
+*zope-2.7.9 (27 Aug 2006)
+
+  27 Aug 2006; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/2.9/zope-2.9.4_logerror.patch, +zope-2.7.9.ebuild,
+  zope-2.8.8.ebuild, zope-2.9.4.ebuild:
+  Fixed 2.9.4 w/o version bump, closes 145081, thanks to Chris Fletcher.
+  Released 2.7.9 (w/ version bump) and 2.8.8 (w/o version bump) to close #141578
 
   20 Aug 2006; Radoslaw Stachowiak <radek@gentoo.org> -zope-2.8.3.ebuild,
   -zope-2.9.0.ebuild, -zope-2.9.1.ebuild, -zope-3.2.0.ebuild:
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 715a82c4cbee..08e63f9153cf 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -14,6 +14,10 @@ AUX 2.7.8/i18n-1.0.0.patch 7634 RMD160 237e25b32b595fbdbb536c5291131263146a2f49
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.8/i18n-1.0.0.patch 7634
 RMD160 237e25b32b595fbdbb536c5291131263146a2f49 files/2.7.8/i18n-1.0.0.patch 7634
 SHA256 d955e75c29482e04a369dcd3be0ba064169287a42c13af7e5d752cb8b52ecbc7 files/2.7.8/i18n-1.0.0.patch 7634
+AUX 2.9/zope-2.9.4_logerror.patch 3323 RMD160 789e17da8df910db6a7382cacf480754f0f320f6 SHA1 ee8696b545d36290fb9cb9fbbf3d32bbacd2fa81 SHA256 be6a0c7a8a2ae73938f75e07013c96f18df5dbde1f380049a54c61b62959b70d
+MD5 9e84c83aae0553c3e866918c6ca2c3e6 files/2.9/zope-2.9.4_logerror.patch 3323
+RMD160 789e17da8df910db6a7382cacf480754f0f320f6 files/2.9/zope-2.9.4_logerror.patch 3323
+SHA256 be6a0c7a8a2ae73938f75e07013c96f18df5dbde1f380049a54c61b62959b70d files/2.9/zope-2.9.4_logerror.patch 3323
 AUX i18n-1.0.0.patch 8080 RMD160 f35b6d3ce90be84c66c8bd1fd5a85d6a8bf87ac3 SHA1 589964578f903b33b51db66fe33db886bcb3ad16 SHA256 8c90ef9363d6334a329aa2b476b37cc74e8471fb9985088db05221caf34edd74
 MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
 RMD160 f35b6d3ce90be84c66c8bd1fd5a85d6a8bf87ac3 files/i18n-1.0.0.patch 8080
@@ -22,9 +26,11 @@ AUX zope.initd 1317 RMD160 39fa98ed8cbc703cd77238d345328430e39bddd4 SHA1 6215743
 MD5 610f19a06033d3b55b76c7fd2d1d464d files/zope.initd 1317
 RMD160 39fa98ed8cbc703cd77238d345328430e39bddd4 files/zope.initd 1317
 SHA256 1a3a03ef186fbdfd566023cf3fbb311f03214c51021b3af628b3233704838506 files/zope.initd 1317
+DIST Hotfix_20060821.tar.gz 1050 RMD160 83479de3200711dd1cff306030f0181674862b51 SHA1 3f7eb3c66443a3317c235f6fc708928c3dca7e13 SHA256 6ba5f717cc7443c6182c5b829f2a4228e7c56667d07e2b6fad8323ab1ec850af
 DIST Zope-2.6.4-src.tgz 2401115 RMD160 33b46814c9db37d661cb0eb374fa53873397a0eb SHA256 368a2a922b9b5fbc3cbe70831701adb88c75ee6cb62b56773487518c85fb143f
 DIST Zope-2.7.7-final.tgz 2925174 RMD160 dc3058b0b261f15b881930e91e4be02d80a6e134 SHA256 9605229870b5ab9a8683d5297b47eedd9bb84fea28ecc08774df7d437919296a
 DIST Zope-2.7.8-final.tgz 2952102 RMD160 2a25b1fbe81c9aec10f35e05f8eaf9522d9cb445 SHA1 742a43825084425a2d2a722534ce1563178299c5 SHA256 06789e7e2bf8415a7e4edf2bd05eada1b4d5dd3a6fa8ca7ab79f8b68006c7bac
+DIST Zope-2.7.9-final.tgz 2993519 RMD160 644e7e815945478b04d68af05beeccf428a82391 SHA1 c114f3644ec4ca71fb7c7d8485d546dbd6486532 SHA256 b3982421dded26e95c8a5a7272365224ba399d552a143a9d457509f11b9d94ab
 DIST Zope-2.8.4-final.tgz 5447275 RMD160 39433af4f6d6766bffce53f81f24716be2a562b9 SHA256 3e6ac902de1052c408cfc531b169e78b350b43ba93ee14e586901ff1b47e193e
 DIST Zope-2.8.6-final.tgz 5378968 RMD160 c73d8b2a1405f68864fb96e1476eede3d1ecc8da SHA1 d1192ccc6d2f15b0dc359a3ecc0e8ce9c00e09eb SHA256 b113e56895986c969a42dc037f19cef78ebb920e84d50d4d0d648f38b7bbffe2
 DIST Zope-2.8.7-final.tgz 5383233 RMD160 55589919eca978786ff2b50e7718299b2af1f8f4 SHA1 9d8da00c85f93e7b3fa5afc211277fb744ac1f31 SHA256 d426ccc6e69455759a405f1f4bae2b1231f3ba9a313ad920f404911ca467a1ce
@@ -45,6 +51,10 @@ EBUILD zope-2.7.8.ebuild 3320 RMD160 f7fb252241f140edbef3520819e49b38c8b6ccca SH
 MD5 dc4604739bfe0cb5c97ce1c6d6b0211f zope-2.7.8.ebuild 3320
 RMD160 f7fb252241f140edbef3520819e49b38c8b6ccca zope-2.7.8.ebuild 3320
 SHA256 eeb2388a9f70e819c35294a6826107155d79be7374beb86736cea1c99136d6af zope-2.7.8.ebuild 3320
+EBUILD zope-2.7.9.ebuild 3554 RMD160 b34e57bf5331e0536b567e6f4f3a99ded4933bae SHA1 5132c02231c18bdc490dd0eabd5e0944795524dc SHA256 24d31af31ecae75c1b9d6a3a16ce2f98d7a806a55f1042ac4876de6590b1e752
+MD5 e6f1b314eebae570de9e5a4b7eb34a80 zope-2.7.9.ebuild 3554
+RMD160 b34e57bf5331e0536b567e6f4f3a99ded4933bae zope-2.7.9.ebuild 3554
+SHA256 24d31af31ecae75c1b9d6a3a16ce2f98d7a806a55f1042ac4876de6590b1e752 zope-2.7.9.ebuild 3554
 EBUILD zope-2.8.4.ebuild 3507 RMD160 a1349af44fd950e7716fd4335c1f85c5fb065055 SHA1 ab1a0ec00dc677925b54afd8b4727b21fd457be9 SHA256 6f2f1b047751914e5b69e269b690d4f56c4112c8ecb9fca0114cd45102df4a59
 MD5 1322ab6ee71eeb6eeb939cb3d9306497 zope-2.8.4.ebuild 3507
 RMD160 a1349af44fd950e7716fd4335c1f85c5fb065055 zope-2.8.4.ebuild 3507
@@ -57,18 +67,18 @@ EBUILD zope-2.8.7.ebuild 3511 RMD160 7b8835e414a2018ff1354831bb3ae161dc6e2107 SH
 MD5 2b2b53ba8ebe3661da35508610fd7e1b zope-2.8.7.ebuild 3511
 RMD160 7b8835e414a2018ff1354831bb3ae161dc6e2107 zope-2.8.7.ebuild 3511
 SHA256 885180aa0639e8693d7662fd9035341ebcca8a25c9f321d7b192560827a33afa zope-2.8.7.ebuild 3511
-EBUILD zope-2.8.8.ebuild 3511 RMD160 a27c58d2fe543498b68419758d0d3783c9ffa638 SHA1 1cf72df03415927b0a62c6d93178ff5d2bcbad8a SHA256 069904140d832f14b451e514ec11c50809335e2b011217bd0e7125f89857dabf
-MD5 9608338384c7b9a9b6aed81babb7b28a zope-2.8.8.ebuild 3511
-RMD160 a27c58d2fe543498b68419758d0d3783c9ffa638 zope-2.8.8.ebuild 3511
-SHA256 069904140d832f14b451e514ec11c50809335e2b011217bd0e7125f89857dabf zope-2.8.8.ebuild 3511
+EBUILD zope-2.8.8.ebuild 2673 RMD160 5e9051191181fc3d5742fb78020618bd6bfb42d3 SHA1 c5ed80fde9e8fb78815b5255dde7cdbf54656e1a SHA256 f22d51eda6c73b3d9470cb56d55057ab012c0e12dc968b55515d6c0e9a052145
+MD5 bfcc66fdc4cae9751509773e7ab5d651 zope-2.8.8.ebuild 2673
+RMD160 5e9051191181fc3d5742fb78020618bd6bfb42d3 zope-2.8.8.ebuild 2673
+SHA256 f22d51eda6c73b3d9470cb56d55057ab012c0e12dc968b55515d6c0e9a052145 zope-2.8.8.ebuild 2673
 EBUILD zope-2.9.3.ebuild 2299 RMD160 b495b688e5fbe961bd8491d71a5fa9d57ad00506 SHA1 fe87a58d00fcc1d44d58e3fa87d2c37a9f336601 SHA256 18b4264f190d13375a25f5a18888f91b3bb050a5eece7e08482899016a270c49
 MD5 46c6d7a49a1289c0229f20320f42c605 zope-2.9.3.ebuild 2299
 RMD160 b495b688e5fbe961bd8491d71a5fa9d57ad00506 zope-2.9.3.ebuild 2299
 SHA256 18b4264f190d13375a25f5a18888f91b3bb050a5eece7e08482899016a270c49 zope-2.9.3.ebuild 2299
-EBUILD zope-2.9.4.ebuild 2367 RMD160 364c5f8e00638427b6ce12b4e0a21d6717cd18b4 SHA1 2da8da9d65a7eca9a46085919e4bc20b2e3e6850 SHA256 8a66333be35c39c81dfd9f309e0915ce93682e9f79c80f38ca5779a36ccc453f
-MD5 4c422e4160d0cc60887cfd3ffb19d031 zope-2.9.4.ebuild 2367
-RMD160 364c5f8e00638427b6ce12b4e0a21d6717cd18b4 zope-2.9.4.ebuild 2367
-SHA256 8a66333be35c39c81dfd9f309e0915ce93682e9f79c80f38ca5779a36ccc453f zope-2.9.4.ebuild 2367
+EBUILD zope-2.9.4.ebuild 2427 RMD160 5ed2b9ad76837cd8c91e05e9b45de53527010561 SHA1 c91b862ccf10ef99d2148596f0027815af247c33 SHA256 4a645a5e79aa707c0ed1980eebd258f3aaf2930d1385fc3efe6319c3ceb68f99
+MD5 4d0cf9341b93fb3dbbfa83771cfd15f4 zope-2.9.4.ebuild 2427
+RMD160 5ed2b9ad76837cd8c91e05e9b45de53527010561 zope-2.9.4.ebuild 2427
+SHA256 4a645a5e79aa707c0ed1980eebd258f3aaf2930d1385fc3efe6319c3ceb68f99 zope-2.9.4.ebuild 2427
 EBUILD zope-3.1.0.ebuild 3235 RMD160 ab35ddfe1f67d8a2e8388f858bc889e5fdc859d5 SHA1 3572a8655d00010861b76d5d0c573b0264b262ed SHA256 a83b24625be677358e3f22a3356fc4297b958e5f52e58724e3bcd724b434f8ed
 MD5 a351702850c91a8d80f6a5454aaeb8ee zope-3.1.0.ebuild 3235
 RMD160 ab35ddfe1f67d8a2e8388f858bc889e5fdc859d5 zope-3.1.0.ebuild 3235
@@ -77,10 +87,10 @@ EBUILD zope-3.2.1.ebuild 3635 RMD160 46fb11998357680617e38531696141b46584e0a9 SH
 MD5 a65627cb2ed696aaacfbf9f8c15eb99e zope-3.2.1.ebuild 3635
 RMD160 46fb11998357680617e38531696141b46584e0a9 zope-3.2.1.ebuild 3635
 SHA256 e234c39a69e77f2d594a2b14763292a89df565c879fe744e650679924f8d240a zope-3.2.1.ebuild 3635
-MISC ChangeLog 16668 RMD160 4f05ea961c81c7e65798cfc5294bda2752f495a7 SHA1 67f87059fce24e6e166cc15ab98a5e2c61e4e0a3 SHA256 0fe2b22523f2a651aae8c73dd5402c10220aa62955ef7d47a703eeb329a19237
-MD5 23bd2b1b79e79f7b95b8ca7349daf8a5 ChangeLog 16668
-RMD160 4f05ea961c81c7e65798cfc5294bda2752f495a7 ChangeLog 16668
-SHA256 0fe2b22523f2a651aae8c73dd5402c10220aa62955ef7d47a703eeb329a19237 ChangeLog 16668
+MISC ChangeLog 17004 RMD160 f40951b3976ce654a9a4a769efe47c8ddcf2ecf6 SHA1 8f5a6f62f8a7d36b858078e8726963f2d8ad92fc SHA256 4f50e34e770cfe638a92ae88e477504316d66cd752a5fae2493f875dd24b4e58
+MD5 655c21c44f8966c73349345e4ae60c82 ChangeLog 17004
+RMD160 f40951b3976ce654a9a4a769efe47c8ddcf2ecf6 ChangeLog 17004
+SHA256 4f50e34e770cfe638a92ae88e477504316d66cd752a5fae2493f875dd24b4e58 ChangeLog 17004
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 metadata.xml 161
@@ -94,6 +104,9 @@ SHA256 93e5f4e64f0b608295c9e9ee93ccf15551abc611b1e04083f0fb6b000d0e4c13 files/di
 MD5 f9fad3370d45a7b8dd66959c4a0b9a2d files/digest-zope-2.7.8 244
 RMD160 70ff0f88c451d873f7aac6911f56b0c82a2c60be files/digest-zope-2.7.8 244
 SHA256 61ba44224b1f25a2f6487873b6db05dc534c3f42b3473e0ed755fd963364dd9a files/digest-zope-2.7.8 244
+MD5 3390e85151a243cfce260b79c29e2199 files/digest-zope-2.7.9 485
+RMD160 def264e3961d2268625edf6959bb2001f4c4f576 files/digest-zope-2.7.9 485
+SHA256 b63589d64d77c8c3f6d367e1ff04d15d2bc429294de3c98d6534d9a6adb888dd files/digest-zope-2.7.9 485
 MD5 b98bff7d6cd6614376b58603ee3fd0eb files/digest-zope-2.8.4 244
 RMD160 3e2d38bd99328c8949e77dd886b317eda0ed1b87 files/digest-zope-2.8.4 244
 SHA256 5e41a7ec77067d72ae044d3a048a0d336516f00230d924b1ab6842dc63ed79d2 files/digest-zope-2.8.4 244
@@ -103,9 +116,9 @@ SHA256 b1107f9450fa994960067d7ef6eb1548c9bad61376e5abdc02797890b1d9720a files/di
 MD5 e950998c66ede11f71254cfa0d6b7b11 files/digest-zope-2.8.7 244
 RMD160 d1dc14e42b99a06c153fe9980a125968bccd52dc files/digest-zope-2.8.7 244
 SHA256 7dbc51da13a4e4b3c9711f644b84da47741ef502bde8fdfd3ecb4e667d4d9371 files/digest-zope-2.8.7 244
-MD5 99754607722422d337800c4e5b690853 files/digest-zope-2.8.8 244
-RMD160 e9c660f04b6069f446bf290258a585ecabd26f18 files/digest-zope-2.8.8 244
-SHA256 c36641585ff96189580a6beba1b03aa26b8afec6b1246bb34e7e34564c6f99bd files/digest-zope-2.8.8 244
+MD5 c655aba0a499d8a0fa3899ecb4fded8a files/digest-zope-2.8.8 485
+RMD160 e61493d8fb751632022d9c576be84cafdce7722a files/digest-zope-2.8.8 485
+SHA256 c9142f259a1ef1331f8ca768042325fe80f9d076341097dbb39ac7731dd875ba files/digest-zope-2.8.8 485
 MD5 d0a0bcda024915c809a8480183102e1b files/digest-zope-2.9.3 226
 RMD160 a1aeaaf1ec85cb8ac02e48c9b8b568c510ccc34a files/digest-zope-2.9.3 226
 SHA256 d6106937d77ecdb893a6d5fa6b89f0c7d22eac8ae3a7935fead078ea3f82be0c files/digest-zope-2.9.3 226
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
new file mode 100644
index 000000000000..b0c04eae745c
--- /dev/null
+++ b/net-zope/zope/files/2.9/zope-2.9.4_logerror.patch
@@ -0,0 +1,63 @@
+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/digest-zope-2.7.9 b/net-zope/zope/files/digest-zope-2.7.9
new file mode 100644
index 000000000000..d5ea9544cae8
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.7.9
@@ -0,0 +1,6 @@
+MD5 5cb921d15ff6d290bfc73bdc20ff67c1 Hotfix_20060821.tar.gz 1050
+RMD160 83479de3200711dd1cff306030f0181674862b51 Hotfix_20060821.tar.gz 1050
+SHA256 6ba5f717cc7443c6182c5b829f2a4228e7c56667d07e2b6fad8323ab1ec850af Hotfix_20060821.tar.gz 1050
+MD5 d44e19ca501f6629375f8f0b40c72e08 Zope-2.7.9-final.tgz 2993519
+RMD160 644e7e815945478b04d68af05beeccf428a82391 Zope-2.7.9-final.tgz 2993519
+SHA256 b3982421dded26e95c8a5a7272365224ba399d552a143a9d457509f11b9d94ab Zope-2.7.9-final.tgz 2993519
diff --git a/net-zope/zope/files/digest-zope-2.8.8 b/net-zope/zope/files/digest-zope-2.8.8
index 4537223f60da..020f0148322d 100644
--- a/net-zope/zope/files/digest-zope-2.8.8
+++ b/net-zope/zope/files/digest-zope-2.8.8
@@ -1,3 +1,6 @@
+MD5 5cb921d15ff6d290bfc73bdc20ff67c1 Hotfix_20060821.tar.gz 1050
+RMD160 83479de3200711dd1cff306030f0181674862b51 Hotfix_20060821.tar.gz 1050
+SHA256 6ba5f717cc7443c6182c5b829f2a4228e7c56667d07e2b6fad8323ab1ec850af Hotfix_20060821.tar.gz 1050
 MD5 6deaf23f8a77a1d6f0be43864cff9b54 Zope-2.8.8-final.tgz 5394023
 RMD160 e1f06d80f9b1943f32316086690b0eb015cf611a Zope-2.8.8-final.tgz 5394023
 SHA256 94a6ad1fe0fdc28c0ea5c3a501976b96b16a4110a3290a80e4897bd3f145c856 Zope-2.8.8-final.tgz 5394023
diff --git a/net-zope/zope/zope-2.7.9.ebuild b/net-zope/zope/zope-2.7.9.ebuild
new file mode 100644
index 000000000000..a06d31493d2a
--- /dev/null
+++ b/net-zope/zope/zope-2.7.9.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.9.ebuild,v 1.1 2006/08/27 16:59:37 radek Exp $
+
+inherit eutils
+
+DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites"
+HOMEPAGE="http://www.zope.org"
+HOTFIXES_URI="http://www.zope.org/Products/Zope/Hotfix-2006-08-21/Hotfix-20060821/Hotfix_20060821.tar.gz"
+SRC_URI="http://www.zope.org/Products/Zope/Zope-${PV}/Zope-${PV}-final.tgz
+			${HOTFIXES_URI}"
+
+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.8/i18n-1.0.0.patch
+		epause 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
+
+	# hotfixes to be applied
+	cp -a ${WORKDIR}/Hotfix_20060821/ ${D}${ZSERVDIR}/lib/python/Products/
+}
+
+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.8.ebuild b/net-zope/zope/zope-2.8.8.ebuild
index 3b8e7c11988e..7438d6e858bf 100644
--- a/net-zope/zope/zope-2.8.8.ebuild
+++ b/net-zope/zope/zope-2.8.8.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.8.ebuild,v 1.1 2006/08/20 19:37:36 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.8.ebuild,v 1.2 2006/08/27 16:59:37 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.tgz"
+HOTFIXES_URI="http://www.zope.org/Products/Zope/Hotfix-2006-08-21/Hotfix-20060821/Hotfix_20060821.tar.gz"
+SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz
+		 ${HOTFIXES_URI}"
 
 LICENSE="ZPL"
 SLOT="${PV}"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="unicode"
+IUSE=""
 
 RDEPEND="=dev-lang/python-2.3*"
 python='python2.3'
@@ -54,32 +56,6 @@ src_install() {
 	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
-		epause 15
-		cd ${S}
-	fi
-
 	make install PREFIX=${D}${ZSERVDIR}
 	rm -rf ${D}${ZSERVDIR}/doc
 	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
@@ -88,6 +64,10 @@ src_install() {
 	# <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
+
+	# hotfixes to be applied
+	cp -a ${WORKDIR}/Hotfix_20060821/ ${D}${ZSERVDIR}/lib/python/Products/
+
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-2.9.4.ebuild b/net-zope/zope/zope-2.9.4.ebuild
index 85f624e57cd0..e0eaaf0e7abe 100644
--- a/net-zope/zope/zope-2.9.4.ebuild
+++ b/net-zope/zope/zope-2.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.4.ebuild,v 1.1 2006/08/20 19:37:36 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.4.ebuild,v 1.2 2006/08/27 16:59:37 radek Exp $
 
 inherit eutils multilib
 
@@ -59,6 +59,10 @@ src_install() {
 
 	# copy the init script skeleton to skel directory of our installation
 	cp ${FILESDIR}/zope.initd ${D}/${ZSERVDIR}/skel/zope.initd
+
+	epatch ${FILESDIR}/2.9/${P}_logerror.patch
+	pwd
+	sleep 15
 }
 
 pkg_postinst() {