diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
commit | 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch) | |
tree | a8a537b82fda83a0799c2ca9887f212558363aa7 /dev-java/commons-logging | |
parent | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff) |
gentoo resync : 11.05.2021
Diffstat (limited to 'dev-java/commons-logging')
-rw-r--r-- | dev-java/commons-logging/Manifest | 3 | ||||
-rw-r--r-- | dev-java/commons-logging/commons-logging-1.2-r1.ebuild | 68 | ||||
-rw-r--r-- | dev-java/commons-logging/commons-logging-1.2-r3.ebuild | 2 |
3 files changed, 2 insertions, 71 deletions
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index a58fe775813d..8f407747db70 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,6 +1,5 @@ AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027 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-r3.ebuild 2353 BLAKE2B 6d9d08371ee42a3707b8aea82abe37a994038dd0f4790330aaf099aa506803fac9e67aa0cb0d96ff20c56f997a4734c8bc5a4e4f74a2c006d7bd076ab56b8e68 SHA512 6c883de9c872c96bc33c8d1b5d0772603524f7d8905388c4c6871df6ddd1f4dd4aaf79bd3f7876f5156490b69457ce51028a39cb4b031f3dc6335ab866abc218 +EBUILD commons-logging-1.2-r3.ebuild 2352 BLAKE2B ad555871569da38ea2a881bb9320d8d8611292d20e7e93c6724d5fc37d25ebb163b5038d64919a98d6224ca29c235cc3ac7ec13d07588f682ca5f1f4bb964b1a SHA512 4f61d2a39de676f9498444ca339ab833f02b311e9d7058b35b68a62fc0e2f1e6a6428d25d9fbf3ca9110f51375cf2959996d1f29d1c02a042d02493d65623e8c MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild deleted file mode 100644 index 890c4bea49ac..000000000000 --- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-ant-2 java-osgi - -DESCRIPTION="An ultra-thin bridge between different Java logging libraries" -HOMEPAGE="https://commons.apache.org/logging/" -SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="avalon-framework avalon-logkit log4j servletapi test" -RESTRICT="!test? ( test ) !servletapi? ( test )" - -CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 ) - avalon-logkit? ( dev-java/avalon-logkit:2.0 ) - log4j? ( dev-java/log4j:0 ) - servletapi? ( java-virtuals/servlet-api:3.1 )" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6 - test? ( dev-java/ant-junit:0 )" - -S="${WORKDIR}/${P}-src" - -EANT_BUILD_TARGET="compile" -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes" - -java_prepare() { - epatch "${FILESDIR}/${P}-gentoo.patch" - # patch to make the build.xml respect no servletapi - epatch "${FILESDIR}/${P}-servletapi.patch" - - # bug #208098 - echo "jdk.1.4.present=true" > build.properties - - use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties - use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties - use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties - use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties -} - -src_install() { - local pkg=org.apache.commons.logging - java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\"" - java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar - java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar - - dodoc RELEASE-NOTES.txt - dohtml PROPOSAL.html - use doc && java-pkg_dojavadoc target/docs/ - use source && java-pkg_dosrc src/main/java/org -} - -src_test() { - java-pkg-2_src_test -} diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild index 0b487ad920db..adffeb36c057 100644 --- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild +++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="avalon-framework avalon-logkit log4j servletapi test" RESTRICT="!test? ( test ) !servletapi? ( test )" |