diff options
| -rw-r--r-- | dev-java/log4j/Manifest | 23 | ||||
| -rw-r--r-- | dev-java/log4j/files/digest-log4j-1.2.14-r1 | 3 | ||||
| -rw-r--r-- | dev-java/log4j/log4j-1.2.14-r1.ebuild | 60 | ||||
| -rw-r--r-- | dev-java/log4j/log4j-1.2.14.ebuild | 5 |
4 files changed, 81 insertions, 10 deletions
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest index e3d4f7571229..dce9ed50ba0c 100644 --- a/dev-java/log4j/Manifest +++ b/dev-java/log4j/Manifest @@ -8,10 +8,14 @@ EBUILD log4j-1.2.13-r1.ebuild 1971 RMD160 b4946eb68883088d13a99821b02d96deec50b0 MD5 045d2e5cb94915a078709a526d2a7144 log4j-1.2.13-r1.ebuild 1971 RMD160 b4946eb68883088d13a99821b02d96deec50b0e3 log4j-1.2.13-r1.ebuild 1971 SHA256 2ed0201c9c5a113788178f71babb8c8d4b1911cc6f72c3f8e7fb55861ba43467 log4j-1.2.13-r1.ebuild 1971 -EBUILD log4j-1.2.14.ebuild 2098 RMD160 9ce6af2954432121b8cd181278ecc7955f908324 SHA1 2db2e82e1c67e40237a50166599bce319e84da1c SHA256 67b68d08cefc2680eb3fd4a2644b95feed2144eb1cd2cdce5b4b087f90936f63 -MD5 4caa4abb034ca2ffffedbc9a9c359219 log4j-1.2.14.ebuild 2098 -RMD160 9ce6af2954432121b8cd181278ecc7955f908324 log4j-1.2.14.ebuild 2098 -SHA256 67b68d08cefc2680eb3fd4a2644b95feed2144eb1cd2cdce5b4b087f90936f63 log4j-1.2.14.ebuild 2098 +EBUILD log4j-1.2.14-r1.ebuild 2171 RMD160 10369ce236ae6eec93532192ea364cd19928312c SHA1 106f67d76540462e4aa08f5e068e67c1829f6694 SHA256 8d83b0e5d8264b316c9d8836ad1a19312be196ab089b7490b1edd42daefaf8e5 +MD5 53d881a05778323bfe4b8a1009479f26 log4j-1.2.14-r1.ebuild 2171 +RMD160 10369ce236ae6eec93532192ea364cd19928312c log4j-1.2.14-r1.ebuild 2171 +SHA256 8d83b0e5d8264b316c9d8836ad1a19312be196ab089b7490b1edd42daefaf8e5 log4j-1.2.14-r1.ebuild 2171 +EBUILD log4j-1.2.14.ebuild 2168 RMD160 410b80e22313190ef240e718d02e51fcf562bba4 SHA1 01e254a0d30de7e97081f081f50c70333da8e9d3 SHA256 e97dbe834c49eea474862d5aca53368ab708f6e76916cecabaead52c2db44dea +MD5 d477a37af0d7bfa3831f18c134cb9051 log4j-1.2.14.ebuild 2168 +RMD160 410b80e22313190ef240e718d02e51fcf562bba4 log4j-1.2.14.ebuild 2168 +SHA256 e97dbe834c49eea474862d5aca53368ab708f6e76916cecabaead52c2db44dea log4j-1.2.14.ebuild 2168 EBUILD log4j-1.2.9.ebuild 1731 RMD160 1fae25199ead2950fbe862c205589e1609df69ea SHA1 a86c1c3eb666814f590b13483149b7c8db886a73 SHA256 5c0cb4f1213a89cf4cdbf146f304b5f41a4f2239993e9e2960e58ba8b5c44f80 MD5 21b6c2ab2672ba932439c29884da04e0 log4j-1.2.9.ebuild 1731 RMD160 1fae25199ead2950fbe862c205589e1609df69ea log4j-1.2.9.ebuild 1731 @@ -30,13 +34,16 @@ SHA256 382bf81b4ab8a767c33e1b6c1f6675b16849bbefce3ab53753b08055c936edd4 files/di MD5 64682b242d8470397d9d928e1f4ecabb files/digest-log4j-1.2.14 265 RMD160 e54e8ee716927b0179d393edfb24052bd3918715 files/digest-log4j-1.2.14 265 SHA256 b323188ba761c284014b29935febfa18fb576c455e94636db1ac6959b392712d files/digest-log4j-1.2.14 265 +MD5 64682b242d8470397d9d928e1f4ecabb files/digest-log4j-1.2.14-r1 265 +RMD160 e54e8ee716927b0179d393edfb24052bd3918715 files/digest-log4j-1.2.14-r1 265 +SHA256 b323188ba761c284014b29935febfa18fb576c455e94636db1ac6959b392712d files/digest-log4j-1.2.14-r1 265 MD5 a042cc8d6c7d4dd99eacff138249abc4 files/digest-log4j-1.2.9 262 RMD160 fd7c206900737ca2851b75ac2a18770571555182 files/digest-log4j-1.2.9 262 SHA256 1405c8fc60edfa094d310fa2c833fa6f1e13007af54332e11470a202d27c2810 files/digest-log4j-1.2.9 262 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFeJwXcxLzpIGCsLQRAuzuAJoCTDWcKUQmet834nzH/fPxQXpHLQCeNN1d -JSev0VGmSL4RZbNswzoeC40= -=Ft1U +iD8DBQFFivsxcxLzpIGCsLQRAkfnAJ9JyCfkXZ+G/Y0P86d+C/3W+XCxTQCfXXeA +qf/wN8VAP5N8s0XhCOvBb6Y= +=h7tZ -----END PGP SIGNATURE----- diff --git a/dev-java/log4j/files/digest-log4j-1.2.14-r1 b/dev-java/log4j/files/digest-log4j-1.2.14-r1 new file mode 100644 index 000000000000..7747cfecca5a --- /dev/null +++ b/dev-java/log4j/files/digest-log4j-1.2.14-r1 @@ -0,0 +1,3 @@ +MD5 7d8d02888b93e6f8d67b8e5f746196ae logging-log4j-1.2.14.tar.gz 2771881 +RMD160 d640c0182deebe1aabf14105b7b89294601bacce logging-log4j-1.2.14.tar.gz 2771881 +SHA256 51e4fcb3c3677fcdb9fe45ca0f73378680537491c9c9e65a9b63c7f54678f90c logging-log4j-1.2.14.tar.gz 2771881 diff --git a/dev-java/log4j/log4j-1.2.14-r1.ebuild b/dev-java/log4j/log4j-1.2.14-r1.ebuild new file mode 100644 index 000000000000..299249f627bd --- /dev/null +++ b/dev-java/log4j/log4j-1.2.14-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14-r1.ebuild,v 1.1 2006/12/21 21:22:44 betelgeuse Exp $ + +inherit java-pkg-2 java-ant-2 + +MY_P="logging-${P}" +DESCRIPTION="A low-overhead robust logging package for Java" +SRC_URI="mirror://apache/logging/log4j/${PV}/${MY_P}.tar.gz" +HOMEPAGE="http://logging.apache.org/log4j/" +LICENSE="Apache-1.1" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +# jikes support disabled: bug #108819 +IUSE="doc javamail jms jmx source" + +RDEPEND=">=virtual/jre-1.4 + javamail? ( dev-java/sun-javamail dev-java/sun-jaf ) + jmx? ( dev-java/sun-jmx ) + jms? ( =dev-java/openjms-bin-0.7.6 )" + +# We should get log4j working with openjms but at the moment that would bring +# a circular dependency. +# jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))" + +# Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails +# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to +# explicitly set the javac.source and javac.target properties in the ebuild. + +DEPEND=">=virtual/jdk-1.4 + >=dev-java/ant-core-1.6.5 + source? ( app-arch/zip ) + ${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd ${S} + rm -rf dist/ + # Takes javamail from system env without this + xml-rewrite.py -f build.xml -c -e available -a ignoresystemclasses -v "true" +} + +src_compile() { + # Because we depend on >=1.4 we always have jaxp + local antflags="jar -Djaxp-present=true" + use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf activation.jar)" + use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)" + #use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)" + use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar" + eant ${antflags} +} + +src_install() { + java-pkg_newjar dist/lib/${P}.jar ${PN}.jar + + use doc && java-pkg_dohtml -r docs/* + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/log4j/log4j-1.2.14.ebuild b/dev-java/log4j/log4j-1.2.14.ebuild index 7ae2f006c3ef..902b151b9569 100644 --- a/dev-java/log4j/log4j-1.2.14.ebuild +++ b/dev-java/log4j/log4j-1.2.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14.ebuild,v 1.4 2006/12/07 22:56:06 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14.ebuild,v 1.5 2006/12/21 21:22:44 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -43,7 +43,8 @@ src_unpack() { } src_compile() { - local antflags="jar" + # Because we depend on >=1.4 we always have jaxp + local antflags="jar -Djaxp-present=true" use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf activation.jar)" use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)" #use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)" |