diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-17 07:26:01 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-17 07:26:01 +0000 |
| commit | 46681de67bae35639277254322c2fa4c3cbb7712 (patch) | |
| tree | 5cb592085567ca6876dae014198e3d6fd2dea5d0 /app-office | |
| parent | mime type updates for gnome (diff) | |
| download | historical-46681de67bae35639277254322c2fa4c3cbb7712.tar.gz historical-46681de67bae35639277254322c2fa4c3cbb7712.tar.bz2 historical-46681de67bae35639277254322c2fa4c3cbb7712.zip | |
clean up dependencies, also fix bug #32315
Package-Manager: portage-2.0.51-r13
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice-bin/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild | 20 |
3 files changed, 15 insertions, 16 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index b3cb09049b5d..296e78b4b20a 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.58 2005/01/16 20:05:54 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.59 2005/01/17 07:26:01 suka Exp $ + + 17 Jan 2005; Andreas Proschofsky <suka@gentoo.org> + openoffice-bin-1.1.4.ebuild: + Clean up dependencies, also don't hard-depend on java anymore, as it is not + needed, close the ancien bug #32315 16 Jan 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-bin-1.1.4.ebuild: diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index d50b52207058..68ada047dbf7 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -1,7 +1,7 @@ MD5 1ba49b12cb835cb2ed980840ea91a4ae openoffice-bin-1.1.3.ebuild 5786 -MD5 645be413284fb60a2ff95d16f669e6e1 openoffice-bin-1.1.4.ebuild 6102 +MD5 84fe668b4e7c868a10d2c04519fd27ee openoffice-bin-1.1.4.ebuild 5900 MD5 e7256783bbd73d3cc243d906591623b3 openoffice-bin-1.1.1.ebuild 5837 -MD5 d868b24ce0687d989e6eaf0d13476ddb ChangeLog 9856 +MD5 10ba73a3d3891db1889f062d4d7f5dfd ChangeLog 10057 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460 MD5 2b70af485f57d1db6983b006f16a0587 files/digest-openoffice-bin-1.1.1 171 MD5 8d9726b3b029e043fbae1b0249a53daf files/digest-openoffice-bin-1.1.3 82 diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild index 8ca45f02f77c..51e303cd2715 100644 --- a/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild,v 1.6 2005/01/16 20:05:54 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild,v 1.7 2005/01/17 07:26:01 suka Exp $ # NOTE: There are two big issues that should be addressed. # @@ -22,26 +22,20 @@ SRC_URI="x86? ( mirror://openoffice/stable/${PV}/OOo_${PV}_LinuxIntel_install.ta LICENSE="|| ( LGPL-2 SISSL-1.1 )" SLOT="0" KEYWORDS="x86 ~amd64" -IUSE="kde gnome" +IUSE="gnome java kde" -DEPEND="sys-apps/findutils +RDEPEND="sys-apps/findutils virtual/libc >=dev-lang/perl-5.0 virtual/x11 app-arch/zip app-arch/unzip - || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) - !app-office/openoffice - amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )" -RDEPEND="virtual/libc - >=dev-lang/perl-5.0 - virtual/x11 - app-arch/zip - app-arch/unzip - || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) + java? ( >=virtual/jre-1.4.1 ) !app-office/openoffice amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )" +DEPEND="${RDEPEND}" + src_install() { # Sandbox issues; bug #8587 addpredict "/user" @@ -131,7 +125,7 @@ src_install() { if use gnome then insinto /usr/share/gnome/apps/OpenOffice.org - # Install the files needed for the catagory + # Install the files needed for the category doins ${D}${INSTDIR}/share/gnome/net/.directory doins ${D}${INSTDIR}/share/gnome/net/.order |