From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-java/commons-el/Manifest | 7 +++ dev-java/commons-el/commons-el-1.0-r3.ebuild | 51 ++++++++++++++++++++++ .../files/commons-el-1.0-java-1.7-compiler.patch | 13 ++++++ dev-java/commons-el/files/commons-el-1.0-manifest | 11 +++++ dev-java/commons-el/metadata.xml | 8 ++++ 5 files changed, 90 insertions(+) create mode 100644 dev-java/commons-el/Manifest create mode 100644 dev-java/commons-el/commons-el-1.0-r3.ebuild create mode 100644 dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch create mode 100644 dev-java/commons-el/files/commons-el-1.0-manifest create mode 100644 dev-java/commons-el/metadata.xml (limited to 'dev-java/commons-el') diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest new file mode 100644 index 000000000000..9989cd0cee70 --- /dev/null +++ b/dev-java/commons-el/Manifest @@ -0,0 +1,7 @@ +AUX commons-el-1.0-java-1.7-compiler.patch 738 SHA256 1c6e91bdb41da37c2cafcd9b052371a1a3a4ec2054071b87e103fe4eb0819326 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807 WHIRLPOOL 88d780b5749fb9dfa1bc581eb119b017ac8af1d8b097ac8cc0e94fc318f6b62b7d5a6196bc0d37215701b30c010b71f8ce7a1530f32714f89e9004207205b276 +AUX commons-el-1.0-manifest 557 SHA256 b2ce487366d61c8ce0ff49c59c20aac7efb358ecb2174d775dc306b4987824f1 SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e WHIRLPOOL c742a839ea456460b7f57d7618a1962140163548522d9a0d02986d48853642d79338061c92f77b8c22165cc55db3640188b5bfccb02cb4a393a2ca1d34801c50 +DIST commons-el-1.0-src.tar.gz 64009 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83 WHIRLPOOL 5f019e0dac1211f713a8b3dd8818277c6241af133d3dc460e355332da40c58357e4d606e28301e770fe7dbf30f19885ba57f252e90cdd8923fbe258bec052ab6 +EBUILD commons-el-1.0-r3.ebuild 1214 SHA256 fec34ed8c1b8941278d6b6c56aaa6373703345ea0bf1f1138015bf98ea6b810c SHA512 d6b785a5663de56b0ed11a5b816d69b629c78deeb9a122540aa0961d7b1996ee4454e9789a58077b69417525052ab53e3e8502de0fbbdf04f31834c4f77be919 WHIRLPOOL 401058f1f562c69c0fb60d31de510d4e34be9365800459ac526fb4e4afdaa42f5c697fd2faa0ee7c32560ccb90ae05d27b82c20b3d0e3a425fe61934a8d64ed7 +MISC ChangeLog 2661 SHA256 d6580a4460a13b98d921bd779b399320a0126bf48e96a9c0b33da31527d69fcd SHA512 f94c84e86bb67581297719d90fd923fe5b3882f76e14e874788542c918e55a10d32db435ebd464efbedc9e37bfebee7a15f0b47c54fab20afb9c07b5d76f60da WHIRLPOOL 92684d2695adbd0729f699f2fe7a22c8347a05cd733173493432eb0963e7f5f01ee58eec6368658115e99e3cbb483eb48380739e0ebc79ead050862c9d41f5c5 +MISC ChangeLog-2015 4270 SHA256 eee8de5ef5f8a96f7a072fb73f5ba2914563bcd3428a774736abb640be01c043 SHA512 87611ff86fd89f619a268e5f93b0ce69bf56e95373dea4af59f1deb0b28923a780714a5fb4c58387fd0d536b630d72f7ff85a339f5e3a0c01ad1770f0dce7d43 WHIRLPOOL 7d649795db4ee0fb28d12d570266da180da45bc989f08428ecf4f088b90a98c5ab4359550cc06db7cc5181078576c26aab560ac2ccb4485486d50c91357d8f3c +MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild new file mode 100644 index 000000000000..f71ae892d58e --- /dev/null +++ b/dev-java/commons-el/commons-el-1.0-r3.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 java-osgi + +DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache" +HOMEPAGE="http://commons.apache.org/el/" +SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz" + +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="amd64 ppc64 x86 ~x86-fbsd" +IUSE="" + +COMMON_DEP=" + java-virtuals/servlet-api:2.5" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.4" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.4" + +S=${WORKDIR}/${P}-src + +JAVA_PKG_FILTER_COMPILER="jikes" + +java_prepare() { + epatch "${FILESDIR}"/${P}-java-1.7-compiler.patch # BGO 486376 + # Build.xml is broken, fix it + sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed" +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_GENTOO_CLASSPATH="servlet-api-2.5" +EANT_EXTRA_ARGS=" + -Dservletapi.build.notrequired=true + -Djspapi.build.notrequired=true" + +src_install() { + java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/${P}-manifest" \ + "Apache Commons EL" + + 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/commons-el-1.0-java-1.7-compiler.patch b/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch new file mode 100644 index 000000000000..60f94c512a46 --- /dev/null +++ b/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch @@ -0,0 +1,13 @@ +--- ./src/java/org/apache/commons/el/parser/ELParser.java.orig 2003-03-30 20:17:07.000000000 -0500 ++++ ./src/java/org/apache/commons/el/parser/ELParser.java 2013-10-13 14:55:24.277749201 -0400 +@@ -1838,8 +1838,8 @@ + jj_expentry[i] = jj_lasttokens[i]; + } + boolean exists = false; +- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) { +- int[] oldentry = (int[])(enum.nextElement()); ++ for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) { ++ int[] oldentry = (int[])(enumx.nextElement()); + if (oldentry.length == jj_expentry.length) { + exists = true; + for (int i = 0; i < jj_expentry.length; i++) { diff --git a/dev-java/commons-el/files/commons-el-1.0-manifest b/dev-java/commons-el/files/commons-el-1.0-manifest new file mode 100644 index 000000000000..86777e8ec2f7 --- /dev/null +++ b/dev-java/commons-el/files/commons-el-1.0-manifest @@ -0,0 +1,11 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %bundleName +Bundle-Vendor: %vendorName +Bundle-Localization: plugin +Bundle-SymbolicName: org.apache.commons.el +Bundle-Version: 1.0 +Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commons.el.parser;version="1.0.0" +Import-Package: javax.servlet;version="2.4",javax.servlet.http;version="2.4",javax.servlet.jsp;version="2.0", + javax.servlet.jsp.el;version="2.0",javax.servlet.jsp.resources;version="2.0", + javax.servlet.jsp.tagext;version="2.0",javax.servlet.resources;version="2.4" diff --git a/dev-java/commons-el/metadata.xml b/dev-java/commons-el/metadata.xml new file mode 100644 index 000000000000..2444066aa02b --- /dev/null +++ b/dev-java/commons-el/metadata.xml @@ -0,0 +1,8 @@ + + + + + java@gentoo.org + Java + + -- cgit v1.2.3