fix grammar bugs, bug #63078

5 files changed, 59 insertions, 16 deletions

diff --git a/app-admin/zope-config/ChangeLog b/app-admin/zope-config/ChangeLog
index 11e14d905b0c..7718469f51b9 100644
--- a/app-admin/zope-config/ChangeLog
+++ b/app-admin/zope-config/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/zope-config
 # Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/ChangeLog,v 1.23 2004/08/01 21:29:34 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/ChangeLog,v 1.24 2004/09/11 20:38:48 lanius Exp $
+
+*zope-config-0.4-r2 (11 Sep 2004)
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> files/0.4/zope-config,
+  +zope-config-0.4-r2.ebuild:
+  fix grammar bugs, bug #63078
 
   01 Aug 2004; Tom Martin <slarti@gentoo.org> zope-config-0.4-r1.ebuild:
   Marked ~amd64.
diff --git a/app-admin/zope-config/Manifest b/app-admin/zope-config/Manifest
index e3d250d51a2d..670b07e0b88a 100644
--- a/app-admin/zope-config/Manifest
+++ b/app-admin/zope-config/Manifest
@@ -1,15 +1,17 @@
+MD5 cbd41a7510c75bff07613a2250e54d48 zope-config-0.4-r2.ebuild 964
 MD5 fb37e913fece40227de866c18b12c380 zope-config-0.3.ebuild 954
 MD5 66364d21a70a8fb1b0a30f7831df514e zope-config-0.1-r1.ebuild 540
 MD5 cbd41a7510c75bff07613a2250e54d48 zope-config-0.4-r1.ebuild 964
 MD5 ce10dc2ab0139995d0a9f0a8bcdce9b1 zope-config-0.4.ebuild 955
-MD5 ca39de20d2e17197a4a0cea71cd98734 ChangeLog 3518
+MD5 1f2647706b40f9b2afba691fb1991e0d ChangeLog 3689
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.4-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-zope-config-0.4-r2 0
 MD5 0f40a729a7da468e26035bb6ee809497 files/0.1/zope-config 6878
 MD5 ee33083be6a5df4425481f4212e94493 files/0.3/zope-config 7714
 MD5 091fc2dce258d3da117b7c1017bd5b9a files/0.3/zope-config.conf 1040
-MD5 60622dc7c77f65baf65e8ff0f995afc8 files/0.4/zope-config 12514
+MD5 2e9598dd56b0894ebc6145c8347e439c files/0.4/zope-config 12582
 MD5 a896b537030a8353798897a448a152ca files/0.4/zope-config.conf 1079
diff --git a/app-admin/zope-config/files/0.4/zope-config b/app-admin/zope-config/files/0.4/zope-config
index 0427a759ef5f..348d99cac072 100644
--- a/app-admin/zope-config/files/0.4/zope-config
+++ b/app-admin/zope-config/files/0.4/zope-config
@@ -9,7 +9,7 @@
 #
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/files/0.4/zope-config,v 1.4 2004/07/24 23:20:46 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/files/0.4/zope-config,v 1.5 2004/09/11 20:38:48 lanius Exp $
 #
 #
 # Notes:
@@ -239,8 +239,8 @@ zinst_dir_set()
 
 	while : ; do
 		ZINST_DIR=$(dialog --stdout \
-			--backtitle "Need a uniqe name for zinstance directory.(Also the name of the rcscript.)" \
-			--inputbox "Enter a new zinstance name:" 0 0 ${DEFAULT_ZINSTANCENAME} )
+			--backtitle "We need a unique name for the zinstance directory. (This will be the name of the rcscript.)" \
+			--inputbox  "Enter a new zinstance name:" 0 0 ${DEFAULT_ZINSTANCENAME} )
 		RESULT=$?
                 if [ ${RESULT} -ne 0 ] ; then
                         break
@@ -295,7 +295,7 @@ zinst_default_set()
 	local RESULT=
 
         if [ -z ${ZINST_DIR} ] ; then
-            zinst_dir_get || { echo 'Canceled: zinst_dir_get' ; exit 1 ; }
+            zinst_dir_get || { echo 'Cancelled: zinst_dir_get' ; exit 1 ; }
         fi
 	RESULT=$?
 	if [ ${RESULT} -eq 0 ] ; then
@@ -325,7 +325,7 @@ zinst_zgid_set()
 	local RESULT=
 	while : ; do
 		ZGID_NAME=$(dialog --stdout \
-			--backtitle "Need to create/assign a zinstance group name." \
+			--backtitle "We need to create and/or assign a zinstance group name." \
 			--inputbox "Enter a group name:" \
 			0 0 $(basename ${ZIRC_NAME}))			
 		RESULT=$?
@@ -335,7 +335,7 @@ zinst_zgid_set()
 			dialog --msgbox "Error: empty string." 0 0
 			continue
 		elif groupmod ${ZGID_NAME} >/dev/null 2>&1 ; then
