version bump

Package-Manager: portage-2.1.2_pre2-r1

6 files changed, 111 insertions, 21 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index c40fad5e65c6..94c072c28689 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,12 @@
 # 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.114 2006/10/02 16:27:21 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.115 2006/10/03 11:53:33 radek Exp $
+
+*zope-2.10.0 (03 Oct 2006)
+
+  03 Oct 2006; Radoslaw Stachowiak <radek@gentoo.org> zope-2.9.4.ebuild,
+  zope-2.9.5.ebuild, +zope-2.10.0.ebuild:
+  version bump
 
 *zope-3.2.2 (02 Oct 2006)
 *zope-2.9.5 (02 Oct 2006)
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index b8340bebf4f2..f106a231ed28 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -27,6 +27,7 @@ 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.10.0-final.tgz 7123131 RMD160 f3dd52d72d512057f722b822f4f6bfd578229d86 SHA1 6b2c537d1fa900e270e5ae042db41628476d7354 SHA256 4a9f8649390942d7faad3a90c128b4f36c3cbcdce5f06a2d13ab367add458f30
 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
@@ -41,6 +42,10 @@ DIST Zope-2.9.5-final.tgz 6982114 RMD160 d8e26839618a19fbb6528967c3d8fc0266251a7
 DIST Zope-3.1.0.tgz 4048336 RMD160 c3af6b6172b56ec53691f8f86f3ee14064003602 SHA256 e102a263f7ceb00744ab503c568482db201557433d9078766846294dd040b445
 DIST Zope-3.2.1.tgz 6532373 RMD160 f7aeb56ab5f09e6780d0df787939af4c7815ceba SHA1 cb45ab704e3a60376e3025e169b782f2c3968074 SHA256 8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341
 DIST Zope-3.2.2.tgz 6544087 RMD160 1e7e08e1178f449bf120d7fc2caa6259fde1a0cf SHA1 9bd3c099fc77f981a8b803770aca168eb813e260 SHA256 c6f6d49d8b910bc35a32b848c6296b7ad61cb64f83974b52dd3623169f141ba4
+EBUILD zope-2.10.0.ebuild 2368 RMD160 b407f43a2794d9809645b96c843100eb05e54f45 SHA1 e04c4b31c642a3b765d2b265a20c1d72f8e37abc SHA256 5573e4deabb4cd76db9c5a667fcf2e949beda46ee313a86851b33c7d9fd6d00a
+MD5 e43b4b7bdddf4accd95f35d1a3f2ac81 zope-2.10.0.ebuild 2368
+RMD160 b407f43a2794d9809645b96c843100eb05e54f45 zope-2.10.0.ebuild 2368
+SHA256 5573e4deabb4cd76db9c5a667fcf2e949beda46ee313a86851b33c7d9fd6d00a zope-2.10.0.ebuild 2368
 EBUILD zope-2.6.4-r1.ebuild 5614 RMD160 15e40be7fe484775cc6cef71e5e0f180508b39a1 SHA1 3030357b2470817b82b12b05fbaa1a5c0aac1edf SHA256 4bb98e1170826dd3f12e095aa0d1eb8d480aad577a481c38f69c8e4bec1b0ee1
 MD5 53952dbbbddf6f222578897b1286953f zope-2.6.4-r1.ebuild 5614
 RMD160 15e40be7fe484775cc6cef71e5e0f180508b39a1 zope-2.6.4-r1.ebuild 5614
@@ -77,14 +82,14 @@ 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 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-2.9.5.ebuild 2427 RMD160 dc80eab49adca84a2c176fbd0a3396bf5e22c9cd SHA1 4ef3688fe5225d23b1a59e4232658bc3282bcfe0 SHA256 edd789fa220a274e508f553b817881d903415a867ffa7249d68e5293e0ef787b
-MD5 d38246076f2c1b835d4740b205456a62 zope-2.9.5.ebuild 2427
-RMD160 dc80eab49adca84a2c176fbd0a3396bf5e22c9cd zope-2.9.5.ebuild 2427
-SHA256 edd789fa220a274e508f553b817881d903415a867ffa7249d68e5293e0ef787b zope-2.9.5.ebuild 2427
+EBUILD zope-2.9.4.ebuild 2412 RMD160 f7aa9faa5c15c0437c9d835903aea713c185d37c SHA1 64bf2c3d41a8b62be9b3d91e3de0c05ddd1bd327 SHA256 8c8ed6512cd53a0d84137778471001508f269bc666102727e4f9ee8f1c16fc77
+MD5 eb073a4946e4ef257f48a38d1aad25a8 zope-2.9.4.ebuild 2412
+RMD160 f7aa9faa5c15c0437c9d835903aea713c185d37c zope-2.9.4.ebuild 2412
+SHA256 8c8ed6512cd53a0d84137778471001508f269bc666102727e4f9ee8f1c16fc77 zope-2.9.4.ebuild 2412
+EBUILD zope-2.9.5.ebuild 2367 RMD160 b1f39489673e4f626fe0f3aab5f761688294ab10 SHA1 ea3589aa9506abb2a632bee87a3148c6605f0be0 SHA256 fd6d6b80d5d0b1b68567344e876963b7998b197e2b570f9773e02c82288b9acc
+MD5 a42199c58fdbbc36222944166c19d5fc zope-2.9.5.ebuild 2367
+RMD160 b1f39489673e4f626fe0f3aab5f761688294ab10 zope-2.9.5.ebuild 2367
+SHA256 fd6d6b80d5d0b1b68567344e876963b7998b197e2b570f9773e02c82288b9acc zope-2.9.5.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
@@ -97,14 +102,17 @@ EBUILD zope-3.2.2.ebuild 3635 RMD160 6f19ae850266446219e3fa6d66887aef49617943 SH
 MD5 6fe2c33a34e36d2615ed740b6a339c8f zope-3.2.2.ebuild 3635
 RMD160 6f19ae850266446219e3fa6d66887aef49617943 zope-3.2.2.ebuild 3635
 SHA256 9d45db37c8c92ff0d0ae7f83563e2997e96a752379b9b73e4824f583844c5582 zope-3.2.2.ebuild 3635
