removed instance creation stuff

5 files changed, 127 insertions, 5 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index a04dd838ef9f..96cfa0f57ada 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,15 @@
 # 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.42 2004/09/18 07:14:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.43 2004/09/18 16:06:41 batlogg Exp $
+
+*zope-2.7.2-r2 (18 Sep 2004)
+
+  18 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; files/2.7.2/zope.initd,
+  +zope-2.7.2-r2.ebuild:
+  removed instance creation stuff, this port now only installs the base, zope
+  user and group are only created for backward compatiblity. CAUTION: you need
+  to emerge zope-config manually if you want the ncurses interfaces. thanks to
+  Bernd Dorn.
 
   18 Sep 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.7.2-r1.ebuild:
   fix double slashes, bug #63915
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 55ff368a3db8..b4165e311462 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -4,8 +4,10 @@ MD5 95db19264fc46abc1bf3fd25469fcc56 zope-2.6.4-r1.ebuild 5359
 MD5 a7b4f0510d44c03e310bf769fee46b18 zope-2.7.2.ebuild 4745
 MD5 19654df17b0444a69f61f02b1109c981 ChangeLog 7834
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 f81417a0fbbd9c0ca4df04691c9f7641 zope-2.7.2-r2.ebuild 3326
 MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
 MD5 c8b31c146de4f24ffcb5442630034d50 files/digest-zope-2.7.2-r1 62
+MD5 c8b31c146de4f24ffcb5442630034d50 files/digest-zope-2.7.2-r2 62
 MD5 ae93e53addb8b829a0c097a3b3d9ddf4 files/digest-zope-2.7.1 60
 MD5 c8b31c146de4f24ffcb5442630034d50 files/digest-zope-2.7.2 62
 MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
@@ -14,5 +16,5 @@ MD5 4d278d26bb7be7693f7213861a9d3805 files/2.6.4/zope.initd 3791
 MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.7.1/zope.confd 950
 MD5 8eed6ba044039a495f48e42555ee0893 files/2.7.1/zope.initd 1030
 MD5 68ed65ed913618858b8c3e298fbdf5a7 files/2.7.1/zdctl.patch 570
-MD5 8b5cd1aaf23873fda5386cae2f850b4b files/2.7.2/zope.initd 1306
+MD5 1522b1e33f80a5d46a491f7dd1023fbe files/2.7.2/zope.initd 1327
 MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.2/gid.patch 460
diff --git a/net-zope/zope/files/2.7.2/zope.initd b/net-zope/zope/files/2.7.2/zope.initd
index d1526095c5fe..a94e11272775 100644
--- a/net-zope/zope/files/2.7.2/zope.initd
+++ b/net-zope/zope/files/2.7.2/zope.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.7.2/zope.initd,v 1.2 2004/07/24 23:45:46 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.7.2/zope.initd,v 1.3 2004/09/18 16:06:42 batlogg Exp $
 
-opts="start stop restart kill quit reload status help"
+opts="start stop restart kill quit status help"
 
 depend() {
         need net
@@ -23,7 +23,8 @@ stop() {
 
 restart() {
         ebegin "Restarting Zope in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl restart
+        svc_stop
+	    svc_start
         eend $?
 }
 
@@ -40,6 +41,7 @@ quit() {
 }
 
 reload() {
+         # throws an error, dunno why
         ebegin "Reloading Zope config in INSTANCE_HOME"
         INSTANCE_HOME/bin/zopectl reload
         eend $?
diff --git a/net-zope/zope/files/digest-zope-2.7.2-r2 b/net-zope/zope/files/digest-zope-2.7.2-r2
new file mode 100644
index 000000000000..c184e1a936a7
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.7.2-r2
@@ -0,0 +1 @@
+MD5 08b3c4a119aa1ded2e7b1b3d5bc45425 Zope-2.7.2-0.tgz 2754459
diff --git a/net-zope/zope/zope-2.7.2-r2.ebuild b/net-zope/zope/zope-2.7.2-r2.ebuild
new file mode 100644
index 000000000000..18f08379e00e
--- /dev/null
+++ b/net-zope/zope/zope-2.7.2-r2.ebuild
@@ -0,0 +1,108 @@
+# 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.2-r2.ebuild,v 1.1 2004/09/18 16:06:42 batlogg Exp $
+
+inherit eutils
+
+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}-0.tgz"
+LICENSE="ZPL"
+SLOT="${PV}"
+
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+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}-0"
+ZUID=zope
+ZGID=zope
+ZS_DIR=${ROOT%/}/usr/lib
+ZSERVDIR=${ZS_DIR}${PN}-${PV}
+
+# 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}
+	use amd64 \
+		&& epatch ${FILESDIR}/2.7.2/gid.patch
+}
+
+src_compile() {
+	#[cs] TODO: ZOPE_DIR should be something else....
+	./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 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}/i18n-1.0.0.patch
+		cd ${S}
+	fi
+
+	make install PREFIX=${D}${ZSERVDIR}
+	rm -rf ${D}${ZSERVDIR}/doc
+	dosym ${DOCDESTTREE} ${D}${ZSERVDIR}/doc
+	# copy the init script skeleton to skel directory of our installation
+	skel=${D}${ZSERVDIR}/skel
+	dodir /etc/init.d
+	cp ${FILESDIR}/${PV}/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 /bin/false /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
+}
+