-			dialog --yesno "${ZGID_NAME} already exists, use it?" 0 0
+			dialog --yesno "The group ${ZGID_NAME} already exists. Do you want to use it?" 0 0
 			RESULT=$?
 			[ ${RESULT} -ne 0 ] && continue 
 		fi
@@ -356,12 +356,12 @@ zinst_zpasswd_set()
 
         zserv_is_2.7_or_newer ${ZSERV_DIR}
         if [ $NEWZOPE = 1 ] ; then
-            echo ">>> Create Zope inituser for \"$(basename ${ZINST_DIR})\"..."
+            echo ">>> Creating a Zope inituser for \"$(basename ${ZINST_DIR})\"..."
 			/usr/bin/python ${BIN}/zpasswd.py ${ZINST_DIR}/inituser
             # If zpasswd is aborted it creates a blank inituser
             chown ${ZUID} ${ZINST_DIR}/inituser
         else
-            echo ">>> Create Zope inituser for \"$(basename ${ZINST_DIR})\"..."
+            echo ">>> Creating a Zope inituser for \"$(basename ${ZINST_DIR})\"..."
             /usr/bin/python ${ZSERV_DIR}/zpasswd.py ${ZINST_DIR}/inituser
             # If zpasswd is aborted it creates a blank inituser
             chown ${ZUID} ${ZINST_DIR}/inituser
@@ -373,7 +373,7 @@ zinst_zpasswd_set()
 usage()
 {
 	echo "$(basename $0) version ${VERSION}"
-	echo "A Gentoo Zope Instance configure tool."
+	echo "A Gentoo Zope instance configuration tool."
 	echo
 	echo "Interactive usage:"
 	echo -e "\t$(basename $0)"
@@ -421,20 +421,20 @@ done
 
 # if ZSERV_DIR isn't set by command line, call zserv_dir_get to set it
 if [ -z ${ZSERV_DIR} ] ; then
-	zserv_dir_get || { echo 'Canceled: zserv_dir_get' ; exit 1 ; }
+	zserv_dir_get || { echo 'Cancelled: zserv_dir_get' ; exit 1 ; }
 	zserv_version_detect
 fi
 
 # if ZINST_DIR passed by command line, call zinst_dir_set to set it
 if [ -z ${ZINST_DIR} ] ; then
-	zinst_dir_set || { echo 'Canceled: zinst_dir_set' ; exit 1 ; }
+	zinst_dir_set || { echo 'Cancelled: zinst_dir_set' ; exit 1 ; }
 fi
 
 # if ZIRC_NAME isn't set then use the base of the ZINST_DIR for ZIRC_NAME
 [ -z ${ZIRC_NAME} ] && ZIRC_NAME=$(basename ${ZINST_DIR})
 
 if [ -z ${ZGID_NAME} ] ; then
-	zinst_zgid_set || { echo 'Canceled: zinst_zgid_set' ; exit 1 ; }
+	zinst_zgid_set || { echo 'Cancelled: zinst_zgid_set' ; exit 1 ; }
 fi
 zserv_is_2.7_or_newer ${ZSERV_DIR}
 
@@ -446,7 +446,6 @@ zinst_rc_setup ${ZSERV_DIR} ${ZINST_DIR} ${ZIRC_NAME}
 gpasswd -a zope ${ZGID_NAME}
 
 zinst_security_setup ${ZINST_DIR} ${ZGID_NAME}
-
 # TODO: see about adding interactive configuration of ZOPE_OPTS
 if [ ${ZOPE27} ] ; then
 	echo "Note: Review settings in ${ZINST_DIR}/etc/zope.conf."
diff --git a/app-admin/zope-config/files/digest-zope-config-0.4-r2 b/app-admin/zope-config/files/digest-zope-config-0.4-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-admin/zope-config/files/digest-zope-config-0.4-r2
diff --git a/app-admin/zope-config/zope-config-0.4-r2.ebuild b/app-admin/zope-config/zope-config-0.4-r2.ebuild
new file mode 100644
index 000000000000..3d631d255d72
--- /dev/null
+++ b/app-admin/zope-config/zope-config-0.4-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/zope-config/zope-config-0.4-r2.ebuild,v 1.1 2004/09/11 20:38:48 lanius Exp $
+
+DESCRIPTION="A Gentoo Zope multi-Instance configure tool"
+SRC_URI=""
+HOMEPAGE="http://www.gentoo.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-util/dialog-0.7
+		sys-apps/grep
+		sys-apps/sed
+		sys-apps/shadow
+		dev-lang/python
+		sys-apps/coreutils"
+
+PDEPEND=">=net-zope/zope-2.7.1"
+
+src_install() {
+	# the script
+	dosbin ${FILESDIR}/${PV}/zope-config
+	# config file
+	insinto /etc
+	doins ${FILESDIR}/${PV}/zope-config.conf
+	# ensure this directory exists
+	keepdir /var/log/zope
+}
+
+pkg_postinst() {
+	source ${FILESDIR}/${PV}/zope-config.conf
+	einfo "Please note that new instances now log into ${EVENTLOGDIR}"
+	einfo "Please see the configuration file /etc/zope-config.conf"
+}