Registered jars per bug #171496. Copy one bin dir instead of two. Replace copy of commons-daemon.jar with symlink via jar-from

(Portage version: 2.1.2.2)

3 files changed, 21 insertions, 8 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 6618da37790d..dd53157e20ea 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.126 2007/03/13 00:06:53 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.127 2007/03/20 04:35:11 wltjr Exp $
+
+*tomcat-6.0.10-r1 (20 Mar 2007)
+
+  20 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-6.0.10.ebuild, +tomcat-6.0.10-r1.ebuild:
+  Registered jars per bug #171496. Copy one bin dir instead of two. Replace
+  copy of commons-daemon.jar with symlink via jar-from
 
   12 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-5.5.20-r8.ebuild, tomcat-5.5.20-r10.ebuild, tomcat-5.5.23.ebuild,
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r1
index 3dd91cc642dc..3dd91cc642dc 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.10
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.10-r1
diff --git a/www-servers/tomcat/tomcat-6.0.10.ebuild b/www-servers/tomcat/tomcat-6.0.10-r1.ebuild
index 073ab9942c0b..da3fa6357dd7 100644
--- a/www-servers/tomcat/tomcat-6.0.10.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10.ebuild,v 1.2 2007/03/13 00:06:53 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.10-r1.ebuild,v 1.1 2007/03/20 04:35:11 wltjr Exp $
 
 WANT_ANT_TASKS="ant-trax"
 
@@ -62,6 +62,17 @@ src_compile(){
 }
 
 src_install() {
+	cd "${S}/output/build/bin"
+	rm -f *.bat commons-daemon.jar
+	java-pkg_jar-from commons-daemon
+	chmod 755 *.sh
+
+	# register jars per bug #171496
+	cd "${S}/output/build/lib/"
+	for jar in *.jar; do
+		java-pkg_dojar ${jar}
+	done
+
 	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
 
 	# init.d, conf.d
@@ -80,10 +91,6 @@ src_install() {
 	diropts -m0755
 
 	cd "${S}"
-	# we don't need dos scripts
-	rm -f bin/*.bat
-	chmod 755 bin/*.sh
-
 	# fix context's since upstream is slackin
 	sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
 	sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
@@ -100,8 +107,7 @@ src_install() {
 	# copy over the directories
 	chown -R tomcat:tomcat webapps/* conf/*
 	cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-	cp -R bin output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \
-		|| die "failed to copy"
+	cp -PR output/build/bin ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
 
 	cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
 		|| die "failed to copy"