* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: tomcat-7.0.56.ebuild ChangeLog
@ 2014-11-02 10:19 Johann Schmitz (ercpe)
0 siblings, 0 replies; 2+ messages in thread
From: Johann Schmitz (ercpe) @ 2014-11-02 10:19 UTC (permalink / raw
To: gentoo-commits
ercpe 14/11/02 10:19:15
Modified: ChangeLog
Added: tomcat-7.0.56.ebuild
Log:
Version bump to 7.0.56
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path
1.330 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.330&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.330&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.329&r2=1.330
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- ChangeLog 2 Nov 2014 08:05:27 -0000 1.329
+++ ChangeLog 2 Nov 2014 10:19:15 -0000 1.330
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.329 2014/11/02 08:05:27 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.330 2014/11/02 10:19:15 ercpe Exp $
+
+*tomcat-7.0.56 (02 Nov 2014)
+
+ 02 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
+ +files/tomcat-7.0.56-build.xml.patch, +tomcat-7.0.56.ebuild:
+ Version bump to 7.0.56
*tomcat-6.0.41 (02 Nov 2014)
1.1 www-servers/tomcat/tomcat-7.0.56.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?rev=1.1&content-type=text/plain
Index: tomcat-7.0.56.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.1 2014/11/02 10:19:15 ercpe Exp $
EAPI=5
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.4"
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}
!<dev-java/tomcat-native-1.1.24
>=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 -frv {} + || 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 -Djava.7.home=${JAVA_HOME}"
# revision of the instance-manager script
IM_REV="-r1"
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${IM_REV}.bash} "${T}" || die
eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
insinto "${dest}"/gentoo
doins "${T}"/tomcat.conf
exeinto "${dest}"/gentoo
doexe "${T}"/tomcat.init
newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-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."
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: tomcat-7.0.56.ebuild ChangeLog
@ 2014-11-11 18:21 Johann Schmitz (ercpe)
0 siblings, 0 replies; 2+ messages in thread
From: Johann Schmitz (ercpe) @ 2014-11-11 18:21 UTC (permalink / raw
To: gentoo-commits
ercpe 14/11/11 18:21:06
Modified: tomcat-7.0.56.ebuild ChangeLog
Log:
Only remove .jar files, not directories; Fixed my stupid patch file (bug #528908)
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Revision Changes Path
1.2 www-servers/tomcat/tomcat-7.0.56.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild?r1=1.1&r2=1.2
Index: tomcat-7.0.56.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat-7.0.56.ebuild 2 Nov 2014 10:19:15 -0000 1.1
+++ tomcat-7.0.56.ebuild 11 Nov 2014 18:21:05 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.1 2014/11/02 10:19:15 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.56.ebuild,v 1.2 2014/11/11 18:21:05 ercpe Exp $
EAPI=5
@@ -48,8 +48,8 @@
}
java_prepare() {
- find -name '*.jar' -exec rm -frv {} + || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
+ find -type f -name '*.jar' -exec rm -frv {} + || die
+ epatch "${FILESDIR}/${P}-2-build.xml.patch"
# For use of catalina.sh in netbeans
sed -i -e "/^# ----- Execute The Requested Command/ a\
1.331 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.331&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.331&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.330&r2=1.331
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -r1.330 -r1.331
--- ChangeLog 2 Nov 2014 10:19:15 -0000 1.330
+++ ChangeLog 11 Nov 2014 18:21:05 -0000 1.331
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.330 2014/11/02 10:19:15 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.331 2014/11/11 18:21:05 ercpe Exp $
+
+ 11 Nov 2014; Johann Schmitz <ercpe@gentoo.org>
+ files/tomcat-7.0.56-build.xml.patch, tomcat-7.0.56.ebuild:
+ Only remove .jar files, not directories; Fixed my stupid patch file (bug
+ #528908)
*tomcat-7.0.56 (02 Nov 2014)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-11-11 18:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-11 18:21 [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: tomcat-7.0.56.ebuild ChangeLog Johann Schmitz (ercpe)
-- strict thread matches above, loose matches on Subject: below --
2014-11-02 10:19 Johann Schmitz (ercpe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox