diff options
Diffstat (limited to 'dev-java/commons-logging')
| -rw-r--r-- | dev-java/commons-logging/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/commons-logging/commons-logging-1.2-r3.ebuild (renamed from dev-java/commons-logging/commons-logging-1.2-r2.ebuild) | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index c831e394f32a..9875d68781f8 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -2,5 +2,5 @@ AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc280 AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39 DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 EBUILD commons-logging-1.2-r1.ebuild 2200 BLAKE2B 00edbc2be3dbf082669f84234fb6e198f6f0209e3b668e227294e25632eafafdc242fce9b56d6cde269bfa2bab3e9110ee5d5d8dd99d268ad11257e144cfd095 SHA512 e3501a786040b5db5d6b323edfc80e8bfab2b9347a8dd3303fe874ad4f05e62ce7f27e723aeec8f25dedf7e5525a6cabd1f43f6169f0efe58b8366c917121e4b -EBUILD commons-logging-1.2-r2.ebuild 2305 BLAKE2B 9d8e30b92dfec19347cc8e35aee59b1534485b9d2ade447a2e117b1b932e295454e7cf386afcf56944843af95de19761f4dadf33b92bc108423c87feb8ebb593 SHA512 4e6a834f0230fe4ae5e21228a0fb80b86dddf2806b8b26eb891e10fe3462cc9c30c24de3f27d8c7feb9523293e240b99b98b6e3a6ba3c2a212b6eba7cfc3dd9d +EBUILD commons-logging-1.2-r3.ebuild 2355 BLAKE2B f7a302e42b8acc956240e2b5775586fd6deda25239483b9ef88ff595bed7fe9dbaee14239a3a7b696f8723285aa078916813121e886f319bec8cdd3256ef1946 SHA512 4513dce22a7665c5d3f93fcbead5d5ece436dea6cb85bbd6b1751dd8db4613c9010a186ca5471777cc9c3e253442b411d0363c822797674f41fbeda5c48e820a MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild index e36cb359aada..bc6d4e26fd4f 100644 --- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 JAVA_PKG_IUSE="doc source" +MAVEN_ID="commons-logging:commons-logging:1.2" inherit java-pkg-2 java-ant-2 java-osgi @@ -18,18 +19,18 @@ IUSE="avalon-framework avalon-logkit log4j servletapi test" RESTRICT="!test? ( test ) !servletapi? ( test )" CDEPEND=" - log4j? ( dev-java/log4j:0 ) - servletapi? ( java-virtuals/servlet-api:3.1 ) avalon-logkit? ( dev-java/avalon-logkit:2.0 ) - avalon-framework? ( dev-java/avalon-framework:4.2 )" + avalon-framework? ( dev-java/avalon-framework:4.2 ) + log4j? ( dev-java/log4j:0 ) + servletapi? ( dev-java/tomcat-servlet-api:4.0 )" RDEPEND=" ${CDEPEND} - >=virtual/jre-1.6" + >=virtual/jre-1.8:*" DEPEND=" ${CDEPEND} - >=virtual/jdk-1.6 + >=virtual/jdk-1.8:* test? ( dev-java/ant-junit:0 )" S="${WORKDIR}/${P}-src" @@ -61,7 +62,7 @@ src_prepare() { fi if use servletapi; then - echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die + echo "servletapi.jar=$(java-pkg_getjar tomcat-servlet-api-4.0 servlet-api.jar)" >> build.properties || die fi } |