diff options
Diffstat (limited to 'dev-java/tomcat-servlet-api')
7 files changed, 6 insertions, 308 deletions
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 10a6ac1c22d5..1e1d4c733088 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,24 +1,18 @@ AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca -DIST apache-tomcat-10.0.21-src.tar.gz 6109792 BLAKE2B c650a2e0cb8c6424d98539eaa802c788ff212b014e614123841a806fc9845a953911b5964f67cfc8c1f2ce33dfe627636b5af2f1eaa4b4c985ef4b78d0d831bf SHA512 925bb61ca8b6432e4aef5d5088838e811dbfc0a7b6190354b6ffd957d4ebf145ac1bf4a919b368def0cf63c86c28caf78faf78b190a6e54e085cbf4f108836a1 DIST apache-tomcat-10.0.22-src.tar.gz 6115322 BLAKE2B 6a9d2e6896fa266b4d75627f85ffa4f132c3cf30db24a331ef2d279e4c618aa817981a963c54148cbcd01af0d502ecf2c4c0f4debdb301f202ea748ea2572a66 SHA512 2d26828a1c44876feb4746186090866784f2a136d8120eb3dc106af7cc4cb95e94c6cbb51a3d4a14ea7159cd3351f4bd475153864e43d7e192296b5382c93a83 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 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce -DIST apache-tomcat-8.5.79-src.tar.gz 5983349 BLAKE2B 8be7a268462c7edfd31636f2790ae83b8dbc16b8c0193f6a02f9f8591ffa9c91683b2042038661a0254fdab66f740b7ab99c1e6f11f0bd1245a836def9011533 SHA512 198f3eefe8445c050a98cf6d69597c17eee76158534c18a636f2285143c0cd248b939b8233618438330aedcd936d76505a064842619b077d8c2fa43244c7a8ff DIST apache-tomcat-8.5.81-src.tar.gz 5988747 BLAKE2B 569e1564cf6f5419aaa0d66a2497852021a244af1a858ad943b45e1c36939011a78edd83c717f346e4327278b95b95535e5c57bdd71af5662e052abc02528f49 SHA512 a9261e2a92e122f0f7f547d0b4e083d6c15cdb4d1ad750bdb3c9e3a597a1c4c1bb0f5dd7ad92f41ce18d15ac7fee47acc2cdd59e588b872f173467864120e581 -DIST apache-tomcat-9.0.63-src.tar.gz 6167222 BLAKE2B b608c61fa0584927f4a0ba1d945a41aa626f9441305855bcd2f613fa339fee8be5fbf1b85d96efe94ea5da7dbde2721761ea91d66a66ca11dc8195e33dd572e8 SHA512 9be4b85e2c39702fc4c80b285d7df1d192ab5024452c75d77e1072438a3051dd3056d080cab4834cc9682fd641a8c9ee0484a16b8d21008b944a870016fb04f3 DIST apache-tomcat-9.0.64-src.tar.gz 6174208 BLAKE2B 3ec55872dc73279202faae10b4825ca8cd4f5d2763c43778445b2f1aee27ed1cd765e7345276735359e3a40779eaf2ef8f9120eaca8d38af07cbbcd0584078b4 SHA512 7e01a979d41f7d73204b7a7ae5a85b0094626bf64bcfa3a52f1fc46989369d504b6dd49718084ee0a10af775cab488aae1e18ce05eb2b527800e2a693c7b6386 -EBUILD tomcat-servlet-api-10.0.21.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a -EBUILD tomcat-servlet-api-10.0.22.ebuild 3016 BLAKE2B d95a171fd0f5d3ed467b02c7fef82df0cc15777ed8d62998eb7515fc7eba84a3c23934765216778dcace0abc47ded6ff71cca335bb4169669bc59d6d030da5d6 SHA512 08416d888f565b2fceb1b1f9a67fa755c1af92d0173a28e7330feb3df6fb7b041750e2ebf340168dac2560799eff7161655f2891fd46151d5e98e43e63e6109c +EBUILD tomcat-servlet-api-10.0.22.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263 -EBUILD tomcat-servlet-api-8.5.79.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634 -EBUILD tomcat-servlet-api-8.5.81.ebuild 3004 BLAKE2B 6dfb6ed890fe7c8461da4f71cb0d4ade2dfa2022647e91e1072d96bd20539d69dfb7cca636d65eed4a415c9047e75f7a24240af35b343737194f1ad6cc4ea04b SHA512 aa07371f8f1d8c8da1c59e8ba9216c4f524518b1a3d99418dcb18c6f08adde472411d9d644588ed529c3fd3dc3201d53d9bb79d79b402ab853db248dbb73bcb1 -EBUILD tomcat-servlet-api-9.0.63.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a -EBUILD tomcat-servlet-api-9.0.64.ebuild 3011 BLAKE2B 2dbffa8fb7484e65d835e876744721aa4a4f67a2f01a8f83a38eefe550069260811e008fde80b228b14f1d6be90cf9ea06498d190ddf4963339872f3a2e4c81e SHA512 3227e875e3e5836ca8d2e75a9dd7da999d33ebce0af9579e39f5ea9fd8ea0e58578934953e2a29bf4f70c0f8140242a7e4e62daeca4fc028b48042f060b7e16d +EBUILD tomcat-servlet-api-8.5.81.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634 +EBUILD tomcat-servlet-api-9.0.64.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild deleted file mode 100644 index 0d28b0e15cd3..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.21.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="source" - -inherit 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 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/${MY_P}/" - -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 compile 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 -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild index df0da8059045..0d28b0e15cd3 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.22.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild deleted file mode 100644 index 888295412849..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.79.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-pkg-simple - -MY_A="apache-${P}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="3.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/${MY_P}/" - -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}/javax/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 javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" - mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" - cp --parents -R javax/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/javax ${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 -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild index d52a57de49fd..888295412849 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.81.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="3.1" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild deleted file mode 100644 index f1c865a27bec..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.63.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-pkg-simple - -MY_A="apache-${PN}-${PV}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/${MY_P}/" - -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}/javax/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 javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" - mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" - cp --parents -R javax/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/javax ${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 -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild index 48250c32ab99..f1c865a27bec 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.64.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="4.0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8:*" |