monsieurp 15/07/22 13:03:26
Modified: tomcat-7.0.59-r2.ebuild tomcat-7.0.59-r1.ebuild
tomcat-7.0.59.ebuild ChangeLog
Log:
Override java.7.home property unconditionally. This was causing tomcat's
javadoc generation to fail.
Signed-off-by: Patrice Clement <[email protected]>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
93491BB8)
Revision Changes Path
1.3 www-servers/tomcat/tomcat-7.0.59-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild?r1=1.2&r2=1.3
Index: tomcat-7.0.59-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat-7.0.59-r2.ebuild 22 Jul 2015 12:21:07 -0000 1.2
+++ tomcat-7.0.59-r2.ebuild 22 Jul 2015 13:03:26 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v 1.2
2015/07/22 12:21:07 monsieurp Exp $
+# $Header:
/var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v 1.3
2015/07/22 13:03:26 monsieurp Exp $
EAPI=5
@@ -69,7 +69,7 @@
IM_REV="-r1"
src_compile() {
- use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
+ EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar)"
java-pkg-2_src_compile
}
1.2 www-servers/tomcat/tomcat-7.0.59-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild?r1=1.1&r2=1.2
Index: tomcat-7.0.59-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat-7.0.59-r1.ebuild 9 Jun 2015 09:24:32 -0000 1.1
+++ tomcat-7.0.59-r1.ebuild 22 Jul 2015 13:03:26 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild,v 1.1
2015/06/09 09:24:32 monsieurp Exp $
+# $Header:
/var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r1.ebuild,v 1.2
2015/07/22 13:03:26 monsieurp Exp $
EAPI=5
@@ -69,7 +69,7 @@
IM_REV="-r1"
src_compile() {
- use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
+ EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar)"
java-pkg-2_src_compile
}
1.7 www-servers/tomcat/tomcat-7.0.59.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild?r1=1.6&r2=1.7
Index: tomcat-7.0.59.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tomcat-7.0.59.ebuild 15 Jun 2015 08:27:12 -0000 1.6
+++ tomcat-7.0.59.ebuild 22 Jul 2015 13:03:26 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v
1.6 2015/06/15 08:27:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59.ebuild,v
1.7 2015/07/22 13:03:26 monsieurp Exp $
EAPI=5
@@ -71,7 +71,7 @@
IM_REV="-r1"
src_compile() {
- use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
+ EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar)"
java-pkg-2_src_compile
}
1.363 www-servers/tomcat/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.363&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.363&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.362&r2=1.363
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- ChangeLog 22 Jul 2015 12:21:07 -0000 1.362
+++ ChangeLog 22 Jul 2015 13:03:26 -0000 1.363
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.362
2015/07/22 12:21:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.363
2015/07/22 13:03:26 monsieurp Exp $
+
+ 22 Jul 2015; Patrice Clement <[email protected]> tomcat-7.0.59-r1.ebuild,
+ tomcat-7.0.59-r2.ebuild, tomcat-7.0.59.ebuild:
+ Override java.7.home property unconditionally. This was causing tomcat's
+ javadoc generation to fail.
22 Jul 2015; Patrice Clement <[email protected]> tomcat-6.0.44-r0.ebuild,
tomcat-7.0.59-r2.ebuild, tomcat-8.0.23-r2.ebuild:
