From 761a3a34e425566ddbecc7cfe19fad24081c3291 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petteri=20R=C3=A4ty?= Date: Tue, 13 Feb 2007 20:03:11 +0000 Subject: [PATCH] Ebuild cleanup and correct LICENSE to Apache-2.0 Package-Manager: portage-2.1.2-r9 --- dev-java/commons-logging/ChangeLog | 6 ++++- dev-java/commons-logging/Manifest | 24 +++++++++---------- .../commons-logging-1.1-r2.ebuild | 14 +++++------ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog index 003eb672caa6..b444a24a8100 100644 --- a/dev-java/commons-logging/ChangeLog +++ b/dev-java/commons-logging/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/commons-logging # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.46 2007/01/10 16:51:17 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.47 2007/02/13 20:03:11 betelgeuse Exp $ + + 13 Feb 2007; Petteri Räty + commons-logging-1.1-r2.ebuild: + Ebuild cleanup and correct LICENSE to Apache-2.0 10 Jan 2007; Petteri Räty commons-logging-1.1-r2.ebuild: diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index 4f6003bc27e4..cd7c7a3e1c4e 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -19,14 +19,14 @@ EBUILD commons-logging-1.0.4-r2.ebuild 1469 RMD160 5207676b44ae8dbbee1755886effe MD5 9cc467dcdb8769e817257e21ad2db458 commons-logging-1.0.4-r2.ebuild 1469 RMD160 5207676b44ae8dbbee1755886effe122b88d46ef commons-logging-1.0.4-r2.ebuild 1469 SHA256 8e7a8633d2a81aaaedcf1d3e33984d55e2585bdc6e7fcb8b6d2e3ca9ede881d6 commons-logging-1.0.4-r2.ebuild 1469 -EBUILD commons-logging-1.1-r2.ebuild 2139 RMD160 323c090de2ebef4fd4c67cdcfe3887809cf5ab0e SHA1 1a2a4b45373b8629ab356678926c7e493b24c47f SHA256 fdc0e21bd2b753e6d0ef821ac4b92067ad72e2b5f6ae7f7da624c51a18b4cfd3 -MD5 92858abb29da4fc3ab3189ca1e101f75 commons-logging-1.1-r2.ebuild 2139 -RMD160 323c090de2ebef4fd4c67cdcfe3887809cf5ab0e commons-logging-1.1-r2.ebuild 2139 -SHA256 fdc0e21bd2b753e6d0ef821ac4b92067ad72e2b5f6ae7f7da624c51a18b4cfd3 commons-logging-1.1-r2.ebuild 2139 -MISC ChangeLog 6396 RMD160 6acdb133818ca745f65e5d2b3aca1ec7cea9fa73 SHA1 3b471cfa8c1b25c43d1986134731d895536d2adf SHA256 d3146a0aa37755f1d3317c58555d7a00384a58f729e0d09b62d1a4a7c0ea9a23 -MD5 0274de447c77378264880efa5d197c1f ChangeLog 6396 -RMD160 6acdb133818ca745f65e5d2b3aca1ec7cea9fa73 ChangeLog 6396 -SHA256 d3146a0aa37755f1d3317c58555d7a00384a58f729e0d09b62d1a4a7c0ea9a23 ChangeLog 6396 +EBUILD commons-logging-1.1-r2.ebuild 2140 RMD160 0b33b649535df58736e8a3bc845e2946d584e283 SHA1 e1587f7faa40390cc93f48be6f09f7a16866390a SHA256 6b2c11b50ece740f41838b82e4dd778b81288522d378a185b9e14b583f4f926e +MD5 93f5d1c22a50cb802748c098abd9a08e commons-logging-1.1-r2.ebuild 2140 +RMD160 0b33b649535df58736e8a3bc845e2946d584e283 commons-logging-1.1-r2.ebuild 2140 +SHA256 6b2c11b50ece740f41838b82e4dd778b81288522d378a185b9e14b583f4f926e commons-logging-1.1-r2.ebuild 2140 +MISC ChangeLog 6534 RMD160 435f9ad11afda0a2005480b469c8bd791f3ee2d3 SHA1 148d5d94c9bff4777c59851dc37c8820ba26aec5 SHA256 8f4f071ec4a61507b916596c5132b870f4f3e69b4cf64243f50e38c6dc0d4240 +MD5 db8d0515e8f2be0b8b9739057cad7e48 ChangeLog 6534 +RMD160 435f9ad11afda0a2005480b469c8bd791f3ee2d3 ChangeLog 6534 +SHA256 8f4f071ec4a61507b916596c5132b870f4f3e69b4cf64243f50e38c6dc0d4240 ChangeLog 6534 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -41,9 +41,9 @@ MD5 dbd98438b253a99ade9f91d18702be61 files/digest-commons-logging-1.1-r2 271 RMD160 9d76f4289df7607857eb75a355c863f71888e879 files/digest-commons-logging-1.1-r2 271 SHA256 1f084370bb15098b91eba2e71dca3522fea67307d4956040e3479d9eedda26ed files/digest-commons-logging-1.1-r2 271 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFpVIGcxLzpIGCsLQRAkPIAJkBHftUL0+trdApHh3NAeb8FO5ZvQCghkcT -XM59Lv9QP63DM2qvGdw7d88= -=0qMt +iD8DBQFF0hmHcxLzpIGCsLQRAu77AKCWUucy3AeadqI6VKTpow+CpCNvhgCgi14b +Fg/2OlTEVkPlFRNPZOwQYCg= +=+8rI -----END PGP SIGNATURE----- diff --git a/dev-java/commons-logging/commons-logging-1.1-r2.ebuild b/dev-java/commons-logging/commons-logging-1.1-r2.ebuild index 4acc0fe1c01b..a69f45d2d8f8 100644 --- a/dev-java/commons-logging/commons-logging-1.1-r2.ebuild +++ b/dev-java/commons-logging/commons-logging-1.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r2.ebuild,v 1.4 2007/01/10 16:51:17 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r2.ebuild,v 1.5 2007/02/13 20:03:11 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -8,7 +8,7 @@ DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between HOMEPAGE="http://jakarta.apache.org/commons/logging/" SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz" -LICENSE="Apache-1.1" +LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" IUSE="avalon-logkit log4j servletapi avalon-framework doc source" @@ -29,7 +29,7 @@ S="${WORKDIR}/${P}-src/" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" epatch ${FILESDIR}/${P}-gentoo.patch # patch to make the build.xml respect no servletapi # TODO file upstream -nichoj @@ -43,17 +43,15 @@ src_unpack() { use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties } -src_compile() { - eant compile $(use_doc) -} +EANT_BUILD_TARGET="compile" src_install() { java-pkg_newjar target/${P}.jar ${PN}.jar 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 - dohtml PROPOSAL.html STATUS.html + dodoc RELEASE-NOTES.txt || die + dohtml PROPOSAL.html STATUS.html || die use doc && java-pkg_dojavadoc target/docs/ use source && java-pkg_dosrc src/java/org } -- 2.26.2