From: William Thomson Date: Tue, 20 Mar 2007 04:35:11 +0000 (+0000) Subject: Registered jars per bug #171496. Copy one bin dir instead of two. Replace copy of... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef434cfc49da6e6a2bbba2ca175cd47992da8d5e;p=gentoo.git Registered jars per bug #171496. Copy one bin dir instead of two. Replace copy of commons-daemon.jar with symlink via jar-from Package-Manager: portage-2.1.2.2 --- 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. + -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. tomcat-5.5.20-r8.ebuild, tomcat-5.5.20-r10.ebuild, tomcat-5.5.23.ebuild, diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index cfbc41133808..c469b13c0fc3 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -150,14 +150,14 @@ EBUILD tomcat-5.5.23.ebuild 10539 RMD160 8cf2dd7934957df4f41b58260dac88938237512 MD5 7a48deb1837cf583f98bd8fa1a2a0cae tomcat-5.5.23.ebuild 10539 RMD160 8cf2dd7934957df4f41b58260dac88938237512a tomcat-5.5.23.ebuild 10539 SHA256 b15bb512df748e54820bc9612008973e33b0f276a3f283f16e6f1bc7dff5a23d tomcat-5.5.23.ebuild 10539 -EBUILD tomcat-6.0.10.ebuild 4740 RMD160 3eabd8a75e661067e90517c7e5a610f9f1b394ae SHA1 31a891618a1751bef4166635a7ae72e3b6721505 SHA256 f7a82f6d88f2cf53945e486589f2718cc489a4b32ff049e5adf305114908f9e1 -MD5 fbb27d4f4319e3ac7a6f66ca9279085d tomcat-6.0.10.ebuild 4740 -RMD160 3eabd8a75e661067e90517c7e5a610f9f1b394ae tomcat-6.0.10.ebuild 4740 -SHA256 f7a82f6d88f2cf53945e486589f2718cc489a4b32ff049e5adf305114908f9e1 tomcat-6.0.10.ebuild 4740 -MISC ChangeLog 40814 RMD160 7d2630ac91c82659b498d81575ea2180eb5f7f0c SHA1 90eeee03457a7707848267f3ea871ecc61b139f5 SHA256 4d2c966b390a7c341dd29ecd585d7c60afa63d30a9f464bc53d1414d954f2dd2 -MD5 ca77f95ebad53d5de71ad4812857ce86 ChangeLog 40814 -RMD160 7d2630ac91c82659b498d81575ea2180eb5f7f0c ChangeLog 40814 -SHA256 4d2c966b390a7c341dd29ecd585d7c60afa63d30a9f464bc53d1414d954f2dd2 ChangeLog 40814 +EBUILD tomcat-6.0.10-r1.ebuild 4878 RMD160 5098ffd69ef3338c3d2e4626edbc92c0ee94da3d SHA1 53a949197d31c45e0d0a7b7e3e9c030f5a9f057c SHA256 bd075832d3b7cc5d7df03956675045ddf739989502ef1781ecba93d393bb489a +MD5 fac9f173878df0cd2efcc7626ef7de79 tomcat-6.0.10-r1.ebuild 4878 +RMD160 5098ffd69ef3338c3d2e4626edbc92c0ee94da3d tomcat-6.0.10-r1.ebuild 4878 +SHA256 bd075832d3b7cc5d7df03956675045ddf739989502ef1781ecba93d393bb489a tomcat-6.0.10-r1.ebuild 4878 +MISC ChangeLog 41087 RMD160 f22940ef41dc38149b18da55d846960a389069da SHA1 cf30890202a07d4de20aaa82debdbf3f9957f3dd SHA256 235aad82bf3a18df47238f5b855aede7479e403cdd872ea70ad48fde4e06eeb2 +MD5 42726853caebad803997b5aa0d50448b ChangeLog 41087 +RMD160 f22940ef41dc38149b18da55d846960a389069da ChangeLog 41087 +SHA256 235aad82bf3a18df47238f5b855aede7479e403cdd872ea70ad48fde4e06eeb2 ChangeLog 41087 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556 @@ -174,6 +174,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di MD5 6947c731df35ce2149f4a2f8009b575f files/digest-tomcat-5.5.23 277 RMD160 c7a3b4f7dd1b085332606c3d6a68cc21f0ff78e2 files/digest-tomcat-5.5.23 277 SHA256 7c1430575374307e6337ec7f22b7822c2093deb36bb3e9fffaa4cf8b23f34051 files/digest-tomcat-5.5.23 277 -MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10 277 -RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10 277 -SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10 277 +MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-6.0.10-r1 277 +RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-6.0.10-r1 277 +SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-6.0.10-r1 277 diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.10 b/www-servers/tomcat/files/digest-tomcat-6.0.10-r1 similarity index 100% rename from www-servers/tomcat/files/digest-tomcat-6.0.10 rename to 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 similarity index 92% rename from www-servers/tomcat/tomcat-6.0.10.ebuild rename to 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"