diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2011-03-13 19:37:16 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2011-03-13 19:37:16 +0000 |
| commit | 91a6b3d444827b6c739b6ed048188f3781581f48 (patch) | |
| tree | 0ec9ac967cb3b634b7378571227bf38d43c5af70 /app-office/openoffice | |
| parent | Add first release candidate for LibreOffice 3.3.2, masked for now (diff) | |
| download | gentoo-2-91a6b3d444827b6c739b6ed048188f3781581f48.tar.gz gentoo-2-91a6b3d444827b6c739b6ed048188f3781581f48.tar.bz2 gentoo-2-91a6b3d444827b6c739b6ed048188f3781581f48.zip | |
Fix up gtk+-2 dependencies
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.0.ebuild | 10 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.2.1-r1.ebuild | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 5fcdcaeb1da6..9f254e3e0ff2 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.546 2011/02/05 10:45:17 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.547 2011/03/13 19:37:16 suka Exp $ + + 13 Mar 2011; Andreas Proschofsky <suka@gentoo.org> openoffice-3.2.0.ebuild, + openoffice-3.2.1-r1.ebuild: + Fix up gtk+-2 dependencies 05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> openoffice-3.2.0.ebuild: Also fix pax stuff and bump EAPI in older ebuild diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 6f4d379b43c3..801326d0c71f 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.30 2011/02/05 10:45:17 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.31 2011/03/13 19:37:16 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="3" @@ -72,11 +72,11 @@ COMMON_DEPEND="!app-office/openoffice-bin >=dev-lang/perl-5.0 >=dev-libs/glib-2.18 dbus? ( >=dev-libs/dbus-glib-0.71 ) - gnome? ( >=x11-libs/gtk+-2.10 - >=gnome-base/gconf-2.0 - >=gnome-base/gnome-vfs-2.6 + gnome? ( >=x11-libs/gtk+-2.10:2 + gnome-base/gconf:2 + >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/cairo-1.0.2 ) - gtk? ( >=x11-libs/gtk+-2.10 + gtk? ( >=x11-libs/gtk+-2.10:2 >=x11-libs/cairo-1.0.2 ) eds? ( >=gnome-extra/evolution-data-server-1.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 diff --git a/app-office/openoffice/openoffice-3.2.1-r1.ebuild b/app-office/openoffice/openoffice-3.2.1-r1.ebuild index 68580e07aad5..4c07fc6a3756 100644 --- a/app-office/openoffice/openoffice-3.2.1-r1.ebuild +++ b/app-office/openoffice/openoffice-3.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild,v 1.5 2011/02/05 10:40:31 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild,v 1.6 2011/03/13 19:37:16 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="3" @@ -72,11 +72,11 @@ COMMON_DEPEND="!app-office/openoffice-bin >=dev-lang/perl-5.0 >=dev-libs/glib-2.18 dbus? ( >=dev-libs/dbus-glib-0.71 ) - gnome? ( >=x11-libs/gtk+-2.10 - >=gnome-base/gconf-2.0 - >=gnome-base/gnome-vfs-2.6 + gnome? ( >=x11-libs/gtk+-2.10:2 + gnome-base/gconf:2 + >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/cairo-1.0.2 ) - gtk? ( >=x11-libs/gtk+-2.10 + gtk? ( >=x11-libs/gtk+-2.10:2 >=x11-libs/cairo-1.0.2 ) eds? ( >=gnome-extra/evolution-data-server-1.2 ) gstreamer? ( >=media-libs/gstreamer-0.10 |