QA: ${PN}-${PV} -> ${P}

Package-Manager: portage-2.0.51.22-r1

6 files changed, 36 insertions, 26 deletions

diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index 3fcfba1b1226..2d7f18601ef7 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -1,20 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ac8e5d0217f2378ed91fa66222aa5737 ChangeLog 11867
-MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 f27b4a8235ae5a33c8755ea5e64836c5 zope-2.6.4-r1.ebuild 5622
-MD5 7544418bbba93dac18d03f9512d1cb68 zope-2.7.2-r2.ebuild 3218
-MD5 e507612b1ba3e3fae0975b0ca0329117 zope-2.7.6.ebuild 3339
-MD5 7589c57a0ea8ba689002c2dfa49d63f7 zope-2.8.0.ebuild 3375
-MD5 9f02f7cbb4ac538907cd3ed04b2ce4e0 zope-2.7.5.ebuild 3338
-MD5 17edb3696d5d99b37864d9bb7cc23d21 files/digest-zope-2.8.0 69
-MD5 c8b31c146de4f24ffcb5442630034d50 files/digest-zope-2.7.2-r2 62
-MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
-MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
-MD5 28b31acf9b00b4388850af2acd90b2e3 files/zope.initd 1232
-MD5 515774f7b0464e0ce8c3283141c676c7 files/digest-zope-2.7.5 66
-MD5 8bf817c4c3e6ad2b06e92a95c6ffd7e0 files/digest-zope-2.7.6 66
-MD5 e99b9fc903db808c1bbb5aa8b9d0b44f files/2.7.2/zope.initd 1169
-MD5 bce3b7d98963ff6f3e3d53557f3b4912 files/2.7.2/gid.patch 460
 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 c97d6dc27b456ae0fbfdf8ee5627ac1b files/2.7.4/i18n-1.0.0.patch 7630
 MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.6/i18n-1.0.0.patch 7634
+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 17edb3696d5d99b37864d9bb7cc23d21 files/digest-zope-2.8.0 69
+MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
+MD5 28b31acf9b00b4388850af2acd90b2e3 files/zope.initd 1232
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 5416407eff85546578bb4e7c61f45d5e zope-2.6.4-r1.ebuild 5629
+MD5 0a5e41adc4e26168061146ca2697ebf0 zope-2.7.2-r2.ebuild 3214
+MD5 42625ed029875b4d13c9af34f02aa7ed zope-2.7.5.ebuild 3334
+MD5 e3ebbd463da7c5b7f7cacd4d79323c46 zope-2.7.6.ebuild 3335
+MD5 9c741d4c9260c508968be3894de4a5ea zope-2.8.0.ebuild 3371
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCz/YvI1lqEGTUzyQRApH7AJ90HCxKOXo5+c9beN3KGs+J2FaptQCg3ahs
+gq2gjVNqX1QZ92zyCyadLzc=
+=VJki
+-----END PGP SIGNATURE-----
diff --git a/net-zope/zope/zope-2.6.4-r1.ebuild b/net-zope/zope/zope-2.6.4-r1.ebuild
index cedd343ccf5d..456aa9a0d6e0 100644
--- a/net-zope/zope/zope-2.6.4-r1.ebuild
+++ b/net-zope/zope/zope-2.6.4-r1.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.6.4-r1.ebuild,v 1.14 2005/01/14 21:16:20 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.4-r1.ebuild,v 1.15 2005/07/09 16:06:46 swegener Exp $
 
 inherit eutils
 
@@ -98,7 +98,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	$python wo_pcgi.py || die "Failed to compile."
+	${python} wo_pcgi.py || die "Failed to compile."
 }
 
 src_install() {
@@ -179,7 +179,7 @@ pkg_postrm() {
 	# Delete .default if this ebuild is the default. zprod-manager will
 	# have to handle a missing default;
 	local VERSION_DEF="$(zope-config --zidef-get)"
-	if [ "${ZGID}" = "$VERSION_DEF" ] ; then
+	if [ "${ZGID}" = "${VERSION_DEF}" ] ; then
 		rm -f ${ZI_DIR}/.default
 	fi
 }
diff --git a/net-zope/zope/zope-2.7.2-r2.ebuild b/net-zope/zope/zope-2.7.2-r2.ebuild
index 463e089305c1..af6ed60c6dd1 100644
--- a/net-zope/zope/zope-2.7.2-r2.ebuild
+++ b/net-zope/zope/zope-2.7.2-r2.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.2-r2.ebuild,v 1.8 2005/04/21 14:23:24 blubb Exp $
+# $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
 
@@ -24,7 +24,7 @@ S="${WORKDIR}/Zope-${PV}-0"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
-ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
 # Security plan:
diff --git a/net-zope/zope/zope-2.7.5.ebuild b/net-zope/zope/zope-2.7.5.ebuild
index 9915f54ccdb2..1bfb1a7d9d3b 100644
--- a/net-zope/zope/zope-2.7.5.ebuild
+++ b/net-zope/zope/zope-2.7.5.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.5.ebuild,v 1.4 2005/05/21 09:33:36 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.5.ebuild,v 1.5 2005/07/09 16:06:46 swegener Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
-ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
 # Security plan:
diff --git a/net-zope/zope/zope-2.7.6.ebuild b/net-zope/zope/zope-2.7.6.ebuild
index f172f377baed..25eff453e03e 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.3 2005/06/14 02:52:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.6.ebuild,v 1.4 2005/07/09 16:06:46 swegener Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
-ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
 # Security plan:
diff --git a/net-zope/zope/zope-2.8.0.ebuild b/net-zope/zope/zope-2.8.0.ebuild
index 59f24b225936..d627df9c4d75 100644
--- a/net-zope/zope/zope-2.8.0.ebuild
+++ b/net-zope/zope/zope-2.8.0.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.0.ebuild,v 1.1 2005/06/11 11:56:33 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.0.ebuild,v 1.2 2005/07/09 16:06:46 swegener Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
-ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
 # Security plan: