diff options
Diffstat (limited to 'dev-java/avalon-logkit')
| -rw-r--r-- | dev-java/avalon-logkit/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/avalon-logkit/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild (renamed from dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild) | 22 |
3 files changed, 19 insertions, 15 deletions
diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog index 7c87a21ee5fe..4b10f6fc56ab 100644 --- a/dev-java/avalon-logkit/ChangeLog +++ b/dev-java/avalon-logkit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/avalon-logkit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.71 2009/11/06 17:13:53 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.72 2009/11/06 17:23:38 caster Exp $ + +*avalon-logkit-2.1-r4 (06 Nov 2009) + + 06 Nov 2009; Vlastimil Babka <caster@gentoo.org> + -avalon-logkit-2.1-r2.ebuild, +avalon-logkit-2.1-r4.ebuild: + Revbump with patch to allow compiling with java6. *avalon-logkit-1.2.2 (06 Nov 2009) diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest index 7c666f69e527..545f9deb6dbe 100644 --- a/dev-java/avalon-logkit/Manifest +++ b/dev-java/avalon-logkit/Manifest @@ -7,7 +7,7 @@ EBUILD avalon-logkit-1.2-r3.ebuild 1380 RMD160 fe9086c39cec24dac5d6412aa90a66202 EBUILD avalon-logkit-1.2-r4.ebuild 1376 RMD160 711f223d5c0775929b8204c7c235160d62cf8fc8 SHA1 0de92c54a97a1e1926fd0141f9d675ea19b3f3a0 SHA256 8cfcce964901b7b55307a9d6384f1d8ab4ad090b84e6a7cf0c57a93ba9363a15 EBUILD avalon-logkit-1.2.2.ebuild 2741 RMD160 8f8d5277cd769c66d8e761307b7a28a7f04fa87f SHA1 4b2ec05c3115d86d5b523dede2760426e4e900ea SHA256 2a5ffa8ecbc208d05d48e31455bdd4ee99a37466a3c9d0837b528ac41aa450e8 EBUILD avalon-logkit-2.1-r1.ebuild 1453 RMD160 2dd8fa60690786b7b547ec59d7f641b7722546df SHA1 1fe2e6e790bc282a7fa5a5c8a932f240bff04aa8 SHA256 634a8806c3408b298ef632c066d22a45fdf5e799c4662919e3eb75fa71167df9 -EBUILD avalon-logkit-2.1-r2.ebuild 1452 RMD160 f0d5c58274bd259bbcc62564835e060c54506cde SHA1 c4b9acdf2681150d560d4ab8d8d0d7d5b763cec5 SHA256 20776e331260e48c43b1d336ef77f1fd6402316b3eae6f1c3314b8fe5e008829 EBUILD avalon-logkit-2.1-r3.ebuild 1458 RMD160 487a35b894f2652bd23d5047304114ce75666d84 SHA1 7bcc9443eb2237a5bb5009c9da9119a712333c0f SHA256 0b1e1e8b87769acf25902bbc82a57011cbf4f17dc8317ac1cb6e4794d936573e -MISC ChangeLog 9670 RMD160 c396aa8bc3adab2587ce37474cd39e17e85f44c2 SHA1 0be041c29eef23d5a35cca94f607f3a1d8faabd4 SHA256 896074fd3a8cc6d20933b11989bb20e241d7d9de369a41fe5b9e4e75a633458d +EBUILD avalon-logkit-2.1-r4.ebuild 1453 RMD160 558cd704a9389d2fdfb3b58e752c1bced001598a SHA1 00f92bfbc5aac80b0106fd8c80ccaa4215178a2f SHA256 1dc496e2b77ca3f882f76d1ee8f93a29951eae39d4ba4fd4f01cd396f0ac5a26 +MISC ChangeLog 9873 RMD160 8ed6f403445127f4f6d4ca06e6536ac02283f335 SHA1 1da1d19c4504865fbd2fb5140d5673c595d072de SHA256 dad851dbc9cba49dc6e12709965945f2b82d79ee2b9652e106ebe02aa7a1cbb1 MISC metadata.xml 311 RMD160 07e159ca280065f33123b03260935fd3241d1431 SHA1 61fa2665915b5c880e24507934cd30524c655a94 SHA256 45bb3113a8dd927f5af7ad3ed3a894275f32040b1656be8e1ea36cb4b1e5af86 diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild index 8128882b5b04..53259fbc3eb9 100644 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild @@ -1,41 +1,39 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild,v 1.8 2008/05/11 16:14:39 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild,v 1.1 2009/11/06 17:23:38 caster Exp $ +EAPI=2 JAVA_PKG_IUSE="doc source test" + inherit java-pkg-2 java-ant-2 DESCRIPTION="Easy-to-use Java logging toolkit" HOMEPAGE="http://avalon.apache.org/" SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz" -KEYWORDS="amd64 ~ia64 ppc ppc64 x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" LICENSE="Apache-2.0" SLOT="2.0" IUSE="" COMMON_DEP=" dev-java/log4j - dev-java/sun-jms + java-virtuals/jms java-virtuals/javamail =dev-java/servletapi-2.4*" RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" # Doesn't like 1.6 changes to JDBC -DEPEND="|| ( - =virtual/jdk-1.5* - =virtual/jdk-1.4* - ) +DEPEND=">=virtual/jdk-1.4 test? ( =dev-java/junit-3* dev-java/ant-junit ) ${COMMON_DEP}" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { + epatch "${FILESDIR}/${PN}-1.2.2-java6.patch" java-ant_ignore-system-classes @@ -45,7 +43,7 @@ src_unpack() { mkdir -p target/lib || die cd target/lib || die java-pkg_jar-from servletapi-2.4 - java-pkg_jar-from sun-jms + java-pkg_jar-from jms java-pkg_jar-from --virtual javamail java-pkg_jar-from log4j java-pkg_filter-compiler jikes |