diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2007-03-10 23:54:13 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-03-10 23:54:13 +0000 |
commit | ed55eeced7e2c69c84e5af4e533e7ca5a1326a49 (patch) | |
tree | 40e14488df2077d8e70bdf5d7b4a59b1c92494ee /dev-java | |
parent | Fix bug 170336. Thanks to doc|work at #gentoo-xfce for reporting.. (diff) | |
download | gentoo-2-ed55eeced7e2c69c84e5af4e533e7ca5a1326a49.tar.gz gentoo-2-ed55eeced7e2c69c84e5af4e533e7ca5a1326a49.tar.bz2 gentoo-2-ed55eeced7e2c69c84e5af4e533e7ca5a1326a49.zip |
Add a depend on >=sys-libs/timezone-data-2007c when elibc is glibc.
(Portage version: 2.1.2.1-r1)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/joda-time/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/joda-time/joda-time-1.4.ebuild | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/dev-java/joda-time/ChangeLog b/dev-java/joda-time/ChangeLog index f051fe1f4bbb..1a1144d9b24d 100644 --- a/dev-java/joda-time/ChangeLog +++ b/dev-java/joda-time/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for dev-java/joda-time # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.20 2007/03/10 23:46:23 betelgeuse Exp $ - +# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.21 2007/03/10 23:54:13 betelgeuse Exp $ + + 10 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> joda-time-1.4.ebuild: + Add a depend on >=sys-libs/timezone-data-2007c when elibc is glibc. + 10 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> joda-time-1.4.ebuild: Add a note about tests most likely failing with <sys-libs/timezone-data-2007c. diff --git a/dev-java/joda-time/joda-time-1.4.ebuild b/dev-java/joda-time/joda-time-1.4.ebuild index 8b286ea5f191..d70bc2b03675 100644 --- a/dev-java/joda-time/joda-time-1.4.ebuild +++ b/dev-java/joda-time/joda-time-1.4.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/joda-time/joda-time-1.4.ebuild,v 1.3 2007/03/10 23:46:23 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/joda-time-1.4.ebuild,v 1.4 2007/03/10 23:54:13 betelgeuse Exp $ inherit java-pkg-2 java-ant-2 @@ -14,14 +14,19 @@ SLOT="0" KEYWORDS="amd64 ~x86" IUSE="doc source test" +COMMON_DEP=" + elibc_glibc? ( >=sys-libs/timezone-data-2007c ) +" + DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core source? ( app-arch/zip ) test? ( dev-java/junit dev-java/ant - )" -RDEPEND=">=virtual/jre-1.4" + ) + ${COMMON_DEP}" +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" S="${WORKDIR}/${MY_P}" |