Stable on amd64, bug #171643. Brought forward ~ia64 keyword, and removed older versions.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 3be70cec5638810e27f6675edee88ae90a341a7f..a23e8d25978bf1e56384395ea974c7a9caffc22e 100644 (file)
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,12 @@
 # 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.50 2007/03/24 18:14:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.51 2007/04/07 04:28:54 wltjr Exp $
+
+  07 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -commons-logging-1.0.4-r1.ebuild, -commons-logging-1.0.4-r2.ebuild,
+  commons-logging-1.1-r2.ebuild:
+  Stable on amd64, bug #171643. Brought forward ~ia64 keyword, and removed
+  older versions.
 
   24 Mar 2007; nixnut <nixnut@gentoo.org> commons-logging-1.1-r2.ebuild:
   Stable on ppc wrt bug 171643

diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index fda10b825c3bf0f92a4a919917db879a4859d7fb..cb8bcb9d6ecd0a7fa4b188de1c8810ee4f8b2116 100644 (file)
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -6,34 +6,19 @@ AUX commons-logging-1.1-servletapi.patch 1988 RMD160 78c13fc15add613a1cb17d73c3a
 MD5 41b91178077c9e3dc891ece05c835d99 files/commons-logging-1.1-servletapi.patch 1988
 RMD160 78c13fc15add613a1cb17d73c3a31c8ee1cc69bd files/commons-logging-1.1-servletapi.patch 1988
 SHA256 836afb926d95aae2dcade9234179df3274402f19bbcc54d77a19e18af30317b3 files/commons-logging-1.1-servletapi.patch 1988
-DIST commons-logging-1.0.4-src.tar.gz 101017 RMD160 9d92e16433e858fc1c2db7b9c65b07ed11ad28fc SHA1 5bea5faa3b45251d97655b37ce00f80678f9db62 SHA256 0752546b1c60e42c4d98cf36354872e22626368bfce252625ea91f1885aa9482
 DIST commons-logging-1.1-src.tar.gz 173556 RMD160 5764ee09a541365adee55aded1a9ba8908deea0d SHA1 cbaf5c65979e6733b07b27b01af083965a55fbad SHA256 56aa7d3f2ab3d50798ce618d6dd60ed6814287f7cc25802d403cd3083238c5fa
-EBUILD commons-logging-1.0.4-r1.ebuild 1548 RMD160 7f65155371f196f03c23ed696d01ae4eb639bf4b SHA1 10c1890d8d49fae3a4ede4d39cb9e0a37a5cc14b SHA256 bc26dc45f3732e2557e2a06e6d04e4bae500c759597af31e09c69e24a5da6a9f
-MD5 006bc4cd69582fbcc210ce9493775f8c commons-logging-1.0.4-r1.ebuild 1548
-RMD160 7f65155371f196f03c23ed696d01ae4eb639bf4b commons-logging-1.0.4-r1.ebuild 1548
-SHA256 bc26dc45f3732e2557e2a06e6d04e4bae500c759597af31e09c69e24a5da6a9f commons-logging-1.0.4-r1.ebuild 1548
-EBUILD commons-logging-1.0.4-r2.ebuild 1469 RMD160 5207676b44ae8dbbee1755886effe122b88d46ef SHA1 496a552f2468a2b5fce0a50495b4f72ee7b58b36 SHA256 8e7a8633d2a81aaaedcf1d3e33984d55e2585bdc6e7fcb8b6d2e3ca9ede881d6
-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 2133 RMD160 1b66b2aebfcab978d29d5906b52eeb1818fdd459 SHA1 9f47a5341d0de2b50a4afa29ff93a997c5f63bbb SHA256 0bc87cbe3cdbcbdfe434b70b555452901bf5419eafa0516507a0f0f05f404410
-MD5 d71ca555afb1c10d6d7d41acfbf37816 commons-logging-1.1-r2.ebuild 2133
-RMD160 1b66b2aebfcab978d29d5906b52eeb1818fdd459 commons-logging-1.1-r2.ebuild 2133
-SHA256 0bc87cbe3cdbcbdfe434b70b555452901bf5419eafa0516507a0f0f05f404410 commons-logging-1.1-r2.ebuild 2133
-MISC ChangeLog 6863 RMD160 4e8cf6e4211fb3b1fd2b2743bbda8e63e09b3390 SHA1 a3e66a73442ccb90f89a81e23a38667dc459fcc7 SHA256 165c3cc378f4c4e8ea92d26f0c8f44b70f45cb5c6b22be9597e2ae5a3c19161d
-MD5 ff57b4d47f78f8607bb89b8754cbcb0f ChangeLog 6863
-RMD160 4e8cf6e4211fb3b1fd2b2743bbda8e63e09b3390 ChangeLog 6863
-SHA256 165c3cc378f4c4e8ea92d26f0c8f44b70f45cb5c6b22be9597e2ae5a3c19161d ChangeLog 6863
+EBUILD commons-logging-1.1-r2.ebuild 2137 RMD160 77e8976e7115bef08fa45a03c2c83d61336bac34 SHA1 3cbc6992f9adc831c61deae48daf33c675c2710b SHA256 59d64d83f3f5795c561251126082c2218392e242768ce96c77b4c254b7b56947
+MD5 ce424cafbcc64b90fd46a40a9a9cc0b3 commons-logging-1.1-r2.ebuild 2137
+RMD160 77e8976e7115bef08fa45a03c2c83d61336bac34 commons-logging-1.1-r2.ebuild 2137
+SHA256 59d64d83f3f5795c561251126082c2218392e242768ce96c77b4c254b7b56947 commons-logging-1.1-r2.ebuild 2137
+MISC ChangeLog 7116 RMD160 9f7d14e6ef7e73240401177dd22e8d908b28ffc8 SHA1 e1af038eaf0a6b53d976d3bed94ecf71d8eceb84 SHA256 639f6d10bb8eb1759a07af6fb10bfd63e12dc862aea18dbe4fd6db74758459b4
+MD5 ab0e4499bbc1d4aee4a2575aeed2dfcc ChangeLog 7116
+RMD160 9f7d14e6ef7e73240401177dd22e8d908b28ffc8 ChangeLog 7116
+SHA256 639f6d10bb8eb1759a07af6fb10bfd63e12dc862aea18dbe4fd6db74758459b4 ChangeLog 7116
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 250f13b693acbedf21c2f971a9f205c9 files/digest-commons-logging-1.0.4-r1 277
-RMD160 50fc8a301773f5c9edc43b5909f52c84ce45a9c9 files/digest-commons-logging-1.0.4-r1 277
-SHA256 75399acafa867704fd3708aa5c5ab0d9181b46bfcc15cee3536ccc9782f022ff files/digest-commons-logging-1.0.4-r1 277
-MD5 250f13b693acbedf21c2f971a9f205c9 files/digest-commons-logging-1.0.4-r2 277
-RMD160 50fc8a301773f5c9edc43b5909f52c84ce45a9c9 files/digest-commons-logging-1.0.4-r2 277
-SHA256 75399acafa867704fd3708aa5c5ab0d9181b46bfcc15cee3536ccc9782f022ff files/digest-commons-logging-1.0.4-r2 277
 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

