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 | c20cfd7574eeb44c80ff3cce2e1a38e27f0d72a6 (patch) | |
| tree | 54791430b3907917b8341099ce724f1549321fa7 /app-office/libreoffice | |
| parent | Mask Release Candidate for LibreOffice 3.3.2 (diff) | |
| download | historical-c20cfd7574eeb44c80ff3cce2e1a38e27f0d72a6.tar.gz historical-c20cfd7574eeb44c80ff3cce2e1a38e27f0d72a6.tar.bz2 historical-c20cfd7574eeb44c80ff3cce2e1a38e27f0d72a6.zip | |
Properly slot gtk+-2 dependencies, also move pre-compilation checks to right stage, bug #358491
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.3.1.ebuild | 48 |
3 files changed, 31 insertions, 27 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/Manifest b/app-office/libreoffice/Manifest index 40b1b12726ba..a07529cdd221 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -88,6 +88,6 @@ DIST libreoffice-testing-3.3.1.2.tar.bz2 50946803 RMD160 dcd8394eab32ed119c4d01e DIST libreoffice-ure-3.3.1.2.tar.bz2 6166982 RMD160 eb65ed62e6f0d3ed0c341edc4956674990140b0d SHA1 417cd74abaf10aaf0050553ecfa11714e21f25e1 SHA256 99978e7977449a578925620ecd2cfff744668ebae05fd0ff5370cad031c9bbdd DIST libreoffice-writer-3.3.1.2.tar.bz2 6776894 RMD160 7667f4fbbe8d6eea2dd8b8fef84bc7152d2a4738 SHA1 17fc2d585da2eb948c5ce7951d112d238a9b124c SHA256 2a1d8836eaa738a4378bbab27accb2d6af1218a6d601354558adb12f2342509b DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -EBUILD libreoffice-3.3.1.ebuild 18336 RMD160 142645e130f026905c0c3f3ff2c2157eb9820854 SHA1 666e5496156930e01d2e2af7e6248f0ed7a25640 SHA256 51ecd9828be5c948e8c7f04c9fcda75c4bd5d006a8f91e26b478baf6939b1bb9 -MISC ChangeLog 3621 RMD160 56b1e503097f2c45932473e6a3fddb50b9c69a5c SHA1 9e894b9dcfc1c864c4091f27abc603aeaa8b2e15 SHA256 f23c683f4325ca13b55c231a4292365cb458aa116c587202b8189a960577498d +EBUILD libreoffice-3.3.1.ebuild 18336 RMD160 d90b30506ddae3d5124a24166fb4bf5542f37ad3 SHA1 7b5690b7fbabd6909bb7a48122f17a47b0fb1c73 SHA256 285bc285f8c4435b8ade111e1e38988dc0fd527735abd66992aacae483417813 +MISC ChangeLog 3801 RMD160 01554cfe851e5123d22ea448d27465c34175918b SHA1 397c73ed4f204af1b5b0e7c413e973ce9a18ba3d SHA256 c6ea038275b7f1047b4392bced86f4e1c359d5d9dbdd69a3bc29643ac309762d MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4 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" |