style fix

Package-Manager: portage-2.0.51.22-r1

6 files changed, 18 insertions, 294 deletions

diff --git a/www-servers/orion/Manifest b/www-servers/orion/Manifest
index 61a9a1db639c..c0e595b26539 100644
--- a/www-servers/orion/Manifest
+++ b/www-servers/orion/Manifest
@@ -1,38 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 108ae22c31862453b1c9fcf6ae7ab0df orion-2.0.5.ebuild 3498
 MD5 c59ddc11464c031845b11c8bde5ae4ba ChangeLog 4700
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 64d2f904818b8231a8e04afe11ec9116 files/digest-orion-2.0.5 60
+MD5 d07a4a710da503acad73a3ff6a33b53d files/2.0/stop_orion.sh 199
+MD5 e175ab77e3672e6af0b3440ecf17d1b0 files/2.0/orion.conf 1488
+MD5 8bc08ac3b94467c660311e05f5274235 files/2.0/orion.init 621
+MD5 d639d66431028cebb11ae1642722e64a files/2.0/start_orion.sh 327
+MD5 abd7c855a9b9601253916624d6f0e782 files/2.0/2.0-gentoo.patch 5301
+MD5 8e79ab4c81d11f32ad95f591e4bdcf86 files/2.0.1/stop_orion.sh 201
 MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.1/2.0.1-gentoo.patch 5301
 MD5 7601a324323ba4d391105924f7130ef5 files/2.0.1/orion.conf 1490
 MD5 4769c90a33df53412fe897b0e85d30ee files/2.0.1/orion.init 623
 MD5 381c1a5cf920e989d67d3dce11a4b18f files/2.0.1/start_orion.sh 329
-MD5 8e79ab4c81d11f32ad95f591e4bdcf86 files/2.0.1/stop_orion.sh 201
-MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.2/2.0.2-gentoo.patch 5301
+MD5 6371601ecd23c07b7e2ff7ade715ac62 files/2.0.2/stop_orion.sh 201
 MD5 9e9bda794856b8df9f83b685b8927e2f files/2.0.2/orion.conf 1490
 MD5 95371637dbe2fe9a6b90a338b1d2713f files/2.0.2/orion.init 623
 MD5 68df9354bacc148d8077dc4aadd5e296 files/2.0.2/start_orion.sh 329
-MD5 6371601ecd23c07b7e2ff7ade715ac62 files/2.0.2/stop_orion.sh 201
+MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.2/2.0.2-gentoo.patch 5301
+MD5 2a85e4707edaf93fac484f6d4776c907 files/2.0.5/stop_orion.sh 201
 MD5 47d0ad15473027f371c1d02681a84e1e files/2.0.5/2.0.5-gentoo.patch 5287
 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
-MD5 2a85e4707edaf93fac484f6d4776c907 files/2.0.5/stop_orion.sh 201
-MD5 abd7c855a9b9601253916624d6f0e782 files/2.0/2.0-gentoo.patch 5301
-MD5 e175ab77e3672e6af0b3440ecf17d1b0 files/2.0/orion.conf 1488
-MD5 8bc08ac3b94467c660311e05f5274235 files/2.0/orion.init 621
-MD5 d639d66431028cebb11ae1642722e64a files/2.0/start_orion.sh 327
-MD5 d07a4a710da503acad73a3ff6a33b53d files/2.0/stop_orion.sh 199
-MD5 5e78308ed1712b24bcced31b5097e7fc files/digest-orion-2.0.1 60
-MD5 2e8906fc5bfd8955cfbac84d1ce4850c files/digest-orion-2.0.2 60
-MD5 64d2f904818b8231a8e04afe11ec9116 files/digest-orion-2.0.5 60
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 e605b6e89f2fc7d1f8ae43f8ee354075 orion-2.0.1.ebuild 3509
-MD5 6d379e2a6e916c83466c80d8d444f0a6 orion-2.0.2.ebuild 3512
-MD5 cf464721523eb29674ef5c99c1d0994d orion-2.0.5.ebuild 3508
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC0A8GI1lqEGTUzyQRAuVzAKCLNmwCJFWZ+IvjI3IuKEDG3gqA9gCgrFJG
-O4wKoRX/ByvQwyt3GD4VDeQ=
-=80QV
+iD8DBQFC3EJz/rLF9B432nYRAkK+AJ48wxuA/zncArKraBnYgJbF2qzy6ACeLnUj
+xZg9ICL0F124/yZjiy4O9kI=
+=hX32
 -----END PGP SIGNATURE-----
