fix premissions (again sorry), should fix 59232 && 58616

17 files changed, 74 insertions, 402 deletions

diff --git a/net-www/tomcat/ChangeLog b/net-www/tomcat/ChangeLog
index 839b44c366da..0085312d19c4 100644
--- a/net-www/tomcat/ChangeLog
+++ b/net-www/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/tomcat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.42 2004/08/03 21:52:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.43 2004/08/06 14:35:02 axxo Exp $
+
+  06 Aug 2004; Thomas Matthijs <axxo@gentoo.org> -files/3.3.2/21tomcat,
+  -files/4.1.30/21tomcat, -files/5.0.27/21tomcat, -tomcat-3.3.2-r1.ebuild,
+  -tomcat-3.3.2.ebuild, -tomcat-4.1.30-r2.ebuild, -tomcat-4.1.30-r3.ebuild,
+  -tomcat-5.0.27-r1.ebuild, -tomcat-5.0.27-r2.ebuild:
+  fix premissions (again sorry), should fix 59232 && 58616
 
 *tomcat-3.3.2-r1 (03 Aug 2004)
 
diff --git a/net-www/tomcat/Manifest b/net-www/tomcat/Manifest
index 14a44fcd3065..da3caff9459a 100644
--- a/net-www/tomcat/Manifest
+++ b/net-www/tomcat/Manifest
@@ -1,38 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ed9f5b961f1ad79621dd0393de91e0c2 tomcat-3.3.2-r1.ebuild 2920
-MD5 c51948b362c299e2735d6e460666e073 tomcat-5.0.27-r1.ebuild 3227
-MD5 064bb30807b209e63f4c181c630732a8 tomcat-3.3.2.ebuild 2894
-MD5 7032e1b63c82b5755b93a592ae55b7a4 tomcat-4.1.30-r3.ebuild 3230
-MD5 8aa660cb189e47312c7fb43a30df7a5d tomcat-4.1.30-r2.ebuild 3207
-MD5 0224b421d666174378fd4960d2fbb48b tomcat-5.0.27-r2.ebuild 3250
-MD5 122be7981b93a7aa3e51bddeca96a358 ChangeLog 9647
+MD5 4a51846a57dbc294830b00b9a48b9aec tomcat-5.0.27-r3.ebuild 3552
+MD5 8f4a58c4bd25c740c7bc25f6a1fd49bd tomcat-3.3.2-r2.ebuild 3171
+MD5 b417654b87f3e94ec13dc3d311abf6e0 ChangeLog 9984
 MD5 56292f22dced45d993974e198033461d metadata.xml 221
-MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2 73
-MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r2 74
-MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r3 74
-MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r1 75
-MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r2 75
-MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2-r1 73
+MD5 60173910827fd276d53e2a357d42debb tomcat-4.1.30-r4.ebuild 3532
+MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r4 74
+MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r3 75
+MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2-r2 73
 MD5 eb7830519ae94bb563d39f1f51ab590a files/3.3.2/gentoo.diff 368
 MD5 d33339579d0be490e2426622bdc02478 files/3.3.2/tomcat.conf 898
 MD5 fc61d48a4df09dc7b355fb37cda3a8f4 files/3.3.2/tomcat.init 629
-MD5 5070001a9e7c2627552e04291bae5d8c files/3.3.2/21tomcat 156
 MD5 5689c5d7853b66c5df8ecfabe34f4eab files/4.1.30/gentoo.diff 461
 MD5 4194c313f01fdfad3685ca575193cbcd files/4.1.30/tomcat.conf 2654
 MD5 3413acebfae38d1968b1c1a09f4dcbff files/4.1.30/tomcat.init 632
 MD5 c19b85e130d0e0a565eebc406d699965 files/4.1.30/jikes.diff 510
-MD5 53987c0a1c63d681756bd147639cf43f files/4.1.30/21tomcat 156
 MD5 8762369123b94c9a0b2c1cc78c301600 files/5.0.27/gentoo.diff 461
 MD5 ee1a8962ae8850ad8a9315ed5d87a295 files/5.0.27/tomcat.conf 2654
 MD5 d35e0401143488349e4399a3f25530b7 files/5.0.27/tomcat.init 632
 MD5 c19b85e130d0e0a565eebc406d699965 files/5.0.27/jikes.diff 510
-MD5 a4af2d8c7172284a45409b4c6869c54d files/5.0.27/21tomcat 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.5 (GNU/Linux)
 
