* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.5.9999.ebuild libreoffice-3.5.2.2.ebuild
@ 2012-04-02 9:19 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2012-04-02 9:19 UTC (permalink / raw
To: gentoo-commits
jlec 12/04/02 09:19:02
Modified: ChangeLog libreoffice-3.5.9999.ebuild
libreoffice-3.5.2.2.ebuild
Log:
Fix check-reqs usage
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Revision Changes Path
1.272 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.272&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.272&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.271&r2=1.272
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- ChangeLog 2 Apr 2012 07:39:49 -0000 1.271
+++ ChangeLog 2 Apr 2012 09:19:02 -0000 1.272
@@ -1,6 +1,10 @@
# 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.271 2012/04/02 07:39:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.272 2012/04/02 09:19:02 jlec Exp $
+
+ 02 Apr 2012; Justin Lecher <jlec@gentoo.org> libreoffice-3.5.2.2.ebuild,
+ libreoffice-3.5.9999.ebuild:
+ Fix check-reqs usage
02 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.2.2.ebuild,
libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild:
1.34 app-office/libreoffice/libreoffice-3.5.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.33&r2=1.34
Index: libreoffice-3.5.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- libreoffice-3.5.9999.ebuild 2 Apr 2012 07:39:49 -0000 1.33
+++ libreoffice-3.5.9999.ebuild 2 Apr 2012 09:19:02 -0000 1.34
@@ -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.33 2012/04/02 07:39:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.34 2012/04/02 09:19:02 jlec Exp $
EAPI=4
@@ -237,8 +237,11 @@
python_set_active_version 2
python_pkg_setup
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend
-
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ CHECKREQS_DISK_BUILD="6G"
+ check-reqs_pkg_pretend
+ fi
if ! use gtk; then
ewarn "If you want the LibreOffice systray quickstarter to work"
ewarn "activate the 'gtk' use flag."
1.4 app-office/libreoffice/libreoffice-3.5.2.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?r1=1.3&r2=1.4
Index: libreoffice-3.5.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libreoffice-3.5.2.2.ebuild 2 Apr 2012 07:39:49 -0000 1.3
+++ libreoffice-3.5.2.2.ebuild 2 Apr 2012 09:19:02 -0000 1.4
@@ -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.3 2012/04/02 07:39:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.4 2012/04/02 09:19:02 jlec Exp $
EAPI=4
@@ -237,8 +237,11 @@
python_set_active_version 2
python_pkg_setup
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend
-
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="512M"
+ CHECKREQS_DISK_BUILD="6G"
+ check-reqs_pkg_pretend
+ fi
if ! use gtk; then
ewarn "If you want the LibreOffice systray quickstarter to work"
ewarn "activate the 'gtk' use flag."
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-02 9:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-02 9:19 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.5.9999.ebuild libreoffice-3.5.2.2.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox