* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/files/, dev-java/tomcat-servlet-api/
@ 2015-08-25 23:22 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2015-08-25 23:22 UTC (permalink / raw
To: gentoo-commits
commit: 42c8662316ff8c71bcdfff8c0af171117ffa1a04
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 22:34:37 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 23:22:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c86623
dev-java/tomcat-servlet-api: Build el-api.jar for 6, fixes bug #558728
Also zip up the sources from the right directory.
Package-Manager: portage-2.2.20.1
dev-java/tomcat-servlet-api/files/2.5-build-r1.xml | 90 ++++++++++++++++++++++
.../tomcat-servlet-api-6.0.44-r1.ebuild | 35 +++++++++
2 files changed, 125 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml b/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
new file mode 100644
index 0000000..585ed9f
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/2.5-build-r1.xml
@@ -0,0 +1,90 @@
+<project name="Tomcat Serlvet API 2.5/JSP API 2.1" default="deploy" basedir=".">
+
+ <property name="compile.source" value="1.5"/>
+
+ <property name="tomcat.build" value="${basedir}/output/build"/>
+ <property name="tomcat.classes" value="${basedir}/output/classes"/>
+ <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+ <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+ <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+ <!-- Just build Tomcat -->
+ <target name="build-prepare">
+
+ <available classname="junit.framework.TestCase" property="junit.present" />
+
+ <mkdir dir="${tomcat.build}"/>
+ <mkdir dir="${tomcat.build}/lib"/>
+ <mkdir dir="${tomcat.classes}"/>
+
+ </target>
+
+ <target name="compile">
+
+ <!-- Compile internal server components -->
+ <javac srcdir="java" destdir="${tomcat.classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**,**/.svn/**">
+ <exclude name="java/javax/annotation/**" />
+ <exclude name="java/javax/ejb/**" />
+ <exclude name="java/javax/mail/**" />
+ <exclude name="java/javax/persistence/**" />
+ <exclude name="java/javax/xml/**" />
+ <exclude name="org/**" />
+ </javac>
+ <tstamp>
+ <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+ <format property="TSTAMP" pattern="hh:mm:ss"/>
+ </tstamp>
+ <!-- Copy static resource files -->
+ <filter token="VERSION" value="${version}"/>
+ <filter token="VERSION_NUMBER" value="${version.number}"/>
+ <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+ <copy todir="${tomcat.classes}" filtering="true">
+ <fileset dir="java">
+ <include name="**/*.properties"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.tasks"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="jar" depends="build-prepare,compile">
+ <!-- Servlet 2.5 Implementation JAR File -->
+ <jar jarfile="${servlet-api.jar}">
+ <fileset dir="${tomcat.classes}">
+ <include name="javax/servlet/*" />
+ <include name="javax/servlet/http/*" />
+ <include name="javax/servlet/resources/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- JSP 2.1 Implementation JAR File -->
+ <jar jarfile="${jsp-api.jar}">
+ <fileset dir="${tomcat.classes}">
+ <include name="javax/servlet/jsp/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- JSP 2.1 EL Implementation JAR File -->
+ <jar jarfile="${el-api.jar}">
+ <fileset dir="${tomcat.classes}">
+ <include name="javax/el/**" />
+ </fileset>
+ </jar>
+
+ </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
new file mode 100644
index 0000000..676adc0
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.5"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml"
+ rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die
+ find -name '*.jar' -delete || die
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/files/, dev-java/tomcat-servlet-api/
@ 2015-12-04 18:11 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2015-12-04 18:11 UTC (permalink / raw
To: gentoo-commits
commit: e1d06f474d45a841ca718aa2564b0fbe5cbd5dd9
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 18:03:02 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 18:03:02 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d06f47
dev-java/tomcat-servlet-api: version bump - slot 9 milestone 1
Package-Manager: portage-2.2.26
dev-java/tomcat-servlet-api/Manifest | 1 +
dev-java/tomcat-servlet-api/files/4.0-build.xml | 93 ++++++++++++++++++++++
.../tomcat-servlet-api-9.0.0_alpha1.ebuild | 37 +++++++++
3 files changed, 131 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 12c7c21..b49cd5a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -12,4 +12,5 @@ DIST apache-tomcat-8.0.26-src.tar.gz 4904717 SHA256 3725621a73501a6e09438f177acf
DIST apache-tomcat-8.0.27-src.tar.gz 4911212 SHA256 149b203c55c08d3ef1e823e8f0f771362bee75ea95db693757e53ddc9fba8fae SHA512 dfb504b37bf991c03b58b50af833d2d84d3f36a1eb5c4290a0eb8abee92811e78798ea69ba21ed72e82abbf8e27f9c2e74fe5989a31e49ee8cecb8530ce3c93a WHIRLPOOL 5dbb965aacbe5c178a4d2dcdf9719821498b3694fd909fe276d8dad7fb96b8c402fcf8d21b6e9b125b55d1c39408cbcb2ce85789c0eb3204d1d9aae5ea1cde3d
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
DIST apache-tomcat-8.0.29-src.tar.gz 4933339 SHA256 5cb87ae9afd145d68906e93b825a6a41303d7975bafe3d57530e9a8ec01c7c80 SHA512 279c971529f0e7513885a0a201753bc94b1ed7a4f035cb33943bf6ae769102630b94144c65236e8b42c666ded7cc843db54c155e8b5cd1ae175b6385d9c2789b WHIRLPOOL 8cfb5402b877be4bd4306cf5d14cf76302b1904e3530de108f262f9bb3de6f1377882fb5a1406e4b2ffc5c239c541f64df55fc98945157edafbd14586deb26bd
+DIST apache-tomcat-9.0.0.M1-src.tar.gz 4984318 SHA256 62fb16ed9743916b643a7b406c4b98b8b9b2df15504e9a66d4a609f6d539b34c SHA512 f47a018e30a0ceb382187de2fef443ea1ef9d6e319ef4f3a027824b7e95fb4b5e9d73531f03357b2a89c5f3baf568ac4cfde83969f9603299dd0cf742c4f6efa WHIRLPOOL ab796c7484fd2c1d5060998910e1bd1cfb4f478b6740d9d105255b1e1b36fc9118048d0089a873699b978be91adbe7e024afcb3a4fc2d5121b17089998cb9210
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/files/4.0-build.xml b/dev-java/tomcat-servlet-api/files/4.0-build.xml
new file mode 100644
index 0000000..ea0ef87
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/4.0-build.xml
@@ -0,0 +1,93 @@
+
+<project name="Tomcat Serlvet API 3.1/JSP API 2.3" default="deploy" basedir=".">
+
+ <property name="compile.source" value="1.7"/>
+
+ <property name="tomcat.build" value="${basedir}/output/build"/>
+ <property name="tomcat.classes" value="${basedir}/output/classes"/>
+ <property name="servlet-api.jar" value="${tomcat.build}/lib/servlet-api.jar"/>
+ <property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
+ <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
+
+ <!-- Just build Tomcat -->
+ <target name="build-prepare">
+
+ <available classname="junit.framework.TestCase" property="junit.present" />
+
+ <mkdir dir="${tomcat.build}"/>
+ <mkdir dir="${tomcat.build}/lib"/>
+ <mkdir dir="${tomcat.classes}"/>
+
+ </target>
+
+ <target name="compile">
+
+ <!-- Compile internal server components -->
+ <javac srcdir="java" destdir="${tomcat.classes}"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**,**/.svn/**">
+ <exclude name="java/javax/annotation/**" />
+ <exclude name="java/javax/ejb/**" />
+ <exclude name="java/javax/mail/**" />
+ <exclude name="java/javax/persistence/**" />
+ <exclude name="java/javax/xml/**" />
+ <exclude name="org/**" />
+ </javac>
+ <tstamp>
+ <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
+ <format property="TSTAMP" pattern="hh:mm:ss"/>
+ </tstamp>
+ <!-- Copy static resource files -->
+ <filter token="VERSION" value="${version}"/>
+ <filter token="VERSION_NUMBER" value="${version.number}"/>
+ <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
+ <copy todir="${tomcat.classes}" filtering="true">
+ <fileset dir="java">
+ <include name="**/*.properties"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.tasks"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.xml"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="jar" depends="build-prepare,compile">
+ <!-- Servlet 3.1 Implementation JAR File -->
+ <jar jarfile="${servlet-api.jar}">
+ <fileset dir="${tomcat.classes}">
+ <include name="javax/servlet/*" />
+ <include name="javax/servlet/annotation/*" />
+ <include name="javax/servlet/descriptor/*" />
+ <include name="javax/servlet/http/*" />
+ <include name="javax/servlet/resources/*" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- JSP 2.3 Implementation JAR File -->
+ <jar jarfile="${jsp-api.jar}">
+ <fileset dir="${tomcat.classes}">
+ <include name="javax/servlet/jsp/**" />
+ <!-- Javadoc and i18n exclusions -->
+ <exclude name="**/package.html" />
+ <exclude name="**/LocalStrings_*" />
+ </fileset>
+ </jar>
+
+ <!-- JSP 2.3 EL Implementation JAR File -->
+ <jar jarfile="${el-api.jar}">
+ <fileset dir="${tomcat.classes}">
+ <include name="javax/el/**" />
+ </fileset>
+ </jar>
+
+ </target>
+
+</project>
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild
new file mode 100644
index 0000000..d48b296
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.0_alpha1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_alpha/.M}"
+MY_A="apache-${PN}-${MY_PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/files/, dev-java/tomcat-servlet-api/
@ 2021-02-04 10:50 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2021-02-04 10:50 UTC (permalink / raw
To: gentoo-commits
commit: 646be235063de489fe94d526b4f8ff9ed4323eae
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 4 10:47:08 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 4 10:50:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646be235
dev-java/tomcat-servlet-api: introduced slot 5 with version 10.0.2
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/tomcat-servlet-api/Manifest | 1 +
...-aQute.bnd.annotation.spi.ServiceConsumer.patch | 20 ++++
.../tomcat-servlet-api-10.0.2.ebuild | 103 +++++++++++++++++++++
3 files changed, 124 insertions(+)
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 78f7caab3ed..6a1965fc22f 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,3 +1,4 @@
+DIST apache-tomcat-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
diff --git a/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
new file mode 100644
index 00000000000..7dffca69ce6
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/tomcat-servlet-api-10.0.2-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch
@@ -0,0 +1,20 @@
+diff --git a/java/jakarta/el/ExpressionFactory.java b/java/jakarta/el/ExpressionFactory.java
+index 2f42de7..5d52580 100644
+--- a/java/jakarta/el/ExpressionFactory.java
++++ b/java/jakarta/el/ExpressionFactory.java
+@@ -36,13 +36,13 @@ import java.util.concurrent.locks.Lock;
+ import java.util.concurrent.locks.ReadWriteLock;
+ import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+-import aQute.bnd.annotation.spi.ServiceConsumer;
++//import aQute.bnd.annotation.spi.ServiceConsumer;
+
+ /**
+ *
+ * @since 2.1
+ */
+-@ServiceConsumer(value=ExpressionFactory.class)
++//@ServiceConsumer(value=ExpressionFactory.class)
+ public abstract class ExpressionFactory {
+
+ private static final boolean IS_SECURITY_ENABLED =
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild
new file mode 100644
index 00000000000..5c22f78e4c3
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+MY_A="apache-${PN}-${PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+# we don't have the aQute.bnd.annotation.spi packaged
+PATCHES=(
+ "${FILESDIR}/${P}-patch-out-aQute.bnd.annotation.spi.ServiceConsumer.patch"
+)
+
+JAVA_TEST_SRC_DIR="src/test"
+
+SERVLET_API_JAR="servlet-api.jar"
+SERVLET_API_SRC="src/main/servlet-api"
+SERVLET_API_RESOURCES="src/resources/servlet-api"
+EL_API_JAR="el-api.jar"
+EL_API_SRC="src/main/el-api"
+EL_API_RESOURCES="src/resources/el-api"
+JSP_API_JAR="jsp-api.jar"
+JSP_API_SRC="src/main/jsp-api"
+JSP_API_RESOURCES="src/resources/jsp-api"
+
+src_prepare() {
+ default
+
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \
+ ${EL_API_SRC} ${EL_API_RESOURCES} \
+ ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory"
+
+ pushd java || die "Failed to cd to java dir"
+
+ cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources"
+ mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources"
+ cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources"
+
+ popd
+
+ for file in $(find src -type f | grep -vE "\.java$"); do
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g")
+ mkdir -p ${target_dir} || die "Failed to create resource directory"
+ mv $file ${target_dir} || die "Failed to move resource file"
+ done
+
+ mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources"
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_compile
+ rm -fr target || die "Failed to remove compiled files"
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar"
+ java-pkg-simple_src_compile
+}
+
+src_install() {
+ JAVA_SRC_DIR="${SERVLET_API_SRC}"
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${EL_API_SRC}"
+ JAVA_JAR_FILENAME="${EL_API_JAR}"
+ java-pkg-simple_src_install
+
+ JAVA_SRC_DIR="${JSP_API_SRC}"
+ JAVA_JAR_FILENAME="${JSP_API_JAR}"
+ java-pkg-simple_src_install
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-04 10:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-04 10:50 [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/files/, dev-java/tomcat-servlet-api/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2015-12-04 18:11 Miroslav Šulc
2015-08-25 23:22 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox