Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 503090 | Differences between
and this patch

Collapse All | Expand All

(-)tomcat-7.0.56.ebuild.orig (-5 / +6 lines)
Lines 27-40 Link Here
27
COMMON_DEP="
27
COMMON_DEP="
28
	dev-java/eclipse-ecj:${ECJ_SLOT}
28
	dev-java/eclipse-ecj:${ECJ_SLOT}
29
	~dev-java/tomcat-servlet-api-${PV}
29
	~dev-java/tomcat-servlet-api-${PV}
30
	doc? ( >=virtual/jre-1.7 )
31
	!doc? ( >=virtual/jre-1.6 )
32
	websockets? ( >=virtual/jre-1.7 )
33
	!websockets? ( >=virtual/jre-1.6 )
30
	extra-webapps? ( dev-java/jakarta-jstl:0 )"
34
	extra-webapps? ( dev-java/jakarta-jstl:0 )"
31
RDEPEND="${COMMON_DEP}
35
RDEPEND="${COMMON_DEP}
32
	!<dev-java/tomcat-native-1.1.24
36
	!<dev-java/tomcat-native-1.1.24"
33
	websockets? ( >=virtual/jre-1.6 )
34
	!websockets? ( >=virtual/jre-1.6 )"
35
DEPEND="${COMMON_DEP}
37
DEPEND="${COMMON_DEP}
36
	websockets? ( >=virtual/jdk-1.6 )
37
	!websockets? ( >=virtual/jdk-1.6 )
38
	>=dev-java/ant-core-1.8.1:0
38
	>=dev-java/ant-core-1.8.1:0
39
	test? (
39
	test? (
40
		dev-java/ant-junit:0
40
		dev-java/ant-junit:0
Lines 71-76 Link Here
71
IM_REV="-r1"
71
IM_REV="-r1"
72
72
73
src_compile() {
73
src_compile() {
74
	use doc && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
74
	use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
75
	use websockets && EANT_EXTRA_ARGS="-Djava.7.home=${JAVA_HOME}"
75
	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
76
	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
76
	java-pkg-2_src_compile
77
	java-pkg-2_src_compile

Return to bug 503090