diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2007-06-22 11:22:42 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2007-06-22 11:22:42 +0000 |
| commit | a7b1acd2d3976c7e429e391d368d295b3026d10f (patch) | |
| tree | a5eb7fc2b444d7eb8031aed987b37be4ea61a348 /app-office | |
| parent | add 2.11.27 (diff) | |
| download | historical-a7b1acd2d3976c7e429e391d368d295b3026d10f.tar.gz historical-a7b1acd2d3976c7e429e391d368d295b3026d10f.tar.bz2 historical-a7b1acd2d3976c7e429e391d368d295b3026d10f.zip | |
Fix some dependencies, see bug #182832
Package-Manager: portage-2.1.3_rc4
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 16 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-2.2.1.ebuild | 5 |
3 files changed, 15 insertions, 12 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2936c2b51d75..3a762d16ac86 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.331 2007/06/21 07:05:41 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.332 2007/06/22 11:22:42 suka Exp $ + + 22 Jun 2007; Andreas Proschofsky <suka@gentoo.org> + openoffice-2.2.1.ebuild: + Fix some dependencies, see bug #182832 21 Jun 2007; Andreas Proschofsky <suka@gentoo.org> files/2.2.1/gentoo-2.2.1.diff, openoffice-2.2.1.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 19e529c7dd69..44ca891ea250 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -31,14 +31,14 @@ DIST lp_solve_5.5.tar.gz 495452 RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 DIST ooo-build-2.2.1.tar.gz 4845814 RMD160 73863358dc7866f2ef9b3454591ad39f6612a271 SHA1 1051eb892960fe86ae7ce2b973ee21d1123ed5f7 SHA256 e642aa70c6b5fdfcb5614f9be787538a9e0f7f4f1c67b74f8c43e4bd5f4dcc3d 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.2.1.ebuild 11915 RMD160 4f4f0a0cf67e442409865ea42ca2594c8b894d98 SHA1 3f00bfec22d5d4c5c6fcb316490a4c423d38d7b5 SHA256 3a1bdebfd0b9f88a85d4181334594fc0e97ee30d02a0ab4935c63dd85262d594 -MD5 cbc17e4454a8dd266a76cb37577f2174 openoffice-2.2.1.ebuild 11915 -RMD160 4f4f0a0cf67e442409865ea42ca2594c8b894d98 openoffice-2.2.1.ebuild 11915 -SHA256 3a1bdebfd0b9f88a85d4181334594fc0e97ee30d02a0ab4935c63dd85262d594 openoffice-2.2.1.ebuild 11915 -MISC ChangeLog 68999 RMD160 7fc2f5434d59661313be5e274c39ef65c0b0df9c SHA1 9611aa20ea8936eb0e2bf9a581fb96a1e6f0b5e5 SHA256 4502324a70a05e02ebae380f8c71227231658820b46a3914abc32007afe4041f -MD5 a05360ad708bb48b9fe44a6a26f66a47 ChangeLog 68999 -RMD160 7fc2f5434d59661313be5e274c39ef65c0b0df9c ChangeLog 68999 -SHA256 4502324a70a05e02ebae380f8c71227231658820b46a3914abc32007afe4041f ChangeLog 68999 +EBUILD openoffice-2.2.1.ebuild 11875 RMD160 67655b81bcc4b93ca571aeb2c3faa6f7f73abdb5 SHA1 b4b63fdfc32c1792d6dccc2d673bbc8ff28a7d18 SHA256 caa98ee3ffdfcf1b7c816537d9a883b3db3ca304a8e67534bbb18ccecc37457f +MD5 1a92eb86c4aa5f3442f94bc1f879864a openoffice-2.2.1.ebuild 11875 +RMD160 67655b81bcc4b93ca571aeb2c3faa6f7f73abdb5 openoffice-2.2.1.ebuild 11875 +SHA256 caa98ee3ffdfcf1b7c816537d9a883b3db3ca304a8e67534bbb18ccecc37457f openoffice-2.2.1.ebuild 11875 +MISC ChangeLog 69121 RMD160 20f27845d5bccf2a0e379c2b6aa344297143a1ba SHA1 3c2d82b7449efb6256c75ae4dd2047eee579a760 SHA256 2f28e08e5c51a90a974c37fd3bb0a7e0e231e927fb8576f9b3fa9fb2f626b978 +MD5 39433d4b9b4f037df6f030879a52d60e ChangeLog 69121 +RMD160 20f27845d5bccf2a0e379c2b6aa344297143a1ba ChangeLog 69121 +SHA256 2f28e08e5c51a90a974c37fd3bb0a7e0e231e927fb8576f9b3fa9fb2f626b978 ChangeLog 69121 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.2.1.ebuild b/app-office/openoffice/openoffice-2.2.1.ebuild index 7a8ba0d88c67..5ef560598883 100644 --- a/app-office/openoffice/openoffice-2.2.1.ebuild +++ b/app-office/openoffice/openoffice-2.2.1.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.2.1.ebuild,v 1.6 2007/06/21 07:05:41 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.2.1.ebuild,v 1.7 2007/06/22 11:22:42 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -50,7 +50,6 @@ KEYWORDS="~amd64 ppc -sparc x86" COMMON_DEPEND="!app-office/openoffice-bin x11-libs/libXaw x11-libs/libXinerama - virtual/libc >=dev-lang/perl-5.0 dbus? ( || ( >=dev-libs/dbus-glib-0.71 @@ -102,7 +101,7 @@ COMMON_DEPEND="!app-office/openoffice-bin linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )" -RDEPEND="java? ( || ( =virtual/jre-1.5* =virtual/jre-1.4* ) ) +RDEPEND="java? ( >=virtual/jre-1.4 ) ${COMMON_DEPEND}" DEPEND="${COMMON_DEPEND} |