Use $IMAGE instead of $D in pkg_*. Don't call fowners in pkg_*, use chown

instead. In 2.0.5, move the chown from pkg_postinst to pkg_preinst so it
happens prior to the merge. Move pkg_preinst below src_install in the ebuild
since the functions are called in that order
Package-Manager: portage-2.0.51.22-r1

5 files changed, 43 insertions, 38 deletions

diff --git a/www-servers/orion/ChangeLog b/www-servers/orion/ChangeLog
index d57c47fb9d7b..5e65fe20563f 100644
--- a/www-servers/orion/ChangeLog
+++ b/www-servers/orion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/orion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/ChangeLog,v 1.8 2005/03/16 13:55:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/ChangeLog,v 1.9 2005/06/24 22:33:04 agriffis Exp $
+
+  24 Jun 2005; Aron Griffis <agriffis@gentoo.org> orion-2.0.1.ebuild,
+  orion-2.0.2.ebuild, orion-2.0.5.ebuild:
+  Use $IMAGE instead of $D in pkg_*. Don't call fowners in pkg_*, use chown
+  instead. In 2.0.5, move the chown from pkg_postinst to pkg_preinst so it
+  happens prior to the merge. Move pkg_preinst below src_install in the ebuild
+  since the functions are called in that order
 
   16 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> orion-2.0.5.ebuild:
   applied parts of the patch which was suggested in #85032 by Marc Vilanova
diff --git a/www-servers/orion/Manifest b/www-servers/orion/Manifest
index 8236aedb1d90..33666101158b 100644
--- a/www-servers/orion/Manifest
+++ b/www-servers/orion/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c8a12e74b3a5310f51d633c0dbc36760 orion-2.0.1.ebuild 3545
-MD5 60a3298925edc6fa6ceb2492ac62baf1 orion-2.0.5.ebuild 3609
-MD5 9d286e41d6e3c3a0b29ff81f50f0a35b orion-2.0.2.ebuild 3548
-MD5 f6d465038c07ef3b2297d2b64f7eff43 ChangeLog 4311
+MD5 998b9d5c664881c55f8235a654a5e66b orion-2.0.1.ebuild 3561
+MD5 3c3c71cab5b82a1319bd7447f524a9cd orion-2.0.5.ebuild 3560
+MD5 5bb023dad9b458825b8c8beef3db2e4a orion-2.0.2.ebuild 3564
+MD5 c59ddc11464c031845b11c8bde5ae4ba ChangeLog 4700
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 5e78308ed1712b24bcced31b5097e7fc files/digest-orion-2.0.1 60
 MD5 2e8906fc5bfd8955cfbac84d1ce4850c files/digest-orion-2.0.2 60
@@ -30,9 +30,9 @@ MD5 10a92f413fc87c341c409074bc3ce7d4 files/2.0.5/orion.conf 1490
 MD5 9395af08eda1e3bebe30f911f366a668 files/2.0.5/orion.init 625
 MD5 640aeac33bfeef4b73251c255a5cf0b5 files/2.0.5/start_orion.sh 329
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCODrc06ebR+OMO78RAmHnAKCE7BrU3Q0IA+V5uahPMR62zyAr5gCePcVK
-sKOeGyTV8kZY4KRkkqBngNc=
-=dsSB
+iD8DBQFCvIopBXaUFmZvwyMRAj1SAJ4q+o8YiLqnc1KLmkbiaL6xVSxO/QCghMuD
+qIfETmwGic0XvU5K4QgZrD0=
+=i6Wp
 -----END PGP SIGNATURE-----
diff --git a/www-servers/orion/orion-2.0.1.ebuild b/www-servers/orion/orion-2.0.1.ebuild
index 662ebefc6bad..fe40b618ccea 100644
--- a/www-servers/orion/orion-2.0.1.ebuild
+++ b/www-servers/orion/orion-2.0.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/www-servers/orion/orion-2.0.1.ebuild,v 1.3 2005/01/08 01:59:21 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.1.ebuild,v 1.4 2005/06/24 22:33:04 agriffis Exp $
 
 inherit eutils java-pkg
 
@@ -24,14 +24,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
 }
 
