ebuild cleanup

6 files changed, 48 insertions, 220 deletions

diff --git a/net-www/orion/ChangeLog b/net-www/orion/ChangeLog
index f2b7437fada2..c9f456e45979 100644
--- a/net-www/orion/ChangeLog
+++ b/net-www/orion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/orion
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/orion/ChangeLog,v 1.15 2004/07/17 22:19:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/ChangeLog,v 1.16 2004/07/26 13:11:12 axxo Exp $
+
+  26 Jul 2004; Thomas Matthijs <axxo@gentoo.org> orion-2.0.1.ebuild,
+  orion-2.0.2.ebuild, -orion-2.0.ebuild:
+  ebuilds cleanup
 
 *orion-2.0.2 (16 Jul 2004)
 
diff --git a/net-www/orion/Manifest b/net-www/orion/Manifest
index 536e38478fcc..27052633e4cf 100644
--- a/net-www/orion/Manifest
+++ b/net-www/orion/Manifest
@@ -1,33 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 048285ddef131103fc09858332985d9d ChangeLog 2592
-MD5 7eb483f833c6216bae4f687f88a059cc orion-2.0.1.ebuild 3858
-MD5 eccc4a6b9fb42efacf12097c27144513 orion-2.0.ebuild 4107
+MD5 c82c4833e0aaf2ce7aa0ea39edf40d75 orion-2.0.1.ebuild 3521
+MD5 92823ea9ff1d6887d788de8eb50eb81b orion-2.0.2.ebuild 3524
+MD5 e17328f3df2f89a29cde7b21057a3250 ChangeLog 2721
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 56ef147f4b255c182a953ac2ef88d6ac orion-2.0.2.ebuild 3849
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-orion-2.0 0
 MD5 5e78308ed1712b24bcced31b5097e7fc files/digest-orion-2.0.1 60
 MD5 2e8906fc5bfd8955cfbac84d1ce4850c files/digest-orion-2.0.2 60
-MD5 abd7c855a9b9601253916624d6f0e782 files/2.0/2.0-gentoo.patch 5301
+MD5 92b722b21c13158f91088a88491436f6 files/2.0/stop_orion.sh 200
 MD5 da5ec0abfb205b2fd83d533d9117d87c files/2.0/orion.conf 1489
 MD5 6c81f8112e67388a4f915d0bcab02d83 files/2.0/orion.init 622
 MD5 2653ae1733c17843a9388200f90e3148 files/2.0/start_orion.sh 328
-MD5 92b722b21c13158f91088a88491436f6 files/2.0/stop_orion.sh 200
+MD5 abd7c855a9b9601253916624d6f0e782 files/2.0/2.0-gentoo.patch 5301
+MD5 e1663e859471f12fda5a7b99abbe42d8 files/2.0.1/stop_orion.sh 202
 MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.1/2.0.1-gentoo.patch 5301
 MD5 e0ef38d0aa2277036adaaecb6b846277 files/2.0.1/orion.conf 1491
 MD5 74f811add4d32c9802cc4188c67cd6db files/2.0.1/orion.init 624
 MD5 c1ae0565520f43469123f10a46496781 files/2.0.1/start_orion.sh 330
-MD5 e1663e859471f12fda5a7b99abbe42d8 files/2.0.1/stop_orion.sh 202
-MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.2/2.0.2-gentoo.patch 5301
+MD5 66ecfe1ca25c5fcf99feb66a4c059e2b files/2.0.2/stop_orion.sh 195
 MD5 070942d311cf91f786c8ece44a2a8785 files/2.0.2/orion.conf 1484
 MD5 d487529fa9e0b42f2162b1e594f88e68 files/2.0.2/orion.init 620
 MD5 b5f590d7830232217b0512fcb0e3c600 files/2.0.2/start_orion.sh 323
-MD5 66ecfe1ca25c5fcf99feb66a4c059e2b files/2.0.2/stop_orion.sh 195
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA+f3VmdTrptrqvGERAngiAKCCzr3DYkIWPXiqJH/7vrNuFDL0/QCgkBCi
-KRocg84EpceuXYGr7/tt3SY=
-=Skew
------END PGP SIGNATURE-----
+MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.2/2.0.2-gentoo.patch 5301
diff --git a/net-www/orion/files/digest-orion-2.0 b/net-www/orion/files/digest-orion-2.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-www/orion/files/digest-orion-2.0
+++ /dev/null
diff --git a/net-www/orion/orion-2.0.1.ebuild b/net-www/orion/orion-2.0.1.ebuild
index d211e11a42b5..7c13f6c8dc1e 100644
--- a/net-www/orion/orion-2.0.1.ebuild
+++ b/net-www/orion/orion-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.1.ebuild,v 1.7 2004/07/16 14:00:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.1.ebuild,v 1.8 2004/07/26 13:11:12 axxo Exp $
 
 inherit eutils
 
