From 445f0831b72e4d2057eabc1e9dee58d7490bb043 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 21 Nov 2014 09:56:38 +0000 Subject: [PATCH] Use makeopts_jobs instead of parsing MAKEOPTS by hand. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200 --- dev-util/plan9port/ChangeLog | 6 +++- dev-util/plan9port/Manifest | 36 ++++++++++---------- dev-util/plan9port/plan9port-20130320.ebuild | 10 +++--- dev-util/plan9port/plan9port-20140304.ebuild | 10 +++--- dev-util/plan9port/plan9port-20140306.ebuild | 10 +++--- 5 files changed, 35 insertions(+), 37 deletions(-) diff --git a/dev-util/plan9port/ChangeLog b/dev-util/plan9port/ChangeLog index 7a834ac03acd..61e0c7688a01 100644 --- a/dev-util/plan9port/ChangeLog +++ b/dev-util/plan9port/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/plan9port # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.36 2014/03/27 12:40:16 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/ChangeLog,v 1.37 2014/11/21 09:56:37 vapier Exp $ + + 21 Nov 2014; Mike Frysinger plan9port-20130320.ebuild, + plan9port-20140304.ebuild, plan9port-20140306.ebuild: + Use makeopts_jobs instead of parsing MAKEOPTS by hand. *plan9port-20140306 (27 Mar 2014) diff --git a/dev-util/plan9port/Manifest b/dev-util/plan9port/Manifest index 9ba3644c9ad9..52f50fb5ba01 100644 --- a/dev-util/plan9port/Manifest +++ b/dev-util/plan9port/Manifest @@ -8,25 +8,25 @@ AUX plan9port-noexecstack.patch 984 SHA256 eafebec7adf9310eba6b4bc1aec1ea41ad3cd DIST plan9port-20130320.tgz 54184719 SHA256 d08fd032edc9c27bc549ee9076963812f210476d0d1f21f5300e9d867699ff55 SHA512 fae40eae76a0f3121f47a3895809f2433beed91fc9e879c8cde25e493ec91dfdfc89fe59e3fe3a8aab7c33a2537a02b30857edb3af7f202df4a98e02cee8ecb7 WHIRLPOOL 5b707c8d18c8f1fa8e3d36e8f14a20213cad9ab3344f088f18942034dce3356ba88675c5817a7d50b66275d71d95e6d5fd3fdefbd18bcca9089790e258dbb60f DIST plan9port-20140304.tgz 54512040 SHA256 926f6531603ce5112108cdeec1fa808103c92045ba374b986672f28a40004817 SHA512 3727cb8d135005b0b4af1621c14a341904fdcaacd45df4e8c60c2998d372f57a7444ab296d35bc60dbc49b47e5f075e2c5d6a96f513395225eb996833ee87c83 WHIRLPOOL d2b76ea9be4e365a63bab2b24bfc3d5a6fdc402f44529ca8774c6f7c346de94b635c235d38707fee4c2fa7c6f522ad971036836f8bdb71890e61a4988cf2073f DIST plan9port-20140306.tgz 54512505 SHA256 cbb826cde693abdaa2051c49e7ebf75119bf2a4791fe3b3229f1ac36a408eaeb SHA512 a0671163940186fd3d8cf37f06824f0d5a4b9734c1e70eb3174cd7f6b9a1ae769cf78e067dcf4e963192a26a2420b4bb1ce79ed788314ed1783c3bd793fe2aef WHIRLPOOL c19977ef310ac34efcb294e9f7f73f6095e9db0ab52ef359956a05e5a5252a0f9d03f88dd29d21d01bfc82d2e0bdd8ac77bc6a8bb80ef81ce3c773b2dfee0677 -EBUILD plan9port-20130320.ebuild 2260 SHA256 fbf3a1531a9591e887960634b8466fb7cf0da06ddc9ced7121a020e7e2404302 SHA512 920a475954109598829598ba1d9afce2d39513f5ce31ead25020023860def06c5b335e2a1ecab82076f4df43d65582b5019e7ae4d370bfab7fe652d6a587c014 WHIRLPOOL de54bd71b1397fe714126eb7cb2292c3a777122ff78e18ab806e41f5c7c50ef6a0d191c4c6340cf5397b5b56bf1de4a0912bc2d7480c4fb744c6b6c37933c073 -EBUILD plan9port-20140304.ebuild 2410 SHA256 3f1933e151002c0513f4e5145900cf114428878b2b3c3bd4940c7ff90aee3d07 SHA512 6eb22d69336a31909ea41d064cf9e94cb929634cbec298e230f218284e9cc763fc9816643f96f9583d343781b6c4c56e2d93f93afcde40b882902a95ef4c2ca5 WHIRLPOOL 21fc1a4c6c1bbef67bd7e420950cc35b7a7214a2ab1c0aaad4b658b2d4c43bda3a67307ddd12bba4e05c7814b31927604b0e6fd1da6b556cd9816f9280d886c7 -EBUILD plan9port-20140306.ebuild 2410 SHA256 31e67986cfaef65e41ca70af1dc16d1d2406312ffa93a032f400a95c58aab053 SHA512 063ffeb2ff706918e2160ae5a57c46d9982a5c4c4f10ad496d5bc2f85ebf31428d69d87d364c6bedca9c70d2eb9a75863525cac6fbc8db607f11abadf3b9ec6a WHIRLPOOL f173ecc9158ff2214578eec8796bd40243c4e8ddc4f3dee0fd7e473dcddaedad4d87b2166bd24a3ea50b0a060bafc336f432ef96bacc1368a4afc70f5650bcc1 -MISC ChangeLog 6611 SHA256 8cbb85b8b24e8fce9b24d9e1bda311ff04d547228d30ec4aa906976ce2cfddca SHA512 38560dc826cada9b2581b29e7107e44a466641c0988d56b9215ff12276dd8821016e928ad1f67e16b6ed0d3319c4ad2190848332c4c229fc89f268f5663fc871 WHIRLPOOL e3f4e693ded9d72ecf698981335874d69a5ae669a971d981956d6c2f81706f9b805fd9d902248d0992f62922b3c67d52977657e65b64cb3581d3677e3adf090a +EBUILD plan9port-20130320.ebuild 2195 SHA256 74bcd5fc0d03fb9ce30a5dc2d02a3cc59153d75f1b4b6f95c074e77ae9def92a SHA512 e1edcb5ba7269d81474ffe7bcf4be0a0cb6cbe680981f3aed574e1821c7fdd0f1039d47ab3a5008c24fe08b45320cae4910bb16007d73cac559c45b8ee73b1c3 WHIRLPOOL 4174e6a0b315b65d85ff6437cd4aba0a1eee0290f391f40c4a8188e0b520dc0247aa42ef635b7e5c79371e2309a94378ca5315dab06f96c12244efb1a1d3fb3a +EBUILD plan9port-20140304.ebuild 2345 SHA256 2fa67778fa25e371bf154301ff239eeb23e9ad6bd705791dcdd295e696164a2c SHA512 53d886cfe8bb816a8705d3c1addc6ebb9830606a94b8de6f7319eb7368a500abdd21470a283885624312f15e5366a04aa3998a4fac37579a9fc8887df4fb42cb WHIRLPOOL 3602cbcdb62f2018cd98d6b9051ee3d07a7e56456d9c843fe73a5ba0f4f76f7868f7e602bc98fe700995e5b8f5258a5efac2bab681f3b9e6f1d01a798cf9818d +EBUILD plan9port-20140306.ebuild 2345 SHA256 143235ac12391d5057fecde3d928fdc5f5f947189603d162c9d5bd9d2d14a84d SHA512 140694e5f4670c142cbf9a043d38a9b2811569e208209d1d14155e56c4f64c0d4ef10458841aded88e20905cc2a764ac0858a01ac962214fdb19fb5010069a28 WHIRLPOOL d1496a98dc2e1b5fce4b19769c02d2c0dad3cc2e4051519c1563a2ea785e024f8ca1231dfb4fb0d95dae018b5e68964541aecfb36b09fb216ca00b0da7a70bf2 +MISC ChangeLog 6800 SHA256 26935902c85acce1c3ff5af5e1c2ed514eeb2b4d5e9c480757f5ae57dc22cfe1 SHA512 605dd2afb2f19e445772be995d8ac754a35fcdc54598891f913825008e1cfece1b0d5594ab3c34fe29bf64d8335b182bd2cc423aa715ebc721c13c5bfa787eeb WHIRLPOOL 964ee61ac81cfffbc0299cc55a9409847f468728f4282c76af3f0d3e4ae409dd7148c1fa312ab915353e8908eefc88d095dcfda063d05ae2c0f5ccb5fed249bb MISC metadata.xml 490 SHA256 9445c40f91b8390422b4707cf254da8260f42d50b4ca0abfeebdc19cff13990b SHA512 50e8479657414b7420d4988beea471311b45d2b58ddf3d1f735063f195b80cf6acf7d21de8afaf802ea291cb53b8dc0163e880d468e904fb641af6570e632b92 WHIRLPOOL 9a3444cb053a047e5adbcd50d04e2a7862920b5f6e1e1f36a9fe36253705f0330de1483115cf608e926e56848a54f8cd04a70ccba0b9696521a622b39dba7bae -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQIcBAEBCAAGBQJTNBxcAAoJEJOE+m71LUu6BZwP/A33vc6wmlCzpTSnh0QtV/6R -Z3jLGDBi0FAli+5rK4a4SDDReVyf5Sni31KfnMOltWoj9nMgskD4tcnH2aKTZm09 -IGFI1+qfh6lgfgU4bxItaeCUv+G6JWbCTbwk5wn4gsBrbEGhFKAfkWHYNx/e+egA -3jLg3Offm6HKl9XWxbmC8rY6H4MJ/J7UXKyTDkTH+V7Q8wZgxLJzYN6TQfCQk0Ie -KyytFPNLFQOHwJLwD81j3Vh18Gvqj7UTlvtvVj71rEXJ2XAGWQr0Pi57buW9fdhA -Kbif2qTuQ/wzjf7NyTHxV1Zseu3H2jLfEdP1cbskod6iNBMWcK8lL1/z7Xj+Kj3J -4L7vcYGNLdFYg5SweLGJty/QhP+FpH5UdUpS15ngJbTxP4vL6BMoM1ZBZ9vUBj9f -mxkxRy4/HTNyhzxyt6g2qyUP3GzUMhcYfSxYzFvfcW4HTPrOTr9No3UYYeda5jAe -OWGfoFVHe20FI2ZbCIr81ZTU5Q0NYUxBYvZvlQ3Pe//YkbIYAoiJHn9ACzY05jLE -NTN9HkPs5hrBGF3T6trD8tFWvbg6THjC02itd809WS4TcDJZNKw1uT5o7o3fcvhq -jIxgtFyY2snu8d07Mkzea5acLB6aeRxkw4rAEDcS2eFcZe5oboTKgPWccmf5WnrH -iAVOM3QnzXaujP0z+m1u -=NTRC +iQIcBAEBCAAGBQJUbwxWAAoJEPGu1DbS6WIAZWgP/0kS0hCMHjQdrkEd5Pky/UAj +T2D/MR25maa/H25BrEekKb4yjC+JtU+FRbIw2INahp7oanI7s+j88o24B5RM4nmW +6kXF7/A0c+olvIKuBUzS7ozzs2zIiwjnDD/Jh6Git3sHMnMtM/OqjKPEZIMAo4+i +s5eNjLLgfkuqcITSfVgniD0Aot6o3uFI6e0ca8YBfYd3L/0nPzoSuskSBYyhPn2p +WBG6ZYt1BvQcQncrrJP+Sa1vnSwQqCdvC57e7Dhg6g200zyTRfCDmwrDQeCDXtj+ +nZ9hCQ9PkgUxzEpl19CNnd3OHTby8kfFTjnQGJJkrZEXze5mlEQuQss6RZ8neQWL +wgT98k4q00s3IDDKQVBlRKkoQgwZN7i6N5qa/KYnLZ1724cX4LWzY61FA1K5+MdX +WM1yrV+0xGnB1jcopmcPwaIRYIgi23OSR9lffmSEvnMEEaO0sjSw/iWTHc50qZ12 +H4TK8GF8fgEUqPTtoGlgdt/AtLg5Q+GQ26JwxbMWewTj/babzO3dZleAk5NxlWJI +/aKHpBdrYxfaHmZ4GZUtr/AXt6Cu3fAQR7ImYCxVu1yntjTfWabypqoLG4xTVHtR +z8qexuN9Syb/akM5zpl1ZagoyQ+Kk2PGYkGeexP6MqGv7UjFUlgGpACOmQ8psNXO +AXaEQkg5nh8Hg/HSqdAX +=qdwD -----END PGP SIGNATURE----- diff --git a/dev-util/plan9port/plan9port-20130320.ebuild b/dev-util/plan9port/plan9port-20130320.ebuild index 215d61fa383b..3dffd0e4dde7 100644 --- a/dev-util/plan9port/plan9port-20130320.ebuild +++ b/dev-util/plan9port/plan9port-20130320.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130320.ebuild,v 1.2 2014/02/10 13:00:00 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20130320.ebuild,v 1.3 2014/11/21 09:56:37 vapier Exp $ EAPI="4" -inherit eutils +inherit eutils multiprocessing DESCRIPTION="Port of many Plan 9 programs and libraries" HOMEPAGE="http://swtch.com/plan9port/" @@ -23,8 +23,7 @@ S="${WORKDIR}/${PN}" PLAN9=/usr/lib/plan9 QA_MULTILIB_PATHS="${PLAN9}/.*/.*" -src_prepare() -{ +src_prepare() { epatch "${FILESDIR}/${PN}-"{9660srv-errno,noexecstack,cflags}".patch" # Fix paths, done in place of ./INSTALL -c @@ -34,8 +33,7 @@ src_prepare() } src_compile() { - # Convert -j5 to NPROC=5 for mk - export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')" + export NPROC=$(makeopts_jobs) # The INSTALL script builds mk then [re]builds everything using that einfo "Compiling Plan 9 from User Space can take a very long time" diff --git a/dev-util/plan9port/plan9port-20140304.ebuild b/dev-util/plan9port/plan9port-20140304.ebuild index 1e317eee5691..058f2eb1ebae 100644 --- a/dev-util/plan9port/plan9port-20140304.ebuild +++ b/dev-util/plan9port/plan9port-20140304.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20140304.ebuild,v 1.1 2014/03/06 15:17:55 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20140304.ebuild,v 1.2 2014/11/21 09:56:37 vapier Exp $ EAPI="4" -inherit eutils +inherit eutils multiprocessing DESCRIPTION="Port of many Plan 9 programs and libraries" HOMEPAGE="http://swtch.com/plan9port/" @@ -23,8 +23,7 @@ S="${WORKDIR}/${PN}" PLAN9=/usr/lib/plan9 QA_MULTILIB_PATHS="${PLAN9}/.*/.*" -src_prepare() -{ +src_prepare() { epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch" # Fix paths, done in place of ./INSTALL -c @@ -40,8 +39,7 @@ src_configure() { } src_compile() { - # Convert -j5 to NPROC=5 for mk - export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')" + export NPROC=$(makeopts_jobs) # The INSTALL script builds mk then [re]builds everything using that einfo "Compiling Plan 9 from User Space can take a very long time" diff --git a/dev-util/plan9port/plan9port-20140306.ebuild b/dev-util/plan9port/plan9port-20140306.ebuild index c5065b016c37..22813ea1b75c 100644 --- a/dev-util/plan9port/plan9port-20140306.ebuild +++ b/dev-util/plan9port/plan9port-20140306.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20140306.ebuild,v 1.1 2014/03/27 12:40:16 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/plan9port/plan9port-20140306.ebuild,v 1.2 2014/11/21 09:56:37 vapier Exp $ EAPI="4" -inherit eutils +inherit eutils multiprocessing DESCRIPTION="Port of many Plan 9 programs and libraries" HOMEPAGE="http://swtch.com/plan9port/" @@ -23,8 +23,7 @@ S="${WORKDIR}/${PN}" PLAN9=/usr/lib/plan9 QA_MULTILIB_PATHS="${PLAN9}/.*/.*" -src_prepare() -{ +src_prepare() { epatch "${FILESDIR}/${PN}-"{noexecstack,cflags,builderr}".patch" # Fix paths, done in place of ./INSTALL -c @@ -40,8 +39,7 @@ src_configure() { } src_compile() { - # Convert -j5 to NPROC=5 for mk - export NPROC="$(echo "$MAKEOPTS" | sed -r -n 's/.*(^| )-j([0-9]*).*/\2/p')" + export NPROC=$(makeopts_jobs) # The INSTALL script builds mk then [re]builds everything using that einfo "Compiling Plan 9 from User Space can take a very long time" -- 2.26.2