summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Wendel <lanius@gentoo.org>2004-09-18 07:14:11 +0000
committerHeinrich Wendel <lanius@gentoo.org>2004-09-18 07:14:11 +0000
commitf9299e8dfaea357c61db7167f9299a98b64e71bc (patch)
tree3b015e8c3bce8a0b43a38ed3ef3ac8e3c9eb3050 /net-zope/zope
parentfix path to DVB headers for compile error (diff)
downloadhistorical-f9299e8dfaea357c61db7167f9299a98b64e71bc.tar.gz
historical-f9299e8dfaea357c61db7167f9299a98b64e71bc.tar.bz2
historical-f9299e8dfaea357c61db7167f9299a98b64e71bc.zip
fix double slashes, bug #63915
Diffstat (limited to 'net-zope/zope')
-rw-r--r--net-zope/zope/ChangeLog5
-rw-r--r--net-zope/zope/Manifest4
-rw-r--r--net-zope/zope/zope-2.7.2-r1.ebuild24
3 files changed, 18 insertions, 15 deletions
diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index f2342be1f7c5..a04dd838ef9f 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,6 +1,9 @@
# 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.41 2004/09/11 21:07:44 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.42 2004/09/18 07:14:11 lanius Exp $
+
+ 18 Sep 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.7.2-r1.ebuild:
+ fix double slashes, bug #63915
11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.7.2-r1.ebuild:
fix permissions, bug #59217
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 3daedfb35caa..55ff368a3db8 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,8 +1,8 @@
MD5 05451aa19ac4681fd16a5a480f1c7ea5 zope-2.7.1.ebuild 3860
-MD5 4dd02f63dedbebc44dbe6da8b0e684cb zope-2.7.2-r1.ebuild 5033
+MD5 63ef64592d4abf31e444d6cce4228ada zope-2.7.2-r1.ebuild 5042
MD5 95db19264fc46abc1bf3fd25469fcc56 zope-2.6.4-r1.ebuild 5359
MD5 a7b4f0510d44c03e310bf769fee46b18 zope-2.7.2.ebuild 4745
-MD5 5db38c503d4c88c6ea7f41fb79a4afbe ChangeLog 7728
+MD5 19654df17b0444a69f61f02b1109c981 ChangeLog 7834
MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
MD5 c8b31c146de4f24ffcb5442630034d50 files/digest-zope-2.7.2-r1 62
diff --git a/net-zope/zope/zope-2.7.2-r1.ebuild b/net-zope/zope/zope-2.7.2-r1.ebuild
index 46b9518f00d7..a6477a481b86 100644
--- a/net-zope/zope/zope-2.7.2-r1.ebuild
+++ b/net-zope/zope/zope-2.7.2-r1.ebuild
@@ -1,6 +1,6 @@
# 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-r1.ebuild,v 1.1 2004/09/11 21:07:44 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.2-r1.ebuild,v 1.2 2004/09/18 07:14:11 lanius Exp $
inherit eutils
@@ -26,10 +26,10 @@ S="${WORKDIR}/Zope-${PV}-0"
ZUID=zope
ZGID=zope
ZGID_INST="$(echo ${PN}-${PV} | sed -e 's/\./_/g' )"
-ZS_DIR=${ROOT%/}/usr/lib/
-ZI_DIR=${ROOT%/}/var/lib/zope/
-ZSERVDIR=${ZS_DIR}${PN}-${PV}/
-ZINSTDIR=${ZI_DIR}${PN}-${PV}/
+ZS_DIR=${ROOT%/}/usr/lib
+ZI_DIR=${ROOT%/}/var/lib/zope
+ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZINSTDIR=${ZI_DIR}/${PN}-${PV}
RCNAME=zope.initd
@@ -60,11 +60,11 @@ setup_security() {
install_instance() {
# Here we add our default zope instance.
if [ -d ${ZINSTDIR} ] ; then
- die "Default instance directory (${ZINSTDIR} already exists!"
+ die "Default instance directory (${ZINSTDIR}) already exists!"
fi
- if [ -f ${ZI_DIR}.default ] ; then
- def_instance=`cat ${ZI_DIR}.default`
- die "Default instance file (${ZI_DIR}.default already exists -> $def_instance"
+ if [ -f ${ZI_DIR}/.default ] ; then
+ def_instance=`cat ${ZI_DIR}/.default`
+ die "Default instance file (${ZI_DIR}/.default) already exists -> $def_instance"
fi
einfo "Creating default zope instance at ${ZINSTDIR} with command:"
einfo "/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} --zgid=${ZGID_INST} --zinituser"
@@ -124,10 +124,10 @@ src_install() {
fi
make install PREFIX=${D}${ZSERVDIR}
- rm -rf ${D}${ZSERVDIR}doc
- dosym ${DOCDESTTREE} ${D}${ZSERVDIR}doc
+ rm -rf ${D}${ZSERVDIR}/doc
+ dosym ${DOCDESTTREE} ${D}${ZSERVDIR}/doc
- skel=${D}${ZSERVDIR}skel
+ skel=${D}${ZSERVDIR}/skel
dodir /etc/init.d
cp ${FILESDIR}/${PV}/zope.initd ${skel}/zope.initd
}