diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2011-03-13 19:29:49 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2011-03-13 19:29:49 +0000 |
| commit | 20b99c770347280894e2754715c7852b7c85515a (patch) | |
| tree | 23ea9a284718f8a7b80cab8be3bace9a96b32dbd /app-office/libreoffice | |
| parent | Mask Release Candidate for LibreOffice 3.3.2 (diff) | |
| download | gentoo-2-20b99c770347280894e2754715c7852b7c85515a.tar.gz gentoo-2-20b99c770347280894e2754715c7852b7c85515a.tar.bz2 gentoo-2-20b99c770347280894e2754715c7852b7c85515a.zip | |
Properly slot gtk+-2 dependencies, also move pre-compilation checks to right stage, bug #358491
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.3.1.ebuild | 48 |
2 files changed, 29 insertions, 25 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index eb1a633f1f06..1ccc78fc346e 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.16 2011/03/02 10:38:22 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.17 2011/03/13 19:29:49 suka Exp $ + + 13 Mar 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.1.ebuild: + Properly slot gtk+-2 dependencies, also move pre-compilation checks to right + stage, bug #358491 02 Mar 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.1.ebuild, +files/libreoffice-3.3.1-neon_remove_SSPI_support.diff: diff --git a/app-office/libreoffice/libreoffice-3.3.1.ebuild b/app-office/libreoffice/libreoffice-3.3.1.ebuild index b114aeb89b7a..345aa1456c72 100644 --- a/app-office/libreoffice/libreoffice-3.3.1.ebuild +++ b/app-office/libreoffice/libreoffice-3.3.1.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/libreoffice/libreoffice-3.3.1.ebuild,v 1.3 2011/03/02 10:38:22 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.1.ebuild,v 1.4 2011/03/13 19:29:49 suka Exp $ EAPI="3" @@ -130,10 +130,10 @@ COMMON_DEPEND="!app-office/libreoffice-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? ( >=x11-libs/gtk+-2.10:2 + gnome-base/gconf: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 @@ -195,6 +195,26 @@ PROVIDE="virtual/ooo" pkg_setup() { + java-pkg-opt-2_pkg_setup + + # sys-libs/db version used + local db_ver=$(db_findver '>=sys-libs/db-4.3') + + kde4-base_pkg_setup + + python_set_active_version 2 + python_pkg_setup + +} + +src_unpack() { + + unpack ${MY_P}.tar.gz + +} + +src_prepare() { + ewarn ewarn " It is important to note that LibreOffice is a very fragile " ewarn " build when it comes to CFLAGS. A number of flags have already " @@ -246,26 +266,6 @@ pkg_setup() { die fi - java-pkg-opt-2_pkg_setup - - # sys-libs/db version used - local db_ver=$(db_findver '>=sys-libs/db-4.3') - - kde4-base_pkg_setup - - python_set_active_version 2 - python_pkg_setup - -} - -src_unpack() { - - unpack ${MY_P}.tar.gz - -} - -src_prepare() { - #Some fixes for our patchset cd "${S}" epatch "${FILESDIR}/gentoo-${PV}.diff" |