Revision bump to support new Java system.

Package-Manager: portage-2.1.1_pre1

5 files changed, 82 insertions, 14 deletions

diff --git a/dev-java/commons-el/ChangeLog b/dev-java/commons-el/ChangeLog
index 7d687bc31884..b7149fd163de 100644
--- a/dev-java/commons-el/ChangeLog
+++ b/dev-java/commons-el/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-el
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.12 2005/11/05 11:11:04 betelgeuse Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.13 2006/07/04 20:40:28 nichoj Exp $
+
+*commons-el-1.0-r1 (04 Jul 2006)
+
+  04 Jul 2006; Joshua Nichols <nichoj@gentoo.org> +commons-el-1.0-r1.ebuild:
+  Revision bump to support new Java system.
 
   05 Nov 2005; Petteri Räty <betelgeuse@gentoo.org> commons-el-1.0.ebuild:
   Fixed homepage reported in bug 111533.
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index 1c6d61375429..8c9b3252ed19 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -1,14 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b836c07e9b98e87745ec51e8ea0c5c42 ChangeLog 1244
+DIST commons-el-1.0-src.tar.gz 64009 RMD160 1f178aeb6aed1cd807573c3add6195a719a533e2 SHA1 bb39426efbd03a2b27105fa42faf90858cfc3d50 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6
+EBUILD commons-el-1.0-r1.ebuild 1513 RMD160 5325361014d3a48ef9813cca55c4c094dd548d11 SHA1 d6b9279c07f989b77e34603e8f5b6c3a6c7f9e91 SHA256 6f542f9ff71a7e2cd5f5e196848c515e73f9cd44ec9ad0c0ee37c9530127b59b
+MD5 5a9bf99ab1354752825a203663a787a6 commons-el-1.0-r1.ebuild 1513
+RMD160 5325361014d3a48ef9813cca55c4c094dd548d11 commons-el-1.0-r1.ebuild 1513
+SHA256 6f542f9ff71a7e2cd5f5e196848c515e73f9cd44ec9ad0c0ee37c9530127b59b commons-el-1.0-r1.ebuild 1513
+EBUILD commons-el-1.0.ebuild 1613 RMD160 a9291335926e1d6b51f0c3663adcb288b6a82940 SHA1 bdf61b8f48524abb047f7b51ab6e401d46e33353 SHA256 9d2c6fda813f1b7662ac2485a18957f572eb7dd96bc752aee5854ad9c89b50cc
 MD5 3dcb36a13c022dd0e01f1cbbbe3cfdcc commons-el-1.0.ebuild 1613
-MD5 35c69c54a30e1f87340edb6d13bc529b files/digest-commons-el-1.0 69
+RMD160 a9291335926e1d6b51f0c3663adcb288b6a82940 commons-el-1.0.ebuild 1613
+SHA256 9d2c6fda813f1b7662ac2485a18957f572eb7dd96bc752aee5854ad9c89b50cc commons-el-1.0.ebuild 1613
+MISC ChangeLog 1396 RMD160 62f2e98272462ce826ea616ef2c819ebba4aabd5 SHA1 f777a9087535d2529408ed1d7243776877aaf9c2 SHA256 759e344bb3d8edbfc45ae11f1f861af2b2f76ff48b79116d114d241328a171f6
+MD5 d3b957428e2f270b409dbb0bee28deb8 ChangeLog 1396
+RMD160 62f2e98272462ce826ea616ef2c819ebba4aabd5 ChangeLog 1396
+SHA256 759e344bb3d8edbfc45ae11f1f861af2b2f76ff48b79116d114d241328a171f6 ChangeLog 1396
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbJNnQiJ/wx066S4RAj0bAKCSZxTy3y2QFtt9IaEesZaFKrRyvQCfWVTk
-6QLbzqnSjmEIBRUP8fNaS/s=
-=DtSb
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 c232ea01626b316aeeb00eab9424c777 files/digest-commons-el-1.0 253
+RMD160 9101127771f7dbce7214db2c3af52bb7e617e6b2 files/digest-commons-el-1.0 253
+SHA256 93d74c102c14220b7f4333544e66dea40458dbbe5b1af8ed1836fac1cd4e132d files/digest-commons-el-1.0 253
+MD5 c232ea01626b316aeeb00eab9424c777 files/digest-commons-el-1.0-r1 253
+RMD160 9101127771f7dbce7214db2c3af52bb7e617e6b2 files/digest-commons-el-1.0-r1 253
+SHA256 93d74c102c14220b7f4333544e66dea40458dbbe5b1af8ed1836fac1cd4e132d files/digest-commons-el-1.0-r1 253
diff --git a/dev-java/commons-el/commons-el-1.0-r1.ebuild b/dev-java/commons-el/commons-el-1.0-r1.ebuild
new file mode 100644
index 000000000000..1c1d72660c22
--- /dev/null
+++ b/dev-java/commons-el/commons-el-1.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0-r1.ebuild,v 1.1 2006/07/04 20:40:28 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache."
+HOMEPAGE="http://jakarta.apache.org/commons/el/"
+SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="source"
+COMMON_DEP="~dev-java/servletapi-2.4"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5
+	${COMMON_DEP}
+	source? ( app-arch/zip )"
+
+S=${WORKDIR}/${P}-src
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv build.properties build.properties.old
+
+	echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
+	echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" >> build.properties
+	echo "junit.jar = $(java-pkg_getjars junit)" >> build.properties
+	echo "servletapi.build.notrequired = true" >> build.properties
+	echo "jspapi.build.notrequired = true" >> build.properties
+
+	# Build.xml is broken, fix it
+	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
+}
+
+src_compile() {
+	eant jar
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar || die "Unable to install"
+	dodoc LICENSE.txt RELEASE-NOTES.txt
+	dohtml STATUS.html PROPOSAL.html
+
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/commons-el/files/digest-commons-el-1.0 b/dev-java/commons-el/files/digest-commons-el-1.0
index 8c71540ed219..22867fcbbb5e 100644
--- a/dev-java/commons-el/files/digest-commons-el-1.0
+++ b/dev-java/commons-el/files/digest-commons-el-1.0
@@ -1 +1,3 @@
 MD5 25038283a0b5f638db5e891295d20020 commons-el-1.0-src.tar.gz 64009
+RMD160 1f178aeb6aed1cd807573c3add6195a719a533e2 commons-el-1.0-src.tar.gz 64009
+SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 commons-el-1.0-src.tar.gz 64009
diff --git a/dev-java/commons-el/files/digest-commons-el-1.0-r1 b/dev-java/commons-el/files/digest-commons-el-1.0-r1
new file mode 100644
index 000000000000..22867fcbbb5e
--- /dev/null
+++ b/dev-java/commons-el/files/digest-commons-el-1.0-r1
@@ -0,0 +1,3 @@
+MD5 25038283a0b5f638db5e891295d20020 commons-el-1.0-src.tar.gz 64009
+RMD160 1f178aeb6aed1cd807573c3add6195a719a533e2 commons-el-1.0-src.tar.gz 64009
+SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 commons-el-1.0-src.tar.gz 64009