From f860a76dc2a0e99e6b868a3cde9bae9095bdbfd9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Petteri=20R=C3=A4ty?= <betelgeuse@gentoo.org>
Date: Sat, 10 Mar 2007 23:54:13 +0000
Subject: [PATCH] Add a depend on >=sys-libs/timezone-data-2007c when elibc is
 glibc. Package-Manager: portage-2.1.2.1-r1

---
 dev-java/joda-time/ChangeLog            |  7 +++++--
 dev-java/joda-time/Manifest             | 22 +++++++++++-----------
 dev-java/joda-time/joda-time-1.4.ebuild | 13 +++++++++----
 3 files changed, 25 insertions(+), 17 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/Manifest b/dev-java/joda-time/Manifest
index 7d36e1003dba..9b7a4305dd2c 100644
--- a/dev-java/joda-time/Manifest
+++ b/dev-java/joda-time/Manifest
@@ -7,14 +7,14 @@ EBUILD joda-time-1.3.ebuild 1230 RMD160 823a36bf806d019fc105d15a128de5b422225f69
 MD5 a77b4dd451ffb39ea7eada8e116a07eb joda-time-1.3.ebuild 1230
 RMD160 823a36bf806d019fc105d15a128de5b422225f69 joda-time-1.3.ebuild 1230
 SHA256 fa0529f022efc71521fa6ca17112f6f0ce3eff5603550776d12b0bbdd535c15d joda-time-1.3.ebuild 1230
-EBUILD joda-time-1.4.ebuild 1624 RMD160 853ca41ab30a5d1c951e722895b0e6ffbf629d0b SHA1 1d734e3becfe0e017024857e4f3ef3346c08b8f9 SHA256 381fa2e56e09b6a8c7d240f706f016f21d8e762f619788b6c181a8b6ea3f84e7
-MD5 93f12b24804368c618ae7e5cc2a02156 joda-time-1.4.ebuild 1624
-RMD160 853ca41ab30a5d1c951e722895b0e6ffbf629d0b joda-time-1.4.ebuild 1624
-SHA256 381fa2e56e09b6a8c7d240f706f016f21d8e762f619788b6c181a8b6ea3f84e7 joda-time-1.4.ebuild 1624
-MISC ChangeLog 2517 RMD160 a3d058bf0db61d1ee005dd45d9ca1e5a8d1d3ff8 SHA1 cf615dec293f197afa7cbb8b8e5c95c36b3b2f1e SHA256 8ba6d2c26cbd2f2aefe49c4b3e7b84c62335e990aec602dd04b704d08fc071e6
-MD5 dd45053b07ebb81eda7ee66df4f69c60 ChangeLog 2517
-RMD160 a3d058bf0db61d1ee005dd45d9ca1e5a8d1d3ff8 ChangeLog 2517
-SHA256 8ba6d2c26cbd2f2aefe49c4b3e7b84c62335e990aec602dd04b704d08fc071e6 ChangeLog 2517
+EBUILD joda-time-1.4.ebuild 1700 RMD160 a744b024f31733f456188a81886f0d20273bb427 SHA1 bddb6c0dc114f59d13d864e40029334ef2eda142 SHA256 deb45df9cf572bdcf5aa1254d5c1a950384c3bd14cad220d1485b6036ee4eed8
+MD5 9fcc9dbe33b754b16f59ea44b0539ee8 joda-time-1.4.ebuild 1700
+RMD160 a744b024f31733f456188a81886f0d20273bb427 joda-time-1.4.ebuild 1700
+SHA256 deb45df9cf572bdcf5aa1254d5c1a950384c3bd14cad220d1485b6036ee4eed8 joda-time-1.4.ebuild 1700
+MISC ChangeLog 2661 RMD160 eea5c826e0d01d67244cc3b93c302d0c186daa16 SHA1 efea7a25d69171cf1a48761bdf8802cbb815253b SHA256 18db392b399e458655da0dda95dde79570e6f0fa8cae65d52b4443b793f4c516
+MD5 9e90a6d5403bb4f562d8fe5b295c6501 ChangeLog 2661
+RMD160 eea5c826e0d01d67244cc3b93c302d0c186daa16 ChangeLog 2661
+SHA256 18db392b399e458655da0dda95dde79570e6f0fa8cae65d52b4443b793f4c516 ChangeLog 2661
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -28,7 +28,7 @@ SHA256 aa8f30295c46d77d07f17671aa254a36dc375e336fb050220ca678270dfe2f20 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF80NVcxLzpIGCsLQRAuG6AJ4zToXkV+BN9Rs56hlMfDjyLfNpBQCeNAIW
-dHipBjQVh/o7Z62rG4g4lyM=
-=evsa
+iD8DBQFF80UmcxLzpIGCsLQRAraSAJ49riuptt+DD0M6hMwcRBokaB0+iwCcCSnN
+Rmj4tTIfgZGb5bxdx+FdJA8=
+=2kuK
 -----END PGP SIGNATURE-----
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}"
 
-- 
2.26.2