cleanup, cosmetic fixes

Package-Manager: portage-2.0.51.22-r2

7 files changed, 9 insertions, 187 deletions

diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 0787f860da81..318f0cb43457 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,10 @@
 # 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.73 2005/08/25 16:56:19 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.74 2005/08/26 18:24:51 batlogg Exp $
+
+  26 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>; -files/2.7.2/gid.patch,
+  -files/2.7.2/zope.initd, -zope-2.7.2-r2.ebuild, zope-2.8.1.ebuild:
+  cleanup, cosmetic fixes
 
   25 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>;
   +files/2.8.1/i18n-1.0.0.patch:
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index d535a0ab05dc..d14080318efd 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,14 +1,12 @@
-MD5 b9d9c73d482254263d5eb1f08e49ab96 zope-2.8.1.ebuild 3359
+MD5 687af36b6fb26280250751c3ac1aa045 zope-2.8.1.ebuild 3359
 MD5 42625ed029875b4d13c9af34f02aa7ed zope-2.7.5.ebuild 3334
 MD5 5416407eff85546578bb4e7c61f45d5e zope-2.6.4-r1.ebuild 5629
 MD5 7b10f9f85f1772dea3cac8f774d8d6ea zope-2.7.7.ebuild 3334
 MD5 03dd7525a3392e245889fba308edc438 zope-2.8.0.ebuild 3362
-MD5 27d02b005a1cc753c0fc146ec24e7e9e ChangeLog 12307
+MD5 6c76ec5b2a33c9fc99f4f23ff9470889 ChangeLog 12478
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 0a5e41adc4e26168061146ca2697ebf0 zope-2.7.2-r2.ebuild 3214
 MD5 e3ebbd463da7c5b7f7cacd4d79323c46 zope-2.7.6.ebuild 3335
 MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
-MD5 c8b31c146de4f24ffcb5442630034d50 files/digest-zope-2.7.2-r2 62
 MD5 515774f7b0464e0ce8c3283141c676c7 files/digest-zope-2.7.5 66
 MD5 8bf817c4c3e6ad2b06e92a95c6ffd7e0 files/digest-zope-2.7.6 66
 MD5 5d8e83203542dfc8d07354dcdd682134 files/digest-zope-2.7.7 66
@@ -18,8 +16,6 @@ MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
 MD5 28b31acf9b00b4388850af2acd90b2e3 files/zope.initd 1232
 MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.6.4/zope.confd 950
 MD5 4d278d26bb7be7693f7213861a9d3805 files/2.6.4/zope.initd 3791
-MD5 e99b9fc903db808c1bbb5aa8b9d0b44f files/2.7.2/zope.initd 1169
-MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.2/gid.patch 460
 MD5 c97d6dc27b456ae0fbfdf8ee5627ac1b files/2.7.4/i18n-1.0.0.patch 7630
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.6/i18n-1.0.0.patch 7634
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.7/i18n-1.0.0.patch 7634
diff --git a/net-zope/zope/files/2.7.2/gid.patch b/net-zope/zope/files/2.7.2/gid.patch
deleted file mode 100644
index bdfe2b81aa30..000000000000
--- a/net-zope/zope/files/2.7.2/gid.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/Components/initgroups/initgroups.c
-+++ lib/Components/initgroups/initgroups.c
-@@ -23,11 +23,14 @@
- initgroups_initgroups(PyObject *self, PyObject *args)
- {
- 	char *username;
-+	int igid;
- 	gid_t gid;
- 
--	if (!PyArg_ParseTuple(args, "sl:initgroups", &username, &gid))
-+	if (!PyArg_ParseTuple(args, "si:initgroups", &username, &igid))
- 		return NULL;
- 
-+	gid = igid;
-+
- 	if (initgroups(username, gid) == -1)
- 		return PyErr_SetFromErrno(PyExc_OSError);
- 
diff --git a/net-zope/zope/files/2.7.2/zope.initd b/net-zope/zope/files/2.7.2/zope.initd
deleted file mode 100644
index f7bde1bcb606..000000000000
--- a/net-zope/zope/files/2.7.2/zope.initd
+++ /dev/null
@@ -1,53 +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.2/zope.initd,v 1.5 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 $?
-}
-
-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 $?
-}
-
-reload() {
-        ebegin "Restarting Zope config in INSTANCE_HOME"
-        INSTANCE_HOME/bin/zopectl restart
-        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.2-r2 b/net-zope/zope/files/digest-zope-2.7.2-r2
deleted file mode 100644
index c184e1a936a7..000000000000
--- a/net-zope/zope/files/digest-zope-2.7.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index af6ed60c6dd1..000000000000
--- a/net-zope/zope/zope-2.7.2-r2.ebuild
+++ /dev/null
@@ -1,106 +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.2-r2.ebuild,v 1.9 2005/07/09 16:06:46 swegener 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}/${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}
-	use amd64 \
-		&& epatch ${FILESDIR}/2.7.2/gid.patch
-}
-
-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.8.1.ebuild b/net-zope/zope/zope-2.8.1.ebuild
index 4acf80802503..9270a166df10 100644
--- a/net-zope/zope/zope-2.8.1.ebuild
+++ b/net-zope/zope/zope-2.8.1.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.8.1.ebuild,v 1.1 2005/08/23 19:48:57 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.1.ebuild,v 1.2 2005/08/26 18:24:51 batlogg Exp $
 
 inherit eutils
 
@@ -73,7 +73,7 @@ src_install() {
 	 	einfo "import sys"
 		einfo "sys.setdefaultencoding('utf8')"
 		cd ${S}/lib/python/StructuredText/
-		epatch ${FILESDIR}/2.7.6/i18n-1.0.0.patch
+		epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
 		sleep 15
 		cd ${S}
 	fi