Move the checks to pkg pretend properly.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 24356fade47ee64383beb58df61b1a7b7c73a68c..9a61577f64e6a25ee350d46c4926b03c327a9d74 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.175 2011/10/18 07:33:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.176 2011/10/19 09:31:26 scarabeus Exp $
+
+  19 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+  Move the checks to pkg pretend properly.
 
   18 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index aef7e8be208123fc66496d5728789082437ac42a..b4d165f7358b1e78b2e9787efeacff4a79b351aa 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -152,24 +152,24 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.4.ebuild 18143 RMD160 567f3a8d7b2267220770f600b893d13028db6f26 SHA1 f525de7d3ea068f38ae62a6887d0e0aadf651592 SHA256 4e7131a8fa14b4224068a21473093a16447086d0d9e390ad74faaffc72ec8ff1
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18446 RMD160 ea7208dc6ed726a698cdd68c96be0417eed323fa SHA1 b82fc9f6ee1215215fdc80f40c76307c9792b459 SHA256 629940b89965508ad7de68acd9a770b10c4d53e8d11b8bd769a7777aded1ef3a
-EBUILD libreoffice-3.4.9999-r1.ebuild 16268 RMD160 e5761718776c50718f95994f9267e580c26754ea SHA1 d9d73a174061bde64426edeb41c7da178d84fb8e SHA256 fcb0f133d36ca7475a781ff1c80b2d7f238829f561c80630d5564598069a7d9b
-EBUILD libreoffice-9999-r1.ebuild 14567 RMD160 c33f48de9b4a5de4d2299a2872fa3f6b7e34cc8d SHA1 e1445e9ce254b2bf46998b061de000bb79be8153 SHA256 46baa93007337c9fe9882e5c1b585bdd4c2e3a82a4156046dddae18a495ff5e9
-MISC ChangeLog 32080 RMD160 5f6beef2aa09afa227fbde5fec8deffd6cadde46 SHA1 a3804eb7a883d8492dbb9d342f8be89aa57fa8e5 SHA256 d5c48d51bea41d950b70545f8eb02cf2693771018360b8b4904b92635b6eaa51
+EBUILD libreoffice-3.4.9999-r1.ebuild 16269 RMD160 d9449d2f8445a12f33fbe5f1af717671d055c792 SHA1 bcbeea0f27b205e64f4659f36ea01b972102c8da SHA256 1189703251017dfb2aca26c53e602598b8be589903d97570fd8138c21888e08e
+EBUILD libreoffice-9999-r1.ebuild 14434 RMD160 88794ec4e252851c574f93591946469471b594da SHA1 02746eb5eea60930f74aa5666ac4f23164dcc9f0 SHA256 f533e0aacc5b10a8c26c71b7fbfdfbe25592fb7a09712f19ee4bfbd0db64412b
+MISC ChangeLog 32241 RMD160 e07b4096522ef70c934439c11ee6280cfc12f3fe SHA1 40a5c8ca9eec5b9e6bf0147d3f496cb3690ccb25 SHA256 cb76f982e67821a640702df24d8183abd803503cddfc44123c4967f6a9de19f7
 MISC metadata.xml 1192 RMD160 f723ac57dc7424dea71c29a052e2aae915c908dd SHA1 87181bf865c0bd53b4215ec36063a1f422e5eca5 SHA256 e3515fe7fcec3baa6e0b2dfb769c91f459ab6c34cf29a6b68498e17c3c7400a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOnSvyAAoJEOSiRoyO7jvoJ4QQAKXQiZFNbCVQHpNrcEWr7gJi
