From ac554c07a3d459db393443129011ce05f55af9b8 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Tue, 5 Dec 2006 00:07:04 +0000 Subject: [PATCH] Adding -ppc -pp64 to all 5.5 and 6.0 ebuilds due to missing sun.ssl.* stuff in IBM jdks. Added code to filter ecj on 5.5 ebuild. Cleaned up 6.0.2 ebuild a bit. Package-Manager: portage-2.1.2_rc2-r4 --- www-servers/tomcat/ChangeLog | 8 +++++- www-servers/tomcat/Manifest | 32 ++++++++++----------- www-servers/tomcat/tomcat-5.0.28-r14.ebuild | 5 ++-- www-servers/tomcat/tomcat-5.5.20-r2.ebuild | 7 +++-- www-servers/tomcat/tomcat-6.0.2.ebuild | 13 +++------ 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 665a4e12d95b..e4ba739c9220 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/tomcat # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.80 2006/11/30 16:07:07 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.81 2006/12/05 00:07:04 wltjr Exp $ + + 05 Dec 2006; William L. Thomson Jr. + tomcat-5.0.28-r14.ebuild, tomcat-5.5.20-r2.ebuild, tomcat-6.0.2.ebuild: + Adding -ppc -pp64 to all 5.5 and 6.0 ebuilds due to missing sun.ssl.* stuff + in IBM jdks. Added code to filter ecj on 5.5 ebuild. Cleaned up 6.0.2 ebuild + a bit. 30 Nov 2006; Vlastimil Babka tomcat-5.0.28-r14.ebuild: Update xerces dep for upcoming 2.6 slotmove. diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 905e53691d1f..180fbbb33e4c 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -158,22 +158,22 @@ EBUILD tomcat-5.0.27-r6.ebuild 3877 RMD160 4efe03ed845aa3781273958de248e63aa7195 MD5 cb8be629daa984a3e7899d058103414e tomcat-5.0.27-r6.ebuild 3877 RMD160 4efe03ed845aa3781273958de248e63aa7195746 tomcat-5.0.27-r6.ebuild 3877 SHA256 9f1947f2f3ef429125dc9a144d2f0f13fd82103779f9c1eada1f8f3a54ab9c2b tomcat-5.0.27-r6.ebuild 3877 -EBUILD tomcat-5.0.28-r14.ebuild 9406 RMD160 8871cda0c7926e16d012a48dcf882f98c52ce28c SHA1 720da42e65214e443c81731b79e39849563018d6 SHA256 8639227b19c4919c5e8aff82930c05f03e35544c9614cf923c843bb28232976e -MD5 139dcab8860d4edb613a4babfa6bbb7c tomcat-5.0.28-r14.ebuild 9406 -RMD160 8871cda0c7926e16d012a48dcf882f98c52ce28c tomcat-5.0.28-r14.ebuild 9406 -SHA256 8639227b19c4919c5e8aff82930c05f03e35544c9614cf923c843bb28232976e tomcat-5.0.28-r14.ebuild 9406 -EBUILD tomcat-5.5.20-r2.ebuild 10235 RMD160 19563a727a10272502d59c0db56f0616bd525655 SHA1 5bb1307c9a6447fa1fe948b1af7caf56a3217bac SHA256 bff504f55e5bad20d5c69120955464071aa0a5937b330e629007f120acd5ce81 -MD5 21b3066750740c3d243974c6b98e9b38 tomcat-5.5.20-r2.ebuild 10235 -RMD160 19563a727a10272502d59c0db56f0616bd525655 tomcat-5.5.20-r2.ebuild 10235 -SHA256 bff504f55e5bad20d5c69120955464071aa0a5937b330e629007f120acd5ce81 tomcat-5.5.20-r2.ebuild 10235 -EBUILD tomcat-6.0.2.ebuild 5122 RMD160 0b2ac2e4b5918a157e56b242fba44b6e43f55893 SHA1 ea138dcf3b829c49345b29636f68cf7afc43e945 SHA256 035403d18554f454c82e3b022730471a1e633e439172998ba759b38c0c904381 -MD5 028abe576f2c997ba59a9b604399a1ad tomcat-6.0.2.ebuild 5122 -RMD160 0b2ac2e4b5918a157e56b242fba44b6e43f55893 tomcat-6.0.2.ebuild 5122 -SHA256 035403d18554f454c82e3b022730471a1e633e439172998ba759b38c0c904381 tomcat-6.0.2.ebuild 5122 -MISC ChangeLog 27219 RMD160 07dbafe875fecd7e56a863eece432f6a1d3793e8 SHA1 95057c94a17a4652c10163be35ee79eb978c7fa7 SHA256 1e71b8f8e604299ccb8a4965e310f30aad8df0548bd03e0bf679548c78d476ad -MD5 6abb70a949a6f4e1c20c76a91b571a02 ChangeLog 27219 -RMD160 07dbafe875fecd7e56a863eece432f6a1d3793e8 ChangeLog 27219 -SHA256 1e71b8f8e604299ccb8a4965e310f30aad8df0548bd03e0bf679548c78d476ad ChangeLog 27219 +EBUILD tomcat-5.0.28-r14.ebuild 9396 RMD160 266effb829b70d11022216a8d479898d0e9a526c SHA1 d815e80dbd5735741b1f42fb1ff15240af394c0b SHA256 729243dac70cf13b8d27cef8d74d86f6e695cf10e00399d7908d930f5e42671d +MD5 c4a7c24e9d21a98c54b824bbc37b636f tomcat-5.0.28-r14.ebuild 9396 +RMD160 266effb829b70d11022216a8d479898d0e9a526c tomcat-5.0.28-r14.ebuild 9396 +SHA256 729243dac70cf13b8d27cef8d74d86f6e695cf10e00399d7908d930f5e42671d tomcat-5.0.28-r14.ebuild 9396 +EBUILD tomcat-5.5.20-r2.ebuild 10267 RMD160 5c9444d9dca44b1742790a0de0db240007603e16 SHA1 6b9d50d96393b4ab71e30a51520d5c54eab65e4b SHA256 bd3064043cfc6b6337b69ca40de87f223866c93bd4a32215bb905c4c49e0a080 +MD5 5c353ee5e679cd168d299cd30cc91f1e tomcat-5.5.20-r2.ebuild 10267 +RMD160 5c9444d9dca44b1742790a0de0db240007603e16 tomcat-5.5.20-r2.ebuild 10267 +SHA256 bd3064043cfc6b6337b69ca40de87f223866c93bd4a32215bb905c4c49e0a080 tomcat-5.5.20-r2.ebuild 10267 +EBUILD tomcat-6.0.2.ebuild 4710 RMD160 9cb4194bba00500f1a03f1b5355a5c9fac26637b SHA1 b5c58296f5a115d95fcb21110f0f57ae2ae50020 SHA256 6aa88555628381bf226f9e1321b31ad4b71f87c56b974ffbc0653b7d5db43869 +MD5 694e0ad892fa9963ff56d030127f1858 tomcat-6.0.2.ebuild 4710 +RMD160 9cb4194bba00500f1a03f1b5355a5c9fac26637b tomcat-6.0.2.ebuild 4710 +SHA256 6aa88555628381bf226f9e1321b31ad4b71f87c56b974ffbc0653b7d5db43869 tomcat-6.0.2.ebuild 4710 +MISC ChangeLog 27516 RMD160 90598c96f94f7d7c959fd38f3db25bc650facb11 SHA1 e0271c2c094c17141da15deb88bfb798c6dd426c SHA256 f2ac06e1d89dc2afb6e4b38684f761fe128c8b86d56bb4c93136a3f03074d126 +MD5 529febd4812d5db0b89128cb6388e2db ChangeLog 27516 +RMD160 90598c96f94f7d7c959fd38f3db25bc650facb11 ChangeLog 27516 +SHA256 f2ac06e1d89dc2afb6e4b38684f761fe128c8b86d56bb4c93136a3f03074d126 ChangeLog 27516 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558 diff --git a/www-servers/tomcat/tomcat-5.0.28-r14.ebuild b/www-servers/tomcat/tomcat-5.0.28-r14.ebuild index 8a782cdb532c..c6c6bc125db3 100644 --- a/www-servers/tomcat/tomcat-5.0.28-r14.ebuild +++ b/www-servers/tomcat/tomcat-5.0.28-r14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r14.ebuild,v 1.3 2006/11/30 16:07:07 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r14.ebuild,v 1.4 2006/12/05 00:07:04 wltjr Exp $ inherit eutils java-pkg @@ -9,7 +9,7 @@ DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container" SLOT="${PV/.*}" SRC_URI="mirror://apache/tomcat/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz" HOMEPAGE="http://tomcat.apache.org/" -KEYWORDS="~x86 ~amd64 -ppc64" +KEYWORDS="~x86 ~amd64 -ppc -ppc64" LICENSE="Apache-2.0" #only one accepted revision of struts to force upgrading because of slot changes RDEPEND=">=virtual/jdk-1.4 @@ -39,7 +39,6 @@ RDEPEND=">=virtual/jdk-1.4 jikes? ( dev-java/jikes )" DEPEND=">=virtual/jdk-1.4 ${RDEPEND} - sys-apps/sed dev-java/ant" IUSE="doc examples source jikes" diff --git a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild b/www-servers/tomcat/tomcat-5.5.20-r2.ebuild index 7fda85c5bcf5..cbc5673e0cdd 100644 --- a/www-servers/tomcat/tomcat-5.5.20-r2.ebuild +++ b/www-servers/tomcat/tomcat-5.5.20-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r2.ebuild,v 1.4 2006/11/28 04:44:39 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r2.ebuild,v 1.5 2006/12/05 00:07:04 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -10,7 +10,7 @@ MY_P="apache-${P}-src" SLOT="5.5" SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz" HOMEPAGE="http://jakarta.apache.org/tomcat" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 x86 -ppc -ppc64" LICENSE="Apache-2.0" IUSE="admin java5 doc examples source test" @@ -46,7 +46,6 @@ RDEPEND="=dev-java/eclipse-ecj-3.1* DEPEND="java5? ( >=virtual/jdk-1.5 ) !java5? ( =virtual/jdk-1.4* ) ${RDEPEND} - sys-apps/sed dev-java/ant" if ! use java5; then @@ -66,6 +65,8 @@ pkg_setup() { enewgroup tomcat enewuser tomcat -1 -1 /dev/null tomcat + java-pkg_filter ecj-3.1 ecj-3.2 + if use java5; then JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" diff --git a/www-servers/tomcat/tomcat-6.0.2.ebuild b/www-servers/tomcat/tomcat-6.0.2.ebuild index 8c0b2cddff93..884ad7081ff5 100644 --- a/www-servers/tomcat/tomcat-6.0.2.ebuild +++ b/www-servers/tomcat/tomcat-6.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.2.ebuild,v 1.1 2006/11/20 04:32:22 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.2.ebuild,v 1.2 2006/12/05 00:07:04 wltjr Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -10,7 +10,7 @@ MY_P="apache-${P}-src" SLOT="6" SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV}/src/${MY_P}.tar.gz" HOMEPAGE="http://jakarta.apache.org/tomcat" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 -ppc -ppc64" LICENSE="Apache-2.0" IUSE="doc examples jni source test" @@ -26,7 +26,6 @@ RDEPEND=">=virtual/jre-1.5 DEPEND=">=virtual/jdk-1.5 ${RDEPEND} - sys-apps/sed test? ( dev-java/junit dev-java/ant @@ -37,8 +36,8 @@ JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*" S=${WORKDIR}/${MY_P} -TOMCAT_HOME="/usr/share/${PN}-${SLOT}" TOMCAT_NAME="${PN}-${SLOT}" +TOMCAT_HOME="/usr/share/${TOMCAT_NAME}" WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps" pkg_setup() { @@ -66,12 +65,8 @@ src_compile(){ local antflags="build-jasper-jdt build-only -Dbase.path=${T}" antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)" antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)" - antflags="${antflags} -Dcommons-dbcp.jar=$(java-pkg_getjar commons-dbcp commons-dbcp.jar)" - antflags="${antflags} -Dcommons-pool.jar=$(java-pkg_getjar commons-pool commons-pool.jar)" antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)" - antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" - antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)" - eant build-jasper-jdt ${antflags} + eant ${antflags} if use jni; then cd ${S}/native/connector -- 2.26.2