version bump, adding changes from Ã#41508

3 files changed, 162 insertions, 10 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index fd408f195631..0d77c6b50178 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.29 2004/07/01 22:51:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.30 2004/07/13 23:51:28 batlogg Exp $
+
+*zope-2.7.1 (14 Jul 2004)
+
+  14 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.1.ebuild,
+  files/2.7.1/zdctl.patch, files/2.7.1/zope.confd, files/2.7.1/zope.initd:
+  finally zope-2.7.1 made it's way to portage, adding user commited eduilds and
+  patches from #41508
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> zope-2.4.0-r6.ebuild,
   zope-2.5.1.ebuild, zope-2.6.4-r1.ebuild, zope-2.6.4.ebuild:
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 3878531bdb7d..d4c068acab3f 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,20 +1,34 @@
-MD5 e1d56f23c91cba818444f888ff220487 ChangeLog 6080
-MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 1c1d7b9c3fd286044b9b4b5307043ef1 zope-2.7.1.ebuild 3870
 MD5 affb8467ebc9c846010e0c264b59924a zope-2.4.0-r6.ebuild 2624
+MD5 a4bcaec52e9f57460494a9802415db7a zope-2.7.0.ebuild 3556
 MD5 aaeec845feaa52c83cb63dd3b0361396 zope-2.5.1.ebuild 2588
-MD5 be6a8e6039d691815856dd0315687020 zope-2.6.4-r1.ebuild 5342
 MD5 07ba7527e0750ed6cdad4506af681643 zope-2.6.4.ebuild 4375
-MD5 c8f695d11a964dd2410a3b200a71cf2f files/custom_zodb.py 219
+MD5 be6a8e6039d691815856dd0315687020 zope-2.6.4-r1.ebuild 5342
+MD5 689106123b5a871c8f33aa7ee36c74b0 zope-2.7.0.tbz2 14827
+MD5 e1d56f23c91cba818444f888ff220487 ChangeLog 6080
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 e13da78ee330353cc967bea9589d1043 files/zope 5577
+MD5 111f2aacb074731c923a5eb93a53f6af files/zctl.py 9455
+MD5 ddde0a17fff53b39fee88852f3a5e2d7 files/zope.rc6 5559
 MD5 24d816c631ba0677864f4f72264bb8de files/digest-zope-2.4.0-r6 121
+MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
 MD5 45724a3c339e9be0f9c0dec39b477c38 files/digest-zope-2.5.1 119
 MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4 64
-MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
+MD5 ae93e53addb8b829a0c097a3b3d9ddf4 files/digest-zope-2.7.1 60
+MD5 c8f695d11a964dd2410a3b200a71cf2f files/custom_zodb.py 219
 MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
-MD5 111f2aacb074731c923a5eb93a53f6af files/zctl.py 9455
-MD5 e13da78ee330353cc967bea9589d1043 files/zope 5577
 MD5 841ff9ee1831723a25c4ea88e5708c55 files/zope.conf 850
-MD5 ddde0a17fff53b39fee88852f3a5e2d7 files/zope.rc6 5559
-MD5 e2bc676da913a7fe562407b9c7f622f0 files/2.6.1/zope.envd 922
+MD5 e13da78ee330353cc967bea9589d1043 zope/files/zope 5577
+MD5 111f2aacb074731c923a5eb93a53f6af zope/files/zctl.py 9455
+MD5 ddde0a17fff53b39fee88852f3a5e2d7 zope/files/zope.rc6 5559
+MD5 6a23c240b02184bbfaf2909d4c64884c zope/files/digest-zope-2.7.0 60
+MD5 c8f695d11a964dd2410a3b200a71cf2f zope/files/custom_zodb.py 219
+MD5 037cf91a5b4d60efe166f90210c837ed zope/files/i18n-1.0.0.patch 8080
+MD5 841ff9ee1831723a25c4ea88e5708c55 zope/files/zope.conf 850
 MD5 bec6833b76ee5b5c224b9e9c420dc400 files/2.6.1/zope.initd 3623
