diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-12-22 10:52:53 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-12-22 10:52:53 +0000 |
| commit | f322e7b4cc033cbaa2af89f6aa95aa461a1babb2 (patch) | |
| tree | dd7e0a320e15c44f485288e446f407d60f6fb7df /app-office/libreoffice | |
| parent | Manifest commit, repoman died on something. (diff) | |
| download | gentoo-2-f322e7b4cc033cbaa2af89f6aa95aa461a1babb2.tar.gz gentoo-2-f322e7b4cc033cbaa2af89f6aa95aa461a1babb2.tar.bz2 gentoo-2-f322e7b4cc033cbaa2af89f6aa95aa461a1babb2.zip | |
Add beta2, punt beta1 (most build fixes will be in beta3 so the same compile failures are present here).
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 10 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.4.99.2.ebuild (renamed from app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild) | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 7 |
3 files changed, 16 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index cc7528d9b9c2..f3183141683e 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,14 @@ # 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.221 2011/12/18 20:52:15 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.222 2011/12/22 10:52:53 scarabeus Exp $ + +*libreoffice-3.4.99.2 (22 Dec 2011) + + 22 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -libreoffice-3.4.99.1-r1.ebuild, +libreoffice-3.4.99.2.ebuild, + libreoffice-9999-r2.ebuild: + Add beta2, punt beta1 (most build fixes will be in beta3 so the same compile + failures are present here). 18 Dec 2011; Mark Loeser <halcy0n@gentoo.org> libreoffice-3.4.3.2-r1.ebuild: Stable for ppc; bug #387187 diff --git a/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.99.2.ebuild index ed3681c42aae..602ca19999a8 100644 --- a/app-office/libreoffice/libreoffice-3.4.99.1-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.99.2.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.4.99.1-r1.ebuild,v 1.4 2011/12/15 13:01:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.99.2.ebuild,v 1.1 2011/12/22 10:52:53 scarabeus Exp $ EAPI=4 @@ -203,7 +203,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then CHECKREQS_MEMORY="512M" - use debug && CHECKREQS_DISK_BUILD="9G" || CHECKREQS_DISK_BUILD="6G" + use debug && CHECKREQS_DISK_BUILD="10G" || CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend if [[ $(gcc-major-version) -lt 4 ]]; then diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index b8924e29bd3d..c034b1994e17 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.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-9999-r2.ebuild,v 1.18 2011/12/15 13:01:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.19 2011/12/22 10:52:53 scarabeus Exp $ EAPI=4 @@ -118,7 +118,10 @@ COMMON_DEPEND=" gnome-base/gconf:2 gnome-base/orbit ) - gtk? ( >=x11-libs/gtk+-2.24:2 ) + gtk? ( + x11-libs/gdk-pixbuf[X] + >=x11-libs/gtk+-2.24:2 + ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( |