Add available memory check to pkg_pretend, bug #471810 by hasufell.

Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x4F1A2555EA71991D!

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index fb4ff78825bdacea12c5df24a696d04cee56fcb1..4814a7765e72565213a1f2ba5fa292ee2e7bc5ac 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1228 2015/04/22 04:42:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1229 2015/04/23 05:12:36 phajdan.jr Exp $
+
+  23 Apr 2015; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-44.0.2376.0.ebuild:
+  Add available memory check to pkg_pretend, bug #471810 by hasufell.
 
 *chromium-44.0.2376.0 (22 Apr 2015)
 

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f72b1b05ff7ae9448c53ff7bb2ce4e5c07578b32..bea0df13d4b337cb64a03a6114ee67d9eed423b9 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -23,25 +23,25 @@ EBUILD chromium-42.0.2311.90.ebuild 20561 SHA256 1c383eb1bdb7d65fc2f6d06dc51c847
 EBUILD chromium-43.0.2357.18.ebuild 20227 SHA256 551d8fd33258d4070c04ff9d4b0afce713abb535459d4ec980fef0c8f545e5f7 SHA512 4ea50abe9475ae721327533dd93f5ddb2042964bf9da1cb530f07f7d5a6625d941b2f61c7a0318af45c839fa0fe9327551dcaf8a4d0d85c2c92529c5dee441c3 WHIRLPOOL 49ceed48245fc0e03f6427463076a5f8ff0c8e7291190f28c2b74a0e6bea277b53c35fbee75a9c2cfa7e1f1d790afb614cb0d933c1c206b518f8a969f84b5e5a
 EBUILD chromium-43.0.2357.2.ebuild 20063 SHA256 d6142f4cb9c12debb787b6694ed70ceef9ddcaf3b5a9b3ef00ed29cdb802a62f SHA512 ddccac8823fd405a3a36fe532c692248f00f2ab380aec54d0b63436ad5f141a99f79d472e683180b953e12df83238afa93cab5cc07a375850c7bfab9ec56ea0d WHIRLPOOL a36054d8c120df82b44d27cba835ada0cb80fbbcadcd2e417496ccc91a815b30f5fde80d241f16fd7666e96498672f629aa75df3c40a4772fd2b89dcde7e042f
 EBUILD chromium-44.0.2369.0.ebuild 20361 SHA256 441b127690e792541c2b299e6beebb7c83f3e355b089a4a413268ee4edf40c5b SHA512 7d1e806a0174acbabcabaf83b26be8c613a8c49c628737134ab51a46517c46ce3aa85f3b5c69f50f64245a9e5a48aeb089fe7b17b8b1a83a793368889a1dbae3 WHIRLPOOL 2843abf414701cc756ce3914b9dbe03e115a790a807ee3c1ac658c7bde15b02d28046b06fc2451b70364da3be732be4e7a5aa8d668c2fbbc4d7b3340305fd8f0
-EBUILD chromium-44.0.2376.0.ebuild 20364 SHA256 a35c1a226c85f561c50c0dcc0de2ca67abd869966982925738e0249a6c0f94cf SHA512 7fe880094529dab31b59031e6a972fa3770ff2eff36f481f1a26abdc24d15020bd6fce32df013f94fa73cd4191f74db552aab566eaf302334db152c12db9d976 WHIRLPOOL ebff66d3abf2dee6e16f0a0568b435e0053d7e23ae6f69b6c72d6aefef4938933af3fece3d4ad8ec838b5c6e51d82d6bb4352018d4ec9565aa67a1e9fed36ae7
-MISC ChangeLog 9882 SHA256 0fd2e483db2710cbfaccf89f153f3d69ec77d8c29b6808bb9261203db834a687 SHA512 ec1a22c9c96fe6aa57347c25d73c5393f8a479b62ebb0385de509b9ec245cfd11f434d1195fcfc0436e39051b038c72764b54d13a4be44a0d69bdadf25cd69a5 WHIRLPOOL 2aad4a464d572eb20d9a3cfa6dfed5df31b928250bd2f7162d09968e0e3f2134655509d0f19cf3a2ff5a154f9417cf59fb670c8632eb2f4dc1e6acfc75fc9670
+EBUILD chromium-44.0.2376.0.ebuild 20403 SHA256 5d52ccbd6b17613119f92fb6a0b45ad09723821e6ddf59e9bd1628f34146666f SHA512 0d78338ca006583d968de882943e2d5203e7f99787ae0736b69d249e8e34a7ed75786903c46282a7e5bf9add89bb96bdb6321d8da319f69a42b6ba03e94d2d67 WHIRLPOOL 4a84ad4f4c2cd14bdcb5edab76903d01c230ff3770f4ad7c4ac1f5b366bf9f800793f24aacc649a8c90987dfa83a61fb30c0203662ee0c8302340232778f54ea
+MISC ChangeLog 10039 SHA256 d02e2a22b34bc502673a7cdba468dc1864287decd5391e5ccd53a71c6e7628c6 SHA512 cd76eedbf743e84eba355fe6d6a18d003cc0cc37d719cae4c2c88fced00316084dfa554bc94d8ef644fdf4aab4c84013bff62f94bdf3ac2d062a6c789fe86ea3 WHIRLPOOL 398b8d796dbdc11c2f1fc4103309b07de5da1ff44ffc33003f8e40603f6d67a79b378304bc971ca55f1f0982f2646bf76182ad0bf8b9110696bab2a57be05e85
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
 MISC metadata.xml 794 SHA256 325b937cabfd7753347c3c911fb8be689b4a7b021430fca37a92c26e7af35433 SHA512 079c7985283d160b85a8dcd53fd54538ee83b9b36fb99327f03aeff16eb3c6dcbb399a01a381094a67be901d970f3c8fa649b2ac156522df3156db2853b6566f WHIRLPOOL c110adec0f1dcb170e4ba52523109d340543d37027f4c6c9f6e6998744c2720177f03a963e7cd162512459c193e5107f0764b8e3dccf7278b008e7cb8a715b8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVNybQAAoJEE8aJVXqcZkd96MQALVXWIFWA9MMizaS7h+DRVqk
