From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/commons-logging/Manifest | 6 ++ .../commons-logging/commons-logging-1.2-r1.ebuild | 68 ++++++++++++++++++ .../commons-logging/commons-logging-1.2-r2.ebuild | 81 ++++++++++++++++++++++ .../files/commons-logging-1.2-gentoo.patch | 26 +++++++ .../files/commons-logging-1.2-servletapi.patch | 42 +++++++++++ dev-java/commons-logging/metadata.xml | 14 ++++ 6 files changed, 237 insertions(+) create mode 100644 dev-java/commons-logging/Manifest create mode 100644 dev-java/commons-logging/commons-logging-1.2-r1.ebuild create mode 100644 dev-java/commons-logging/commons-logging-1.2-r2.ebuild create mode 100644 dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch create mode 100644 dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch create mode 100644 dev-java/commons-logging/metadata.xml (limited to 'dev-java/commons-logging') diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest new file mode 100644 index 000000000000..60ec7a48ebff --- /dev/null +++ b/dev-java/commons-logging/Manifest @@ -0,0 +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 +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 new file mode 100644 index 000000000000..d31cbb5b606b --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="avalon-framework avalon-logkit log4j servletapi test" +RESTRICT="!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 || die + dohtml PROPOSAL.html || die + 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-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild new file mode 100644 index 000000000000..0f4bba416ed0 --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="avalon-framework avalon-logkit log4j servletapi test" +RESTRICT="!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 )" + +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" + +DOCS=( RELEASE-NOTES.txt PROPOSAL.html ) + +src_prepare() { + default + + eapply "${FILESDIR}/${P}-gentoo.patch" + # patch to make the build.xml respect no servletapi + eapply "${FILESDIR}/${P}-servletapi.patch" + + # bug #208098 + echo "jdk.1.4.present=true" > build.properties || die + + if use avalon-framework; then + echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties || die + fi + if use avalon-logkit; then + echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties || die + fi + if use log4j; then + echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties || die + fi + + if use servletapi; then + echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties || die + fi +} + +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 + + einstalldocs + 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/files/commons-logging-1.2-gentoo.patch b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch new file mode 100644 index 000000000000..a654ce1fc763 --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch @@ -0,0 +1,26 @@ +--- a/build.xml ++++ b/build.xml +@@ -773,4 +773,23 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch new file mode 100644 index 000000000000..a9fccba8d5c1 --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch @@ -0,0 +1,42 @@ +--- a/build.xml ++++ b/build.xml +@@ -279,6 +279,8 @@ + classpathref="compile.classpath" + classname="org.apache.log.Logger"/> + ++ ++ + +@@ -315,6 +317,13 @@ + + + ++ ++ ++ *** WARNING *** ++ ServletAPI not found: Cannot Build ServletContextCleaner ++ ++ ++ + + + *** WARNING *** +@@ -337,7 +346,7 @@ + + + ++ depends='log4j12-warning,log4j13-warning,logkit-warning,jdk1.4-warning,avalon-framework-warning,servletapi-warning,compile-1.4'/> + + +@@ -365,6 +374,7 @@ + + + ++ + + + + + + java@gentoo.org + Java + + + Add optional support for avalon-framework + Add optional support for avalon-logkit + Add optional support for log4j + Add optional support for servletapi + + -- cgit v1.2.3