From 272ff49a087031b3a06554964cafd27a264cec8e Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Mon, 7 Aug 2006 00:32:55 +0000 Subject: [PATCH] Updated depenedencies, so that Java 1.6 won\'t be used at build time, because it causes build errors. Package-Manager: portage-2.1.1_pre3-r5 --- dev-java/commons-dbcp/ChangeLog | 7 ++++- dev-java/commons-dbcp/Manifest | 26 ++++++------------- .../commons-dbcp/commons-dbcp-1.2.1-r1.ebuild | 15 ++++++++--- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dev-java/commons-dbcp/ChangeLog b/dev-java/commons-dbcp/ChangeLog index cfe25e0f868b..a51f4c1a871c 100644 --- a/dev-java/commons-dbcp/ChangeLog +++ b/dev-java/commons-dbcp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/commons-dbcp # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.23 2006/07/22 22:36:41 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/ChangeLog,v 1.24 2006/08/07 00:32:55 nichoj Exp $ + + 07 Aug 2006; Joshua Nichols + commons-dbcp-1.2.1-r1.ebuild: + Updated depenedencies, so that Java 1.6 won't be used at build time, because + it causes build errors. *commons-dbcp-1.2.1-r1 (22 Jul 2006) diff --git a/dev-java/commons-dbcp/Manifest b/dev-java/commons-dbcp/Manifest index 8e03dc0200a3..5adb4cdfba0f 100644 --- a/dev-java/commons-dbcp/Manifest +++ b/dev-java/commons-dbcp/Manifest @@ -1,19 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST commons-dbcp-1.2.1-src.tar.gz 578573 RMD160 397b1da0c870b6dc460a652c1cd695708f648719 SHA1 82db8bc09ab13b139c3ca3efffb223c8bc9c4a09 SHA256 31a2806955c667460222d2ebf3ec11f88181ccef7d4e10eb683cff55626a0061 -EBUILD commons-dbcp-1.2.1-r1.ebuild 1258 RMD160 00a1e4d7d828ee8cfed93462075a9d6fb95e2a3a SHA1 e0f996c9b2ba26381cff10ff975158a71da84f8c SHA256 717c824a09b993b43c13d3c72dd032e813dfcf116181cd2705f971d199e72e2c -MD5 456c4a25d430cb63346e2d24775c7bbb commons-dbcp-1.2.1-r1.ebuild 1258 -RMD160 00a1e4d7d828ee8cfed93462075a9d6fb95e2a3a commons-dbcp-1.2.1-r1.ebuild 1258 -SHA256 717c824a09b993b43c13d3c72dd032e813dfcf116181cd2705f971d199e72e2c commons-dbcp-1.2.1-r1.ebuild 1258 +EBUILD commons-dbcp-1.2.1-r1.ebuild 1390 RMD160 98201fa0a12cf0bf909d471bf48dd6f50f44ce23 SHA1 77a7659a5e07826f21e8313db5eb9fd661fa7ff1 SHA256 5720a671311acfa4ea6cf3fa8610039fd4d185e4533313cfbe6cf0515b74f03a +MD5 30cf4b1d160ff2e0906f58890fa33b16 commons-dbcp-1.2.1-r1.ebuild 1390 +RMD160 98201fa0a12cf0bf909d471bf48dd6f50f44ce23 commons-dbcp-1.2.1-r1.ebuild 1390 +SHA256 5720a671311acfa4ea6cf3fa8610039fd4d185e4533313cfbe6cf0515b74f03a commons-dbcp-1.2.1-r1.ebuild 1390 EBUILD commons-dbcp-1.2.1.ebuild 1329 RMD160 e52e250f77fdbe4ede485c5f9ef2a0b4050a3033 SHA1 27327dff825cb7b4162c7cce2c32d7c2f4df1cb7 SHA256 1212ad248ee79abcd59edd078423b07201857ed2b78740c0f70edea421f4d81e MD5 10db76df6aa804e675e38986c1b9de4c commons-dbcp-1.2.1.ebuild 1329 RMD160 e52e250f77fdbe4ede485c5f9ef2a0b4050a3033 commons-dbcp-1.2.1.ebuild 1329 SHA256 1212ad248ee79abcd59edd078423b07201857ed2b78740c0f70edea421f4d81e commons-dbcp-1.2.1.ebuild 1329 -MISC ChangeLog 3440 RMD160 ba6b38816438647b7b76ab90d23ec44e1cc1af76 SHA1 7baf35083cf0b142e8805aae323228bc6c501ceb SHA256 ac6c7cc1bb1e337d3e326e4e1cf7468eb08792ceaca01d6b311bebb452a62c7e -MD5 0ea1cc5e9a52524b8c621d859ae60c3e ChangeLog 3440 -RMD160 ba6b38816438647b7b76ab90d23ec44e1cc1af76 ChangeLog 3440 -SHA256 ac6c7cc1bb1e337d3e326e4e1cf7468eb08792ceaca01d6b311bebb452a62c7e ChangeLog 3440 +MISC ChangeLog 3626 RMD160 e3a106a04ec42210f2322cd5877e9187db0aeee4 SHA1 cb852c1e451ba47d89206fcbb805854d631e2419 SHA256 7a54d4dc2475f2745fe78d655985041ff2c8d4b31447c3697213164bcc991c15 +MD5 7f161b246d2030fb2d0bc8192d524842 ChangeLog 3626 +RMD160 e3a106a04ec42210f2322cd5877e9187db0aeee4 ChangeLog 3626 +SHA256 7a54d4dc2475f2745fe78d655985041ff2c8d4b31447c3697213164bcc991c15 ChangeLog 3626 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -24,10 +21,3 @@ SHA256 1093fb58c9691f9fe7aa64e8005f5c104d3982d15df875e73d222ae74f37c960 files/di MD5 c653e6286799c9f71c443a22e902cb52 files/digest-commons-dbcp-1.2.1-r1 268 RMD160 5b91486f3cf464ac76ec38502338122cc5b0061d files/digest-commons-dbcp-1.2.1-r1 268 SHA256 1093fb58c9691f9fe7aa64e8005f5c104d3982d15df875e73d222ae74f37c960 files/digest-commons-dbcp-1.2.1-r1 268 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) - -iD8DBQFEwqiCgo/w9rxVVVERAsSjAJwNK8e4XImZ1i5XzkSfkaKwpNHEnwCgv9j1 -CBlozVDkt6P7f7QUoezhSaw= -=9qcw ------END PGP SIGNATURE----- diff --git a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild index 5140ab4f05c5..ceb7d5cc0375 100644 --- a/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild +++ b/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild @@ -1,18 +1,25 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.1 2006/07/22 22:36:41 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-dbcp/commons-dbcp-1.2.1-r1.ebuild,v 1.2 2006/08/07 00:32:55 nichoj Exp $ inherit java-pkg-2 java-ant-2 DESCRIPTION="Jakarta component providing database connection pooling API" HOMEPAGE="http://jakarta.apache.org/commons/dbcp/" SRC_URI="mirror://apache/jakarta/commons/dbcp/source/${P}-src.tar.gz" -RDEPEND=">=virtual/jre-1.3 +COMMON_DEP=" >=dev-java/commons-collections-2.0 >=dev-java/commons-pool-1.1" -DEPEND=">=virtual/jdk-1.3 +RDEPEND=">=virtual/jre-1.3 + ${COMMON_DEP}" +# FIXME doesn't like API changes with Java 1.6 +DEPEND="|| ( + =virtual/jdk-1.3* + =virtual/jdk-1.4* + =virtual/jdk-1.5* + ) >=dev-java/ant-core-1.4 - ${RDEPEND} + ${COMMON_DEP} source? ( app-arch/zip )" LICENSE="Apache-1.1" SLOT="0" -- 2.26.2