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 | ac6f87b97a9353e2fddb919978dbd8f2ad0127ae (patch) | |
| tree | c30e0b4a4a1643eb28df1ac8ab3ec6e95883887f /app-office/openoffice-bin | |
| parent | mime type updates for gnome (diff) | |
| download | gentoo-2-ac6f87b97a9353e2fddb919978dbd8f2ad0127ae.tar.gz gentoo-2-ac6f87b97a9353e2fddb919978dbd8f2ad0127ae.tar.bz2 gentoo-2-ac6f87b97a9353e2fddb919978dbd8f2ad0127ae.zip | |
clean up dependencies, also fix bug #32315
(Portage version: 2.0.51-r13)
Diffstat (limited to 'app-office/openoffice-bin')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-1.1.4.ebuild | 20 |
2 files changed, 13 insertions, 14 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/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 |