version bump zope-2.8.0, stable x86 2.7.6, removed orphaned ebuilds.

(Portage version: 2.0.51.22-r1)

9 files changed, 28 insertions, 174 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index dab3869e1cad..5a91b52cffb9 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-zope/zope
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.68 2005/05/21 09:33:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.69 2005/06/11 11:56:33 radek Exp $
+
+*zope-2.8.0 (11 Jun 2005)
+
+  11 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -files/2.7.3/zope.initd, -zope-2.7.3.ebuild, -zope-2.7.4.ebuild,
+  zope-2.7.6.ebuild, +zope-2.8.0.ebuild:
+  added zope-2.8.0 (downgraded all arches to ~)
+  removed obsolete 2.7.3 and 2.7.4 ebuilds
+  marked stable 2.7.6 on x86
 
   21 May 2005; Simon Stelling <blubb@gentoo.org> zope-2.7.5.ebuild:
   stable on amd64
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 45eb8a8cb51b..68a671d5ba8e 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,23 +1,25 @@
+MD5 071e0cbd0de1fce59351895a4fc924cd zope-2.7.3.ebuild 3164
+MD5 9f02f7cbb4ac538907cd3ed04b2ce4e0 zope-2.7.5.ebuild 3338
+MD5 f27b4a8235ae5a33c8755ea5e64836c5 zope-2.6.4-r1.ebuild 5622
+MD5 f44c78cff966aa3c8fa06cb899f32dea zope-2.8.0.ebuild 3375
+MD5 3915c7c6ff5f6e5bcd756986202669be zope-2.7.4.ebuild 3320
 MD5 d1553334f192c74f7be39db750d2616b ChangeLog 11472
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 f27b4a8235ae5a33c8755ea5e64836c5 zope-2.6.4-r1.ebuild 5622
 MD5 7544418bbba93dac18d03f9512d1cb68 zope-2.7.2-r2.ebuild 3218
-MD5 071e0cbd0de1fce59351895a4fc924cd zope-2.7.3.ebuild 3164
-MD5 3915c7c6ff5f6e5bcd756986202669be zope-2.7.4.ebuild 3320
-MD5 9f02f7cbb4ac538907cd3ed04b2ce4e0 zope-2.7.5.ebuild 3338
 MD5 3b5befd0c3d116de0ee27823b26a14b0 zope-2.7.6.ebuild 3341
 MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
 MD5 c8b31c146de4f24ffcb5442630034d50 files/digest-zope-2.7.2-r2 62
 MD5 5bed447c71046c9266eb31ec4781b314 files/digest-zope-2.7.3 62
 MD5 6d06eaf6855a28d450c36882ed56e703 files/digest-zope-2.7.4 62
 MD5 515774f7b0464e0ce8c3283141c676c7 files/digest-zope-2.7.5 66
+MD5 8bf817c4c3e6ad2b06e92a95c6ffd7e0 files/digest-zope-2.7.6 66
+MD5 17edb3696d5d99b37864d9bb7cc23d21 files/digest-zope-2.8.0 69
 MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
 MD5 28b31acf9b00b4388850af2acd90b2e3 files/zope.initd 1232
-MD5 8bf817c4c3e6ad2b06e92a95c6ffd7e0 files/digest-zope-2.7.6 66
 MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.6.4/zope.confd 950
 MD5 4d278d26bb7be7693f7213861a9d3805 files/2.6.4/zope.initd 3791
-MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.2/gid.patch 460
 MD5 e99b9fc903db808c1bbb5aa8b9d0b44f files/2.7.2/zope.initd 1169
+MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.2/gid.patch 460
 MD5 998ccd16d3ca461a8d30d2f9a7d46d24 files/2.7.3/zope.initd 1240
 MD5 c97d6dc27b456ae0fbfdf8ee5627ac1b files/2.7.4/i18n-1.0.0.patch 7630
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.6/i18n-1.0.0.patch 7634
diff --git a/net-zope/zope/files/2.7.3/zope.initd b/net-zope/zope/files/2.7.3/zope.initd
deleted file mode 100644
index d825eaac98f1..000000000000
--- a/net-zope/zope/files/2.7.3/zope.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.7.3/zope.initd,v 1.2 2004/10/25 14:36:24 batlogg Exp $
-
-opts="start stop reload kill quit status help"
-
-depend() {
-        need net
-}
-
-start() {
-        ebegin "Starting Zope in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl start
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Zope in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl stop
-        eend $?
-}
-
-reload() {
-        # note: reload calls zope restart, runscript restart stops and starts
-        ebegin "Restarting Zope in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl restart
-        eend $?
-}
-
-kill() {
-        ebegin "Killing Zope in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl kill
-        eend $?
-}
-
-quit() {
-        ebegin "Quitting Zope Daemon Manager INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl quit
-        eend $?
-}
-
-status() {
-        ebegin "Status of Zope in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl status
-        eend $?
-}
-
-help() {
-        ebegin "Help for Zope Daemon Manager in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl help
-        eend $?
-}
-
diff --git a/net-zope/zope/files/digest-zope-2.7.3 b/net-zope/zope/files/digest-zope-2.7.3
deleted file mode 100644
index 8cba22bbfe34..000000000000
--- a/net-zope/zope/files/digest-zope-2.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15001ab6d429dc80b1f49735e8d2ee10 Zope-2.7.3-0.tgz 2778293
diff --git a/net-zope/zope/files/digest-zope-2.7.4 b/net-zope/zope/files/digest-zope-2.7.4
deleted file mode 100644
index d4e8e1d058b4..000000000000
--- a/net-zope/zope/files/digest-zope-2.7.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97c310f1de4609956c176588b08b25c5 Zope-2.7.4-0.tgz 2932971
diff --git a/net-zope/zope/files/digest-zope-2.8.0 b/net-zope/zope/files/digest-zope-2.8.0
new file mode 100644
index 000000000000..db33e7a87113
--- /dev/null
+++ b/net-zope/zope/files/digest-zope-2.8.0
@@ -0,0 +1 @@
+MD5 f734fa4c55f36b5038f36be9a6d4e61e Zope-2.8.0-final.tar.gz 5315876
diff --git a/net-zope/zope/zope-2.7.3.ebuild b/net-zope/zope/zope-2.7.3.ebuild
deleted file mode 100644
index cacae9b2fbbf..000000000000
--- a/net-zope/zope/zope-2.7.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.3.ebuild,v 1.5 2005/01/14 21:16:20 radek 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}
-}
-
-src_compile() {
-	./configure --ignore-largefile --prefix=. || 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 ../../share/doc/${PF} ${ZSERVDIR}/doc
-	# copy the init script skeleton to skel directory of our installation
-	skel=${D}${ZSERVDIR}/skel
-	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
-}
-
diff --git a/net-zope/zope/zope-2.7.6.ebuild b/net-zope/zope/zope-2.7.6.ebuild
index bf1601a6691d..ebe03895c50b 100644
--- a/net-zope/zope/zope-2.7.6.ebuild
+++ b/net-zope/zope/zope-2.7.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.6.ebuild,v 1.1 2005/05/08 20:03:47 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.6.ebuild,v 1.2 2005/06/11 11:56:33 radek Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~alpha ~amd64"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
diff --git a/net-zope/zope/zope-2.7.4.ebuild b/net-zope/zope/zope-2.8.0.ebuild
index baa73c94c10e..59f24b225936 100644
--- a/net-zope/zope/zope-2.7.4.ebuild
+++ b/net-zope/zope/zope-2.8.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.4.ebuild,v 1.4 2005/02/25 01:10:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.0.ebuild,v 1.1 2005/06/11 11:56:33 radek 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"
+SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tar.gz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="x86 sparc ~ppc ~alpha ~amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
@@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
 virtual/libc
 >=sys-apps/sed-4.0.5"
 
-S="${WORKDIR}/Zope-${PV}-0"
+S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
@@ -52,6 +52,7 @@ 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.
@@ -72,7 +73,8 @@ src_install() {
 	 	einfo "import sys"
 		einfo "sys.setdefaultencoding('utf8')"
 		cd ${S}/lib/python/StructuredText/
-		epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
+		epatch ${FILESDIR}/2.7.6/i18n-1.0.0.patch
+		sleep 15
 		cd ${S}
 	fi