-6JaZ3liBedbHMWzfHtW/61ZVPrJ5IWcbrZ9m9bPDPsp4mYUMxG1RR4TNmXdaVq0A
-OpXm9aqn2HrAv+CmhedhMiHTIiCVe6I9lWWa0i/+Tac1quLpMkIHMpXPdhYPpU5S
-22MfyY4hAmQXH/Z6vOL53ylAYISJre0pLxkG/nGpKxBPSzll4vT+mXRvfpGRFY32
-gcJnjk35EUUWL5QWhAS+OR10tJHtiZ0z0KJFIibTwvmFMTVwMKAWJp41e/B2mqgG
-I5VBQjXExaEjOdYVsycC8cmIsutgWzHTAHUKvugr4sW8wx2fDPBu3GUKOJsmMACK
-qnrKwiF+sPW8/RV5RQUeEQsnItNO+GYNSIQTF2ZjHalnjIvYHjfNMPh6uruJSVcp
-caOa6euCd9tN8d3VEd1oc8F/5KwkzxRMfiMWsxI+rVqJyPBLEf/6OSOoRQAxZEgj
-n18a+fXx+fOUVS2yKo1CjbFa8Npxu8cF1ORHHQsIzrpGGU1CwsItM60mCO49o/Bj
-QMqlvorc1itxPC/ZDuoDWqk18OAivfX/g4zNg8gdr/syKXa7eKQSROut5K5hFQrS
-6ALddjj+u/kxEk2VjpKMSqETZFbpbLQZeZnsiZreY9qBaCRyzlrtRqXmszgUuPgl
-9LOz/a19DJg5Et/1nnQ2
-=lRd1
+iQIcBAEBCAAGBQJVOH9LAAoJEE8aJVXqcZkd6soP/iGvIANG6S9rCk4DCZtbFmQF
+ZHdAv0a0BVR70xY8oWXkp0LgXaiieLGKaSrOzo64q3XtYB8dmAn/coquBBpo7Q94
+vswpkgZvh5M0XpbYAmzEpvA7hMYPNN3cXbdpx+SQLZ9syVB4IXrd7GbE+8VDNFbG
+bNt/MKZhlNTYZT3/39eas5+Onc7Jw9IKUBpP1Ryp85/iqG0ZqQHR1HVSvfPhcFhh
+3t0DrtFsyEzqDKDOqpTt/RgGAW6ZR9UCJNQGmHokMgBB4dLXnjmH78dSocasTWt+
+1vrQ4K1ylpCt+zmnpsgt48knWxpzVHABUmVsh60gLYTWCscA5IBbsVgzIfRNmuuO
+kaS9aQaUKhhD3MKqEJOs8KD3t4viffcWkp2cbwQVqtMhgQI9bRFrSRSlu+n6nRat
+Q9hsA0b5J3IRfEttJo1e0bdbWlg4x0V6wSWAUgwvRDVv3xk9cxfe3MTPW8mzavEf
+8WK++FggvVyir03tJes+q5KS/+tli0JBp9ulm1DQmqsBn38HmXKCgfoE33v4s4Ie
+lJMUZ9r8gW22CsRuNpvXrnuVh4Jbr0Tpi4W+RcuE3p9nTovdD5B4W8BBzkD0Uoh5
+azGyNjcw1YCF6Uj62LIjHW18dD5Vzinkt+JGd3qORz/O1tMFDBATaurTnpLaAKmR
+JOjegOF0hZ8f16v2zgRn
+=7vJ/
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-44.0.2376.0.ebuild b/www-client/chromium/chromium-44.0.2376.0.ebuild
index 2879ab3500e83c86fb508aa83deddbddb3fed8d2..d231bd4f62cb22b9660bb5627445d59eb9e5222f 100644 (file)
--- a/www-client/chromium/chromium-44.0.2376.0.ebuild
+++ b/www-client/chromium/chromium-44.0.2376.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2376.0.ebuild,v 1.1 2015/04/22 04:42:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-44.0.2376.0.ebuild,v 1.2 2015/04/23 05:12:36 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -157,7 +157,8 @@ pkg_pretend() {
                die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
        fi
 
-       # Check build requirements, bug #541816 .
+       # Check build requirements, bug #541816 and bug #471810 .
+       CHECKREQS_MEMORY="3G"
        CHECKREQS_DISK_BUILD="5G"
        eshopts_push -s extglob
        if is-flagq '-g?(gdb)?([1-9])'; then