-MapfXLficJvs07FMYgM9TLWMpRx27dN3I6/Ly50ME4gtU/b5orCVkRubYsyVwDP2
-rYITF3aOsf+kUf18dcqyKq1bDAWsZUszmMSlWJqJXSD8BxRoxlluGnQw79P5xPG3
-j+mYI25VYSiLS5cxJv24q/5W6xyOcoQCUAYuf9NfrfdxqJzVnV0X40idiUu6nk3G
-mRwxNHnywLrzwsw91PcmwtN1JL2UBuc2OHB8Xw0CUemJ1FVzaYD5vlNflF2wgYz2
-WU4UJcR2G293eA1v3mbgy2+30N94CBAimEtdBhtYgbbuJSCf74Nv4r3n/8TkvoWw
-fmTN3m1TIQr22cpwGPue8AEe9TnQQ3chPdcxHtctuGhyjmmrvuCFdoOlDnCt9jG2
-1GOBrhmSjAmn8llD3DNMNgpUvmk1Ff3OwRWuDwh3BOVHN9AX+Xx24Q5lr3iGUsTh
-KP4pKPMAaQnOTS7eb+bBlm/YRKBezd4BXuFhXCRyZzXPJ8o0OwbxuYLo34uVe1UI
-RGJwNxqVs77+Jl+mMKvTZEhS1fXcKM02Eq+DE8Nb+0bpWBh3x4P3Ej6BG9DKx2bp
-slv8UOLdAwc06In2l0ydXztkGFRqcjoNykPLrRjWBskoxVWJNczJszi0m+bKWSEB
-997vkUaO9SGy7QL1vDyC
-=64qQ
+iQIcBAEBAgAGBQJOnpkQAAoJEOSiRoyO7jvoURUP/jR5s9a9F+owNtOJ3y1zEM0J
+yE9pspQ4+JYqLOj9TEE0WQxEJJc3d8UpFd5SlDXs3gz5Mt5PRwICBV/N/LKzxy/u
+SuNEYkCXyrE0vNAPYY+zmSo0RraL/z05BqJHobjPfW+c3lD3Jo546o0eY0Fx2MUb
+heubxxvQV4ae/0PKyPbmCnM19NogdVfFwe8JPsDmxytNhqMZXuPjODdysm+QW5cx
+O7NBWeCKObfTTlqtZlCAQBXDSN51PvPlsMa/NPmASQ5hHR9qqcU0tRQqrX3S0hD5
+Mqzfeo55f7W8ImWqdFcNUzZiRTZKUnWb5HaxVnb6hn/co2OKNyIvrZkqC9AGHAfX
+F64CjLmrK+PgBkV7htfXj/hjE28qbX8mLYZHydWQZmwlwxClOkvk0AZvKaKJ8lGl
+MenW9sFCO5lenPrjVEUp/WMQnOQWRJc8RMb/7s8StWNzypLU/YLfnXoev5joz2M9
+vYTlmYSwX3/a8ECvwR3s9+6CS89sy9UgIm+0G6jXFsfI5r6qHLdnHlCfEgHhzTzm
+RBlK4O04TCLfJ+w3zUXipJING5gKZvGS1c7p83d9QMnZXd0GIu1mCCaTSQYygnN4
+TrXedIp49yVGeJdM5Cr6g6/6KrVUx7UK3QBs60p16eSLIEeGUaQP7kdnvYhx+PyK
+Fh79Q/DLh5WNOWHDFK2H
+=1pyJ
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 3235ac180e791dc214b778bbb04d885bd0fa9bcb..8e167553a67812194beeb2c315e10354fa5c4272 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.15 2011/10/18 07:33:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.16 2011/10/19 09:31:26 scarabeus Exp $
 
 EAPI=4
 
@@ -217,6 +217,19 @@ RESTRICT="test"
 
 S="${WORKDIR}/${PN}-bootstrap-${PV}"
 
+pkg_pretend() {
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               CHECKREQS_MEMORY="1G"
+               use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+               check-reqs_pkg_pretend
+
+               if [[ $(gcc-major-version) -lt 4 ]]; then
+                       eerror "Compilation with gcc older than 4.0 is not supported"
+                       die "Too old gcc found."
+               fi
+       fi
+}
+
 pkg_setup() {
        java-pkg-opt-2_pkg_setup
        kde4-base_pkg_setup
@@ -224,11 +237,6 @@ pkg_setup() {
        python_set_active_version 2
        python_pkg_setup
 
-       if [[ $(gcc-major-version) -lt 4 ]]; then
-               eerror "Compilation with gcc older than 4.0 is not supported"
-               die "Too old gcc found."
-       fi
-
        if use custom-cflags; then
                ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
                ewarn "all sorts of build and runtime errors."
@@ -255,11 +263,6 @@ pkg_setup() {
                ewarn "activate the 'gtk' use flag."
                ewarn
        fi
-
-       # Check if we have enough RAM and free diskspace to build this beast
-       CHECKREQS_MEMORY="1G"
-       use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
-       check-reqs_pkg_setup
 }
 
 src_unpack() {

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 548f3915a4686a5f18ac047c92228b732347a60d..94f6de298beaaba628cab74c254b328b1c36b5f1 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.44 2011/10/18 07:33:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.45 2011/10/19 09:31:26 scarabeus Exp $
 
 EAPI=4
 
@@ -209,9 +209,16 @@ REQUIRED_USE="
 S="${WORKDIR}/${PN}-core-${PV}"
 
 pkg_pretend() {
-       CHECKREQS_MEMORY="1G"
-       use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
-       check-reqs_pkg_setup
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               CHECKREQS_MEMORY="1G"
+               use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+               check-reqs_pkg_pretend
+
+               if [[ $(gcc-major-version) -lt 4 ]]; then
+                       eerror "Compilation with gcc older than 4.0 is not supported"
+                       die "Too old gcc found."
+               fi
+       fi
 }
 
 pkg_setup() {
@@ -221,21 +228,11 @@ pkg_setup() {
        python_set_active_version 2
        python_pkg_setup
 
-       if [[ $(gcc-major-version) -lt 4 ]]; then
-               eerror "Compilation with gcc older than 4.0 is not supported"
-               die "Too old gcc found."
-       fi
-
        if ! use gtk; then
                ewarn "If you want the LibreOffice systray quickstarter to work"
                ewarn "activate the 'gtk' use flag."
                ewarn
        fi
-
-       # Check if we have enough RAM and free diskspace to build this beast
-       CHECKREQS_MEMORY="1G"
-       use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
-       check-reqs_pkg_setup
 }
 
 src_unpack() {