From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/commons-el/Manifest | 5 --- 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, 88 deletions(-) delete mode 100644 dev-java/commons-el/Manifest delete mode 100644 dev-java/commons-el/commons-el-1.0-r3.ebuild delete mode 100644 dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch delete mode 100644 dev-java/commons-el/files/commons-el-1.0-manifest delete 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 deleted file mode 100644 index 63488d779190..000000000000 --- a/dev-java/commons-el/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX commons-el-1.0-java-1.7-compiler.patch 738 BLAKE2B dd71cf204af414172484d5d537c3bd0acd8d3056eabfff95161d7b30db0490a611cf22cb07c76f8782e4543ab8760602ad391ac6f4de12def16468e096bef7a2 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807 -AUX commons-el-1.0-manifest 557 BLAKE2B 085ab2a725e32c7a277a9713f31f613637ea3be5c43e8e4d3134f0cfd996622b9472fc275776a9c03aa2b58fdeb430ddd7f6179e06a84fce24e209ba4ceadf1c SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e -DIST commons-el-1.0-src.tar.gz 64009 BLAKE2B df9f6daa8b5a9d86a43f5fdf0e1608b04a5cb3e78dbf7cdce5ba7e484685c9e4271db22777661d07c89a4c792fc9c519b7efef484a41394ba5f1a3a7e302594c SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83 -EBUILD commons-el-1.0-r3.ebuild 1204 BLAKE2B bb58285024b5392e4771a834b231c334526395f7c9edf2bd401ec4ac17f72d5cf29837b4e2c3569fa04751046c7684de3fda3785cc638ba0528a5ab0d2aaf660 SHA512 3a9bee59dc8b1c62040d1de1c177b73a55d690e1a6fec5649e7182eccf200f84257b4c3a50acc26758126df5c1d6fb67f590b04f35774a1ed0af3282fb1b1370 -MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 diff --git a/dev-java/commons-el/commons-el-1.0-r3.ebuild b/dev-java/commons-el/commons-el-1.0-r3.ebuild deleted file mode 100644 index a7b3d71f48c2..000000000000 --- a/dev-java/commons-el/commons-el-1.0-r3.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 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" -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 deleted file mode 100644 index 60f94c512a46..000000000000 --- a/dev-java/commons-el/files/commons-el-1.0-java-1.7-compiler.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./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 deleted file mode 100644 index 86777e8ec2f7..000000000000 --- a/dev-java/commons-el/files/commons-el-1.0-manifest +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 2444066aa02b..000000000000 --- a/dev-java/commons-el/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - java@gentoo.org - Java - - -- cgit v1.2.3