summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-04-02 07:39:49 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-04-02 07:39:49 +0000
commit2ea1740650ac28d16d5cbbd4d0fc8fdd9d2f84ae (patch)
treee5c44f802dcbee37e55fbe644f430ae6e173624f /app-office
parentFix building against >=libimobiledevice-1.1.2 (bug #410411, thanks to Leo Lau... (diff)
downloadhistorical-2ea1740650ac28d16d5cbbd4d0fc8fdd9d2f84ae.tar.gz
historical-2ea1740650ac28d16d5cbbd4d0fc8fdd9d2f84ae.tar.bz2
historical-2ea1740650ac28d16d5cbbd4d0fc8fdd9d2f84ae.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.
Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog7
-rw-r--r--app-office/libreoffice/Manifest34
-rw-r--r--app-office/libreoffice/libreoffice-3.5.2.2.ebuild4
-rw-r--r--app-office/libreoffice/libreoffice-3.5.9999.ebuild4
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild4
5 files changed, 32 insertions, 21 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/Manifest b/app-office/libreoffice/Manifest
index 217136b0efce..1ea66dce5f2f 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -112,25 +112,25 @@ 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 14546 RMD160 5b62508ef983b24222f925c13143d15fc40bdec6 SHA1 9c2ab5ee991656ecc273f70b4e31406dc83e746c SHA256 e64d5964570ab93f5500b425c588d9f4846d0d0f81320d591ae792e735649451
-EBUILD libreoffice-3.5.9999.ebuild 14548 RMD160 d1d1ba8ce2814f2eade094c561a51e7fbb206ca7 SHA1 1e1aa897e09b8795cd733481273196aa05937854 SHA256 c3ebd0fc11f72b3537f84fabcfe4d2637dd43982abb3a682b37052a2f4dcd146
-EBUILD libreoffice-9999-r2.ebuild 14446 RMD160 9ad3a2ce190eac0f632ea7540607f163851bf1d6 SHA1 7ef6805954b08bb47eb1cff74d2bc43eb0bae83f SHA256 d454d1deb7f5c14d31484561ffa65f047abac0d27cc463af8b4b690e3560aaa2
-MISC ChangeLog 49435 RMD160 e3c1bf182f44e3965813d5f214f10363642fc938 SHA1 5d5c9b94f00e52e18537a1044d8bd78bcfe89096 SHA256 d6e57665c7c6502e185e71dd6c55edb37c06774a16c8f820da669f6d244665d6
+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-9999-r2.ebuild 14504 RMD160 d7e63ffb3943402b7140fa65c0ab8ffe04364a13 SHA1 f9cbd23599ff0d0299492c4dc228cf6922f339cc SHA256 35be48e208887b9eeb8412ab0bf5992b56581347686c31918445bbd3bbc883f8
+MISC ChangeLog 49728 RMD160 457649e8a3472ea68d0008480fe6c011e89f2b76 SHA1 8c7fc5d9d8fc4d96e1ba78a85b3b7f36e3c95f39 SHA256 d1f2b26bc20a61960e3ac7441823a040acbaf49914426b8712a9977df074f284
MISC metadata.xml 1490 RMD160 0c1570336daac60ec87e2dc84a4f3897d5c3feda SHA1 5efa4d2ef0eb9bd9daa685202b97fdb6a18a7250 SHA256 6ab64c192679a514a95c3c594ca5d212ba60f02b1760352bcc1a6c22838a6c96
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJPdbS4AAoJEOSiRoyO7jvos58QAKyvlO2DOG8Q/4RzBqt5d2LT
-YjZyAWICiRMZmFo69IkRaJyiQ7bgEncSq2av4L989mcy5+f/RirUP8AwQmYPvEsH
-9R60MEK5a4fNGpSdrh7Dckmcq11pKAnAarM0bs8bKE6w+p4lzEW1R43M5e4ePOsW
-HSxZTxpWydPeGIIDWZtcjD185YB8N7ihqmzYm1A82WXL9GYKAHlRHE46i3dlz/qN
-vDyKk1rmRG5V6fO9+gNphF7yVgB7W4ZclZtXg9NahxQYPglPX41wn7e3qna+6tg0
-lEmeDoLuchnHAz3YKHU/713Db7RyjW0mhKO6edDkblyXazQthivNlIYiewH9vQTu
-OlxRBXBWNyIVhziFsgs+k210FCIOj4GRy97yR1270p1frBIzGg4bycQ3ZnrGInTM
-2yTjszzcZ9WSc0QPwu4WZ366IehIIu3aQfGGMy1WJK1oSd9uj1UtnpXheWk2eNlr
-ZGRK0ZTbEH5LHPKDUUf5cK0sD1XhRk93f0W2hi2C9p67agS7Jltx2OtxmchnBaiO
-Vj9Hpu1Ng1Ps2VME8bt9Hlt7rusPHW2Gf6y4LHBQT119xhmzDNCgvlPX2cjD/Axp
-zvxvEmm6bgN9HIlRiAM7zKDEdjmzGZsr4r5aIP/malVo+6S2VyeNsc8ME2sdGp8P
-Cw6uOLBU/BDuMXyV2vfi
-=E16y
+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
-----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 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."