diff --git a/www-servers/orion/files/digest-orion-2.0.1 b/www-servers/orion/files/digest-orion-2.0.1
deleted file mode 100644
index 924ed52ca3b4..000000000000
--- a/www-servers/orion/files/digest-orion-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 05c1b4fc84fbb7021d8d314de94ddc35 orion2.0.1.zip 7204675
diff --git a/www-servers/orion/files/digest-orion-2.0.2 b/www-servers/orion/files/digest-orion-2.0.2
deleted file mode 100644
index b8cb9f179264..000000000000
--- a/www-servers/orion/files/digest-orion-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0bc33958ecee3684c5c92a4739bf1d85 orion2.0.2.zip 7125959
diff --git a/www-servers/orion/orion-2.0.1.ebuild b/www-servers/orion/orion-2.0.1.ebuild
deleted file mode 100644
index d7a3a10d01f5..000000000000
--- a/www-servers/orion/orion-2.0.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.5 2005/07/09 17:52:44 swegener 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="x86 ppc sparc"
-LICENSE="ORIONSERVER"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
-}
-
-src_install() {
-	# CREATE DIRECTORIES
-	diropts -m0775
-	dodir /opt/${PN}
-	dodir /opt/${PN}/config
-	dodir /opt/${PN}/sbin
-	dodir /var/log/${PN}
-
-	cd ${S}
-
-	# INSTALL STARTUP SCRIPTS
-	insinto /opt/orion/sbin
-	insopts -m0750
-	doins ${FILESDIR}/${PV}/start_orion.sh
-	doins ${FILESDIR}/${PV}/stop_orion.sh
-
-	cp -a ${FILESDIR}/${PV}/orion.init ${S}/orion
-	insinto /etc/init.d
-	insopts -m0750
-	doins ${S}/orion
-
-	cp -a ${FILESDIR}/${PV}/orion.conf ${S}/orion
-	insinto /etc/conf.d
-	insopts -m0750
-	doins ${S}/orion
-
-	# CREATE DUMMY LOG & PERSISTENCE DIR
-	dodir /var/log/${PN}
-	dodir /opt/${PN}/persistence
-
-	keepdir /var/log/${PN}
-	keepdir /opt/${PN}/persistence
-
-	# INSTALL EXTRA FILES
-	local dirs="applications database default-web-app demo lib persistence autoupdate.properties"
-	for i in $dirs ; do
-		cp -a ${i} ${D}/opt/${PN}/
-	done
-
-	# INSTALL APP 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 -a ${i} ${D}/opt/${PN}/config
-	done
-
-	# INSTALL JARS
-	cd ${S}
-	for i in `ls *.jar` ; do
-		java-pkg_dojar $i
-	done
-
-	# LINK IN SDK TOOLS.JAR
-	dosym ${JAVA_HOME}/lib/tools.jar /usr/share/${PN}/lib/tools.jar
-
-	# INSTALL DOCS
-	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!"
-	einfo " User and group 'orion' have been added."
-	einfo " Please set a password for the user account 'orion'"
-	einfo " if you have not done so already."
-	einfo
-	einfo
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Orion home directory: /opt/orion"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/orion"
-	einfo "     Contains CLASSPATH and JDK settings."
-	einfo " 3.  Logs:  /var/log/orion/"
-	einfo " 4.  Executables, libraries:  /usr/share/${PN}/"
-	einfo
-	einfo
-	einfo " STARTING AND STOPPING ORION:"
-	einfo "   /etc/init.d/orion start"
-	einfo "   /etc/init.d/orion stop"
-	einfo "   /etc/init.d/orion restart"
-	einfo
-	einfo
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Orion runs on port 8080.  You can change this"
-	einfo " value by editing /opt/orion/config/default-web-site.xml."
-	einfo
-	einfo " To test Orion while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	einfo
-	einfo
-	einfo " APPLICATION DEPLOYMENT:"
-	einfo " To set an administrative password, execute the following"
-	einfo " commands as user 'orion':"
-	einfo " \$ java -jar /usr/share/${PN}/lib/orion.jar -install"
-	einfo
-	einfo
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
-}
diff --git a/www-servers/orion/orion-2.0.2.ebuild b/www-servers/orion/orion-2.0.2.ebuild
deleted file mode 100644
index 5deb21220f6f..000000000000
--- a/www-servers/orion/orion-2.0.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.5 2005/07/09 17:52:44 swegener 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="~x86 ~ppc ~sparc"
-LICENSE="ORIONSERVER"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
-}
-
-src_install() {
-	# CREATE DIRECTORIES
-	diropts -m0775
-	dodir /opt/${PN}
-	dodir /opt/${PN}/config
-	dodir /opt/${PN}/sbin
-	dodir /var/log/${PN}
-
-	cd ${S}
-
-	# INSTALL STARTUP SCRIPTS
-	insinto /opt/orion/sbin
-	insopts -m0750
-	doins ${FILESDIR}/${PV}/start_orion.sh
-	doins ${FILESDIR}/${PV}/stop_orion.sh
-
-	cp -a ${FILESDIR}/${PV}/orion.init ${S}/orion
-	insinto /etc/init.d
-	insopts -m0750
-	doins ${S}/orion
-
-	cp -a ${FILESDIR}/${PV}/orion.conf ${S}/orion
-	insinto /etc/conf.d
-	insopts -m0750
-	doins ${S}/orion
-
-	# CREATE DUMMY LOG & PERSISTENCE DIR
-	dodir /var/log/${PN}
-	dodir /opt/${PN}/persistence
-
-	keepdir /var/log/${PN}
-	keepdir /opt/${PN}/persistence
-
-	# INSTALL EXTRA FILES
-	local dirs="applications database default-web-app demo lib persistence autoupdate.properties"
-	for i in $dirs ; do
-		cp -a ${i} ${D}/opt/${PN}/
-	done
-
-	# INSTALL APP 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 -a ${i} ${D}/opt/${PN}/config
-	done
-
-	# INSTALL JARS
-	cd ${S}
-	for i in `ls *.jar` ; do
-		java-pkg_dojar $i
-	done
-
-	# LINK IN SDK TOOLS.JAR
-	dosym ${JAVA_HOME}/lib/tools.jar /usr/share/${PN}/lib/tools.jar
-
-	# INSTALL DOCS
-	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!"
-	einfo " User and group 'orion' have been added."
-	einfo " Please set a password for the user account 'orion'"
-	einfo " if you have not done so already."
-	einfo
-	einfo
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Orion home directory: /opt/orion"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/orion"
-	einfo "     Contains CLASSPATH and JDK settings."
-	einfo " 3.  Logs:  /var/log/orion/"
-	einfo " 4.  Executables, libraries:  /usr/share/${PN}/"
-	einfo
-	einfo
-	einfo " STARTING AND STOPPING ORION:"
-	einfo "   /etc/init.d/orion start"
-	einfo "   /etc/init.d/orion stop"
-	einfo "   /etc/init.d/orion restart"
-	einfo
-	einfo
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Orion runs on port 8080.  You can change this"
-	einfo " value by editing /opt/orion/config/default-web-site.xml."
-	einfo
-	einfo " To test Orion while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	einfo
-	einfo
-	einfo " APPLICATION DEPLOYMENT:"
-	einfo " To set an administrative password, execute the following"
-	einfo " commands as user 'orion':"
-	einfo " \$ java -jar /usr/share/${PN}/lib/orion.jar -install"
-	einfo
-	einfo
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
-}
diff --git a/www-servers/orion/orion-2.0.5.ebuild b/www-servers/orion/orion-2.0.5.ebuild
index f745dcecbfb5..328905632963 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.5 2005/07/09 17:52:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/orion/orion-2.0.5.ebuild,v 1.6 2005/07/18 23:59:33 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -11,7 +11,7 @@ At=${PN}${PV}.zip
 DESCRIPTION="Orion EJB/J2EE application webserver"
 SRC_URI="http://www.orionserver.com/distributions/${At}"
 HOMEPAGE="http://www.orionserver.com/"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 LICENSE="ORIONSERVER"
 SLOT="0"
 DEPEND=">=virtual/jdk-1.3
@@ -72,7 +72,7 @@ src_install() {
 
 	# INSTALL JARS
 	cd ${S}
-	for i in `ls *.jar` ; do
+	for i in *.jar ; do
 		java-pkg_dojar $i
 	done