From 420eeee727d39d869d864caddb04a80dafda7160 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Oct 2017 17:51:45 +0100 Subject: gentoo resync : 17.10.2017 --- dev-python/pypy-bin/Manifest | 21 +- .../pypy-bin/files/5.6.0_all_distutils_cxx.patch | 340 ------------------ .../pypy-bin/files/5.7.1_all_distutils_cxx.patch | 388 --------------------- dev-python/pypy-bin/metadata.xml | 7 - dev-python/pypy-bin/pypy-bin-5.6.0.ebuild | 204 ----------- dev-python/pypy-bin/pypy-bin-5.7.1.ebuild | 189 ---------- 6 files changed, 1 insertion(+), 1148 deletions(-) delete mode 100644 dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch delete mode 100644 dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch delete mode 100644 dev-python/pypy-bin/pypy-bin-5.6.0.ebuild delete mode 100644 dev-python/pypy-bin/pypy-bin-5.7.1.ebuild (limited to 'dev-python/pypy-bin') diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest index 44fd5438422f..b25341ed535b 100644 --- a/dev-python/pypy-bin/Manifest +++ b/dev-python/pypy-bin/Manifest @@ -1,20 +1,6 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 SHA256 110c15482123bc6fbf11e237df30eb0daad7f6032e2f73903e9e3c225121737a SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474 WHIRLPOOL 14084d22388b2bbda7fbd19195f448265f99b1437b7cefdac276ccab52785c67b71768303e1d1ea9009f8533ba07de0014eb237b4de675cf8dbc1acbeacb8508 AUX 4.0.0-gentoo-path.patch 1915 SHA256 106683dc3849851df2d4985f542825ae2b37e0b3ec57ff34d2a5cbd16f79f830 SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278 WHIRLPOOL 0c68c232e5ffeb1ce5e5d3e41471cbde45aca7765b2c85227c02b5b759891a33ab404ce5f444c048361e922a90868621845a8839207efceba6a70ebd5c70dfe0 -AUX 5.6.0_all_distutils_cxx.patch 17053 SHA256 77e2274dac32d065f861882daf59f9020064efc3b7ab39d5152538ea343d854c SHA512 79b3e073a57981ef78c42db3f6c6c0b410525d84d5c6166ac7f8947d66a7b00c52d1fd30516708eaf3d33664466302e11a954f73c40ae48a8aedfb554cec86a2 WHIRLPOOL ae97f0e6a8cf2c0b6df946297f4d6dae27fbe4dd0ea3576d6a17e869fa5e610971302c07465ca4018d6e1ced650d6531ae20639fa08a7d69693ff337a60216e1 -AUX 5.7.1_all_distutils_cxx.patch 18249 SHA256 33bf43330f0a2ae0dfb4b4999a7b27c74ba789a18f6f181928e13cb1553bd39e SHA512 a347cf438a0d308c69bc92cd04236be0bcf95f595daff1fbcb19eaadbbd7355e90fd661843d8a8d1588003da3ec37b3e3e9fa8a24af92baa5d2c0c0a866284dc WHIRLPOOL fe363fe49b70e4e291a092b5229e5f17d39f50f5edee97bb4aac8275410d2981c6963e096fa77d7ecf549d0d97ea0c6168947b2c1526e92d3e73919873ef68da AUX 5.8.0_all_distutils_cxx.patch 18248 SHA256 2f7c75a5966ebfd0750ca902ea855ca321829a0309a60e6c57f45eb418054dae SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a WHIRLPOOL 807d777cabd6db4cc909f6135de230705f289ac8d1ef851fd872abdbabb3b13e299c98b53e9bf993f044c64702576e15f0d1b3a1a9a4aa9a4458204267c25b92 -DIST pypy-bin-5.6.0-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 13093418 SHA256 5c8c78751a4afd89e98c5a644d4c1d5fa9b1c2dce9a6c6f8f1ad92068f4b26f5 SHA512 c9748eb5850f3948961451436e7d40eea3bb318a73626bcca0cf9bbd605a27de60383a11dcd8a6e9d93116cf811d5c541e4b8545adfe05ba3f56526cc698d114 WHIRLPOOL ba5fac6c6bc31461cbb83a1f68a780d7ce738bb3a9270385d1b35fe8859de7a4b029a8318f5ab90cca9e5f35e10b87a10211550d7685455bf24ef9e23a6806df -DIST pypy-bin-5.6.0-amd64+bzip2+jit+ncurses.tar.lz 14167380 SHA256 7e8ea31eebcaf102b6c606400259da93a33bcc1a81f40c5c10070aff917e2ae3 SHA512 629bb65af656e1e16e2eb2f536015fa263f477e4a8744cad61b7f9bb65a17511944d09adbd9bef271f2b62445bf0e39405d88d60721d0c635a27d4a1a497d220 WHIRLPOOL 668ce5da583fc784de99d1aa0faa337ff8f769eb9b505d2d229e7c3c7e71a40c24c6437f25bf9e8f18fe2799ec605fb3f9cb745a8a6a646404119b526dfb02d7 -DIST pypy-bin-5.6.0-amd64+bzip2+ncurses.tar.lz 7337932 SHA256 d059ce9862a2cca587de08215caf2c6b814a5302087bc15c385f284b8d46e57a SHA512 7f168f4dc3dc3855dc27789682afbbef35dc8ebc04d1745f5ffeceed56918db3d3c16a5c90989daf3d00b48e994842f5712f77fdf9febdace2381d852336377f WHIRLPOOL 118fd413ac35ca6a77c9c4b3e6d9c8887c7b4880d8678d24606b2a72c4b05a0caa4a31913c0135623e65241b4fa572d6d7461750189b14b6dff5f194ff19beb8 -DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 10451373 SHA256 34ee937087e78f9d445ad080718f2306dd3540483e968db4102692f841809b66 SHA512 81c7c354e96e6997692e22a2dc51330cd31853df7b9bbd6a17b03874b022fec8cfbbc5afe6bc4f22fdc3f06b36d6dcf7f27f32c88f8022b5850edb92fe8a07ed WHIRLPOOL 98c4cb9aaca48e24c82d2db375744e08859b79d69cbd00b479d304efb8d51ea815756f1a8a0e0c2c5f71b806a7b52cc1378ceab7e2aacb2004e16e4fe5862017 -DIST pypy-bin-5.6.0-x86+bzip2+jit+ncurses+sse2.tar.lz 11678153 SHA256 3a1cafb572f3565862dce0e4a3386bcd63da26eb17a39301637e7751b827c2d4 SHA512 9608eed3c1583c09ce504b47a6efd82edaf27e83fc6471ee4e478a3167fcf38cae57470ba0246ef6e56398922ec270e81ceb75e7a6d0744a02f5bca454fa33cf WHIRLPOOL 24ad25b4cd686976de99494943135ad2fbb56898981f26e1ff339ea5b0d96171f0e65e24afa40374cfabcae75887ce4e59ab8a5f323bc4af41e1ccc38fc5d74c -DIST pypy-bin-5.6.0-x86+bzip2+ncurses+sse2.tar.lz 6075399 SHA256 14e3dde904e6ee5b8d276f6785cf8a3339e3689f5d151d0b146f76cde77b7ca2 SHA512 b2c6ce1415b7c49be7c69a02c744884b03ccd17227d8c66c0b042f8b5421e006c3e81353f20d6c74bc886ff10927d2efaf0f4b938571e165678135e18870e06b WHIRLPOOL fc3c3e0554d96a52c0a9631080250a6fd825d3ccf5d3c31da172c6f820fea6106b7c4f1094ea2fe838deb786a6ce8b0e78a9a78b7864394c828db32d9c31adc1 -DIST pypy-bin-5.6.0-x86+bzip2+ncurses.tar.lz 6073628 SHA256 a667781d65abee8f535769a08cc9cf7e39ae2c12f6aa71cab32de53baf21ceb3 SHA512 adfe5c01c575378c537dc72eaa6cf98cf2f8f2642abeefcfde70f0930f26202b6c08bb715e0c6cf058495fcf1baa035f43e0452014e90e249a27118bcece4dda WHIRLPOOL 4b74440e22fc76c128d8330df57a54dd48a5d5b4fd390f6b912ace46a34d58b03f4a1f6990a274bd1ea8c88615e5f1d1fe56a124a25e1d6618798d7c3a00646a -DIST pypy-bin-5.7.1-amd64+bzip2+jit+ncurses.tar.lz 12313034 SHA256 410f32b11f6d28ea4bdc59d6ee9de4239178b16834fcd35bf5e9f462e3a51ebd SHA512 e6a66b2aeb3b3d2fd8b99ef5d0fa49b9e99752f9baa996280d14d9031b4103795bd5f0180755e3a360889b808267e19939b32e504bd91811df3875c9ae634775 WHIRLPOOL 1ab24432bc071d2aea1c0023817a8ef89444b560f21276d7f66c4d5a3c72662eda4b2ec13b39a60920dade363b39051f610af8505f011b5cb626ff2cdebb65cb -DIST pypy-bin-5.7.1-amd64+bzip2+ncurses.tar.lz 7104886 SHA256 76373ee444a173287d02dda552a07bf029ee7b3c1d5b94784cf13b53d0b12584 SHA512 fed7f2f3ae78f7e1723cb22cd2de1772b2afb633e84714335e06c91ef8062ba1216f3539b2f49e1570e174e823417c83d30d9cff852c6118241b8ff7fe16d627 WHIRLPOOL b661b9a6f4033e15a6d398f724455ad7b9c06bf5ab2a4a06656a4a0888adfee5abfcefe6c27e1d9e4c38c99d38d944523cf1afd2da1084e7fefc9a6c91c89e6a -DIST pypy-bin-5.7.1-x86+bzip2+jit+ncurses+sse2.tar.lz 9956906 SHA256 25638e27a0939268014c35b94f4b5e9031d5f3a92cb51e96adbe4b59befbb579 SHA512 1ef83113f832a71ee4370381f21a07c24059a3b1bd2cad14846f06aa4d8319c14cb3633314f81f6ee898ecd9d2612bd03b72a3c1a87264ff34214f716e13bc4f WHIRLPOOL 8896245974d5a9b7b524edc888399c88e1dd651561017a8688405ad82d9906ff5c81e899cee57eb64506903af583439045dc5fe7f8f5592d071642fb8bb6d9e2 -DIST pypy-bin-5.7.1-x86+bzip2+ncurses+sse2.tar.lz 5958810 SHA256 05228eabb25b02aea0c80aca4902ee3d81c3767e64daae5662c4797b39ed6a07 SHA512 e27e84e4a060a7c20bcb862da7d0f32508f5588753b067d726d7cd43835307853a7409203c0bbb98844ac59affc03ea43dc650266d74c345a1afcb7e528f1a8f WHIRLPOOL 2169a6e306643669573434dc065235dc5272c8dffd34a09b136e5a23cd2b8bb70fef552cdf3d79018c7e3b3b1c4edb4d7dcde0a4feb550827dbeafea514742aa -DIST pypy-bin-5.7.1-x86+bzip2+ncurses.tar.lz 5984920 SHA256 a1507fb0d55633b28fe6c249291f4dbf0097cfaf2e2a8d36f20636c5ccd34ea3 SHA512 769f62cb3768b762a09f83926ea695d2aea01f8bb3f33d921607f454a9f1d9ab30fc5400787274d1d94a8ca5b82027d737df4e5e693d639b6944c22eb69e75f8 WHIRLPOOL 825a531ae629015022ce1260e11258ee057535ae8e491f9f08fb90cc38a6eda4f02a5f9e32c8ecb85cdeb81c5de9f2353c415abd83d05e107ebce3669560b484 DIST pypy-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 13029615 SHA256 236b12d1abfea9bca81247be01d77b6e82ca9ce923f4e21cb1fceedf8b752675 SHA512 4234bb85c527999fc9ec91e7187d7b05e9aa5fa9965ac4a7fa7a652f678b1221cd04d119316073c5f8352d7bd533c4a7b1c79f5cafce6eb04f32b0a764fdf36d WHIRLPOOL 2b411e1eda2cb18c8a823bcc75de457d68eb9b6793431e3a3a2950bad0f8f5ba882f3cfc21064d0b3656b66bd7cb1389889cb70cb3c9181669286a1fbe0d229f DIST pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 7617650 SHA256 3b8b42a1bc0ca612951452430fc078b8bf81a0dff42eb966fe0e7dc965401d5d SHA512 532d7fd9bdb92b1d5c8e8ebcf60c56fbe2a32b8b89f8650d91b6e0a7cfe6733e3e6b6b232f02a6f24bf9f30569dd8b9cce0b93268d0bb45cd808671ee41be3ae WHIRLPOOL c1a3051c91c747fe60d4bc080749d6b72c79825368da940c4a3ad701d62687ffa6ad81f2e1deb6d7113239443a1fb8e1d07d1e02563c9e59a82d8bc5da3b6ef1 DIST pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10744836 SHA256 9d943e832695ec4d66b07ed9a6dc5e58885ea671d96ba7b728d03b18686111f7 SHA512 bd39bad8f292eabae37b384b9f9f36bc221606b1d2d4aa3df8a45fb1f7ad94755d5fe5dbb7983a49c4e44df87f745ce00691bcb3a5b6c197509c360d9b24d24c WHIRLPOOL b473572a5a84b1ab0510f7274038546836ef3f61ed3cea3260f7ee4e4086093555673064f9fd58c2510b2d80848ec276ca7069372826ef466408c6cabdc74424 @@ -25,17 +11,12 @@ DIST pypy-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 7452420 SHA256 a7ffddd40bb61c18f0 DIST pypy-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10218708 SHA256 c3130b6d01b03521e0333a3d90be643b1ce16ebdd207122d959eeb146377d8de SHA512 b2a4169dc7ad8216f754d1245283024d0accc0543d86acf6452a19e67051482ac4cf5b3cf4ae20be7c865bfdb1515b75030a5d4a02b8965252e7810baaefcff8 WHIRLPOOL abf4276d93be4b8e9370969ca6d8a730a3337ace944fbe1eb75b54032fcf1e2bcbf081dd820918afaadd416ead8cd10797735606d948c17b4bb676adbf358e52 DIST pypy-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 6269532 SHA256 8d28e152919e01b6cce9aa9350107972307fc63918bec3d24408bfb1fa92f2ad SHA512 ee447e8b03733b41f92625a02653ed70a9f4cb3866a27bcbdbaf1383a00551c5f4617540eea227b120a7adab5cf87afddffde663c7cb79abde852e0bbf18d622 WHIRLPOOL 9b484c003485daa36a5ecfb5aade84b431d692aeaa73e604868934b27e7006b530f7d6661aa580aaceafd1e52ff5573627ed8dd6c3c18da001c20eded9af21dd DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 SHA256 64207bf1703e3a3666c60effed55fa176e6be0282504db3271121616e81df8d8 SHA512 6151ed379dc3dd4d9eda892718a5cdeea55386251c27230cb4606fd0a16589035de332c549d108d699c506f8ff46bed3cec3edb960155550a9746ae2fc0d2349 WHIRLPOOL 5e84a4ab7cbe3efff867d9e11c758e4e0ea0d9585745966fb29fea399fff1dc0dfa5dc727a21e84b6100cc659b6bc658a4a574d4e7e89607e3fe8fc90f4873fb -DIST pypy2-v5.6.0-src.tar.bz2 18388539 SHA256 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0 SHA512 a92ef611ae2417aaa202b9f5c75dd86e82fc2549e53bab3164cccff37d131542bc71cbce6aaedf428d3dfc7d59a2d3b3a5ed03e3a3439628f29d43c4d30a64de WHIRLPOOL 896894225407f8cd462b094d77723880f6a423d60a79e5d3cf4e0804737fdd0337fc668b05573902fe81f826798b2046cb115c8d230f0810ec0ad2508590ee4a -DIST pypy2-v5.7.1-src.tar.bz2 18940413 SHA256 d01bee43c6df79f7bbc1149bb3e85f489491fb2358a6a1f9a7f0d6e07715832f SHA512 1ad2dddb40c28d2d3e95a9f0730e765d981dee6e2d0664cf1274eb7c1021690a848c3485c846eac8a8b64425b44946b5b2d223058ec4699155a2122ee7d38b75 WHIRLPOOL e0223d889a26f8a5bc5097561dbe617ff9b11972590f3a8d717d572798a2d685540bc6059e4ce4ff73ce0db9d2476a4274f17dad1f825fb780726d6ecd78a4c8 DIST pypy2-v5.8.0-src.tar.bz2 19163498 SHA256 504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5 SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365 WHIRLPOOL 775fbe656996e80fce9cb9a4d4f44fe1b87f0b22f18f74940d5824143337773bb5e3a4d23564bfdc22d010693010f31689026432134a8a2e30ddee670dba1b6d DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 de4bf05df47f1349dbac97233d9277bbaf1ef3331663ea2557fd5da3dbcfd0a7 SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d WHIRLPOOL 5cbfc6922469450fdd55cda79afbd41e5750446eb09396ea53a65d6fbe099905103f14ab08665ecd76bf4da44f11d2c4609d8df97999a41d03f2985d6fae32fa -DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 WHIRLPOOL ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d -EBUILD pypy-bin-5.6.0.ebuild 6078 SHA256 6c54fd6211b18e489da8cf1e90dc1753087da35636a761bfa2271e0663020c3f SHA512 16a76d68a01ed73f7dc978332c131e1c1627431d80b52a44f6c82695815e380310b22157048d5a62099801070d58eff13514b6cfa9f89a15ad83a1727be18b39 WHIRLPOOL 5a009b06ec8f10fbe3cbfaf6ca4bac64b238aaaf460bce68f5a3579d6483b390473463d1683495a231c639458d6e5e76f8202cb072f8a9c52b0fe2e0c2166706 -EBUILD pypy-bin-5.7.1.ebuild 5819 SHA256 4ecdec56f1ae5457c36fa8bdafcd8f8ff8ce8c565ba1de8bc82f71b51a72ee68 SHA512 0abf25651d8432a51a32e4129fbee0046d9e1a838a3c866e66407433b4059aedf640d63a371a9934d6d4f7ec5b2a79665606cd9a18ee4b16a656610cc5b93b7f WHIRLPOOL 43db08fdadc7eddb4e292a515ca15f159529115decdf0630828f0bf9bbfe4f52fe56d6897c0426cece3c14f46f788282f32cb4df119e80248045a2ac73c5c342 EBUILD pypy-bin-5.8.0.ebuild 5819 SHA256 a328766890d2a892513e895518884de98f67d3cf7429aaf18bcd7e182fcf872e SHA512 8ba2d88b641b86a6b7a64f271b56a80aa98139307bb4e294cba6f4ed34a0821a7fae66ec037cbdbf6a6fa00b2d381044b81b24c3f805345c2de77bac0e60b7cf WHIRLPOOL a877c7eec69b9020756a8e0addbc854e2656f897adf476f3fca341a7ed8e24061476843a551611dc6df6b5db1808a5692aaf9e99a50c65855317ad519ea9af3a EBUILD pypy-bin-5.9.0.ebuild 5819 SHA256 775790b1cb15fe94d626c5622ffc903fecdfb0cb0a3b9577223d2c54776d421d SHA512 fbc7150be4c5ec2fcd59e6727c2bd439257766d09c1b31aab6a3a4702447955193d8fe58723f90f50db2a7d57eb5bd58c124aa0043f06feb0a1aaf986e51b8ac WHIRLPOOL 9fe05ae695e9dc4a6e1db8054189dae98cd3adc9cf4b4ab38e7270bc224a8dfed41b579517e0240ba54523676f89a54fa41f8b75aa0ed0e9dee758610e5c7445 MISC ChangeLog 9199 SHA256 9c47a49b40abc59f48abeb8422551c11d6fd22baa080d4748c480f998e4ab4b9 SHA512 f29475889f803f8e330e2811bd96aebb6bb829ca8043056ca539edacb6d513f772dd4b192a85b995caa626f468ce5bec3f98acbc8dcf41f54f16cebaf6783325 WHIRLPOOL 4231ef2b20556aa4e6853f40f1f89f58205206ea069204efe33ec2a2a5553e3e03d83c3e21b55226b64c4ee377d747b0e6352cc37f0e3b7f93c2862bd3c6ada0 MISC ChangeLog-2015 7187 SHA256 ea84ecd028b95b790792d4f80386a8c5884a667de5de21d37747412ac6868d66 SHA512 afd832969505f5ea599a10a629fe0e068c3282d5b8f3d880dc04818e25034c9df1821b0dea2b623b91ae6561ca82ec9de6c4907badcc2befc2230dec986c9302 WHIRLPOOL 05c59d774d47ac5eabd74c1af2044ba0c2d2fdd0f4b3bb8f4cc9914c65a8133dcf59ee047c13d676783a84b28a4ea9c2fcbd9c910ec6057581b9c3ca227ef410 -MISC metadata.xml 514 SHA256 418905501db31b0962ef487f62db5c376e6cce16be2e7513553049979dae1968 SHA512 a4f6fbf391b7f566b99cef0dc503d41ad1c0eb119187650b550697c4c10b394bae847fcd809eb9db2883f578e5bcf3416146941cabddc0632b2e10dd50fb0315 WHIRLPOOL a510d10c48a29615969f1332fb78e91b5036c3e7cc5456981a627f96b72bc3fb407b6023d7e564da4ccf4170925d3c3902a42074b11f9af105b200e7cfebe58f +MISC metadata.xml 317 SHA256 2aec924d1dd9649258f8fa5468e176864976d3516e72cd7a5828a485f30931a4 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 WHIRLPOOL 9f43842af1bdced8a7ba6b47f57def4960f066272a625063b508431c007ef51bd13149afbb3f1a136160778ee3dedb4f5f4b98f43e0edc22c7c714ba2b3481cb diff --git a/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch deleted file mode 100644 index 5d9c2cd1a5ad..000000000000 --- a/dev-python/pypy-bin/files/5.6.0_all_distutils_cxx.patch +++ /dev/null @@ -1,340 +0,0 @@ -http://bugs.python.org/issue1222585 -http://bugs.gentoo.org/show_bug.cgi?id=599918 - -diff -Naur pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py ---- pypy2-v5.6.0-src/lib-python/2.7/_osx_support.py 2016-11-08 09:52:16.000000000 +0100 -+++ pypy2-v5.6.0-src-patched/lib-python/2.7/_osx_support.py 2016-12-08 16:59:26.213690338 +0100 -@@ -14,13 +14,13 @@ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' -diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py ---- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_pypy.py 2016-11-08 09:52:16.000000000 +0100 -+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_pypy.py 2016-12-08 17:01:33.594553801 +0100 -@@ -126,19 +126,56 @@ - setattr(compiler, executable, command) - - if compiler.compiler_type == "unix": -- compiler.compiler_so.extend(['-O2', '-fPIC', '-Wimplicit']) -+ cc = ' '.join(compiler.compiler) -+ cxx = ' '.join(compiler.compiler_cxx) -+ ldshared = ' '.join(compiler.linker_so) -+ ldcxxshared = ' '.join(compiler.linker_so_cxx) -+ -+ cflags = '' -+ cxxflags = '' -+ ccshared = '-fPIC' -+ -+ if 'CC' in os.environ: -+ cc = os.environ['CC'] -+ if 'CXX' in os.environ: -+ cxx = os.environ['CXX'] -+ if 'LDSHARED' in os.environ: -+ ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] -+ if 'CPP' in os.environ: -+ cpp = os.environ['CPP'] -+ else: -+ cpp = cc + " -E" # not always -+ if 'CPPFLAGS' in os.environ: -+ cpp = cpp + ' ' + os.environ['CPPFLAGS'] -+ cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] -+ ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] -+ if 'CFLAGS' in os.environ: -+ cflags = os.environ['CFLAGS'] -+ ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] -+ if 'LDFLAGS' in os.environ: -+ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] -+ -+ cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags -+ compiler.set_executables( -+ preprocessor=cpp, -+ compiler=cc_cmd, -+ compiler_so=cc_cmd + ' ' + ccshared, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, -+ linker_so=ldshared, -+ linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx) - compiler.shared_lib_extension = get_config_var('SO') -- if "CPPFLAGS" in os.environ: -- cppflags = shlex.split(os.environ["CPPFLAGS"]) -- for executable in ('compiler', 'compiler_so', 'linker_so'): -- customize(executable, cppflags) -- if "CFLAGS" in os.environ: -- cflags = shlex.split(os.environ["CFLAGS"]) -- for executable in ('compiler', 'compiler_so', 'linker_so'): -- customize(executable, cflags) -- if "LDFLAGS" in os.environ: -- ldflags = shlex.split(os.environ["LDFLAGS"]) -- customize('linker_so', ldflags) - - - from sysconfig_cpython import ( -diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py ---- pypy2-v5.6.0-src/lib-python/2.7/distutils/cygwinccompiler.py 2016-11-08 09:52:16.000000000 +0100 -+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/cygwinccompiler.py 2016-12-08 16:59:26.213690338 +0100 -@@ -120,8 +120,10 @@ - # dllwrap 2.10.90 is buggy - if self.ld_version >= "2.10.90": - self.linker_dll = "gcc" -+ self.linker_dll_cxx = "g++" - else: - self.linker_dll = "dllwrap" -+ self.linker_dll_cxx = "dllwrap" - - # ld_version >= "2.13" support -shared so use it instead of - # -mdll -static -@@ -135,9 +137,13 @@ - self.set_executables(compiler='gcc -mcygwin -O -Wall', - compiler_so='gcc -mcygwin -mdll -O -Wall', - compiler_cxx='g++ -mcygwin -O -Wall', -+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', - linker_exe='gcc -mcygwin', - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='g++ -mcygwin', -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -163,8 +169,12 @@ - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -330,9 +340,14 @@ - self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, - compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, - compiler_cxx='g++%s -O -Wall' % no_cygwin, -+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, - linker_exe='gcc%s' % no_cygwin, - linker_so='%s%s %s %s' - % (self.linker_dll, no_cygwin, -+ shared_option, entry_point), -+ linker_exe_cxx='g++%s' % no_cygwin, -+ linker_so_cxx='%s%s %s %s' -+ % (self.linker_dll_cxx, no_cygwin, - shared_option, entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) -diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py ---- pypy2-v5.6.0-src/lib-python/2.7/distutils/emxccompiler.py 2016-11-08 09:52:16.000000000 +0100 -+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/emxccompiler.py 2016-12-08 16:59:26.213690338 +0100 -@@ -65,8 +65,12 @@ - # XXX optimization, warnings etc. should be customizable. - self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - linker_exe='gcc -Zomf -Zmt -Zcrtdll', -- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') -+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', -+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', -+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') - - # want the gcc library statically linked (so that we don't have - # to distribute a version dependent on the compiler we have) -@@ -83,8 +87,12 @@ - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py ---- pypy2-v5.6.0-src/lib-python/2.7/distutils/sysconfig_cpython.py 2016-11-08 09:52:16.000000000 +0100 -+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/sysconfig_cpython.py 2016-12-08 16:59:26.213690338 +0100 -@@ -171,10 +171,12 @@ - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SO', 'AR', -- 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SO', 'AR', 'ARFLAGS') -+ -+ cflags = '' -+ cxxflags = '' - - if 'CC' in os.environ: - newcc = os.environ['CC'] -@@ -189,19 +191,27 @@ - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -210,13 +220,17 @@ - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = so_ext -diff -Naur pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py ---- pypy2-v5.6.0-src/lib-python/2.7/distutils/unixccompiler.py 2016-11-08 09:52:16.000000000 +0100 -+++ pypy2-v5.6.0-src-patched/lib-python/2.7/distutils/unixccompiler.py 2016-12-08 16:59:26.213690338 +0100 -@@ -55,14 +55,17 @@ - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } - - if sys.platform[:6] == "darwin": -@@ -129,12 +132,19 @@ - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -191,23 +201,16 @@ - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i = i + 1 -- -- linker[i] = self.compiler_cxx[i] -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] -+ else: -+ linker = self.linker_so[:] - - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) diff --git a/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch b/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch deleted file mode 100644 index 8249fbc91db8..000000000000 --- a/dev-python/pypy-bin/files/5.7.1_all_distutils_cxx.patch +++ /dev/null @@ -1,388 +0,0 @@ -From 9bf4611231faa0dc9ae64c6a7a8b55a3290a3ca2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Tue, 25 Apr 2017 07:14:11 +0200 -Subject: [PATCH] Fancy patch for distutils C++ support, rebased for pypy5.7 - -http://bugs.python.org/issue1222585 -http://bugs.gentoo.org/show_bug.cgi?id=599918 ---- - _osx_support.py | 10 ++--- - distutils/cygwinccompiler.py | 21 ++++++++-- - distutils/emxccompiler.py | 14 +++++-- - distutils/sysconfig_cpython.py | 26 ++++++++++--- - distutils/sysconfig_pypy.py | 37 ++++++++++++++---- - distutils/unixccompiler.py | 55 ++++++++++++++------------- - 6 files changed, 112 insertions(+), 51 deletions(-) - -diff --git a/_osx_support.py b/_osx_support.py -index d2aaae7..8bcdb05 100644 ---- a/_osx_support.py -+++ b/_osx_support.py -@@ -14,13 +14,13 @@ __all__ = [ - # configuration variables that may contain universal build flags, - # like "-arch" or "-isdkroot", that may need customization for - # the user environment --_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS', -- 'BLDSHARED', 'LDSHARED', 'CC', 'CXX', -- 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS', -- 'PY_CORE_CFLAGS') -+_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS', -+ 'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', -+ 'PY_CPPFLAGS', 'PY_CORE_CFLAGS') - - # configuration variables that may contain compiler calls --_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX') -+_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX') - - # prefix added to original configuration variable names - _INITPRE = '_OSX_SUPPORT_INITIAL_' -diff --git a/distutils/cygwinccompiler.py b/distutils/cygwinccompiler.py -index 767400c..7133097 100644 ---- a/distutils/cygwinccompiler.py -+++ b/distutils/cygwinccompiler.py -@@ -120,8 +120,10 @@ class CygwinCCompiler (UnixCCompiler): - # dllwrap 2.10.90 is buggy - if self.ld_version >= "2.10.90": - self.linker_dll = "gcc" -+ self.linker_dll_cxx = "g++" - else: - self.linker_dll = "dllwrap" -+ self.linker_dll_cxx = "dllwrap" - - # ld_version >= "2.13" support -shared so use it instead of - # -mdll -static -@@ -135,9 +137,13 @@ class CygwinCCompiler (UnixCCompiler): - self.set_executables(compiler='gcc -mcygwin -O -Wall', - compiler_so='gcc -mcygwin -mdll -O -Wall', - compiler_cxx='g++ -mcygwin -O -Wall', -+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', - linker_exe='gcc -mcygwin', - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='g++ -mcygwin', -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -163,8 +169,12 @@ class CygwinCCompiler (UnixCCompiler): - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -330,9 +340,14 @@ class Mingw32CCompiler (CygwinCCompiler): - self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, - compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, - compiler_cxx='g++%s -O -Wall' % no_cygwin, -+ compiler_so_cxx='g++%s -mdll -O -Wall' % no_cygwin, - linker_exe='gcc%s' % no_cygwin, - linker_so='%s%s %s %s' - % (self.linker_dll, no_cygwin, -+ shared_option, entry_point), -+ linker_exe_cxx='g++%s' % no_cygwin, -+ linker_so_cxx='%s%s %s %s' -+ % (self.linker_dll_cxx, no_cygwin, - shared_option, entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) -diff --git a/distutils/emxccompiler.py b/distutils/emxccompiler.py -index a017205..bdc532c 100644 ---- a/distutils/emxccompiler.py -+++ b/distutils/emxccompiler.py -@@ -65,8 +65,12 @@ class EMXCCompiler (UnixCCompiler): - # XXX optimization, warnings etc. should be customizable. - self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', -+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', - linker_exe='gcc -Zomf -Zmt -Zcrtdll', -- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') -+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', -+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', -+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') - - # want the gcc library statically linked (so that we don't have - # to distribute a version dependent on the compiler we have) -@@ -83,8 +87,12 @@ class EMXCCompiler (UnixCCompiler): - raise CompileError, msg - else: # for other files use the C-compiler - try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -diff --git a/distutils/sysconfig_cpython.py b/distutils/sysconfig_cpython.py -index 35f39e4..8dd032d 100644 ---- a/distutils/sysconfig_cpython.py -+++ b/distutils/sysconfig_cpython.py -@@ -171,10 +171,12 @@ def customize_compiler(compiler): - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SO', 'AR', -- 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SO', 'AR', 'ARFLAGS') -+ -+ cflags = '' -+ cxxflags = '' - - if 'CC' in os.environ: - newcc = os.environ['CC'] -@@ -189,19 +191,27 @@ def customize_compiler(compiler): - cxx = os.environ['CXX'] - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -210,13 +220,17 @@ def customize_compiler(compiler): - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = so_ext -diff --git a/distutils/sysconfig_pypy.py b/distutils/sysconfig_pypy.py -index 368f232..4fe1f08 100644 ---- a/distutils/sysconfig_pypy.py -+++ b/distutils/sysconfig_pypy.py -@@ -67,6 +67,7 @@ def _init_posix(): - g['CFLAGS'] = "-DNDEBUG -O2" - g['CCSHARED'] = "-fPIC" - g['LDSHARED'] = "gcc -pthread -shared" -+ g['LDCXXSHARED'] = "g++ -pthread -shared" - g['SO'] = [s[0] for s in imp.get_suffixes() if s[2] == imp.C_EXTENSION][0] - g['AR'] = "ar" - g['ARFLAGS'] = "rc" -@@ -85,6 +86,7 @@ def _init_posix(): - # just a guess - arch = platform.machine() - g['LDSHARED'] += ' -undefined dynamic_lookup' -+ g['LDCXXSHARED'] += ' -undefined dynamic_lookup' - g['CC'] += ' -arch %s' % (arch,) - - global _config_vars -@@ -168,37 +170,52 @@ def customize_compiler(compiler): - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SO', 'AR', -- 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SO', 'AR', 'ARFLAGS') -+ -+ cflags = '' -+ cxxflags = '' - - if 'CC' in os.environ: - newcc = os.environ['CC'] -- if (sys.platform == 'darwin' -+ if (True - and 'LDSHARED' not in os.environ - and ldshared.startswith(cc)): - # On OS X, if CC is overridden, use that as the default - # command for LDSHARED as well -+ # Gentoo: s/OS X/every system/ - ldshared = newcc + ldshared[len(cc):] - cc = newcc - if 'CXX' in os.environ: -- cxx = os.environ['CXX'] -+ newcxx = os.environ['CXX'] -+ if ('LDCXXSHARED' not in os.environ -+ and ldcxxshared.startswith(cxx)): -+ ldcxxshared = newcxx + ldcxxshared[len(cxx):] -+ cxx = newcxx - if 'LDSHARED' in os.environ: - ldshared = os.environ['LDSHARED'] -+ if 'LDCXXSHARED' in os.environ: -+ ldcxxshared = os.environ['LDCXXSHARED'] - if 'CPP' in os.environ: - cpp = os.environ['CPP'] - else: - cpp = cc + " -E" # not always - if 'LDFLAGS' in os.environ: - ldshared = ldshared + ' ' + os.environ['LDFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] - if 'CFLAGS' in os.environ: -- cflags = opt + ' ' + os.environ['CFLAGS'] -+ cflags = os.environ['CFLAGS'] - ldshared = ldshared + ' ' + os.environ['CFLAGS'] -+ if 'CXXFLAGS' in os.environ: -+ cxxflags = os.environ['CXXFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] - if 'CPPFLAGS' in os.environ: - cpp = cpp + ' ' + os.environ['CPPFLAGS'] - cflags = cflags + ' ' + os.environ['CPPFLAGS'] -+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] - ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] -+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] - if 'AR' in os.environ: - ar = os.environ['AR'] - if 'ARFLAGS' in os.environ: -@@ -207,13 +224,17 @@ def customize_compiler(compiler): - archiver = ar + ' ' + ar_flags - - cc_cmd = cc + ' ' + cflags -+ cxx_cmd = cxx + ' ' + cxxflags - compiler.set_executables( - preprocessor=cpp, - compiler=cc_cmd, - compiler_so=cc_cmd + ' ' + ccshared, -- compiler_cxx=cxx, -+ compiler_cxx=cxx_cmd, -+ compiler_so_cxx=cxx_cmd + ' ' + ccshared, - linker_so=ldshared, - linker_exe=cc, -+ linker_so_cxx=ldcxxshared, -+ linker_exe_cxx=cxx, - archiver=archiver) - - compiler.shared_lib_extension = so_ext -diff --git a/distutils/unixccompiler.py b/distutils/unixccompiler.py -index dee88a5..558b568 100644 ---- a/distutils/unixccompiler.py -+++ b/distutils/unixccompiler.py -@@ -55,14 +55,17 @@ class UnixCCompiler(CCompiler): - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["c++"], # pypy: changed, 'cc' is bogus -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } - - if sys.platform[:6] == "darwin": -@@ -129,12 +132,19 @@ class UnixCCompiler(CCompiler): - - def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = self.compiler_so -+ compiler_so_cxx = self.compiler_so_cxx - if sys.platform == 'darwin': - compiler_so = _osx_support.compiler_fixup(compiler_so, - cc_args + extra_postargs) -+ compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx, -+ cc_args + extra_postargs) - try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) -+ if self.detect_language(src) == 'c++': -+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) -+ else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) - except DistutilsExecError, msg: - raise CompileError, msg - -@@ -191,23 +201,16 @@ class UnixCCompiler(CCompiler): - ld_args.extend(extra_postargs) - self.mkpath(os.path.dirname(output_filename)) - try: -- if target_desc == CCompiler.EXECUTABLE: -- linker = self.linker_exe[:] -+ if target_lang == "c++": -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe_cxx[:] -+ else: -+ linker = self.linker_so_cxx[:] - else: -- linker = self.linker_so[:] -- if target_lang == "c++" and self.compiler_cxx: -- # skip over environment variable settings if /usr/bin/env -- # is used to set up the linker's environment. -- # This is needed on OSX. Note: this assumes that the -- # normal and C++ compiler have the same environment -- # settings. -- i = 0 -- if os.path.basename(linker[0]) == "env": -- i = 1 -- while '=' in linker[i]: -- i = i + 1 -- -- linker[i] = self.compiler_cxx[i] -+ if target_desc == CCompiler.EXECUTABLE: -+ linker = self.linker_exe[:] -+ else: -+ linker = self.linker_so[:] - - if sys.platform == 'darwin': - linker = _osx_support.compiler_fixup(linker, ld_args) --- -2.12.2 - diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml index c1d59c6d4a0e..ff5bc95069a0 100644 --- a/dev-python/pypy-bin/metadata.xml +++ b/dev-python/pypy-bin/metadata.xml @@ -1,17 +1,10 @@ - - alicef@gentoo.org - Alice Ferrazzi - python@gentoo.org Python - - Use a shadow stack for finding GC roots - pypy/pypy diff --git a/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild deleted file mode 100644 index e15879131bd9..000000000000 --- a/dev-python/pypy-bin/pypy-bin-5.6.0.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) -inherit eutils multilib pax-utils python-any-r1 unpacker versionator - -BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}" -CPY_PATCHSET_VERSION="2.7.11-0" -MY_P=pypy2-v${PV} - -DESCRIPTION="Pre-built version of PyPy" -HOMEPAGE="http://pypy.org/" -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz - amd64? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+jit+ncurses+shadowstack.tar.lz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz - ) ) - ) - x86? ( - cpu_flags_x86_sse2? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz - ) ) - ) - !cpu_flags_x86_sse2? ( - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz - ) ) - ) - )" - -# Supported variants -REQUIRED_USE="!jit? ( !shadowstack ) - x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )" - -LICENSE="MIT" -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' -SLOT="0/41" -KEYWORDS="~amd64 ~x86" -IUSE="doc gdbm +jit +shadowstack sqlite cpu_flags_x86_sse2 test tk" - -# yep, world would be easier if people started filling subslots... -RDEPEND=" - app-arch/bzip2:0= - dev-libs/expat:0= - dev-libs/libffi:0= - dev-libs/openssl:0=[-bindist] - sys-libs/glibc:2.2= - sys-libs/ncurses:0/6 - sys-libs/zlib:0= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !dev-python/pypy:0" -DEPEND="${RDEPEND} - app-arch/lzip - app-arch/xz-utils - doc? ( ${PYTHON_DEPS} - dev-python/sphinx )" - -S=${WORKDIR}/${MY_P}-src - -QA_PREBUILT=" - usr/lib*/pypy/pypy-c - usr/lib*/pypy/libpypy-c.so" - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - use doc && python-any-r1_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \ - "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" - - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -e "s^@libdir@^$(get_libdir)^" \ - -i lib-python/2.7/distutils/command/install.py || die - - # apply CPython stdlib patches - pushd lib-python/2.7 > /dev/null || die - epatch "${FILESDIR}"/5.6.0_all_distutils_cxx.patch \ - "${WORKDIR}"/patches/22_all_turkish_locale.patch \ - "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch - popd > /dev/null || die - - epatch_user -} - -src_compile() { - # Tadaam! PyPy compiled! - mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die - mv "${WORKDIR}"/${P}*/include/*.h include/ || die - # (not installed by pypy) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/ || die - - use doc && emake -C pypy/doc/ html - #needed even without jit :( also needed in both compile and install phases - pax-mark m pypy-c libpypy-c.so -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - local dest=/usr/$(get_libdir)/pypy - einfo "Installing PyPy ..." - insinto "${dest}" - doins -r include lib_pypy lib-python pypy-c libpypy-c.so - fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so - pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so" - dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ - "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ - "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${dest}"/lib_pypy/_tkinter \ - "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die - fi - - # Install docs - use doc && dohtml -r pypy/doc/_build/html/ - - einfo "Generating caches and byte-compiling ..." - - local -x PYTHON=${ED%/}${dest}/pypy-c - local -x LD_LIBRARY_PATH="${ED%/}${dest}" - # we can't use eclass function since PyPy is dumb and always gives - # paths relative to the interpreter - local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages - python_export pypy EPYTHON - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # Generate Grammar and PatternGrammar pickles. - "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # Generate cffi modules - # Please keep in sync with pypy/tool/build_cffi_imports.py! -#cffi_build_scripts = { -# "sqlite3": "_sqlite3_build.py", -# "audioop": "_audioop_build.py", -# "tk": "_tkinter/tklib_build.py", -# "curses": "_curses_build.py" if sys.platform != "win32" else None, -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, -# "resource": "_resource_build.py" if sys.platform != "win32" else None, - cffi_targets=( audioop curses syslog pwdgrp resource ) - use gdbm && cffi_targets+=( gdbm ) - use sqlite && cffi_targets+=( sqlite3 ) - use tk && cffi_targets+=( tkinter/tklib ) - - local t - # all modules except tkinter output to . - # tkinter outputs to the correct dir ... - cd "${ED%/}${dest}"/lib_pypy || die - for t in "${cffi_targets[@]}"; do - # tkinter doesn't work via -m - "${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" - done - - # Cleanup temporary objects - find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die - find "${ED%/}${dest}" -type d -empty -delete || die - - # compile the installed modules - python_optimize "${ED%/}${dest}" -} diff --git a/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild b/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild deleted file mode 100644 index aaa6411b77bb..000000000000 --- a/dev-python/pypy-bin/pypy-bin-5.7.1.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 pypy ) -inherit pax-utils python-any-r1 unpacker versionator - -BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}" -CPY_PATCHSET_VERSION="2.7.13-0" -MY_P=pypy2-v${PV} - -DESCRIPTION="Pre-built version of PyPy" -HOMEPAGE="http://pypy.org/" -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 - https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz - amd64? ( - jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz ) - !jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz ) - ) - x86? ( - cpu_flags_x86_sse2? ( - jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz ) - !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz ) - ) - !cpu_flags_x86_sse2? ( - !jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz ) - ) - )" - -# Supported variants -REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )" - -LICENSE="MIT" -# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")' -SLOT="0/41" -KEYWORDS="~amd64 ~x86" -IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk" - -# yep, world would be easier if people started filling subslots... -RDEPEND=" - app-arch/bzip2:0= - dev-libs/expat:0= - dev-libs/libffi:0= - dev-libs/openssl:0=[-bindist] - sys-libs/glibc:2.2= - sys-libs/ncurses:0/6 - sys-libs/zlib:0= - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !dev-python/pypy:0" -DEPEND="${RDEPEND} - app-arch/lzip - app-arch/xz-utils - doc? ( ${PYTHON_DEPS} - dev-python/sphinx )" - -S=${WORKDIR}/${MY_P}-src - -QA_PREBUILT=" - usr/lib*/pypy/pypy-c - usr/lib*/pypy/libpypy-c.so" - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - use doc && python-any-r1_pkg_setup - fi -} - -src_prepare() { - eapply "${FILESDIR}/4.0.0-gentoo-path.patch" - eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" - - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -e "s^@libdir@^$(get_libdir)^" \ - -i lib-python/2.7/distutils/command/install.py || die - - # apply CPython stdlib patches - pushd lib-python/2.7 > /dev/null || die - # TODO: cpy turkish locale patch now fixes C code - # probably needs better port to pypy, if it is broken there - eapply "${FILESDIR}"/5.7.1_all_distutils_cxx.patch - eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch - popd > /dev/null || die - - eapply_user -} - -src_compile() { - # Tadaam! PyPy compiled! - mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die - mv "${WORKDIR}"/${P}*/include/*.h include/ || die - # (not installed by pypy) - rm pypy/module/cpyext/include/_numpypy/numpy/README || die - mv pypy/module/cpyext/include/* include/ || die - mv pypy/module/cpyext/parse/*.h include/ || die - - use doc && emake -C pypy/doc/ html - #needed even without jit :( also needed in both compile and install phases - pax-mark m pypy-c libpypy-c.so -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - local dest=/usr/$(get_libdir)/pypy - einfo "Installing PyPy ..." - insinto "${dest}" - doins -r include lib_pypy lib-python pypy-c libpypy-c.so - fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so - pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so" - dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ - "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ - "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${dest}"/lib_pypy/_tkinter \ - "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die - fi - - # Install docs - use doc && dodoc -r pypy/doc/_build/html - - einfo "Generating caches and byte-compiling ..." - - local -x PYTHON=${ED%/}${dest}/pypy-c - local -x LD_LIBRARY_PATH="${ED%/}${dest}" - # we can't use eclass function since PyPy is dumb and always gives - # paths relative to the interpreter - local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages - python_export pypy EPYTHON - - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # Generate Grammar and PatternGrammar pickles. - "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ - || die "Generation of Grammar and PatternGrammar pickles failed" - - # Generate cffi modules - # Please keep in sync with pypy/tool/build_cffi_imports.py! -#cffi_build_scripts = { -# "sqlite3": "_sqlite3_build.py", -# "audioop": "_audioop_build.py", -# "tk": "_tkinter/tklib_build.py", -# "curses": "_curses_build.py" if sys.platform != "win32" else None, -# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, -# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, -# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, -# "resource": "_resource_build.py" if sys.platform != "win32" else None, - cffi_targets=( audioop curses syslog pwdgrp resource ) - use gdbm && cffi_targets+=( gdbm ) - use sqlite && cffi_targets+=( sqlite3 ) - use tk && cffi_targets+=( tkinter/tklib ) - - local t - # all modules except tkinter output to . - # tkinter outputs to the correct dir ... - cd "${ED%/}${dest}"/lib_pypy || die - for t in "${cffi_targets[@]}"; do - # tkinter doesn't work via -m - "${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" - done - - # Cleanup temporary objects - find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die - find "${ED%/}${dest}" -type d -empty -delete || die - - # compile the installed modules - python_optimize "${ED%/}${dest}" -} -- cgit v1.2.3