version bump

Package-Manager: portage-2.1.2_pre2-r1

6 files changed, 241 insertions, 5 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index d13cf008b4b1..c40fad5e65c6 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.113 2006/09/03 15:39:30 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.114 2006/10/02 16:27:21 radek Exp $
+
+*zope-3.2.2 (02 Oct 2006)
+*zope-2.9.5 (02 Oct 2006)
+
+  02 Oct 2006; Radoslaw Stachowiak <radek@gentoo.org> +zope-2.9.5.ebuild,
+  +zope-3.2.2.ebuild:
+  version bump
 
   03 Sep 2006; Thomas Cort <tcort@gentoo.org> zope-2.7.9.ebuild,
   zope-2.8.8.ebuild:
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 8e975b0730ea..b8340bebf4f2 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -37,8 +37,10 @@ DIST Zope-2.8.7-final.tgz 5383233 RMD160 55589919eca978786ff2b50e7718299b2af1f8f
 DIST Zope-2.8.8-final.tgz 5394023 RMD160 e1f06d80f9b1943f32316086690b0eb015cf611a SHA1 fc12c4f888d184c12068615827f415e505981814 SHA256 94a6ad1fe0fdc28c0ea5c3a501976b96b16a4110a3290a80e4897bd3f145c856
 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-2.9.5-final.tgz 6982114 RMD160 d8e26839618a19fbb6528967c3d8fc0266251a7d SHA1 066e31068f5265a95d89729076195ae62d14410d SHA256 e4036fa61af22379530b1a42534591d7f19fdbcb3345d20e7a337b3c375a323e
 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.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
@@ -79,6 +81,10 @@ EBUILD zope-2.9.4.ebuild 2427 RMD160 5ed2b9ad76837cd8c91e05e9b45de53527010561 SH
 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-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 +93,14 @@ 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 17743 RMD160 4b7d7a7694931763bd952e17443212ba0947bdbc SHA1 d8953e5f8c2788f8b0d94b4327127bd125cc034e SHA256 6167060f92188507849d7eb8f2bf02816ca598fd007244fa57092cd7ba1ccab7
-MD5 cc40d1f6b2ddec4492bd97f792d12f35 ChangeLog 17743
-RMD160 4b7d7a7694931763bd952e17443212ba0947bdbc ChangeLog 17743
-SHA256 6167060f92188507849d7eb8f2bf02816ca598fd007244fa57092cd7ba1ccab7 ChangeLog 17743
+EBUILD zope-3.2.2.ebuild 3635 RMD160 6f19ae850266446219e3fa6d66887aef49617943 SHA1 d611e8a4857a8825c478467e60f1ffd3fd8086e8 SHA256 9d45db37c8c92ff0d0ae7f83563e2997e96a752379b9b73e4824f583844c5582
+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 metadata.xml 161 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 SHA1 9755179a2dee0511818b1f6738ded28e335e1b9a SHA256 e69ac7205cbc2e42a297e20d8f08922003390a345bbf50ccf00d1158a1c97cc5
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 RMD160 5e136d45f811478292bd2ee1798a9b0229ffe468 metadata.xml 161
@@ -125,9 +135,15 @@ SHA256 d6106937d77ecdb893a6d5fa6b89f0c7d22eac8ae3a7935fead078ea3f82be0c files/di
 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 fe963a99519211d0875bd04da99cf0a6 files/digest-zope-2.9.5 244
+RMD160 58198ef40d58f893eeb813ec280343567bc657f8 files/digest-zope-2.9.5 244
+SHA256 e50cfbddfbf792a79f8e0af7230e4bb24151fbebfcb58a705a1c3c43f942baa9 files/digest-zope-2.9.5 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
 MD5 0e93371dab6290d514a68aaec23e86be files/digest-zope-3.2.1 226
 RMD160 6945dcb788c32c175bae7188acdf787fa09699be files/digest-zope-3.2.1 226
 SHA256 f8d1e13a95418f534ccf2a4a574ca31179e11c5d515b0a19a55906e6b5f43f72 files/digest-zope-3.2.1 226
