Added missing xalan dep. Force either 1.4 or 1.5, as it fails to compile with 1.6 because of changes in the JDBC API. Reported in bug #148410.

Package-Manager: portage-2.1.2_pre1-r1

3 files changed, 26 insertions, 15 deletions

diff --git a/dev-java/jakarta-jstl/ChangeLog b/dev-java/jakarta-jstl/ChangeLog
index 48817c373be3..c090c46aabd9 100644
--- a/dev-java/jakarta-jstl/ChangeLog
+++ b/dev-java/jakarta-jstl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jakarta-jstl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.7 2006/09/18 01:25:07 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/ChangeLog,v 1.8 2006/09/27 04:14:05 nichoj Exp $
+
+  27 Sep 2006; Joshua Nichols <nichoj@gentoo.org>
+  jakarta-jstl-1.1.2-r1.ebuild:
+  Added missing xalan dep. Force either 1.4 or 1.5, as it fails to compile
+  with 1.6 because of changes in the JDBC API. Reported in bug #148410.
 
 *jakarta-jstl-1.1.2-r1 (18 Sep 2006)
 
diff --git a/dev-java/jakarta-jstl/Manifest b/dev-java/jakarta-jstl/Manifest
index 23b70b88c4e7..b0e741e1048a 100644
--- a/dev-java/jakarta-jstl/Manifest
+++ b/dev-java/jakarta-jstl/Manifest
@@ -3,18 +3,18 @@ MD5 90e28dc5d90aba8e6d6d573e2a4864ef files/jakarta-jstl-1.1.2-remove-bootclasspa
 RMD160 7e2f0439bec451eb4ba614d4e0a6f1ad5a91f0d6 files/jakarta-jstl-1.1.2-remove-bootclasspath.patch 585
 SHA256 7aaa78dff11710a7737af2194d42d44f245ca3a2edd82f7f9b580d3bec79fb96 files/jakarta-jstl-1.1.2-remove-bootclasspath.patch 585
 DIST jakarta-taglibs-standard-1.1.2-src.tar.gz 287031 RMD160 00ac3b34c7aab445f757bf5b6aaef273194bbf94 SHA1 1d24c9e5019b57f298a40a77bac3f863ecf8a033 SHA256 47a0222c426d93dcc9d7493520d52dba85ba256385d351cdc957cf4b6b30fe23
-EBUILD jakarta-jstl-1.1.2-r1.ebuild 1733 RMD160 43b406e2091be36f89c4268ce26b57c72c717294 SHA1 2ebf8de8c4d3e1ae7b7f09019c9d6f32901beadc SHA256 9cff44e9baaf7ffec5c98b9d507f46c42658af1cfa961ffbe469163c9cb6b98f
-MD5 fdc641e321631c875d2b6c7d681738f8 jakarta-jstl-1.1.2-r1.ebuild 1733
-RMD160 43b406e2091be36f89c4268ce26b57c72c717294 jakarta-jstl-1.1.2-r1.ebuild 1733
-SHA256 9cff44e9baaf7ffec5c98b9d507f46c42658af1cfa961ffbe469163c9cb6b98f jakarta-jstl-1.1.2-r1.ebuild 1733
+EBUILD jakarta-jstl-1.1.2-r1.ebuild 1905 RMD160 2b567de6d36767d09f6b7b423a78fc766050a8e7 SHA1 6cfb193d2611bcc334a26d3d1c969b769a21046b SHA256 0db4f18e7f13f460ba20f0ee57100ea7201b8aafe0cd910239751effcb6ceeeb
+MD5 d295990f39e805b5249fe348fa40f6fd jakarta-jstl-1.1.2-r1.ebuild 1905
+RMD160 2b567de6d36767d09f6b7b423a78fc766050a8e7 jakarta-jstl-1.1.2-r1.ebuild 1905
+SHA256 0db4f18e7f13f460ba20f0ee57100ea7201b8aafe0cd910239751effcb6ceeeb jakarta-jstl-1.1.2-r1.ebuild 1905
 EBUILD jakarta-jstl-1.1.2.ebuild 1890 RMD160 b33b1d90e28c84057f076a5bc2c161e9a866bce5 SHA1 5c1c123c8346d2d34cb3482ecbab403a312c71e1 SHA256 21bec4ff88156a41136b03d1a5c2c654a533e7f98f63c9a6c0db48f2f5585cbf
 MD5 741e0d08691f7116f24110042b583095 jakarta-jstl-1.1.2.ebuild 1890
 RMD160 b33b1d90e28c84057f076a5bc2c161e9a866bce5 jakarta-jstl-1.1.2.ebuild 1890
 SHA256 21bec4ff88156a41136b03d1a5c2c654a533e7f98f63c9a6c0db48f2f5585cbf jakarta-jstl-1.1.2.ebuild 1890
