stop using $IMAGE

Package-Manager: portage-2.1.2.2

2 files changed, 30 insertions, 30 deletions

diff --git a/www-servers/orion/Manifest b/www-servers/orion/Manifest
index 1efe53c3dafa..4d657d0717c4 100644
--- a/www-servers/orion/Manifest
+++ b/www-servers/orion/Manifest
@@ -82,10 +82,10 @@ MD5 d07a4a710da503acad73a3ff6a33b53d files/2.0/stop_orion.sh 199
 RMD160 d5e2a2e33239dcd689464bd4868955bd60bd0a78 files/2.0/stop_orion.sh 199
 SHA256 7a835e805e0b69de3bf7fbd907390e11153d7bc8e2a77890fe283c8d3547f402 files/2.0/stop_orion.sh 199
 DIST orion2.0.5.zip 7013799 RMD160 27d9c362a8e196d0a61c0ffd4e56de4eea8bc4b6 SHA1 f7794a59585801a5952b23c5a3d63c1970716842 SHA256 d299579f13c3532acb55cf6f09e98e44f3e10cac934671336ca071c04854cf8b
-EBUILD orion-2.0.5.ebuild 3346 RMD160 80e7b2cf672340d4f59c6752346cad08d00710dd SHA1 5b471bd6f468b5b18d42ddbd7a4fd4c4e608a14c SHA256 951d8b163018400cc6940eb1cceee4478c1acd71f761f5d88aaee7e7a68f75f4
-MD5 5e52b7f2613d4c0d04302b9ee126ca4e orion-2.0.5.ebuild 3346
-RMD160 80e7b2cf672340d4f59c6752346cad08d00710dd orion-2.0.5.ebuild 3346
-SHA256 951d8b163018400cc6940eb1cceee4478c1acd71f761f5d88aaee7e7a68f75f4 orion-2.0.5.ebuild 3346
+EBUILD orion-2.0.5.ebuild 3427 RMD160 50141dd5a21c87c08b286e6680d493dafcbc9edc SHA1 4e3feb31916c0c4d740a86b1811b6f7335334c13 SHA256 e631e55ac64746f9ad6e19e49e12153e4efe7c4c4ba58b591ab3a61208d5ce61
+MD5 3529c3eac7bf76a62b5a00fb6b08ec47 orion-2.0.5.ebuild 3427
+RMD160 50141dd5a21c87c08b286e6680d493dafcbc9edc orion-2.0.5.ebuild 3427
+SHA256 e631e55ac64746f9ad6e19e49e12153e4efe7c4c4ba58b591ab3a61208d5ce61 orion-2.0.5.ebuild 3427
 MISC ChangeLog 5280 RMD160 3ec60345af24a47fd32c9cdb22ee7b9413f19145 SHA1 7ba95d507aba31459d4b9587292ab92cf828bc84 SHA256 1aa86a37e6b96dbbd3175242f551d8f3ff178eb9802415779900d75926b1f5df
 MD5 b4e0ebf989b3a40a9074a4a62c741e3e ChangeLog 5280
 RMD160 3ec60345af24a47fd32c9cdb22ee7b9413f19145 ChangeLog 5280
@@ -98,9 +98,9 @@ MD5 e78eb071963df7725342b890942bd767 files/digest-orion-2.0.5 226
 RMD160 2e4a2c1654efc03bb7333e84f88893662f069463 files/digest-orion-2.0.5 226
 SHA256 4b46ad4a60989b720908f5e373752369413f8feddc4d2a87160bec12c7600d44 files/digest-orion-2.0.5 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF3OLrz974XjDVpbkRAshGAJ92EyaVEC5rXrdpdd6X5o1IqUfwPwCeI8mR
-kJ3kZwjOMkWd89s1kgJES0o=
-=AKhw
+iD8DBQFF8st+8bi6rjpTunYRApC3AKDI80OrPVxq6RXIcwZqvU/2xhEKwACgmPnZ
+ekaHCpkZ8xzW8DoNKX/aImw=
+=pit+
 -----END PGP SIGNATURE-----
diff --git a/www-servers/orion/orion-2.0.5.ebuild b/www-servers/orion/orion-2.0.5.ebuild
index 9c51588c2d68..7d115a665f75 100644
--- a/www-servers/orion/orion-2.0.5.ebuild
+++ b/www-servers/orion/orion-2.0.5.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2007 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.9 2007/01/09 15:45:39 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.5.ebuild,v 1.10 2007/03/10 15:14:58 vapier Exp $
 
 inherit eutils java-pkg
 
-S=${WORKDIR}/${PN}
-
-At=${PN}${PV}.zip
-
 DESCRIPTION="Orion EJB/J2EE application webserver"
-SRC_URI="http://www.orionserver.com/distributions/${At}"
 HOMEPAGE="http://www.orionserver.com/"
-KEYWORDS="~amd64 ~ppc x86"
+SRC_URI="http://www.orionserver.com/distributions/${PN}${PV}.zip"
+
 LICENSE="ORIONSERVER"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
+IUSE=""
+
 DEPEND=">=virtual/jdk-1.3
 	app-arch/unzip"
-IUSE=""
+
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}/${PV}-gentoo.patch
 }
 
 src_install() {
@@ -32,16 +32,16 @@ src_install() {
 	dodir /opt/${PN}/sbin
 	dodir /var/log/${PN}
 
-	cd ${S}
+	cd "${S}"
 
 	# INSTALL STARTUP SCRIPTS
 	insinto /opt/orion/sbin
 	insopts -m0750
-	doins ${FILESDIR}/${PV}/start_orion.sh
-	doins ${FILESDIR}/${PV}/stop_orion.sh
+	doins "${FILESDIR}"/${PV}/start_orion.sh || die
+	doins "${FILESDIR}"/${PV}/stop_orion.sh || die
 
-	newinitd ${FILESDIR}/${PV}/orion.init orion
-	newconfd ${FILESDIR}/${PV}/orion.conf orion
+	newinitd "${FILESDIR}"/${PV}/orion.init orion
+	newconfd "${FILESDIR}"/${PV}/orion.conf orion
 
 	# CREATE DUMMY LOG & PERSISTENCE DIR
 	dodir /var/log/${PN}
@@ -53,18 +53,18 @@ src_install() {
 	# INSTALL EXTRA FILES
 	local dirs="applications default-web-app demo lib persistence autoupdate.properties"
 	for i in $dirs ; do
-		cp -pPR ${i} ${D}/opt/${PN}/
+		cp -pPR ${i} "${D}"/opt/${PN}/ || die "install ${i} failed"
 	done
 
 	# INSTALL APP CONFIG
-	cd ${S}/config
+	cd "${S}"/config
 	local dirs="application.xml data-sources.xml database-schemas default-web-site.xml global-web-application.xml jms.xml mime.types principals.xml rmi.xml server.xml"
 	for i in $dirs ; do
-		cp -pPR ${i} ${D}/opt/${PN}/config
+		cp -pPR ${i} "${D}"/opt/${PN}/config || die "install ${i} failed"
 	done
 
 	# INSTALL JARS
-	cd ${S}
+	cd "${S}"
 	for i in *.jar ; do
 		java-pkg_dojar $i
 	done
@@ -79,9 +79,9 @@ src_install() {
 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:0 ${IMAGE}/etc/conf.d/orion
+	chown -R orion:orion "${D}"/opt/${PN}
+	chown -R orion:orion "${D}"/var/log/${PN}
+	chown root:0 "${D}"/etc/conf.d/orion
 }
 
 pkg_postinst() {