summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-04-02 09:19:02 +0000
committerJustin Lecher <jlec@gentoo.org>2012-04-02 09:19:02 +0000
commit2c310efe1736adbe16196b8db0c57997d68c25ea (patch)
tree5722e23beef4a07240a913b6ee54c7d6a45f3f8c /app-office/libreoffice
parentVersion bump (diff)
downloadhistorical-2c310efe1736adbe16196b8db0c57997d68c25ea.tar.gz
historical-2c310efe1736adbe16196b8db0c57997d68c25ea.tar.bz2
historical-2c310efe1736adbe16196b8db0c57997d68c25ea.zip
Fix check-reqs usage
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/Manifest26
-rw-r--r--app-office/libreoffice/libreoffice-3.5.2.2.ebuild9
-rw-r--r--app-office/libreoffice/libreoffice-3.5.9999.ebuild9
4 files changed, 25 insertions, 25 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c5659bb8f0b1..9d0f7f4b85bb 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -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:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 1ea66dce5f2f..a2a4f1d24203 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
AUX generate_libreoffice_package.sh 2586 RMD160 5a5059446e8ec1172bce8f69d3419f963c7e7e97 SHA1 95f8beeaa7603a75ec361bd109a60f76dbfd0d99 SHA256 8b48315f2f830136b1950cf1bfe50ba15c051404cd61155b76e553240b29d18b
AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
@@ -112,25 +112,15 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1de3b64322482c80b SHA1 277b886e63383cc37cead0deb6b1e02b40cfc9d0 SHA256 b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c
EBUILD libreoffice-3.4.3.2-r1.ebuild 18554 RMD160 0b79b699e3d60974db7793b41c9f8dfb7f6951fd SHA1 f3b7ee7f389077f56c4c6efc8583aa7cf85d23eb SHA256 9e7f82d19a8a762698efa2af848076d15df4fb702612e6dfd5635e10512bbeb3
EBUILD libreoffice-3.4.5.2.ebuild 15232 RMD160 246fd5a3007a6de67ee6023c7bd6a89794692d6d SHA1 29546cda5ce47875b54c9b583261e0bc1b35e514 SHA256 24bff75483db00b80173eff9f60e4fe4117ee871183042a7f8bc2455a08e90cb
-EBUILD libreoffice-3.5.2.2.ebuild 14604 RMD160 b06fb4e5c8360ed5e9203ca742fe28b3e1131178 SHA1 005c301d5e0faad9f54935ec40b9ae7007625559 SHA256 e2d6a054967e86a917899ae9ada522258e96b6bdd1e2f1d39e6939e8d234d9b3
-EBUILD libreoffice-3.5.9999.ebuild 14606 RMD160 85f077bc7a4f65015572aa578fba9f6bf9e14283 SHA1 885ff85382e7a90a1aa30cf4a93f0be6c8a40282 SHA256 4c9be6691ac4762574293a05f0e9e2b2b47c4d9bf883df255f6740c829a846ca
+EBUILD libreoffice-3.5.2.2.ebuild 14664 RMD160 7677bf3ab6f3676ef2a4037f2c636f148913945e SHA1 b548095d946e3f0eca08b6bf938b336425654a37 SHA256 bc13caf8af509beff94beddea36982913b38d570d9a9652dc469b983aba3b6e2
+EBUILD libreoffice-3.5.9999.ebuild 14666 RMD160 6b795a520f30d8de61ffaf944b4c7d06eb691cb6 SHA1 de61b8865eee93e095b90591dbf2bd44a1f257a7 SHA256 b22c11fe9f4a1126060e05c3b2d86bddbe5935462906acd926ac00f90b1af33c
EBUILD libreoffice-9999-r2.ebuild 14504 RMD160 d7e63ffb3943402b7140fa65c0ab8ffe04364a13 SHA1 f9cbd23599ff0d0299492c4dc228cf6922f339cc SHA256 35be48e208887b9eeb8412ab0bf5992b56581347686c31918445bbd3bbc883f8
-MISC ChangeLog 49728 RMD160 457649e8a3472ea68d0008480fe6c011e89f2b76 SHA1 8c7fc5d9d8fc4d96e1ba78a85b3b7f36e3c95f39 SHA256 d1f2b26bc20a61960e3ac7441823a040acbaf49914426b8712a9977df074f284
+MISC ChangeLog 49853 RMD160 c96b0ef201de49fa4181f68e407adf3154328bb5 SHA1 8f050a65d3936716e2e7d7d0434acd9ac6930220 SHA256 04461dc3cb6271242f00b89a413d699c65ef267fcc2f70c1e40b0852b5749bbc
MISC metadata.xml 1490 RMD160 0c1570336daac60ec87e2dc84a4f3897d5c3feda SHA1 5efa4d2ef0eb9bd9daa685202b97fdb6a18a7250 SHA256 6ab64c192679a514a95c3c594ca5d212ba60f02b1760352bcc1a6c22838a6c96
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBAgAGBQJPeVflAAoJEOSiRoyO7jvom4YP/0ssG1noR4La08i3xn8HAeg6
-RW7gUwmNeKbWQqCBUR01zh8P2i25WOsHgNVcxO5kkJ3i3gxukDKck7CuorYZdAHd
-S7ErlZMaFqFeQRqqUOlP4zNrZ8nm5a1V7oRI2BD0TCHfHKw6YdAyH+I8decyXgg+
-YZnt/0oAu4iwR8osaGHa7X0hAWldo82y9tPPKihbcsoKO11muo38YIHR0hvn0IA1
-pSmwDSktLy9Jqf/A4kSkgHxivWd2N+HbjlFg/0MD9RT40ApHg5GVuNYHl8akoN9X
-IN2MXLAz5jZHYfnyJTFoqgr15FeFTgnJCFFen/dj711ae3kJUAGm1y4o5yeFxa2j
-zj1gRkyVVnhGyuua3m9zxlF8uiGR6PVjruc88f3YYBWLr6YJv0VrBTPUATqjpEcX
-mqLTQWovHnub/OZC6sdG1vRj03VKAmF+/1ePfQZk54W2hDfgOR+jJ0GCuF+7c8Pk
-epd9NVhuUMPQinBhtEWnBU20EYhvTxdCj5M3IqomBU1/KSyznK2Rf+dP9oz6UXde
-Ah2pcPeLgjcZ0M5Q760OxC+ndUg0AQEqma4sdjLRGZMR5AeCBWD/Yois70YPEvWI
-O7r4w4QCB46J5QCkMJqgDh9pNIwQ4/n9mvzRtp2fT/hlDngIDuu/kIFhKM5a+8QH
-PCbgP0vFjQBahaopf8cQ
-=VN2e
+iEYEAREKAAYFAk95bwoACgkQgAnW8HDreRZUigCeMy2wlnukAJ7QIQCODjzxW1ap
+Le8An1inhXqIDF5LaZNPDWuDbG5lTLzo
+=VWD4
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild
index 4311e3969277..8c295f2d176d 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.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 @@ pkg_setup() {
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."
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index a51fd850cd6e..11e201599c74 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.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 @@ pkg_setup() {
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."