Fix java dependency to not accidentaly force =jdk-1.4, closes bug #161871

Package-Manager: portage-2.1.2_rc4-r9

4 files changed, 21 insertions, 17 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 2b8471c467b7..79897c03ecf4 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.293 2007/01/12 22:54:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.294 2007/01/13 10:54:31 suka Exp $
+
+  13 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.1.0.ebuild, openoffice-2.0.4.ebuild:
+  Fix java dependency to not accidentally force =jdk-1.4, closes bug #161871
 
   12 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
   +files/2.1.0/ooo-wrapper.in, +files/2.1.0/wrapper-readd.diff,
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index acc36f51dde8..88a47132248e 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -46,18 +46,18 @@ DIST ooo-build-2.0.4.11.tar.gz 4675395 RMD160 73f7f981f3d4a15f879bbd8cc41d1690be
 DIST ooo-build-2.1.tar.gz 4034756 RMD160 8acf5e0276a878c33762365434c8753a45765233 SHA1 02a3857fb18b5b60d5f946a2bf6c9c90defd3f23 SHA256 02bdf2c8b3fa02cabfdb8aa74a2d0f194d5488c504afb1019d720ed5ce38b4ac
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
-EBUILD openoffice-2.0.4.ebuild 9998 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5c9c SHA1 b4a7518f0e464022685b17347ec199a30408eb13 SHA256 64895490bbc4c12cf6f552ffb37d847c79f37e8563fa8a115b50c1865a2bdc10
-MD5 7387216086e33c7907d1450fe64bb965 openoffice-2.0.4.ebuild 9998
-RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5c9c openoffice-2.0.4.ebuild 9998
-SHA256 64895490bbc4c12cf6f552ffb37d847c79f37e8563fa8a115b50c1865a2bdc10 openoffice-2.0.4.ebuild 9998
-EBUILD openoffice-2.1.0.ebuild 11160 RMD160 112743fac96cb92f26806e271869931e7711cd9a SHA1 735e936d3218bcfd854ee1e2eba71d2c8902d28c SHA256 ce3b1a511f476ca7bfb21c721c42f674e30784178c832b7f004b86c1ed2f8653
-MD5 84d1c332efd845a4814745eb3fcbe7fd openoffice-2.1.0.ebuild 11160
-RMD160 112743fac96cb92f26806e271869931e7711cd9a openoffice-2.1.0.ebuild 11160
-SHA256 ce3b1a511f476ca7bfb21c721c42f674e30784178c832b7f004b86c1ed2f8653 openoffice-2.1.0.ebuild 11160
-MISC ChangeLog 61265 RMD160 46f61993ec58337a35884e0592d31ca0c539b842 SHA1 fc30a6211dde185463c97e7c1a62dd0864bfbeed SHA256 4cf8e88ea442b1338247b47272cffa202b008844f4035e00bc0c3605f35643f1
-MD5 00c3a109f363bac19e2a192fc1f1045b ChangeLog 61265
-RMD160 46f61993ec58337a35884e0592d31ca0c539b842 ChangeLog 61265
-SHA256 4cf8e88ea442b1338247b47272cffa202b008844f4035e00bc0c3605f35643f1 ChangeLog 61265
+EBUILD openoffice-2.0.4.ebuild 9992 RMD160 c22b6f7169f61187731cd215ad8013875cd9d939 SHA1 6274c01b2565b6ae6f54611989a7774b474c3c71 SHA256 20aacdfc804f5458abc42d521b07068485ba648481266cc8eceb892ad19d869a
+MD5 ae7ccc1a160003a2f290036b79af9076 openoffice-2.0.4.ebuild 9992
+RMD160 c22b6f7169f61187731cd215ad8013875cd9d939 openoffice-2.0.4.ebuild 9992
+SHA256 20aacdfc804f5458abc42d521b07068485ba648481266cc8eceb892ad19d869a openoffice-2.0.4.ebuild 9992
+EBUILD openoffice-2.1.0.ebuild 11160 RMD160 2418a71c0a5c07dc306ce78fef365d2853eb8472 SHA1 f857d639b426d9e1c4af302a706c07c70d4abe5c SHA256 099ef20a88d6993efe91d701c64578de5aa8a2d61a5f40882dfb49114ac66ac9
+MD5 f044c08cf2befac7609824291ede3691 openoffice-2.1.0.ebuild 11160
+RMD160 2418a71c0a5c07dc306ce78fef365d2853eb8472 openoffice-2.1.0.ebuild 11160
+SHA256 099ef20a88d6993efe91d701c64578de5aa8a2d61a5f40882dfb49114ac66ac9 openoffice-2.1.0.ebuild 11160
+MISC ChangeLog 61448 RMD160 a36999d144450199eda5125c798c2f783c27c4d2 SHA1 384933ccdb811ce5e25c99c9edb6acef6b570649 SHA256 2dea38800d1b072720677f7c91a95bd114a4e294711eb2bf872e8ae7db6a7e4a
+MD5 1b570e2dbf45af2f40dd1ee3aeb0fd7a ChangeLog 61448
+RMD160 a36999d144450199eda5125c798c2f783c27c4d2 ChangeLog 61448
+SHA256 2dea38800d1b072720677f7c91a95bd114a4e294711eb2bf872e8ae7db6a7e4a ChangeLog 61448
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
diff --git a/app-office/openoffice/openoffice-2.0.4.ebuild b/app-office/openoffice/openoffice-2.0.4.ebuild
index 647f01c75e3b..4e1e68023f80 100644
--- a/app-office/openoffice/openoffice-2.0.4.ebuild
+++ b/app-office/openoffice/openoffice-2.0.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/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.27 2007/01/09 17:49:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.4.ebuild,v 1.28 2007/01/13 10:54:31 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -106,7 +106,7 @@ DEPEND="${COMMON_DEPEND}
 	pam? ( sys-libs/pam )
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
-	java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) )
+	java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
 		dev-java/ant-core )
 	dev-libs/libxslt
 	ldap? ( net-nds/openldap )
diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild
index a046c7e05cbb..793a060b8a22 100644
--- a/app-office/openoffice/openoffice-2.1.0.ebuild
+++ b/app-office/openoffice/openoffice-2.1.0.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/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.6 2007/01/12 22:54:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.7 2007/01/13 10:54:31 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -115,7 +115,7 @@ DEPEND="${COMMON_DEPEND}
 	pam? ( sys-libs/pam )
 	!dev-util/dmake
 	>=dev-lang/python-2.3.4
-	java? ( || ( =virtual/jdk-1.4* !amd64? ( =virtual/jdk-1.5* ) )
+	java? ( || ( !amd64? ( =virtual/jdk-1.5* ) =virtual/jdk-1.4* )
 		dev-java/ant-core )
 	dev-libs/libxslt
 	ldap? ( net-nds/openldap )