From 982fa02d488f2a0c17e12413240881752f434f98 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 22 Apr 2007 18:44:18 +0000 Subject: [PATCH] Remove needless junit dep; some polishing. Package-Manager: portage-2.1.2.4 --- dev-java/avalon-logkit/ChangeLog | 6 +++++- dev-java/avalon-logkit/Manifest | 16 ++++++++-------- .../avalon-logkit/avalon-logkit-1.2-r2.ebuild | 18 ++++++++---------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog index be72ee117fec..873369e6335d 100644 --- a/dev-java/avalon-logkit/ChangeLog +++ b/dev-java/avalon-logkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/avalon-logkit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.43 2007/04/08 20:13:40 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.44 2007/04/22 18:44:18 caster Exp $ + + 22 Apr 2007; Vlastimil Babka + avalon-logkit-1.2-r2.ebuild: + Remove needless junit dep; some polishing. 08 Apr 2007; William L. Thomson Jr. -files/2.0-build.xml, -avalon-logkit-2.0-r2.ebuild, diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest index 047517501179..9cec73681f7f 100644 --- a/dev-java/avalon-logkit/Manifest +++ b/dev-java/avalon-logkit/Manifest @@ -1,17 +1,17 @@ DIST LogKit-1.2-src.tar.gz 239132 RMD160 76310c6d26c816f3fa6d33b3da326475c29ef495 SHA1 e5ed86b664bd67481948ad30548587a27cbc8d4a SHA256 63fce9268f21696b284a7e942925806bf733a0e4086f76f565c35c7df4d06a2c DIST avalon-logkit-2.1-src.tar.gz 60218 RMD160 03d42940610150390744a9e2bd546be4537a371e SHA1 a1fc2054d375461b6781fa9b5274298d0b158c7a SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 -EBUILD avalon-logkit-1.2-r2.ebuild 1420 RMD160 daa9814306ee88fdae793e7741eee71d264cc1ca SHA1 7502ce37b6b1652cc30787cd5c9fbe0925eb50ed SHA256 898a4ef3c95d5357c2cf01d7e55cdeeb3f5c2f4695dbd70351b0da8794a878d7 -MD5 b2e12ca531adacce7e2b517d91b81ebc avalon-logkit-1.2-r2.ebuild 1420 -RMD160 daa9814306ee88fdae793e7741eee71d264cc1ca avalon-logkit-1.2-r2.ebuild 1420 -SHA256 898a4ef3c95d5357c2cf01d7e55cdeeb3f5c2f4695dbd70351b0da8794a878d7 avalon-logkit-1.2-r2.ebuild 1420 +EBUILD avalon-logkit-1.2-r2.ebuild 1314 RMD160 4010783e2ab6a7195071001d0ec49902653d7a6f SHA1 b2ef26d7a684bfe0bb8e2907e02b3f77b0ad6e2a SHA256 2916232c326f2c6c67b5b438254494a4ee0df693cebcd609ad16c71264602901 +MD5 bfc6475fbc7b43ea83abcbba7d12d524 avalon-logkit-1.2-r2.ebuild 1314 +RMD160 4010783e2ab6a7195071001d0ec49902653d7a6f avalon-logkit-1.2-r2.ebuild 1314 +SHA256 2916232c326f2c6c67b5b438254494a4ee0df693cebcd609ad16c71264602901 avalon-logkit-1.2-r2.ebuild 1314 EBUILD avalon-logkit-2.1.ebuild 1471 RMD160 c0c787f02baf88f5583decf6ae262d93772c5d07 SHA1 0a5c74bfbec7ba04f311dc0d281f0a0bec047420 SHA256 d6805155518200289ba61969221143c40788f766c317b05c2331d44e0c7fb28d MD5 b95905fc0f67a2cba256c696a9af67d8 avalon-logkit-2.1.ebuild 1471 RMD160 c0c787f02baf88f5583decf6ae262d93772c5d07 avalon-logkit-2.1.ebuild 1471 SHA256 d6805155518200289ba61969221143c40788f766c317b05c2331d44e0c7fb28d avalon-logkit-2.1.ebuild 1471 -MISC ChangeLog 5782 RMD160 547188caa7f68a992de008ca77bfa55cedf84acc SHA1 a8392688345eb3dcdd6d6079298110295acdce42 SHA256 77b1fbd468283ab2438a193775ef2e0a98cf303403593e9b350198ad3aeda35b -MD5 ef7176ab0d84659b9b46aa0599dcd131 ChangeLog 5782 -RMD160 547188caa7f68a992de008ca77bfa55cedf84acc ChangeLog 5782 -SHA256 77b1fbd468283ab2438a193775ef2e0a98cf303403593e9b350198ad3aeda35b ChangeLog 5782 +MISC ChangeLog 5911 RMD160 9a81ba54b0662fba9158534dda4d2adb76978c84 SHA1 524f85bc71a06b3df2d207b27167722ae2bb8011 SHA256 a20d93d3f42e8d2e9e9ba33395724f46487ad2556cf5b5fa92a0cc1fa4f565e2 +MD5 6cce0999e42978c420d39d051be72083 ChangeLog 5911 +RMD160 9a81ba54b0662fba9158534dda4d2adb76978c84 ChangeLog 5911 +SHA256 a20d93d3f42e8d2e9e9ba33395724f46487ad2556cf5b5fa92a0cc1fa4f565e2 ChangeLog 5911 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild index b472a2c1be67..ca7db47a2cff 100644 --- a/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild +++ b/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild,v 1.5 2007/02/10 16:44:43 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild,v 1.6 2007/04/22 18:44:18 caster Exp $ +JAVA_PKG_IUSE="doc javamail jms source" inherit java-pkg-2 java-ant-2 DESCRIPTION="An easy-to-use Java logging toolkit designed for secure, performance-oriented logging." @@ -13,31 +14,27 @@ COMMON_DEP=" dev-java/sun-javamail ) jms? ( dev-java/sun-jms )" -RDEPEND=">=virtual/jre-1.3 +RDEPEND=">=virtual/jre-1.4 ${COMMON_DEP}" # Doesn't like 1.6 changes to JDBC DEPEND="|| ( - =virtual/jdk-1.3* - =virtual/jdk-1.4* =virtual/jdk-1.5* + =virtual/jdk-1.4* ) - dev-java/ant-core - dev-java/junit - source? ( app-arch/zip ) ${COMMON_DEP}" LICENSE="Apache-1.1" SLOT="1.2" KEYWORDS="amd64 ~ia64 ppc ppc64 x86" -IUSE="doc javamail jms source" +IUSE="" S="${WORKDIR}/LogKit-${PV}" src_unpack() { unpack ${A} + rm -rf "${S}/src/test/org" cd "${S}/lib" - rm -f *.jar if use javamail; then java-pkg_jar-from sun-jaf @@ -45,12 +42,13 @@ src_unpack() { fi use jms && java-pkg_jar-from sun-jms + } src_compile() { # not generating api docs because we would # need avalon-site otherwise - eant jar -Djunit.jar=$(java-pkg_getjar --build-only junit junit.jar) + eant jar } src_install() { -- 2.26.2