| 1 |
commit: a7606f282af3ac4824d3517df449956f59639a91 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 9 11:26:59 2021 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 9 11:26:59 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7606f28 |
| 7 |
|
| 8 |
dev-java/tomcat-servlet-api: bump to 8.5.69 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-java/tomcat-servlet-api/Manifest | 1 + |
| 14 |
.../tomcat-servlet-api-8.5.69.ebuild | 99 ++++++++++++++++++++++ |
| 15 |
2 files changed, 100 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest |
| 18 |
index ec7da9064eb..6aa2b5bdf2e 100644 |
| 19 |
--- a/dev-java/tomcat-servlet-api/Manifest |
| 20 |
+++ b/dev-java/tomcat-servlet-api/Manifest |
| 21 |
@@ -7,6 +7,7 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713 |
| 22 |
DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce |
| 23 |
DIST apache-tomcat-8.5.66-src.tar.gz 5879748 BLAKE2B bfef20872bd19ffa2bb34b98a1da875fdd5f232e681458f0aef093b7eecd63a95c1cd26130f54251f149249e639d0da2577770e43314d2a86b8ee9b48b675f0d SHA512 322fda683197898f873feb375791092d33c90aac08a54889fabab0f59ecbc7b27784f027b37008c6893fdbf8ca7973b73268f42673d7e8df762419b5a536593b |
| 24 |
DIST apache-tomcat-8.5.68-src.tar.gz 5907026 BLAKE2B 2312edb94f98ee98b594325fbc32521776e9cadc4422a3a46f3651f1fee072a99c5f6874378ac06215396504d34ad750edd6ec3399a3931554068195a8ee15ef SHA512 579a35f944ead756995d288b66ea8a4ab30289a90c32aa01119abcea85a8524f6594ce5cb7ac9df6d352c1e3b54a18c814b5d3a6409dce6a43614e3a89284066 |
| 25 |
+DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb |
| 26 |
DIST apache-tomcat-9.0.46-src.tar.gz 6068533 BLAKE2B 400814281aedd588c008a1363199f8602e856870d4c39d536b13f8a357c2390d2db689940f4a6971ec74a84e8e400174e72610e0d64a220de41f2dff419dda3c SHA512 dc380e23aa87273c6ba32e79659e768c551b07812635c2f1c62d2c34b493b1d3d51b4548fec5014fdb36f8461fc90942aa7917874ddf3d6f5c5345d8ca02dfc1 |
| 27 |
DIST apache-tomcat-9.0.48-src.tar.gz 6080015 BLAKE2B 9b2cac8143ca8186857d7d53e8737f2f7d2ec8e0ca03d32447ad25b429cbf37c1c7b39bc6e4b93679c08bd5f4940280d00946a70e9fa82f8c2a596ea18a2a4c6 SHA512 9b762f6d1a1f6c75e10f1bc05c39a647ae2165f3b81c09ff73cc286f3c487b034b9d14c73b808c73b35f55f642848831a0329d9d611c8bbb3928559e552a3ff3 |
| 28 |
DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2 |
| 29 |
|
| 30 |
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..eaffc40f403 |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.69.ebuild |
| 35 |
@@ -0,0 +1,99 @@ |
| 36 |
+# Copyright 1999-2021 Gentoo Authors |
| 37 |
+# Distributed under the terms of the GNU General Public License v2 |
| 38 |
+ |
| 39 |
+EAPI=7 |
| 40 |
+ |
| 41 |
+JAVA_PKG_IUSE="source" |
| 42 |
+ |
| 43 |
+inherit java-pkg-2 java-pkg-simple |
| 44 |
+ |
| 45 |
+MY_A="apache-${P}-src" |
| 46 |
+MY_P="${MY_A/-servlet-api/}" |
| 47 |
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" |
| 48 |
+HOMEPAGE="https://tomcat.apache.org/" |
| 49 |
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" |
| 50 |
+ |
| 51 |
+LICENSE="Apache-2.0" |
| 52 |
+SLOT="3.1" |
| 53 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 54 |
+IUSE="" |
| 55 |
+ |
| 56 |
+DEPEND=">=virtual/jdk-1.8:*" |
| 57 |
+RDEPEND=">=virtual/jre-1.8:*" |
| 58 |
+ |
| 59 |
+S="${WORKDIR}/${MY_P}/" |
| 60 |
+ |
| 61 |
+JAVA_TEST_SRC_DIR="src/test" |
| 62 |
+ |
| 63 |
+SERVLET_API_JAR="servlet-api.jar" |
| 64 |
+SERVLET_API_SRC="src/main/servlet-api" |
| 65 |
+SERVLET_API_RESOURCES="src/resources/servlet-api" |
| 66 |
+EL_API_JAR="el-api.jar" |
| 67 |
+EL_API_SRC="src/main/el-api" |
| 68 |
+EL_API_RESOURCES="src/resources/el-api" |
| 69 |
+JSP_API_JAR="jsp-api.jar" |
| 70 |
+JSP_API_SRC="src/main/jsp-api" |
| 71 |
+JSP_API_RESOURCES="src/resources/jsp-api" |
| 72 |
+ |
| 73 |
+src_prepare() { |
| 74 |
+ default |
| 75 |
+ |
| 76 |
+ # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package |
| 77 |
+ |
| 78 |
+ mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ |
| 79 |
+ ${EL_API_SRC} ${EL_API_RESOURCES} \ |
| 80 |
+ ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ |
| 81 |
+ ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" |
| 82 |
+ |
| 83 |
+ pushd java || die "Failed to cd to java dir" |
| 84 |
+ |
| 85 |
+ cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" |
| 86 |
+ mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" |
| 87 |
+ cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" |
| 88 |
+ |
| 89 |
+ popd |
| 90 |
+ |
| 91 |
+ for file in $(find src -type f | grep -vE "\.java$"); do |
| 92 |
+ target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") |
| 93 |
+ mkdir -p ${target_dir} || die "Failed to create resource directory" |
| 94 |
+ mv $file ${target_dir} || die "Failed to move resource file" |
| 95 |
+ done |
| 96 |
+ |
| 97 |
+ mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" |
| 98 |
+ |
| 99 |
+ java-pkg-2_src_prepare |
| 100 |
+} |
| 101 |
+ |
| 102 |
+src_compile() { |
| 103 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
| 104 |
+ JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" |
| 105 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
| 106 |
+ java-pkg-simple_src_compile |
| 107 |
+ rm -fr target || die "Failed to remove compiled files" |
| 108 |
+ |
| 109 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
| 110 |
+ JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" |
| 111 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
| 112 |
+ java-pkg-simple_src_compile |
| 113 |
+ rm -fr target || die "Failed to remove compiled files" |
| 114 |
+ |
| 115 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
| 116 |
+ JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" |
| 117 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
| 118 |
+ JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" |
| 119 |
+ java-pkg-simple_src_compile |
| 120 |
+} |
| 121 |
+ |
| 122 |
+src_install() { |
| 123 |
+ JAVA_SRC_DIR="${SERVLET_API_SRC}" |
| 124 |
+ JAVA_JAR_FILENAME="${SERVLET_API_JAR}" |
| 125 |
+ java-pkg-simple_src_install |
| 126 |
+ |
| 127 |
+ JAVA_SRC_DIR="${EL_API_SRC}" |
| 128 |
+ JAVA_JAR_FILENAME="${EL_API_JAR}" |
| 129 |
+ java-pkg-simple_src_install |
| 130 |
+ |
| 131 |
+ JAVA_SRC_DIR="${JSP_API_SRC}" |
| 132 |
+ JAVA_JAR_FILENAME="${JSP_API_JAR}" |
| 133 |
+ java-pkg-simple_src_install |
| 134 |
+} |
Archives