fix patch to source the correct file, 58835

5 files changed, 127 insertions, 8 deletions

diff --git a/net-www/tomcat/ChangeLog b/net-www/tomcat/ChangeLog
index da58d8789852..001045f7a300 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.39 2004/07/29 13:22:16 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/ChangeLog,v 1.40 2004/07/29 22:29:17 axxo Exp $
+
+*tomcat-4.1.30-r2 (30 Jul 2004)
+
+  30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/4.1.30/gentoo.diff,
+  +tomcat-4.1.30-r2.ebuild:
+  fix patch to source the correct file, 58835
 
 *tomcat-5.0.27-r1 (29 Jul 2004)
 
diff --git a/net-www/tomcat/Manifest b/net-www/tomcat/Manifest
index dc5f809d656a..a3b0898cd393 100644
--- a/net-www/tomcat/Manifest
+++ b/net-www/tomcat/Manifest
@@ -5,11 +5,13 @@ MD5 fb7e3fb8368f14e954af39b85ea20613 tomcat-4.1.30-r1.ebuild 3207
 MD5 c51948b362c299e2735d6e460666e073 tomcat-5.0.27-r1.ebuild 3227
 MD5 064bb30807b209e63f4c181c630732a8 tomcat-3.3.2.ebuild 2894
 MD5 26888d55423622f08c73b99bb21b59af tomcat-4.1.30.ebuild 3204
+MD5 8aa660cb189e47312c7fb43a30df7a5d tomcat-4.1.30-r2.ebuild 3207
 MD5 fea373c4e52e11022321c763e61c4d1b tomcat-5.0.27.ebuild 3224
-MD5 24fd7d6f207daa0275dca483d46ab6c2 ChangeLog 9151
+MD5 00a964cc0cf6f8a466fbb06c03a401cd ChangeLog 9334
 MD5 56292f22dced45d993974e198033461d metadata.xml 221
 MD5 6940eb780efc66ecb6ecf11b6b7adb05 files/digest-tomcat-3.3.2 73
 MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r1 74
+MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r2 74
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r1 75
 MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30 74
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27 75
@@ -17,7 +19,7 @@ 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 8762369123b94c9a0b2c1cc78c301600 files/4.1.30/gentoo.diff 461
+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
@@ -30,7 +32,7 @@ MD5 a4af2d8c7172284a45409b4c6869c54d files/5.0.27/21tomcat 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBCPp3/rLF9B432nYRAp/IAJ9PGuQ3xXO//8hwvLwIXE8gkFh8mQCfddBd
-N9MPYGr974fQm9i6lAlpnxU=
-=bKFj
+iD8DBQFBCXqp/rLF9B432nYRAtreAJwJ3AylVvGbVKP+IMojm3UWs3riogCaAnVS
+lyk5cz4GR+V7n/kP7rtmk/g=
+=saAc
 -----END PGP SIGNATURE-----
diff --git a/net-www/tomcat/files/4.1.30/gentoo.diff b/net-www/tomcat/files/4.1.30/gentoo.diff
index 319bb07ac686..2ae07dfb9e5f 100644
--- a/net-www/tomcat/files/4.1.30/gentoo.diff
+++ b/net-www/tomcat/files/4.1.30/gentoo.diff
@@ -1,12 +1,12 @@
 --- bin/catalina.sh	2004-05-19 02:25:07.000000000 -0400
 +++ bin/catalina.sh	2004-05-19 02:23:20.128089696 -0400
 @@ -38,6 +38,10 @@
- # $Id: gentoo.diff,v 1.3 2004/07/28 22:31:32 axxo Exp $
+ # $Id: gentoo.diff,v 1.4 2004/07/29 22:29:18 axxo Exp $
  # -----------------------------------------------------------------------------
  
 +# source the appropriate files right away
 +source /etc/profile
-+source /etc/conf.d/tomcat5
++source /etc/conf.d/tomcat4
 +
  # OS specific support.  $var _must_ be set to either true or false.
  cygwin=false
diff --git a/net-www/tomcat/files/digest-tomcat-4.1.30-r2 b/net-www/tomcat/files/digest-tomcat-4.1.30-r2
new file mode 100644
index 000000000000..a1651a599a01
--- /dev/null
+++ b/net-www/tomcat/files/digest-tomcat-4.1.30-r2
@@ -0,0 +1 @@
+MD5 ff27f6a5900768c1aafab4a68675b2ed jakarta-tomcat-4.1.30.tar.gz 7894019
diff --git a/net-www/tomcat/tomcat-4.1.30-r2.ebuild b/net-www/tomcat/tomcat-4.1.30-r2.ebuild
new file mode 100644
index 000000000000..a256f5ed9c91
--- /dev/null
+++ b/net-www/tomcat/tomcat-4.1.30-r2.ebuild
@@ -0,0 +1,110 @@
+# 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 " "
+}