-pkg_preinst() {
-	enewgroup orion
-	enewuser orion -1 /bin/bash /opt/orion orion
-	chown -R orion:orion ${D}/opt/${PN}
-	chown -R orion:orion ${D}/var/log/${PN}
-	fowners orion:orion /etc/conf.d/orion
-}
-
 src_install() {
 	# CREATE DIRECTORIES
 	diropts -m0775
@@ -91,6 +83,14 @@ src_install() {
 	dodoc Readme.txt changes.txt
 }
 
+pkg_preinst() {
+	enewgroup orion
+	enewuser orion -1 /bin/bash /opt/orion orion
+	chown -R orion:orion ${IMAGE}/opt/${PN}
+	chown -R orion:orion ${IMAGE}/var/log/${PN}
+	chown orion:orion ${IMAGE}/etc/conf.d/orion
+}
+
 pkg_postinst() {
 	einfo " "
 	einfo " NOTICE!"
diff --git a/www-servers/orion/orion-2.0.2.ebuild b/www-servers/orion/orion-2.0.2.ebuild
index 5593086f95b6..e22ce909eb80 100644
--- a/www-servers/orion/orion-2.0.2.ebuild
+++ b/www-servers/orion/orion-2.0.2.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/www-servers/orion/orion-2.0.2.ebuild,v 1.3 2005/01/08 01:59:21 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.2.ebuild,v 1.4 2005/06/24 22:33:04 agriffis Exp $
 
 inherit eutils java-pkg
 
@@ -24,14 +24,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
 }
 
-pkg_preinst() {
-	enewgroup orion
-	enewuser orion -1 /bin/bash /opt/orion orion
-	chown -R orion:orion ${D}/opt/${PN}
-	chown -R orion:orion ${D}/var/log/${PN}
-	fowners orion:orion /etc/conf.d/orion
-}
-
 src_install() {
 	# CREATE DIRECTORIES
 	diropts -m0775
@@ -91,6 +83,14 @@ src_install() {
 	dodoc Readme.txt changes.txt
 }
 
+pkg_preinst() {
+	enewgroup orion
+	enewuser orion -1 /bin/bash /opt/orion orion
+	chown -R orion:orion ${IMAGE}/opt/${PN}
+	chown -R orion:orion ${IMAGE}/var/log/${PN}
+	chown orion:orion ${IMAGE}/etc/conf.d/orion
+}
+
 pkg_postinst() {
 	einfo " "
 	einfo " NOTICE!"
diff --git a/www-servers/orion/orion-2.0.5.ebuild b/www-servers/orion/orion-2.0.5.ebuild
index 57dd00b72bac..4d05db0b81f4 100644
--- a/www-servers/orion/orion-2.0.5.ebuild
+++ b/www-servers/orion/orion-2.0.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/www-servers/orion/orion-2.0.5.ebuild,v 1.3 2005/03/16 13:55:30 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.5.ebuild,v 1.4 2005/06/24 22:33:04 agriffis Exp $
 
 inherit eutils java-pkg
 
@@ -24,11 +24,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
 }
 
-pkg_preinst() {
-	enewgroup orion
-	enewuser orion -1 /bin/bash /opt/orion orion
-}
-
 src_install() {
 	# CREATE DIRECTORIES
 	diropts -m0755
@@ -88,12 +83,15 @@ src_install() {
 	dodoc Readme.txt changes.txt
 }
 
-pkg_postinst() {
-
-	chown -R orion:orion /opt/${PN} || die "Failed to chown in /opt"
-	chown -R orion:orion /var/log/${PN} || die "Failed to chown in /var/log"
-	chown root:root /etc/conf.d/orion
+pkg_preinst() {
+	enewgroup orion
+	enewuser orion -1 /bin/bash /opt/orion orion
+	chown -R orion:orion ${IMAGE}/opt/${PN}
+	chown -R orion:orion ${IMAGE}/var/log/${PN}
+	chown root:root ${IMAGE}/etc/conf.d/orion
+}
 
+pkg_postinst() {
 	einfo " "
 	einfo " NOTICE!"
 	einfo " User and group 'orion' have been added."