diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-02 07:39:49 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-02 07:39:49 +0000 |
commit | 5d17bb320990e9186f431db89d7a7b976dd86be9 (patch) | |
tree | d960e529363a3032f664a5fa8bd9bbb16f207f7a /app-office | |
parent | Fix building against >=libimobiledevice-1.1.2 (bug #410411, thanks to Leo Lau... (diff) | |
download | gentoo-2-5d17bb320990e9186f431db89d7a7b976dd86be9.tar.gz gentoo-2-5d17bb320990e9186f431db89d7a7b976dd86be9.tar.bz2 gentoo-2-5d17bb320990e9186f431db89d7a7b976dd86be9.zip |
Check for disk/ram constrains even in pkg_setup phase, pretend is there just for initial check. Thanks to Andreas Reichel for spotting the issue.
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/libreoffice/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-3.5.2.2.ebuild | 4 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-3.5.9999.ebuild | 4 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index b2f7b618927b..c5659bb8f0b1 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.270 2012/03/30 13:22:45 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.271 2012/04/02 07:39:49 scarabeus Exp $ + + 02 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.2.2.ebuild, + libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild: + Check for disk/ram constrains even in pkg_setup phase, pretend is there just + for initial check. Thanks to Andreas Reichel for spotting the issue. 30 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml: Fix the usedesc for webdav. diff --git a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild index 36beb46a38f7..4311e3969277 100644 --- a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.2 2012/03/30 13:19:48 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.3 2012/04/02 07:39:49 scarabeus Exp $ EAPI=4 @@ -237,6 +237,8 @@ pkg_setup() { python_set_active_version 2 python_pkg_setup + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend + if ! use gtk; then ewarn "If you want the LibreOffice systray quickstarter to work" ewarn "activate the 'gtk' use flag." diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild index cae84cc2fb4a..a51fd850cd6e 100644 --- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.32 2012/03/30 13:19:48 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.33 2012/04/02 07:39:49 scarabeus Exp $ EAPI=4 @@ -237,6 +237,8 @@ pkg_setup() { python_set_active_version 2 python_pkg_setup + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend + if ! use gtk; then ewarn "If you want the LibreOffice systray quickstarter to work" ewarn "activate the 'gtk' use flag." diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index a3a4c06ad5ac..dd3440a03e5c 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.43 2012/03/30 13:19:48 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.44 2012/04/02 07:39:49 scarabeus Exp $ EAPI=4 @@ -243,6 +243,8 @@ pkg_setup() { python_set_active_version 2 python_pkg_setup + [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend + if ! use gtk; then ewarn "If you want the LibreOffice systray quickstarter to work" ewarn "activate the 'gtk' use flag." |