+MD5 c16a49e5cef0c1e03b78629879917fa9 files/digest-zope-3.2.2 226
+RMD160 b90c01d15ec9e6f81a64c033e8daf75cbdec523f files/digest-zope-3.2.2 226
+SHA256 d43a4c0301d243a6e917cfb56aa8fded484ee3db8767b9919f6a409bb17c3fff files/digest-zope-3.2.2 226
diff --git a/net-zope/zope/files/digest-zope-2.9.5 b/net-zope/zope/files/digest-zope-2.9.5
new file mode 100644
index 000000000000..19a2b06233fb
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.9.5
@@ -0,0 +1,3 @@
+MD5 b648770c9e3735f88b61b56384942ff8 Zope-2.9.5-final.tgz 6982114
+RMD160 d8e26839618a19fbb6528967c3d8fc0266251a7d Zope-2.9.5-final.tgz 6982114
+SHA256 e4036fa61af22379530b1a42534591d7f19fdbcb3345d20e7a337b3c375a323e Zope-2.9.5-final.tgz 6982114
diff --git a/net-zope/zope/files/digest-zope-3.2.2 b/net-zope/zope/files/digest-zope-3.2.2
new file mode 100644
index 000000000000..cfac01d13bac
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-3.2.2
@@ -0,0 +1,3 @@
+MD5 c9413e061ffde6ac8b57e5c9b528815c Zope-3.2.2.tgz 6544087
+RMD160 1e7e08e1178f449bf120d7fc2caa6259fde1a0cf Zope-3.2.2.tgz 6544087
+SHA256 c6f6d49d8b910bc35a32b848c6296b7ad61cb64f83974b52dd3623169f141ba4 Zope-3.2.2.tgz 6544087
diff --git a/net-zope/zope/zope-2.9.5.ebuild b/net-zope/zope/zope-2.9.5.ebuild
new file mode 100644
index 000000000000..82c166574816
--- /dev/null
+++ b/net-zope/zope/zope-2.9.5.ebuild
@@ -0,0 +1,83 @@
+# 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 $
+
+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
+
+	epatch ${FILESDIR}/2.9/${P}_logerror.patch
+	pwd
+	sleep 15
+}
+
+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-3.2.2.ebuild b/net-zope/zope/zope-3.2.2.ebuild
new file mode 100644
index 000000000000..0acb4b2d4943
--- /dev/null
+++ b/net-zope/zope/zope-3.2.2.ebuild
@@ -0,0 +1,124 @@
+# 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-3.2.2.ebuild,v 1.1 2006/10/02 16:27:21 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/Zope3/${PV}/Zope-${PV}.tgz"
+
+LICENSE="ZPL"
+SLOT="${PV}"
+KEYWORDS="~sparc ~x86"
+IUSE=""
+
+RDEPEND="=dev-lang/python-2.4*"
+DEPEND="${RDEPEND}
+	>=app-shells/bash-2.0
+	>=sys-apps/sed-4.0.5"
+
+S=${WORKDIR}/Zope-${PV}
+
+ZUNAME=zope
+ZGNAME=zope
+
+ZS_DIR=${ROOT%/}/usr/$(get_libdir)
+ZSERVDIR=${ZS_DIR}/${P}
+ZSKELDIR=${ZSERVDIR}/zopeskel
+ZINSTDIR=/var/lib/zope/${P}
+
+src_compile() {
+
+	cd ${S}
+
+	./configure --prefix=${D}${ZSERVDIR} --with-python=/usr/bin/python2.4 || die "Failed to configure."
+	emake || die "Failed to compile."
+}
+
+src_install() {
+
+	cd ${S}
+
+	dodoc README.txt
+	dodoc Zope/doc/*.txt
+	for DIR in schema security skins style zcml zsync
+	  do
+	  docinto ${DIR}
+	  dodoc Zope/doc/${DIR}/*
+	done
+
+	make install prefix=${D}${ZSERVDIR}
+
+	dosym ../../share/doc/${PF} ${ZSERVDIR}/doc
+
+	# copy the init script skeleton to zopeskel directory of our installation
+	cp ${FILESDIR}/zope.initd ${D}${ZSKELDIR}/zope.initd
+}
+
+pkg_postinst() {
+	# create the zope user and group for backward compatibility
+	enewgroup ${ZGNAME} 261
+	usermod -g ${ZGNAME} -c "Zope Admin User" -d /var/lib/zope -s /bin/bash ${ZUNAME} 2>&1 >/dev/null || \
+	enewuser ${ZUNAME} 261 /bin/bash /var/lib/zope ${ZGNAME} -c "Zope Admin User"
+
+	einfo "This release can create a default instance using the command: "
+	einfo "    emerge --config =${PF}"
+	einfo "Instance (${P}) will be created in ${ZINSTDIR} as its home."
+	einfo "System uid/gid for instance will be: ${ZUNAME}:${ZGNAME}"
+}
+
+pkg_prerm() {
+
+	find ${ZSERVDIR}/lib/python -name \*.py[co] -exec rm -f {} \;
+}
+
+pkg_postrm() {
+
+	rmdir /usr/$(get_libdir)/${ZSERVDIR} 2>/dev/null
+	ewarn "Instances created for this package are NOT automaticaly deleted!"
+	ewarn "Inspect these locations and manually remove them (if needed):"
+	ewarn "    /etc/init.d/${P}"
+	ewarn "    ${ZINSTDIR}"
+}
+
+pkg_config() {
+
+	if [ -f /etc/init.d/${P} -o -d ${ZINSTDIR} ]
+	then
+		ewarn "Default instance already exists, aborting.."
+		ewarn "Please delete first /etc/init.d/${P} and ${ZINSTDIR}"
+		die "Failed to create default instance."
+	fi
+
+	mkdir -p ${ZINSTDIR}
+	einfo "Instance ${P} creation, calling mkzopeinstance.."
+	${ZSERVDIR}/bin/mkzopeinstance --non-interactive -d ${ZINSTDIR} -u admin:admin
+
+	# bug in zope
+	einfo "Patching ${ZINSTDIR}/etc/zdaemon.conf"
+	sed -i -e 's|daemon on|daemon on\n\n  # socket has to be defined inside of instance\n  socket-name $INSTANCE/var/zdsock|' ${ZINSTDIR}/etc/zdaemon.conf
+
+	# remove unnecessary zope.initd
+	rm -f ${ZINSTDIR}/zope.initd
+
+	# log symlink
+	rm -rf ${ZINSTDIR}/log
+	mkdir -p /var/log/zope/${PN}
+	ln -s /var/log/zope/${PN} ${ZINSTDIR}/log
+
+	# permissions changes
+	chmod go-rwx -R ${ZINSTDIR}
+	chown ${ZUNAME}:${ZGNAME} -R ${ZINSTDIR} /var/log/zope/${PN}
+
+	cp ${ZSKELDIR}/zope.initd /etc/init.d/${P}
+	chmod 755 /etc/init.d/${P}
+	sed -i -e "s|INSTANCE_HOME|${ZINSTDIR}|" /etc/init.d/${P}
+	sed -i -e "s|zopectl|zopectl -u ${ZUNAME}|" /etc/init.d/${P}
+
+	einfo "Default instance created at ${ZINSTDIR}"
+	einfo "Created default zope user 'admin' with password 'admin'."
+	einfo "System uid/gid for instance is: ${ZUNAME}:${ZGNAME}."
+	einfo "To start instance (default ports 8080,8021) use: /etc/init.d/${P} start"
+	einfo "To start instance on every restart use: rc-update -a ${P} default"
+}