version bump, fixes #141578

Package-Manager: portage-2.1.1_pre5

6 files changed, 222 insertions, 5 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 162568bbd6c9..5e8cdf142b12 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,13 @@
 # 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.103 2006/06/03 14:43:03 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.104 2006/08/20 19:37:36 radek Exp $
+
+*zope-2.9.4 (20 Aug 2006)
+*zope-2.8.8 (20 Aug 2006)
+
+  20 Aug 2006; Radoslaw Stachowiak <radek@gentoo.org> +zope-2.8.8.ebuild,
+  +zope-2.9.4.ebuild:
+  version bump, fixes #141578
 
 *zope-2.8.7 (03 Jun 2006)
 
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index d602f3c54f65..002c15988bf1 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -29,9 +29,11 @@ DIST Zope-2.8.3-final.tgz 8235294 RMD160 794dd7bb26c4036f970922e5ed437c3e546db73
 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
+DIST Zope-2.8.8-final.tgz 5394023 RMD160 e1f06d80f9b1943f32316086690b0eb015cf611a SHA1 fc12c4f888d184c12068615827f415e505981814 SHA256 94a6ad1fe0fdc28c0ea5c3a501976b96b16a4110a3290a80e4897bd3f145c856
 DIST Zope-2.9.0.tgz 7943193 RMD160 427c0beefd4427666cc693121762ea85f6ca1160 SHA256 29befe13ebd32bd130af4cfb385c929c40f1b27974fa8bcc56f9c39a36a244b2
 DIST Zope-2.9.1.tar.gz 7945029 RMD160 3c0236a78ca9af9cb27a282ea6861c9912a5fb58 SHA256 065a0488334eddffdfcf7a28e862eada26bbd43e1012c1d31fd56cd61bfd7d4c
 DIST Zope-2.9.3.tgz 8010113 RMD160 a4aa2303400efa17ec0d225b501c5282c454705b SHA1 c852139f8060bef7592e6c877e1dd0e90b95837b SHA256 2c60f25266663d676c1c8c2c6864a038a1b675ff8879cec40fbc72f72efc0bfa
+DIST Zope-2.9.4-final.tgz 6962298 RMD160 297254e4ad0a27bdc585c88147a6e42698de485e SHA1 37e525b662de5f878d4da39b6578c1d9f15e2669 SHA256 4085dee8a6bd252072ca69f1c2d9e00cbff8d999651da93fd9df5a9db65dba35
 DIST Zope-3.1.0.tgz 4048336 RMD160 c3af6b6172b56ec53691f8f86f3ee14064003602 SHA256 e102a263f7ceb00744ab503c568482db201557433d9078766846294dd040b445
 DIST Zope-3.2.0.tgz 6566282 RMD160 dcb47d95328ef29342c18bcf75582281dc1b34f3 SHA256 21d6ad3ad3ec4c1d9ca754fbe0f7c8b550799eb5fe027e86fbb4a17ae319cbff
 DIST Zope-3.2.1.tgz 6532373 RMD160 f7aeb56ab5f09e6780d0df787939af4c7815ceba SHA1 cb45ab704e3a60376e3025e169b782f2c3968074 SHA256 8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341
@@ -63,6 +65,10 @@ 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.9.0.ebuild 2300 RMD160 d01ff3057907e7d8fcc5a89d9ac9ec27a9bd7baf SHA1 595601a6d7cc95a45fe1fd8b1ae95db095e24e49 SHA256 504079505c4095d0d62a868d82ada6e73c0dfa862982fbd6483082a3d73eb7a6
 MD5 b4ce94ff5a7f1e62a04fbb159583aa33 zope-2.9.0.ebuild 2300
 RMD160 d01ff3057907e7d8fcc5a89d9ac9ec27a9bd7baf zope-2.9.0.ebuild 2300
@@ -75,6 +81,10 @@ EBUILD zope-2.9.3.ebuild 2299 RMD160 b495b688e5fbe961bd8491d71a5fa9d57ad00506 SH
 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-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