-iD8DBQFBEAmr/rLF9B432nYRAs5eAJ4+C8FqOydMLIQSwwbbFHmfCK74TACfQ+Wp
-zjPqf2gPAhzTjoTDxnq2eK0=
-=9zR2
+iD8DBQFBE5ck/rLF9B432nYRAk2KAKDAYi2EmQGscyShF9yo4mVF2V1GNACZAa/E
+3hXY0fe8FKxpNsCDuUMVVw8=
+=NTYH
 -----END PGP SIGNATURE-----
diff --git a/net-www/tomcat/files/3.3.2/21tomcat b/net-www/tomcat/files/3.3.2/21tomcat
deleted file mode 100644
index b069a3d9c6d0..000000000000
--- a/net-www/tomcat/files/3.3.2/21tomcat
+++ /dev/null
@@ -1,5 +0,0 @@
-#CATALINA_HOME=/opt/tomcat3
-CONFIG_PROTECT=/etc/tomcat3
-#CATALINA_LIBDIR=/usr/share/tomcat3/lib 
-#CLASSPATH=${CATALINA_LIBDIR} 
-#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/4.1.30/21tomcat b/net-www/tomcat/files/4.1.30/21tomcat
deleted file mode 100644
index b6f3618522b7..000000000000
--- a/net-www/tomcat/files/4.1.30/21tomcat
+++ /dev/null
@@ -1,5 +0,0 @@
-#CATALINA_HOME=/opt/tomcat4
-CONFIG_PROTECT=/etc/tomcat4
-#CATALINA_LIBDIR=/usr/share/tomcat4/lib 
-#CLASSPATH=${CATALINA_LIBDIR} 
-#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/5.0.27/21tomcat b/net-www/tomcat/files/5.0.27/21tomcat
deleted file mode 100644
index 57195e8b5481..000000000000
--- a/net-www/tomcat/files/5.0.27/21tomcat
+++ /dev/null
@@ -1,5 +0,0 @@
-#CATALINA_HOME=/opt/tomcat5
-CONFIG_PROTECT=/etc/tomcat5
-#CATALINA_LIBDIR=/usr/share/tomcat5/lib 
-#CLASSPATH=${CATALINA_LIBDIR} 
-#ENV_VARS="CATALINA_LIBDIR"
diff --git a/net-www/tomcat/files/digest-tomcat-3.3.2-r1 b/net-www/tomcat/files/digest-tomcat-3.3.2-r1
deleted file mode 100644
index 44bcb5d64a95..000000000000
--- a/net-www/tomcat/files/digest-tomcat-3.3.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 edaa93b5867df0e007be7a9b44f48e0c jakarta-tomcat-3.3.2.tar.gz 6527346
diff --git a/net-www/tomcat/files/digest-tomcat-3.3.2 b/net-www/tomcat/files/digest-tomcat-3.3.2-r2
index 44bcb5d64a95..44bcb5d64a95 100644
--- a/net-www/tomcat/files/digest-tomcat-3.3.2
+++ b/net-www/tomcat/files/digest-tomcat-3.3.2-r2
diff --git a/net-www/tomcat/files/digest-tomcat-4.1.30-r3 b/net-www/tomcat/files/digest-tomcat-4.1.30-r3
deleted file mode 100644
index a1651a599a01..000000000000
--- a/net-www/tomcat/files/digest-tomcat-4.1.30-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff27f6a5900768c1aafab4a68675b2ed jakarta-tomcat-4.1.30.tar.gz 7894019
diff --git a/net-www/tomcat/files/digest-tomcat-4.1.30-r2 b/net-www/tomcat/files/digest-tomcat-4.1.30-r4
index a1651a599a01..a1651a599a01 100644
--- a/net-www/tomcat/files/digest-tomcat-4.1.30-r2
+++ b/net-www/tomcat/files/digest-tomcat-4.1.30-r4
diff --git a/net-www/tomcat/files/digest-tomcat-5.0.27-r2 b/net-www/tomcat/files/digest-tomcat-5.0.27-r2
deleted file mode 100644
index f96d1cd9d33a..000000000000
--- a/net-www/tomcat/files/digest-tomcat-5.0.27-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b802ee042677e284bcf65738c7bdc3b6 jakarta-tomcat-5.0.27.tar.gz 10298374
diff --git a/net-www/tomcat/files/digest-tomcat-5.0.27-r1 b/net-www/tomcat/files/digest-tomcat-5.0.27-r3
index f96d1cd9d33a..f96d1cd9d33a 100644
--- a/net-www/tomcat/files/digest-tomcat-5.0.27-r1
+++ b/net-www/tomcat/files/digest-tomcat-5.0.27-r3
diff --git a/net-www/tomcat/tomcat-3.3.2-r1.ebuild b/net-www/tomcat/tomcat-3.3.2-r2.ebuild
index a314683fa1c6..855ab2f804e3 100644
--- a/net-www/tomcat/tomcat-3.3.2-r1.ebuild
+++ b/net-www/tomcat/tomcat-3.3.2-r2.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/tomcat/tomcat-3.3.2-r1.ebuild,v 1.1 2004/08/03 21:52:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-3.3.2-r2.ebuild,v 1.1 2004/08/06 14:35:02 axxo Exp $
 
 inherit eutils
 
@@ -27,14 +27,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/gentoo.diff
 }
 
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
 src_install() {
 	dodoc LICENSE
 
@@ -47,10 +39,6 @@ src_install() {
 	insopts -m0644
 	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
 
-	insinto /etc/env.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
-
 	diropts -m750
 	dodir ${TOMCAT_HOME}
 	dodir /var/log/${TOMCAT_NAME}
@@ -61,11 +49,27 @@ src_install() {
 
 	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
 	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
+}
+
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
 
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
+	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
 }
 
 pkg_postinst() {
+	#due to previous ebuild bloopers make sure everything is correct
+	chown -R root:root /usr/share/doc/${TOMCAT_NAME}
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+
 	einfo " "
 	einfo " NOTICE!"
 	einfo " FILE LOCATIONS:"
diff --git a/net-www/tomcat/tomcat-3.3.2.ebuild b/net-www/tomcat/tomcat-3.3.2.ebuild
deleted file mode 100644
index 920d52ac9f05..000000000000
--- a/net-www/tomcat/tomcat-3.3.2.ebuild
+++ /dev/null
@@ -1,104 +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/tomcat/tomcat-3.3.2.ebuild,v 1.2 2004/07/28 09:38:00 axxo Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.2/JSP-1.1 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		sys-apps/sed"
-IUSE=""
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-}
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-}
-
-src_install() {
-	dodoc LICENSE
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-
-	insinto /etc/env.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME}
-	dodir /var/log/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	mv conf ${D}/etc/${TOMCAT_NAME}
-	mv bin doc lib modules native webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	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/net-www/tomcat/tomcat-4.1.30-r2.ebuild b/net-www/tomcat/tomcat-4.1.30-r2.ebuild
deleted file mode 100644
index a256f5ed9c91..000000000000
--- a/net-www/tomcat/tomcat-4.1.30-r2.ebuild
+++ /dev/null
@@ -1,110 +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/tomcat/tomcat-4.1.30-r2.ebuild,v 1.1 2004/07/29 22:29:17 axxo Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.3/JSP-1.2 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-}
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-}
-
-src_install() {
-	dodoc RELEASE* RUNNING.txt LICENSE
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
-
-	insinto /etc/env.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME}
-	dodir /var/log/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	mv conf ${D}/etc/${TOMCAT_NAME}
-	mv bin common server shared temp work ${D}${TOMCAT_HOME}
-	if ! use doc ; then
-		rm -rf webapps/{examples,tomcat-docs}
-	fi
-	mv webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	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/net-www/tomcat/tomcat-4.1.30-r3.ebuild b/net-www/tomcat/tomcat-4.1.30-r4.ebuild
index 6bcfdd65ba3e..bc8d0990b324 100644
--- a/net-www/tomcat/tomcat-4.1.30-r3.ebuild
+++ b/net-www/tomcat/tomcat-4.1.30-r4.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/tomcat/tomcat-4.1.30-r3.ebuild,v 1.1 2004/08/03 21:52:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-4.1.30-r4.ebuild,v 1.1 2004/08/06 14:35:02 axxo Exp $
 
 inherit eutils
 