-MISC ChangeLog 17908 RMD160 aab008c4ae3616a4fc4e06effb2df301e1cfc8ff SHA1 4353e189647a23fda9928d63364784d6552f6fc2 SHA256 7f06fbdc574b73778313c4eddac78508846f10a1f07ed921d7cd8633b8d652dc
-MD5 89100ea10a700f511bed38b5d7929fc5 ChangeLog 17908
-RMD160 aab008c4ae3616a4fc4e06effb2df301e1cfc8ff ChangeLog 17908
-SHA256 7f06fbdc574b73778313c4eddac78508846f10a1f07ed921d7cd8633b8d652dc ChangeLog 17908
+MISC ChangeLog 18067 RMD160 9f4fbb409a3d38d53c78be1b9e5e9fa29bff1ef0 SHA1 63e343e19cb82ebbfd654b9a5baf44413ae1c9d9 SHA256 da46535bad71fb4e5e04a00164792acb7e91dc1b8314d53e18009d357bad784a
+MD5 f91b71236b2d703f99478571b5ca9cc4 ChangeLog 18067
+RMD160 9f4fbb409a3d38d53c78be1b9e5e9fa29bff1ef0 ChangeLog 18067
+SHA256 da46535bad71fb4e5e04a00164792acb7e91dc1b8314d53e18009d357bad784a ChangeLog 18067
 MISC metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 metadata.xml 161
 SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5 metadata.xml 161
+MD5 0e3fa5e2ebd23d4b6c5a34162b7154a6 files/digest-zope-2.10.0 247
+RMD160 c9731fcfddd7697944fe78b3af38c434a4729028 files/digest-zope-2.10.0 247
+SHA256 76586b2ba483e4d00d4c4ce592b77b8e5c7a43fb8e953e0cd758e7e3db13a766 files/digest-zope-2.10.0 247
 MD5 123a2246c454fdd66488a9f3c8c20918 files/digest-zope-2.6.4-r1 238
 RMD160 880d3eb05f1955cf58a9827e2295b4fd574fcf70 files/digest-zope-2.6.4-r1 238
 SHA256 b2afc924aa7b7cc4d4d8954f97f4d22d5c73e462add4d0106e6f81d9c658f2d6 files/digest-zope-2.6.4-r1 238
diff --git a/net-zope/zope/files/digest-zope-2.10.0 b/net-zope/zope/files/digest-zope-2.10.0
new file mode 100644
index 000000000000..da2811332345
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.10.0
@@ -0,0 +1,3 @@
+MD5 4ff264d6a002e51a7853a096e72aa6d1 Zope-2.10.0-final.tgz 7123131
+RMD160 f3dd52d72d512057f722b822f4f6bfd578229d86 Zope-2.10.0-final.tgz 7123131
+SHA256 4a9f8649390942d7faad3a90c128b4f36c3cbcdce5f06a2d13ab367add458f30 Zope-2.10.0-final.tgz 7123131
diff --git a/net-zope/zope/zope-2.10.0.ebuild b/net-zope/zope/zope-2.10.0.ebuild
new file mode 100644
index 000000000000..6cbe102402b7
--- /dev/null
+++ b/net-zope/zope/zope-2.10.0.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.10.0.ebuild,v 1.1 2006/10/03 11:53:33 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
+}
diff --git a/net-zope/zope/zope-2.9.4.ebuild b/net-zope/zope/zope-2.9.4.ebuild
index e0eaaf0e7abe..9759e7466535 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.2 2006/08/27 16:59:37 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.4.ebuild,v 1.3 2006/10/03 11:53:33 radek Exp $
 
 inherit eutils multilib
 
@@ -61,8 +61,6 @@ src_install() {
 	cp ${FILESDIR}/zope.initd ${D}/${ZSERVDIR}/skel/zope.initd
 
 	epatch ${FILESDIR}/2.9/${P}_logerror.patch
-	pwd
-	sleep 15
 }
 
 pkg_postinst() {
diff --git a/net-zope/zope/zope-2.9.5.ebuild b/net-zope/zope/zope-2.9.5.ebuild
index 82c166574816..0fbb6a8c09ad 100644
--- a/net-zope/zope/zope-2.9.5.ebuild
+++ b/net-zope/zope/zope-2.9.5.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.5.ebuild,v 1.1 2006/10/02 16:27:21 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.9.5.ebuild,v 1.2 2006/10/03 11:53:33 radek Exp $
 
 inherit eutils multilib
 
@@ -59,10 +59,6 @@ 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() {