From 50d6d74b59973e0163b9ce7db5da08d24938f165 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Tue, 19 Feb 2013 07:28:34 +0000 Subject: www-servers/tomcat: version bump (Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key CFE47E2F) --- www-servers/tomcat/ChangeLog | 8 +- .../tomcat/files/tomcat-7.0.37-build.xml.patch | 105 ++++++++++++++++ www-servers/tomcat/tomcat-7.0.37.ebuild | 137 +++++++++++++++++++++ 3 files changed, 249 insertions(+), 1 deletion(-) create mode 100644 www-servers/tomcat/files/tomcat-7.0.37-build.xml.patch create mode 100644 www-servers/tomcat/tomcat-7.0.37.ebuild (limited to 'www-servers/tomcat') diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 9c6eb5cc14ca..23972621db7c 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.314 2013/01/17 10:29:05 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.315 2013/02/19 07:28:33 fordfrog Exp $ + +*tomcat-7.0.37 (19 Feb 2013) + + 19 Feb 2013; Miroslav Šulc +tomcat-7.0.37.ebuild, + +files/tomcat-7.0.37-build.xml.patch: + version bump *tomcat-7.0.35 (17 Jan 2013) diff --git a/www-servers/tomcat/files/tomcat-7.0.37-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.37-build.xml.patch new file mode 100644 index 000000000000..9b07137451aa --- /dev/null +++ b/www-servers/tomcat/files/tomcat-7.0.37-build.xml.patch @@ -0,0 +1,105 @@ +diff --git a/build.xml b/build.xml +index 3ff8f81..83357a4 100644 +--- a/build.xml ++++ b/build.xml +@@ -613,7 +614,8 @@ + filesId="files.annotations-api" + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + +- ++ ++ JSP 2.2 Implementation JAR File + + +- ++ JSP 2.2 EL Implementation JAR File + ++--> + + + + ++ + + + +@@ -918,9 +922,11 @@ + + + ++ + + + +@@ -1355,7 +1361,8 @@ + + ++ description="Prepare to build web services extras package" ++ unless="noget"> + + + +@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + + + ++ description="Download (and build) components necessary to compile" ++ unless="noget"> + + + +@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + + + ++ description="Download additional components for the tests" ++ unless="noget"> + + + +@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + + + ++ description="Download additional components for a distribution" ++ unless="noget"> + + + diff --git a/www-servers/tomcat/tomcat-7.0.37.ebuild b/www-servers/tomcat/tomcat-7.0.37.ebuild new file mode 100644 index 000000000000..40953b183b8b --- /dev/null +++ b/www-servers/tomcat/tomcat-7.0.37.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.37.ebuild,v 1.1 2013/02/19 07:28:33 fordfrog Exp $ + +EAPI=4 + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="7" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="extra-webapps" + +RESTRICT="test" # can we run them on a production system? + +ECJ_SLOT="4.2" +SAPI_SLOT="3.0" + +COMMON_DEP=" + dev-java/eclipse-ecj:${ECJ_SLOT} + ~dev-java/tomcat-servlet-api-${PV} + extra-webapps? ( dev-java/jakarta-jstl:0 )" +RDEPEND="${COMMON_DEP} + !=virtual/jre-1.6" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.6 + >=dev-java/ant-core-1.8.1:0 + test? ( + dev-java/ant-junit:0 + dev-java/junit:4 + )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +java_prepare() { + find -name '*.jar' -exec rm -v {} + || die + epatch "${FILESDIR}/${P}-build.xml.patch" + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" + +src_test() { + java-pkg-2_src_test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + # so we don't have to call java-config with --with-dependencies, which might + # bring in more jars then actually desired. + java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})" + + dodoc RELEASE-NOTES RUNNING.txt + use doc && java-pkg_dojavadoc output/dist/webapps/docs/api + use source && java-pkg_dosrc java/* + + ### Webapps ### + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # replace the default pw with a random one, see #92281 + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + doexe "${T}"/tomcat{.init,-instance-manager.bash} +} + +pkg_postinst() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + +# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." +} -- cgit v1.2.3-65-gdbad