@@ -87,10 +97,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 16314 RMD160 e1edd2429bfcb7f413b9c337d01e517da17b01a0 SHA1 25876ef5effab3a2bd9136dabf334ac437c2ac9f SHA256 d58e5c445c6c205d54dc35b6903a8c57b5dbb64c37c96029adea7c0e08f540b5
-MD5 62125849a8b2d09d477c722714f89300 ChangeLog 16314
-RMD160 e1edd2429bfcb7f413b9c337d01e517da17b01a0 ChangeLog 16314
-SHA256 d58e5c445c6c205d54dc35b6903a8c57b5dbb64c37c96029adea7c0e08f540b5 ChangeLog 16314
+MISC ChangeLog 16494 RMD160 f08144415fa2db97efdab14819214908ad6db096 SHA1 c6b5ef7240c17a3404fab49d0e5e80604fa74c85 SHA256 a4270219172c0b142b802cfc6b77011bb392744bc7fc40706d845ec5f9aa9898
+MD5 974e31f2cbbe7a524285fa48e824213d ChangeLog 16494
+RMD160 f08144415fa2db97efdab14819214908ad6db096 ChangeLog 16494
+SHA256 a4270219172c0b142b802cfc6b77011bb392744bc7fc40706d845ec5f9aa9898 ChangeLog 16494
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 metadata.xml 161
@@ -116,6 +126,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 d9ef001efe8d877093bad5047974432d files/digest-zope-2.9.0 226
 RMD160 4650da4f6a2cab3dfa55e3254607fb6aef55081a files/digest-zope-2.9.0 226
 SHA256 a8ed247a3511c5cf1938d06564ae7f1cedd9efc1d6c9523f002935d72e2f3719 files/digest-zope-2.9.0 226
@@ -125,6 +138,9 @@ SHA256 18da5bc6850501f52b36a248347eb4fa63009e5b05d3293e2572126b8277d81a files/di
 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
+MD5 401151a13ea8c4190907eb5a6a66c822 files/digest-zope-2.9.4 244
+RMD160 0a1d3fcda1a75445aaaacf17084819a47cb1c234 files/digest-zope-2.9.4 244
+SHA256 ee912d3adc8cac1128e4e9ef516e696723f5950a1d94af2b840ec325a718f959 files/digest-zope-2.9.4 244
 MD5 8eee3e0c656adbcd9917c6d6d768128d files/digest-zope-3.1.0 226
 RMD160 25b5d0d6098722a3cdad57f93078258d8f5e0df9 files/digest-zope-3.1.0 226
 SHA256 b22e04ad037d3d6a332e9eb07dee874961908946bb07c5941e9f08cb979fb079 files/digest-zope-3.1.0 226
diff --git a/net-zope/zope/files/digest-zope-2.8.8 b/net-zope/zope/files/digest-zope-2.8.8
new file mode 100644
index 000000000000..4537223f60da
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.8.8
@@ -0,0 +1,3 @@
+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/files/digest-zope-2.9.4 b/net-zope/zope/files/digest-zope-2.9.4
new file mode 100644
index 000000000000..f6a90e199ab4
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.9.4
@@ -0,0 +1,3 @@
+MD5 7d7ffe62eabc84d0c438e450e344c29f Zope-2.9.4-final.tgz 6962298
+RMD160 297254e4ad0a27bdc585c88147a6e42698de485e Zope-2.9.4-final.tgz 6962298
+SHA256 4085dee8a6bd252072ca69f1c2d9e00cbff8d999651da93fd9df5a9db65dba35 Zope-2.9.4-final.tgz 6962298
diff --git a/net-zope/zope/zope-2.8.8.ebuild b/net-zope/zope/zope-2.8.8.ebuild
new file mode 100644
index 000000000000..3b8e7c11988e
--- /dev/null
+++ b/net-zope/zope/zope-2.8.8.ebuild
@@ -0,0 +1,109 @@
+# 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 $
+
+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="~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/$(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
+		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
+}
+
+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.9.4.ebuild b/net-zope/zope/zope-2.9.4.ebuild
new file mode 100644
index 000000000000..85f624e57cd0
--- /dev/null
+++ b/net-zope/zope/zope-2.9.4.ebuild
@@ -0,0 +1,79 @@
+# 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 $
+
+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="~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}-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  --prefix="${D}${ZSERVDIR}" --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} || die "Failed to install into ${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
+}