From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-java/commons-logging/Manifest | 7 +++ .../commons-logging/commons-logging-1.2-r1.ebuild | 65 ++++++++++++++++++++++ .../files/commons-logging-1.2-gentoo.patch | 26 +++++++++ .../files/commons-logging-1.2-servletapi.patch | 42 ++++++++++++++ dev-java/commons-logging/metadata.xml | 14 +++++ 5 files changed, 154 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/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..44bcf2673c97 --- /dev/null +++ b/dev-java/commons-logging/Manifest @@ -0,0 +1,7 @@ +AUX commons-logging-1.2-gentoo.patch 897 SHA256 21228c67f8ca6b36dd196eac3953e711fc011e6ecf181f52fbddf307a3ff72f8 SHA512 b486f96b1d7ae8e8decb3210fb33a31dbfa147cd30ae8311c60eab4f0d48b71518825bba06f146490aeea746dc3dc996a7191a974d57cf990ca253793b9294a1 WHIRLPOOL a7c4db64662f0a1129094df892124f8046158f0ddf331af3995e011dbb7d227d270a31707b6d70de1ef2ac28b088f487e3834b3e9487fd57fd6921b1fba8732b +AUX commons-logging-1.2-servletapi.patch 1855 SHA256 286f6565a36ef5539e33f61bd36027e3a330d34d5abdcc0ccd884af2c48bbb55 SHA512 3e608ec37279664249d89eb90eaee7e2f5536ab37efcb6e94a8d586b5284a4641aaa5c58f6ef4730955e51fd22491e82f1a6b5b50303f9c4d7cfd066f751799c WHIRLPOOL cfda499740a07b41de4265012686df0680e9b090ef3b97e8ae71163422c51567c5329676e9bbcc367637b5cb614facdb2b538021a1049290b913898c29ff7c94 +DIST commons-logging-1.2-src.tar.gz 188536 SHA256 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9 WHIRLPOOL fe31832404d9071d73fba940021ab664998ffa9867a88c2078918547cc6a23a06339f33f5d74f8b6ea5aaeeb86cd94c0aef6c6195e454a651b8fc492a1a6b5f8 +EBUILD commons-logging-1.2-r1.ebuild 2216 SHA256 37ff3444af2046ee3ee893ce5e005efa6586072b0b4b854f125d3a9109d79f5b SHA512 9ba1fb6158df59d239036d09ad071b244f0f1aec726355689db92bb0f0d7dda453d23c520388df9afe70cbeba01282b3b67acd0599280bd9c5a1d708e822fcb8 WHIRLPOOL 402af71f39e078fe983dc794c8e1f13c1c796698f4539a02308a200d48d4e405f8a6f2a9ef505b95b3381463de8053976f2d00c1f47dc162b6e246ff02c5f7fc +MISC ChangeLog 4559 SHA256 8c32b4a183a1bb44c6239e6d26ad2b1e0e8445a6297ae2d13a4f6410d6955aeb SHA512 be129be5eaf8f52b8f64b2943f7ffd07468f489c25f07cab4497f6d7669e719d9ef2895cce234141efe8dd5c6079026575883d77fad94ba24c09a084ac4a6cfb WHIRLPOOL d83a8d569fa1ea39fa61a3869ed4aab6118bdd7ec716949f550b6bcb606511b6bbaa42843cd77d9f8d5b5928c286bff08c1d4b3de597b454c16fb108e5f9170b +MISC ChangeLog-2015 10700 SHA256 7bc33b5d942e46fbd931159b57bc4636686964e543b508218c7235b7cac30689 SHA512 4ba4d42764fb2cca19f30ebc2d4a0d48840ef8ae5e4b2df7e72e08108c9da2661fc09d145d53838953904814b8de44bfcc34fe8a73965194639fc89d0f0e3630 WHIRLPOOL b0a5772db6dddb946e6641a7b613000bab9682c5c2e4aab8da0c9d871e9f3ad634873e2729a48971de7fa5fbd1aed38dab15ccb2d6fdd7056aad5afb6f3133d9 +MISC metadata.xml 551 SHA256 625874ef1f44ed178bd13744f12ae6e8600b7e5263d0a8c0a594a880f1cb8533 SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd WHIRLPOOL 95253c79d29cb02b309b34730d8336716e4f6f37776d8d7d779db99724e15b42504f7467114947143c847a0e104598b8546a49810ef346e07540f998b09ca155 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..e39e1e328940 --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2017 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="http://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 ~x86-fbsd ~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/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..f359e8e224bf --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.2-gentoo.patch @@ -0,0 +1,26 @@ +--- a/build.xml 2013-05-16 22:04:22.000000000 +0200 ++++ b/build.xml 2013-12-25 23:58:47.447266535 +0100 +@@ -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..96299c131f1b --- /dev/null +++ b/dev-java/commons-logging/files/commons-logging-1.2-servletapi.patch @@ -0,0 +1,42 @@ +--- a/build.xml 2013-12-26 00:00:51.019721667 +0100 ++++ b/build.xml 2013-12-26 00:22:27.616511976 +0100 +@@ -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