| 1 |
betelgeuse 08/09/12 21:41:11 |
| 2 |
|
| 3 |
Modified: tomcat-5.5.27.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use jdk-with-com-sun:0 for java5 use flag and jdk-with-com-sun:1.4 without it. |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 www-servers/tomcat/tomcat-5.5.27.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: tomcat-5.5.27.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- tomcat-5.5.27.ebuild 12 Sep 2008 17:10:55 -0000 1.2 |
| 22 |
+++ tomcat-5.5.27.ebuild 12 Sep 2008 21:41:10 -0000 1.3 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild,v 1.2 2008/09/12 17:10:55 fordfrog Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.27.ebuild,v 1.3 2008/09/12 21:41:10 betelgeuse Exp $ |
| 28 |
|
| 29 |
EAPI=1 |
| 30 |
JAVA_PKG_IUSE="doc source" |
| 31 |
@@ -41,15 +41,18 @@ |
| 32 |
dev-java/ant-core |
| 33 |
admin? ( dev-java/struts:1.2 ) |
| 34 |
dev-java/sun-javamail |
| 35 |
- java5? ( >=virtual/jre-1.5 ) |
| 36 |
+ java5? ( |
| 37 |
+ >=virtual/jre-1.5 |
| 38 |
+ >=java-virtuals/jdk-with-com-sun-20080505-r1:0 |
| 39 |
+ ) |
| 40 |
!java5? ( |
| 41 |
=virtual/jre-1.4* |
| 42 |
+ java-virtuals/jdk-with-com-sun:1.4 |
| 43 |
dev-java/sun-jaf |
| 44 |
dev-java/mx4j-core:3.0 |
| 45 |
dev-java/xerces:2 |
| 46 |
dev-java/xml-commons-external:1.3 |
| 47 |
- ) |
| 48 |
- >=java-virtuals/jdk-with-com-sun-20080505-r1" |
| 49 |
+ )" |
| 50 |
DEPEND="java5? ( >=virtual/jdk-1.5 ) |
| 51 |
!java5? ( =virtual/jdk-1.4* ) |
| 52 |
${RDEPEND}" |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.192 www-servers/tomcat/ChangeLog |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.192&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.192&content-type=text/plain |
| 60 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.191&r2=1.192 |
| 61 |
|
| 62 |
Index: ChangeLog |
| 63 |
=================================================================== |
| 64 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v |
| 65 |
retrieving revision 1.191 |
| 66 |
retrieving revision 1.192 |
| 67 |
diff -u -r1.191 -r1.192 |
| 68 |
--- ChangeLog 12 Sep 2008 17:10:55 -0000 1.191 |
| 69 |
+++ ChangeLog 12 Sep 2008 21:41:10 -0000 1.192 |
| 70 |
@@ -1,6 +1,10 @@ |
| 71 |
# ChangeLog for www-servers/tomcat |
| 72 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 73 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.191 2008/09/12 17:10:55 fordfrog Exp $ |
| 74 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.192 2008/09/12 21:41:10 betelgeuse Exp $ |
| 75 |
+ |
| 76 |
+ 12 Sep 2008; Petteri Räty <betelgeuse@g.o> tomcat-5.5.27.ebuild: |
| 77 |
+ Use jdk-with-com-sun:0 for java5 use flag and jdk-with-com-sun:1.4 without |
| 78 |
+ it. |
| 79 |
|
| 80 |
12 Sep 2008; Miroslav Šulc <fordfrog@g.o> tomcat-5.5.27.ebuild: |
| 81 |
Fixed compilation so JDK with com.sun.* packages is used as tomcat needs |
Archives