diff --git a/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild
deleted file mode 100644 (file)
index 9eba6c2..0000000
--- a/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2006 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.0.4-r1.ebuild,v 1.11 2006/10/05 15:29:27 gustavoz Exp $
-
-inherit java-pkg
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
-HOMEPAGE="http://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc64 ppc"
-IUSE="avalon doc jikes source"
-
-RDEPEND=">=virtual/jre-1.3
-       =dev-java/avalon-logkit-1.2*
-       dev-java/log4j
-       avalon? ( =dev-java/avalon-framework-4.2* )"
-DEPEND=">=virtual/jdk-1.3
-       dev-java/ant-core
-       jikes? ( >=dev-java/jikes-1.21 )
-       source? ( app-arch/zip )
-       ${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       echo "log4j.jar=$(java-pkg_getjars log4j)" > build.properties
-       echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
-       use avalon && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-}
-
-src_compile() {
-       local antflags="compile"
-       use doc && antflags="${antflags} javadoc"
-       use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-       ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-       java-pkg_dojar target/${PN}-api.jar target/${PN}.jar
-
-       dodoc RELEASE-NOTES.txt
-       dohtml PROPOSAL.html STATUS.html
-       use doc && java-pkg_dohtml -r dist/docs/
-       use source && java-pkg_dosrc src/java/org
-}

diff --git a/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild b/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild
deleted file mode 100644 (file)
index 37ad8b6..0000000
--- a/dev-java/commons-logging/commons-logging-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 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.0.4-r2.ebuild,v 1.4 2006/10/17 03:40:44 nichoj Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
-HOMEPAGE="http://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="avalon doc source"
-
-RDEPEND=">=virtual/jre-1.3
-       =dev-java/avalon-logkit-1.2*
-       dev-java/log4j
-       avalon? ( =dev-java/avalon-framework-4.2* )"
-DEPEND=">=virtual/jdk-1.3
-       dev-java/ant-core
-       source? ( app-arch/zip )
-       ${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       echo "log4j.jar=$(java-pkg_getjars log4j)" > build.properties
-       echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
-       use avalon && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
-}
-
-src_compile() {
-       local antflags="compile"
-       use doc && antflags="${antflags} javadoc"
-       eant ${antflags} || die "compile problem"
-}
-
-src_install() {
-       java-pkg_dojar target/${PN}-api.jar target/${PN}.jar
-
-       dodoc RELEASE-NOTES.txt
-       dohtml PROPOSAL.html STATUS.html
-       use doc && java-pkg_dohtml -r dist/docs/
-       use source && java-pkg_dosrc src/java/org
-}

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 4b56d78e89469cb17cea36a4f5166dedd87e93b3..1872ce405e5d498da7aaf75d450290cb7454a13e 100644 (file)
--- 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.8 2007/03/24 18:14:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1-r2.ebuild,v 1.9 2007/04/07 04:28:54 wltjr Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
 
 RDEPEND=">=virtual/jre-1.3

diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r1 b/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r1
deleted file mode 100644 (file)
index 2e608f3..0000000
--- a/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db5dc75c89e794f794be92d10df6be1b commons-logging-1.0.4-src.tar.gz 101017
-RMD160 9d92e16433e858fc1c2db7b9c65b07ed11ad28fc commons-logging-1.0.4-src.tar.gz 101017
-SHA256 0752546b1c60e42c4d98cf36354872e22626368bfce252625ea91f1885aa9482 commons-logging-1.0.4-src.tar.gz 101017

diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r2 b/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r2
deleted file mode 100644 (file)
index 2e608f3..0000000
--- a/dev-java/commons-logging/files/digest-commons-logging-1.0.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db5dc75c89e794f794be92d10df6be1b commons-logging-1.0.4-src.tar.gz 101017
-RMD160 9d92e16433e858fc1c2db7b9c65b07ed11ad28fc commons-logging-1.0.4-src.tar.gz 101017
-SHA256 0752546b1c60e42c4d98cf36354872e22626368bfce252625ea91f1885aa9482 commons-logging-1.0.4-src.tar.gz 101017