-MISC ChangeLog 1352 RMD160 7a2a396cbdb96d3267c0ee9b25acca438a0450f5 SHA1 5607d1346a2d71b925e0e6b4d9c6fdfa9f537984 SHA256 7bbe2436646dbef41eb879fe7a366e723845020249f3428114ecb3c9f228beb5
-MD5 183dfaa75e3bd58831b85877f1528137 ChangeLog 1352
-RMD160 7a2a396cbdb96d3267c0ee9b25acca438a0450f5 ChangeLog 1352
-SHA256 7bbe2436646dbef41eb879fe7a366e723845020249f3428114ecb3c9f228beb5 ChangeLog 1352
+MISC ChangeLog 1582 RMD160 dd3e63c222c4b6bf236aae9b11b94742e52f5d31 SHA1 83bfc2ff3f9177f0363ca2cba69fb1331bfa92d9 SHA256 e93d242307d654c0603e053abcd90d6fbd9f0292d908f33e0c9e16d2b71a4320
+MD5 0aba4f16a1722799b4987bd122ee90dd ChangeLog 1582
+RMD160 dd3e63c222c4b6bf236aae9b11b94742e52f5d31 ChangeLog 1582
+SHA256 e93d242307d654c0603e053abcd90d6fbd9f0292d908f33e0c9e16d2b71a4320 ChangeLog 1582
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
diff --git a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
index 424689df4808..4884bd237b25 100644
--- a/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
+++ b/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild
@@ -1,26 +1,31 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.1 2006/09/18 01:25:07 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-jstl/jakarta-jstl-1.1.2-r1.ebuild,v 1.2 2006/09/27 04:14:05 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
+MY_PN="jakarta-taglibs-standard"
+MY_P="${MY_PN}-${PV}"
 DESCRIPTION="An implementation of the JSP Standard Tag Library (JSTL)"
 HOMEPAGE="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html"
-SRC_URI="mirror://apache/jakarta/taglibs/standard/source/jakarta-taglibs-standard-${PV}-src.tar.gz"
+SRC_URI="mirror://apache/jakarta/taglibs/standard/source/${MY_P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc examples source"
 
+COMMON_DEP="~dev-java/servletapi-2.4
+	dev-java/xalan"
 RDEPEND=">=virtual/jre-1.4.2
-	=dev-java/servletapi-2.4*"
-DEPEND=">=virtual/jdk-1.4.2
-	${RDEPEND}
+	${COMMON_DEP}"
+# FIXME breaks due to new JDBC API in 1.6
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+	${COMMON_DEP}
 	dev-java/ant-core
 	source? ( app-arch/zip )"
 
-S=${WORKDIR}/jakarta-taglibs-standard-${PV}-src/standard
+S="${WORKDIR}/${MY_P}-src/standard"
 
 src_unpack() {
 	unpack ${A}
@@ -37,6 +42,7 @@ src_unpack() {
 		"dist.dir = \${base.dir}/dist\n" \
 		"servlet24.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)\n" \
 		"jsp20.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)\n" \
+		"xalan.jar=$(java-pkg_getjar xalan xalan.jar)" \
 		> build.properties
 }