summaryrefslogtreecommitdiff
path: root/dev-java/commons-logging
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-java/commons-logging
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-java/commons-logging')
-rw-r--r--dev-java/commons-logging/Manifest4
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r1.ebuild8
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r2.ebuild4
3 files changed, 8 insertions, 8 deletions
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 60ec7a48ebff..ac0930825acb 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,6 +1,6 @@
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 2212 BLAKE2B b91b91b4e26f1d9a5aea2a3743f979df0eb0f884ec00b5ac10087d0859828e6ca0b981fdcdcd520272d224b3f0b377eac8cb1da1566fd08671e3c9d6a6343153 SHA512 63621491db41bc2627c1a673c161218c4b999a3b925493f92e2442a053d9c6feffc5bf8a7c35f05d1a7c6f26504e0e87d723829d25496359c5bea71e4cd3d646
-EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B 3c11c135b650f00c703dfad89cb12648dcbe61bf251de7a7428bce266a51c980187cfbc902e4a7500b5d7c2b457c21d556bd547754ec5fc011a4eb5b7cd62830 SHA512 39b7fd0405164b07c062f300b7f0b71e29650b25d06873fb83171f6571dc63852238a47b71a1f1253fe7f3398556a09441f45220ae621dbbde694fe5daece285
+EBUILD commons-logging-1.2-r1.ebuild 2211 BLAKE2B b08909ddee2e5a33b14e08a414b4ead6e28a6cdcb1a0636c5c45e953dcf1508c89b767f117d524282e822fd0893b4ff379f66e87139555f39a42c786db1716b3 SHA512 f9cf0941c6b8637980734ef0c26fc043a443d496e91017c56bcddee9cfb65d3eb92c588e39737aa98505d4edd65f47b2cd4a7f4444c36847e2d71b0841f6770b
+EBUILD commons-logging-1.2-r2.ebuild 2316 BLAKE2B 9cdec18e702b826e1981a555e25921fcf76492dcde0d12bd5c40a7117786202f8faccd18981a85b0046fa83c39e6ce396f4890e47c7cd3920ca2a0952d6a41bd SHA512 ee663d8d3c443a19f5bbbcc004e68cd22d536acb566a6e77c9ee4111279802a4a2276b234e1bf20c08a231295b2fd7b66a8efe50aafe14924234e6b675590fc4
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
index d31cbb5b606b..b0c5a76ff00c 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
-RESTRICT="!servletapi? ( test )"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
avalon-logkit? ( dev-java/avalon-logkit:2.0 )
@@ -57,8 +57,8 @@ src_install() {
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 || die
- dohtml PROPOSAL.html || die
+ dodoc RELEASE-NOTES.txt
+ dohtml PROPOSAL.html
use doc && java-pkg_dojavadoc target/docs/
use source && java-pkg_dosrc src/main/java/org
}
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index 0f4bba416ed0..22f763911556 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
-RESTRICT="!servletapi? ( test )"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
CDEPEND="
log4j? ( dev-java/log4j:0 )