+MD5 e2bc676da913a7fe562407b9c7f622f0 files/2.6.1/zope.envd 922
 MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.6.4/zope.confd 950
 MD5 f226fb5fc238b351ff76552205fd799f files/2.6.4/zope.initd 3786
+MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.7.0/zope.confd 950
+MD5 94892bd4d6056351c7239858ff45df55 files/2.7.0/zope.initd 1030
+MD5 68ed65ed913618858b8c3e298fbdf5a7 files/2.7.0/zdctl.patch 570
diff --git a/net-zope/zope/zope-2.7.1.ebuild b/net-zope/zope/zope-2.7.1.ebuild
new file mode 100644
index 000000000000..e6239b49de05
--- /dev/null
+++ b/net-zope/zope/zope-2.7.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.1.ebuild,v 1.1 2004/07/13 23:51:28 batlogg Exp $
+
+inherit eutils
+
+SFPV="$(echo ${PV} | sed -e 's/_beta/-b/')"
+SDPV="$(echo ${PV} | sed -e 's/_beta/b/')"
+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/${SDPV}/Zope-${SFPV}.tgz"
+LICENSE="ZPL"
+SLOT="${PV}"
+
+KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+IUSE="unicode"
+
+RDEPEND="=dev-lang/python-2.3.3"
+python='python2.3'
+
+DEPEND="${RDEPEND}
+virtual/glibc
+>=sys-apps/sed-4.0.5
+>=app-admin/zope-config-0.3"
+
+S="${WORKDIR}/Zope-${SFPV}-0"
+
+ZUID=zope
+ZGID=zope
+ZS_DIR=${ROOT}/usr/share/zope/
+ZI_DIR=${ROOT}/var/lib/zope/
+ZSERVDIR=${ZS_DIR}${PF}/
+RCNAME=zope.initd
+
+# 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's should not have any access to ${ZSERVDIR},
+#   because they can work through the Zope web interface.
+#   This should protect our code/data better.
+
+# Parameters:
+#  $1 = instance directory
+#  $2 = group
+
+setup_security() {
+	# The old version made everything owned by zope:${DEFAULT_INSTANCE_GID},
+	# and group-writable. This is like making everything in net-www/apache2 
+	# owned by apache! The zope instance runs as the zope user, so the zope
+	# user should not own any files. However, we make everything group-owned
+	# by the zope group, of which the zope user is a member, so that running
+	# zope instances will be able to read everything.
+	# -- Andy Dustman
+	chown -R root:${2} ${1}
+	chmod -R g+r,g-w,o-rwx ${1}
+}
+
+install_help() {
+	einfo "Run zope-config to set up an instance before trying to start zope."
+}
+
+pkg_setup() {
+	enewgroup ${ZGID} 261
+	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} zope
+}
+
+src_compile() {
+	./configure --ignore-largefile --prefix=${ZOPE_DIR} || 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 sitecusomize.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}/i18n-1.0.0.patch
+	    cd ${S}
+	fi
+
+	make install PREFIX=${D}/${ZSERVDIR}
+	rm -rf ${D}${ZSERVDIR}/doc
+	dosym ${DOCDESTTREE} ${D}${ZSERVDIR}/doc
+
+	skel=${D}${ZSERVDIR}/skel
+	dodir /etc/init.d
+	cp ${FILESDIR}/${PV}/zope.initd ${skel}/zope.initd
+
+	setup_security ${D}${ZSERVDIR} ${ZGID}
+}
+
+pkg_postinst() {
+	# Here we add our default zope instance.
+	# I strongly believe a default instance should not be installed.
+	# -- Andy Dustman
+	#/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} \
+	#	--zgid=${ZGID}
+	install_help
+}
+
+pkg_postrm() {
+	# rcscripts and conf.d files will remain. i.e. /etc protection.
+
+	# Delete .default if this ebuild is the default. zprod-manager will
+	# have to handle a missing default;
+	rm -f ${ZI_DIR}/.default
+}
+
+pkg_config() {
+	install_help
+}