@@ -19,24 +19,22 @@ DEPEND=">=virtual/jdk-1.3
 IUSE=""
 
 src_unpack() {
-	unzip -q ${DISTDIR}/${At} || die
+	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
 }
 
-pkg_setup() {
-	if ! groupmod orion ; then
-		groupadd -g 260 orion || die "problem adding group orion"
-	fi
-	if ! id orion; then
-		useradd -u 260 -g orion -s /bin/bash -d /opt/orion -c "orion" orion || die "problem adding user orion"
-	fi
+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
-	DIROPTIONS="--mode=0775 --owner=orion --group=orion"
+	diropts -m0775
 	dodir /opt/${PN}
 	dodir /opt/${PN}/config
 	dodir /opt/${PN}/sbin
@@ -46,7 +44,7 @@ src_install() {
 
 	# INSTALL STARTUP SCRIPTS
 	insinto /opt/orion/sbin
-	insopts -o orion -g orion -m0750
+	insopts -m0750
 	doins ${FILESDIR}/${PV}/start_orion.sh
 	doins ${FILESDIR}/${PV}/stop_orion.sh
 
@@ -57,22 +55,20 @@ src_install() {
 
 	cp -a ${FILESDIR}/${PV}/orion.conf ${S}/orion
 	insinto /etc/conf.d
-	insopts -m0755
+	insopts -m0750
 	doins ${S}/orion
 
 	# CREATE DUMMY LOG & PERSISTENCE DIR
-	insopts -o orion -g orion -m0750
-	touch ${S}/.keep
-	insinto /var/log/${PN}
-	doins ${S}/.keep
-	insinto /opt/${PN}/persistence
-	doins ${S}/.keep
+	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}/
-		chown -R orion:orion ${D}/opt/${PN}/${i}
 	done
 
 	# INSTALL APP CONFIG
@@ -80,7 +76,6 @@ src_install() {
 	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
-		chown -R orion:orion ${D}/opt/${PN}/config/${i}
 	done
 
 	# INSTALL JARS
@@ -90,7 +85,7 @@ src_install() {
 	done
 
 	# LINK IN SDK TOOLS.JAR
-	ln -s ${JAVA_HOME}/lib/tools.jar ${D}/usr/share/${PN}/lib/tools.jar
+	dosym ${JAVA_HOME}/lib/tools.jar /usr/share/${PN}/lib/tools.jar
 
 	# INSTALL DOCS
 	dodoc Readme.txt changes.txt
@@ -137,6 +132,4 @@ pkg_postinst() {
 	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
 	einfo " may not get seen.  Thank you."
 	einfo " "
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 10
 }
diff --git a/net-www/orion/orion-2.0.2.ebuild b/net-www/orion/orion-2.0.2.ebuild
index 5bc29c84dbf7..ec1ebf4be634 100644
--- a/net-www/orion/orion-2.0.2.ebuild
+++ b/net-www/orion/orion-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.2.ebuild,v 1.1 2004/07/16 14:00:35 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.2.ebuild,v 1.2 2004/07/26 13:11:12 axxo Exp $
 
 inherit eutils
 
@@ -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"
+KEYWORDS="~x86 ~ppc ~sparc"
 LICENSE="ORIONSERVER"
 SLOT="0"
 DEPEND=">=virtual/jdk-1.3
@@ -19,24 +19,22 @@ DEPEND=">=virtual/jdk-1.3
 IUSE=""
 
 src_unpack() {
-	unzip -q ${DISTDIR}/${At} || die
+	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
 }
 
-pkg_setup() {
-	if ! groupmod orion ; then
-		groupadd -g 260 orion || die "problem adding group orion"
-	fi
-	if ! id orion; then
-		useradd -u 260 -g orion -s /bin/bash -d /opt/orion -c "orion" orion || die "problem adding user orion"
-	fi
+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
-	DIROPTIONS="--mode=0775 --owner=orion --group=orion"
+	diropts -m0775
 	dodir /opt/${PN}
 	dodir /opt/${PN}/config
 	dodir /opt/${PN}/sbin
@@ -46,7 +44,7 @@ src_install() {
 
 	# INSTALL STARTUP SCRIPTS
 	insinto /opt/orion/sbin
-	insopts -o orion -g orion -m0750
+	insopts -m0750
 	doins ${FILESDIR}/${PV}/start_orion.sh
 	doins ${FILESDIR}/${PV}/stop_orion.sh
 
@@ -57,22 +55,20 @@ src_install() {
 
 	cp -a ${FILESDIR}/${PV}/orion.conf ${S}/orion
 	insinto /etc/conf.d
-	insopts -m0755
+	insopts -m0750
 	doins ${S}/orion
 
 	# CREATE DUMMY LOG & PERSISTENCE DIR
-	insopts -o orion -g orion -m0750
-	touch ${S}/.keep
-	insinto /var/log/${PN}
-	doins ${S}/.keep
-	insinto /opt/${PN}/persistence
-	doins ${S}/.keep
+	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}/
-		chown -R orion:orion ${D}/opt/${PN}/${i}
 	done
 
 	# INSTALL APP CONFIG
@@ -80,7 +76,6 @@ src_install() {
 	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
-		chown -R orion:orion ${D}/opt/${PN}/config/${i}
 	done
 
 	# INSTALL JARS
@@ -90,7 +85,7 @@ src_install() {
 	done
 
 	# LINK IN SDK TOOLS.JAR
-	ln -s ${JAVA_HOME}/lib/tools.jar ${D}/usr/share/${PN}/lib/tools.jar
+	dosym ${JAVA_HOME}/lib/tools.jar /usr/share/${PN}/lib/tools.jar
 
 	# INSTALL DOCS
 	dodoc Readme.txt changes.txt
@@ -137,6 +132,4 @@ pkg_postinst() {
 	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
 	einfo " may not get seen.  Thank you."
 	einfo " "
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 10
 }
diff --git a/net-www/orion/orion-2.0.ebuild b/net-www/orion/orion-2.0.ebuild
deleted file mode 100644
index b898bcf42b71..000000000000
--- a/net-www/orion/orion-2.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.ebuild,v 1.14 2004/07/16 14:00:35 axxo Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${PN}
-
-At=${PN}${PV}.zip
-
-DESCRIPTION="Orion EJB/J2EE application webserver"
-SRC_URI=""
-HOMEPAGE="http://www.orionserver.com/"
-KEYWORDS="x86 ppc sparc"
-LICENSE="ORIONSERVER"
-SLOT="0"
-DEPEND=">=virtual/jdk-1.3
-	app-arch/unzip"
-IUSE=""
-
-src_unpack() {
-	if [ ! -f ${DISTDIR}/${At} ] ; then
-		einfo "Due to licensing restrictions, you must:"
-		einfo " "
-		einfo "1. Download ${At} from ${HOMEPAGE}."
-		einfo "2. Place ${At} into ${DISTDIR}."
-		einfo "3. Run 'emerge' on this ebuild again to continue."
-		die "Missing ${DISTDIR}/${At}; aborting."
-	fi
-	unzip -q ${DISTDIR}/${At} || die
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PV}-gentoo.patch
-}
-
-pkg_setup() {
-	if ! groupmod orion ; then
-		groupadd -g 260 orion || die "problem adding group orion"
-	fi
-	if ! id orion; then
-		useradd -u 260 -g orion -s /bin/bash -d /opt/orion -c "orion" orion || die "problem adding user orion"
-	fi
-}
-
-src_install() {
-
-	# CREATE DIRECTORIES
-	DIROPTIONS="--mode=0775 --owner=orion --group=orion"
-	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 -o orion -g orion -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 -m0755
-	doins ${S}/orion
-
-	# CREATE DUMMY LOG & PERSISTENCE DIR
-	insopts -o orion -g orion -m0750
-	touch ${S}/.keep
-	insinto /var/log/${PN}
-	doins ${S}/.keep
-	insinto /opt/${PN}/persistence
-	doins ${S}/.keep
-
-	# 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}/
-		chown -R orion:orion ${D}/opt/${PN}/${i}
-	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
-		chown -R orion:orion ${D}/opt/${PN}/config/${i}
-	done
-
-	# INSTALL JARS
-	cd ${S}
-	for i in `ls *.jar` ; do
-		dojar $i
-	done
-
-	# LINK IN SDK TOOLS.JAR
-	ln -s ${JAVA_HOME}/lib/tools.jar ${D}/usr/share/${PN}/lib/tools.jar
-
-	# INSTALL DOCS
-	dodoc Readme.txt changes.txt
-}
-
-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 " "
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 10
-}