@@ -28,14 +28,6 @@ src_unpack() {
 	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
 }
 
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
 src_install() {
 	dodoc RELEASE* RUNNING.txt LICENSE
 
@@ -49,10 +41,6 @@ src_install() {
 	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
 	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
 
-	insinto /etc/env.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
-
 	diropts -m750
 	dodir ${TOMCAT_HOME}
 	dodir /var/log/${TOMCAT_NAME}
@@ -71,7 +59,25 @@ src_install() {
 	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
 }
 
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
+
+	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
+}
+
 pkg_postinst() {
+	#due to previous ebuild bloopers, make sure everything is correct
+	chown -R root:root /usr/share/doc/${TOMCAT_NAME}
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+
 	einfo " "
 	einfo " NOTICE!"
 	einfo " FILE LOCATIONS:"
diff --git a/net-www/tomcat/tomcat-5.0.27-r1.ebuild b/net-www/tomcat/tomcat-5.0.27-r1.ebuild
deleted file mode 100644
index c29496835cb8..000000000000
--- a/net-www/tomcat/tomcat-5.0.27-r1.ebuild
+++ /dev/null
@@ -1,110 +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/tomcat/tomcat-5.0.27-r1.ebuild,v 1.1 2004/07/29 13:22:16 axxo Exp $
-
-inherit eutils
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-JT_P="jakarta-${P}.tar.gz"
-S=${WORKDIR}/jakarta-${P}
-SLOT="${PV/.*}"
-SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/bin/${JT_P}"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-LICENSE="Apache-2.0"
-DEPEND="sys-apps/sed"
-RDEPEND=">=virtual/jdk-1.3
-		jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-
-TOMCAT_HOME="/opt/${PN}${SLOT}"
-TOMCAT_NAME="${PN}${SLOT}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/gentoo.diff
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
-}
-
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}
-	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
-}
-
-src_install() {
-	dodoc RELEASE* RUNNING.txt LICENSE
-
-	# INIT SCRIPTS AND ENV
-	insinto /etc/init.d
-	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-
-	insinto /etc/conf.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
-
-	insinto /etc/env.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
-
-	diropts -m750
-	dodir ${TOMCAT_HOME}
-	dodir /var/log/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}
-
-	mv conf ${D}/etc/${TOMCAT_NAME}
-	mv bin common server shared temp work ${D}${TOMCAT_HOME}
-	if ! use doc; then
-		rm -rf webapps/{tomcat-docs,jsp-examples,servlets-examples}
-	fi
-	mv webapps ${D}${TOMCAT_HOME}
-
-	dosym /etc/${TOMCAT_NAME} ${TOMCAT_HOME}/conf
-	dosym /var/log/${TOMCAT_NAME} ${TOMCAT_HOME}/logs
-
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	einfo " "
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo " "
-	einfo " "
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo " "
-	einfo " "
-	ewarn " If you are upgrading from older ebuild do NOT use"
-	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
-	ewarn " want to remove these. "
-	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
-	ewarn " can be installed side by side"
-	einfo " "
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo " "
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	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/net-www/tomcat/tomcat-5.0.27-r2.ebuild b/net-www/tomcat/tomcat-5.0.27-r3.ebuild
index 9103ee901ed4..3d284e4ecdad 100644
--- a/net-www/tomcat/tomcat-5.0.27-r2.ebuild
+++ b/net-www/tomcat/tomcat-5.0.27-r3.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/tomcat/tomcat-5.0.27-r2.ebuild,v 1.1 2004/08/03 21:52:36 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-5.0.27-r3.ebuild,v 1.1 2004/08/06 14:35:02 axxo Exp $
 
 inherit eutils
 
@@ -28,14 +28,6 @@ src_unpack() {
 	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
 }
 
-pkg_preinst() {
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
-	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
-}
-
 src_install() {
 	dodoc RELEASE* RUNNING.txt LICENSE
 
@@ -49,10 +41,6 @@ src_install() {
 	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
 	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
 
-	insinto /etc/env.d
-	insopts -m0644
-	newins ${FILESDIR}/${PV}/21tomcat 21${TOMCAT_NAME}
-
 	diropts -m750
 	dodir ${TOMCAT_HOME}
 	dodir /var/log/${TOMCAT_NAME}
@@ -71,7 +59,26 @@ src_install() {
 	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
 }
 
+
+pkg_preinst() {
+	enewgroup tomcat
+	enewuser tomcat -1 -1 /dev/null tomcat
+
+	chown -R tomcat:tomcat ${D}/opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat ${D}/var/log/${TOMCAT_NAME}
+}
+
 pkg_postinst() {
+	#due to previous ebuild bloopers make sure everything is correct
+	chown -R root:root /usr/share/doc/${TOMCAT_NAME}
+	chown root:root /etc/init.d/${TOMCAT_NAME}
+	chown root:root /etc/conf.d/${TOMCAT_NAME}
+
+	chown -R tomcat:tomcat /opt/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /etc/${TOMCAT_NAME}
+	chown -R tomcat:tomcat /var/log/${TOMCAT_NAME}
+
 	einfo " "
 	einfo " NOTICE!"
 	einfo " FILE LOCATIONS:"