| 1 |
jlec 12/04/02 09:19:02 |
| 2 |
|
| 3 |
Modified: ChangeLog libreoffice-3.5.9999.ebuild |
| 4 |
libreoffice-3.5.2.2.ebuild |
| 5 |
Log: |
| 6 |
Fix check-reqs usage |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.272 app-office/libreoffice/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.272&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.272&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.271&r2=1.272 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 20 |
retrieving revision 1.271 |
| 21 |
retrieving revision 1.272 |
| 22 |
diff -u -r1.271 -r1.272 |
| 23 |
--- ChangeLog 2 Apr 2012 07:39:49 -0000 1.271 |
| 24 |
+++ ChangeLog 2 Apr 2012 09:19:02 -0000 1.272 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for app-office/libreoffice |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.271 2012/04/02 07:39:49 scarabeus Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.272 2012/04/02 09:19:02 jlec Exp $ |
| 30 |
+ |
| 31 |
+ 02 Apr 2012; Justin Lecher <jlec@g.o> libreoffice-3.5.2.2.ebuild, |
| 32 |
+ libreoffice-3.5.9999.ebuild: |
| 33 |
+ Fix check-reqs usage |
| 34 |
|
| 35 |
02 Apr 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.5.2.2.ebuild, |
| 36 |
libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild: |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.34 app-office/libreoffice/libreoffice-3.5.9999.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.34&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?rev=1.34&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild?r1=1.33&r2=1.34 |
| 45 |
|
| 46 |
Index: libreoffice-3.5.9999.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v |
| 49 |
retrieving revision 1.33 |
| 50 |
retrieving revision 1.34 |
| 51 |
diff -u -r1.33 -r1.34 |
| 52 |
--- libreoffice-3.5.9999.ebuild 2 Apr 2012 07:39:49 -0000 1.33 |
| 53 |
+++ libreoffice-3.5.9999.ebuild 2 Apr 2012 09:19:02 -0000 1.34 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2012 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.33 2012/04/02 07:39:49 scarabeus Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.34 2012/04/02 09:19:02 jlec Exp $ |
| 59 |
|
| 60 |
EAPI=4 |
| 61 |
|
| 62 |
@@ -237,8 +237,11 @@ |
| 63 |
python_set_active_version 2 |
| 64 |
python_pkg_setup |
| 65 |
|
| 66 |
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend |
| 67 |
- |
| 68 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 69 |
+ CHECKREQS_MEMORY="512M" |
| 70 |
+ CHECKREQS_DISK_BUILD="6G" |
| 71 |
+ check-reqs_pkg_pretend |
| 72 |
+ fi |
| 73 |
if ! use gtk; then |
| 74 |
ewarn "If you want the LibreOffice systray quickstarter to work" |
| 75 |
ewarn "activate the 'gtk' use flag." |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
1.4 app-office/libreoffice/libreoffice-3.5.2.2.ebuild |
| 80 |
|
| 81 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?rev=1.4&view=markup |
| 82 |
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 |
| 83 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild?r1=1.3&r2=1.4 |
| 84 |
|
| 85 |
Index: libreoffice-3.5.2.2.ebuild |
| 86 |
=================================================================== |
| 87 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v |
| 88 |
retrieving revision 1.3 |
| 89 |
retrieving revision 1.4 |
| 90 |
diff -u -r1.3 -r1.4 |
| 91 |
--- libreoffice-3.5.2.2.ebuild 2 Apr 2012 07:39:49 -0000 1.3 |
| 92 |
+++ libreoffice-3.5.2.2.ebuild 2 Apr 2012 09:19:02 -0000 1.4 |
| 93 |
@@ -1,6 +1,6 @@ |
| 94 |
# Copyright 1999-2012 Gentoo Foundation |
| 95 |
# Distributed under the terms of the GNU General Public License v2 |
| 96 |
-# $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 $ |
| 97 |
+# $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 $ |
| 98 |
|
| 99 |
EAPI=4 |
| 100 |
|
| 101 |
@@ -237,8 +237,11 @@ |
| 102 |
python_set_active_version 2 |
| 103 |
python_pkg_setup |
| 104 |
|
| 105 |
- [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend |
| 106 |
- |
| 107 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 108 |
+ CHECKREQS_MEMORY="512M" |
| 109 |
+ CHECKREQS_DISK_BUILD="6G" |
| 110 |
+ check-reqs_pkg_pretend |
| 111 |
+ fi |
| 112 |
if ! use gtk; then |
| 113 |
ewarn "If you want the LibreOffice systray quickstarter to work" |
| 114 |
ewarn "activate the 'gtk' use flag." |
Archives