diff options
Diffstat (limited to 'dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild')
-rw-r--r-- | dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild index 7e94860a0441..527fd4be58da 100644 --- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild +++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 + JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 eutils @@ -13,24 +14,29 @@ MY_COMPAT="${MY_PN}-compat" DESCRIPTION="JSP Standard Tag Library (JSTL) - Compat jar" HOMEPAGE="https://tomcat.apache.org/taglibs/standard/" -SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip" +SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 x86" IUSE="test" -CDEPEND="java-virtuals/servlet-api:3.0 +CDEPEND=" dev-java/tomcat-jstl-spec:0 - dev-java/tomcat-jstl-impl:0" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 + dev-java/tomcat-jstl-impl:0 + java-virtuals/servlet-api:3.0" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" + +DEPEND=" + ${CDEPEND} test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) - ${CDEPEND}" + >=virtual/jdk-1.6" S="${WORKDIR}/${MY_P}" @@ -40,7 +46,7 @@ EANT_BUILD_TARGET="package" EANT_BUILD_XML="compat/build.xml" java_prepare() { - cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml + cp "${FILESDIR}"/${P}-build.xml "${S}"/compat/build.xml || die } EANT_TEST_TARGET="test" |