commit: e23617f190d977852c120be2b1aa0ed404e184f4 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Feb 17 11:33:35 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Feb 17 11:44:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23617f1
dev-python/pypy3-bin: Clean up old versions dev-python/pypy3-bin/Manifest | 16 -- .../files/2.4.0-21_all_distutils_c++.patch | 251 --------------------- dev-python/pypy3-bin/files/2.4.0-ncurses6.patch | 34 --- .../files/pypy3-2.4.0-fix-tkinter-regression.patch | 74 ------ .../pypy3-bin/files/pypy3-2.4.0-libressl.patch | 187 --------------- dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild | 193 ---------------- .../pypy3-bin/pypy3-bin-5.2.0_alpha1-r1.ebuild | 200 ---------------- 7 files changed, 955 deletions(-) diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest index 62570a6c02..a1172a5dd5 100644 --- a/dev-python/pypy3-bin/Manifest +++ b/dev-python/pypy3-bin/Manifest @@ -1,18 +1,3 @@ -DIST pypy3-2.4.0-src.tar.bz2 14693194 SHA256 d9ba207d6eecf8a0dc4414e9f4e92db1abd143e8cc6ec4a6bdcac75b29f104f3 SHA512 7e2b0c21f1833b8cd61251c2d58c6a9f99207e5d582618f0036886ff28dcb313541dce1c36bd1b57b332a36a94b13e416bb7b67110be7c8ece8283749ba712be WHIRLPOOL bd02009c828b7b491b46b260d687d268561e5372766adccbcb58e87a3f1c545f293c54e5cdd6e6b7fb95feb678677137211ee890f106140ce1bc256f8563d2cd -DIST pypy3-bin-2.4.0-nossl2-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 9320887 SHA256 98a2a6f1ba738e8e39b272e757cfa4b90684be05b58f28e9d7766d2e3238bed2 SHA512 b9569c7d9f607ec89dfc2adadea86d485e99c2cc8a9bd2751fbf450b331a706acd8cab9b67730162f67a74ccb682ec23769556cfb3b028265a7e5b06e920bd07 WHIRLPOOL 450be6f24c7bd58fc801bb95ca08f1d5874c2df0a5e75e062847b25f7a11e1ed81dfbb1b38e9607882593f96a2d3171c7f59cb63fd039c3ebf542bee7a53d09d -DIST pypy3-bin-2.4.0-nossl2-amd64+bzip2+jit+ncurses.tar.lz 10751255 SHA256 aca3afd551ab073d91c9d3d6e7bfffdbee2ccab0672d461b9abc0d3087d6ccab SHA512 85032e9418f03319dbf827fd68870d8c5d8f368f5b416ff9a96af48a1b3bcfd651a66c0d1c3372bf522c1d7433734d1d167e8fb037ca998f55c1ad4c13ed5a5d WHIRLPOOL 0eb02a3c4e7d6d5fbbdf239a68c067f87449a07a8a63a3a03858ada73fcf13a09a1b3f9f8402a173fd17baee4565de9f2b68038471527b8f43f14c4251af6432 -DIST pypy3-bin-2.4.0-nossl2-amd64+bzip2+ncurses.tar.lz 6188358 SHA256 2ee5d99218a02bac26a77327db3bcf754f36ed40ef0593567895ee2ad128bc04 SHA512 a07b3c3cdf16592af9ea76d8f70c053f6e75f3b92e10d019921dd8024161b8953477c3da7a5d82912f1f10f0ab4581e299215e7a5f50ee0ff923648e7a18d8cc WHIRLPOOL 75da4de6977382729d21881d7d66895871ad3e5f53a108bfad3c97d9f6db6dec6754f353e600436853d4d06586b350d4e47ccfa7ca25364c54b276fd629e5d5b -DIST pypy3-bin-2.4.0-nossl2-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 8246135 SHA256 91df98e4031bca19a1e9cc30cdb18f221ee2df00c2f3c5251b817feb9b2fe3d8 SHA512 d518184c5588e95cf584c5654b8a1ea3c0157d85e5274b5ba612edf38dd9c4848f37f2e87ee508fc0071f5b0a1a272312868b7628c251dcb584de1fd237f85fd WHIRLPOOL 98754b9c05a80167c474feef81ccf4cd057dfae621f1f15c85fa5595c2e9d97b4201a47e866a2fde4137e1e7e0225544aa00901e2c33ae6a1209e859df93510a -DIST pypy3-bin-2.4.0-nossl2-x86+bzip2+jit+ncurses+sse2.tar.lz 9073643 SHA256 436128604cc9649228992206abcfef84ff14994984b3da91b2d4ee1ab654274c SHA512 0cffa75008f174d0703d07e86ed1036a27efe7707b14e2a5c6bfe92bd703ad0ce7223a0b590aeffe1e7dd11756d385ac9e2eba9a7d49d6d970377aef8aa2d8bb WHIRLPOOL 579625d8e36bd22ca04a2468592f784269bd514799725a5fe0f5ce47e09477dada96a95c2296e46a8f4d03fc82aff6100c7a89c4e71993b033a31516ffc0b2a4 -DIST pypy3-bin-2.4.0-nossl2-x86+bzip2+ncurses+sse2.tar.lz 5549183 SHA256 ecb7dae543219b4bc1d75114a0a5316d870a4a92ae439b9679ae8436903fcc77 SHA512 06040c2f843ce77573616f9fc5a9773ffb67957860d33ca26538a39ba68aa56eea98bc0af0e99e6319f50ee42ff894a9f4944b7924348f20ce90078f0615a707 WHIRLPOOL ebf165deb7b65cbfef081841037206a74658906e49b52225c1966874f3f8ad39f19157c801653e2797a03b9fd0287a5c4e7ffb7d53d951fb5686eaba9c533b29 -DIST pypy3-bin-2.4.0-nossl2-x86+bzip2+ncurses.tar.lz 5503668 SHA256 7cc045e8ec9e7d4c01eb0dd9e83296bbf38483bcd0a5af0298ef53b9dc0bc63d SHA512 fa398b43a479c71bcd708e30055716dbe0c8f6421ed632a3ed8b3fa1cf30310e5325106b2c5d2be70b3a7e3bc706e70b599ffa34497ef6a0aeb78df534397f79 WHIRLPOOL c13aee013422d552cbf34fa41326f7edfb1a3817801a3ac72ff472b92460528876505b88e6bd95866dbf731d707d1ba789f22ae76d3a004cded36772afab2436 -DIST pypy3-bin-5.2.0_alpha1-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 10607836 SHA256 2fe7ab10ef9dc527fa6a187c8d81ada8e507ce3319496eb929507bc7f556b6f3 SHA512 6bc108500c2a87c806592c95ddd0cf65c2792648e6b9788b7503a14297d7c2f742357f9565066faea44c0968402a3b4e6054198dadf99044d61141e58dc21ef7 WHIRLPOOL c9d3f9c7655f2b55267570b7b1c3c942c6d7d9e947822fc3dc92c503aed49cbe6c0017749cd029ea9c262e26182d72deb10d3f8c772aab1033113f6270586a45 -DIST pypy3-bin-5.2.0_alpha1-amd64+bzip2+jit+ncurses.tar.lz 11330839 SHA256 10c4d1689d3fb1dd25e0ea765132a65799bdef8f0ca952241ef32cdf2f53e4e8 SHA512 e7f68ae8dfaab4894b4340e35cf14b16e47da8b192ea5aea97d33d7ec2b39ddc657ea36ac088325ffbd149bcc2bbc9528b9bd13f5cb8fd653ee2657a85d489f8 WHIRLPOOL 13faf88eff92ce6596e5d924e926e1ab56a97e668123852ec12a17ad57b7439d91528c4fb636190c7688823c7d68bc6b425ee115ed2c80811062ad715b08952d -DIST pypy3-bin-5.2.0_alpha1-amd64+bzip2+ncurses.tar.lz 6215094 SHA256 3cb22aee7c12a244b68215cdb03ee2c31589fdce55781dfa9cec706ede027d42 SHA512 00d1669cb7b208e18f48da339f4d843cff8bff49178fa547e8caf7b568e796dd8a2ede8204535e12b57e534375e752417e2a3f8023529673988fa315d8c1684b WHIRLPOOL 6e21ce63aacf1b07199947bd7ca36b263bee49a7a975b5f08d29f2ed9d971feeb77fb14c6052f822e7bb04ab1794f2bb0a04de34870bb454d88abf9f65a13761 -DIST pypy3-bin-5.2.0_alpha1-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 8533753 SHA256 7ec05fa19bbad93e6a25500fedf212f495eb8952ec486feb52379b979bd8ee3a SHA512 ab87d575e0c06ee6533fe61a6c0fad5fe8bf77417772fd196588449c81263801ac14dd8367821d61263cabbde2c05b33cebb0f5e8057d0a9eabb2e68a66571ad WHIRLPOOL 19b32146ac28497e8d80eeec4bbccdfc6ddff65ff768b2828905e9bc5e6b597cbafe631da7091eb4c91969362f24f12edd1ae726a4f3e41b637a32aaab7cf946 -DIST pypy3-bin-5.2.0_alpha1-x86+bzip2+jit+ncurses+sse2.tar.lz 9328963 SHA256 b6a8097c834e1dbb62b5042fb754c03a86d70e3c3c54f8b2c2c1268828f9ade1 SHA512 121305c1c5c84ac3ac1beec18ba5fcf2ca9f53ba4abfa200dd3fb688be0d261552f6f44c7ccf64b37cd52f95720e149efac5608d81e65c172298ecd5da9af16a WHIRLPOOL 5bb4f533f6a747ed9b4eb0eaccaf7ad86498eb3267270706510ee249b2bc5c2a95de4e16015bed633d60bd8ab4b10c09aad1719e411f61c8d7fbef3f7cc85851 -DIST pypy3-bin-5.2.0_alpha1-x86+bzip2+ncurses+sse2.tar.lz 5197922 SHA256 4cd32da0468db5863d5f975637009f81c594c878d9a954b7aa0198029b4869f7 SHA512 1568f3784feee713bf893cd27e1b159d55a39014a8ae69be80648e79ec8e415da425da2140d537f7c3d9a1854d14e76816d132938a3a350dd20ce97dddf032d9 WHIRLPOOL a1f0cce9f24b7d04a602e0ddc2770b9431a3e708832f680ab923346769292ed5493cc3bc1e748676978966dacb4f42e6b4137ee0e05010d81b8d3d819fd740aa -DIST pypy3-bin-5.2.0_alpha1-x86+bzip2+ncurses.tar.lz 5197502 SHA256 443b6542da9bb14826eff2b1080d16005a4a9fe6672eef41c5d29d8852b47904 SHA512 859037552e699b3bc172ab93f7e32315ae1d4b1a6f8d15bbbb14ca1a389f36360eb04cfc792d79bb99b418d1fd507d0d084f2652e04688bd53eed05391197c2c WHIRLPOOL f6003d1c6d05f54ea72f00755fa5b708ffc16ba180ed74846422b0cbbf95cdf9ad0b1109068ed72f43ac2b945b10bf37453984b88cfb30b335c9f5ba4878265d DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses+shadowstack.tar.lz 10860820 SHA256 46437ffdc3327b11fb116071ec8bb5c93aa94ac143a7105cadb678be708faeb5 SHA512 ed93e8452c82e627699aa876cfa55d2fd84d7ec7c6698e2a20bda2a5bb564def68b51a2e62ca45a36f88805cbca453b0a8a6565016428c4eef22a5539bb24647 WHIRLPOOL 858befe94e009628cee4e8527aaaa1e8e92fe264ff91b382fed74ba31314eccf914c403b376792eec322bcead140e8159d255b265bc88832accb3d65d16fd78c DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+jit+ncurses.tar.lz 11610069 SHA256 a400bd9c2df450647278dec93d397e4d040fd058f78309e8cdaff8b0792b8c01 SHA512 e0dca44387c03306691c63263aae7d484a5244b686cfd57315d7c4bd630fd5fba888d8cb57855d3f84c9bda576194597e4048877990456812f747d7d099b5819 WHIRLPOOL 3f61e0b02bbfc77a413fe38aca59c626857b1b8a05b952e7a832e4d3cc20dd5d98d9173161d08cd92587e2a7b44a2a55ba61f516c632611cb4d16a20f3eb4e74 DIST pypy3-bin-5.5.0_alpha-amd64+bzip2+ncurses.tar.lz 6243046 SHA256 34ae3b199194a90f0867e95306b6530faa3acafb9dc9ef077ba4e229f3a5d0de SHA512 4fdae8644c40734281d81adb5c8273a0f2429c47bff8672a7f98988195c6e9ab82d9a1443e2d1c1bc2ca75d471c112ac40ac403e75808d8610dce94fee15031b WHIRLPOOL ca2c5b4f0334f1193ef5cd6bf7ebe9034fbd176f0ce34b6302125c6e2b175e69129ca53d21ef34327bb064cf90af907c10bd81d62ccb429298020043a41fdfa0 @@ -20,6 +5,5 @@ DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz 8656783 DIST pypy3-bin-5.5.0_alpha-x86+bzip2+jit+ncurses+sse2.tar.lz 9549100 SHA256 fdd95b1fb91d669e1861b2dff52b97af0d01aaedf61eb11f07c8f92cd398c7f6 SHA512 2ac8cb894cafae8da81bddb601185941b42933aa41bda8d1696eb70ca22cbeaa0c23385e4a4cd640c46f9e301acfc2f9bc89adaf5a7f5cbef4bc23ca8af550bb WHIRLPOOL e4c21be6b52468135ff6e53434a8ae8c0450880d0f5c8d37bdc18a99f9ceb0ae101c82b8a7a6ae2088297f9dbfa7146fcf80a24948dd3316d56f0f798cc7ecec DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses+sse2.tar.lz 5231919 SHA256 6a9848bc2d1d948a91bc15ce20768bc7024726ec7afdd2767bfba25926a35c7f SHA512 fbdc955b1c2873d07e8ad36dd697fbb21932ac50726e76fed20da1fca218b329f18c81b8b4a65cd7ece26091859529d5bb56c7ed2efaf14ae8d9988581d88d9b WHIRLPOOL 08ffd98122e4745af4e785ebb986cd7d185472ec0879bb9dc6070b14de6d35e4177e35a85326468329a06617df03880744e23a6bef825f67d40476c92c7d430e DIST pypy3-bin-5.5.0_alpha-x86+bzip2+ncurses.tar.lz 5232239 SHA256 d808aa66ecd5b3d868554ad29b0eee3948e3de69390826bcb5e6b8ceb2408037 SHA512 5e107304537855f459cc7bee92d3b2d05e16f2421d2249205c34f40f1f9415ca657f3e0842c79de98fed732e0a2752b280b44880f96eeeaa0d50d4b4bf2c525c WHIRLPOOL 562fe0c00aeb83a74d9f1ccba4ffed70b5efa6592ef04c82ea06c38afc560e97aa02b835de8b69925690149c1d6803ecfbcad7eefd59bdf4462bdbbbf82c2577 -DIST pypy3.3-v5.2.0-alpha1-src.tar.bz2 24390595 SHA256 344c2f088c82ea1274964bb0505ab80d3f9e538cc03f91aa109325ddbaa61426 SHA512 1b6bcab12a7f4dd0ac44158b8acafd64de4b9bcc277385ba4c05982381dcd577fa6ec7b2247f70d2671055f3669764b92b4447b32d51ded58c60e6ec23509595 WHIRLPOOL 9455686af04f31da52da812e4f48d773c1ce45180ba067a308a779fa8b468b5a10c446a28d7468e61278801837705e882240a2e17884bc94069e564a5706f177 DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3 DIST python-gentoo-patches-3.3.5-0.tar.xz 12892 SHA256 a7240de9598033cb40f8f273d8104d4e2b1dcaea028d45ac28efaa3c680ff6f7 SHA512 27eef4c2b3f631b000db3f6a5c426d9b498d63a08fe82b1ab7c2c010fb72208109461a5f008d47703852526655b70a734ea95be8742897026db5750bb9cc9d16 WHIRLPOOL edab9222d7da94cab3b1de0e1a27c6c7dbd49194b813a0a1cf9e532063029c4e4f19151c9f4878eeabed3168ff1f97eae7f008280c7ed2897fc14c5516c68d7e diff --git a/dev-python/pypy3-bin/files/2.4.0-21_all_distutils_c++.patch b/dev-python/pypy3-bin/files/2.4.0-21_all_distutils_c++.patch deleted file mode 100644 index 90525d56ae..0000000000 --- a/dev-python/pypy3-bin/files/2.4.0-21_all_distutils_c++.patch +++ /dev/null @@ -1,251 +0,0 @@ -http://bugs.python.org/issue1222585 - ---- Lib/distutils/cygwinccompiler.py -+++ Lib/distutils/cygwinccompiler.py -@@ -136,9 +136,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, shared_option))) - - # cygwin and mingw32 need different sets of libraries - if self.gcc_version == "2.91.57": -@@ -162,8 +166,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 as msg: - raise CompileError(msg) - -@@ -294,10 +302,15 @@ - self.set_executables(compiler='gcc -mno-cygwin -O -Wall', - compiler_so='gcc -mno-cygwin -mdll -O -Wall', - compiler_cxx='g++ -mno-cygwin -O -Wall', -+ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall', - linker_exe='gcc -mno-cygwin', - linker_so='%s -mno-cygwin %s %s' - % (self.linker_dll, shared_option, -- entry_point)) -+ entry_point), -+ linker_exe_cxx='g++ -mno-cygwin', -+ linker_so_cxx='%s -mno-cygwin %s %s' -+ % (self.linker_dll, shared_option, -+ entry_point)) - # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) - # (-mthreads: Support thread-safe exception handling on `Mingw32') ---- Lib/distutils/emxccompiler.py -+++ Lib/distutils/emxccompiler.py -@@ -63,8 +63,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) -@@ -81,8 +85,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 as msg: - raise CompileError(msg) - ---- Lib/distutils/sysconfig_cpython.py -+++ Lib/distutils/sysconfig_cpython.py -@@ -170,9 +170,12 @@ - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' - -- (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ -+ cflags = '' -+ cxxflags = '' - - newcc = None - if 'CC' in os.environ: -@@ -181,19 +184,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: -@@ -202,13 +213,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 = shlib_suffix ---- Lib/distutils/unixccompiler.py -+++ Lib/distutils/unixccompiler.py -@@ -52,14 +52,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' : ["cc"], -- '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": -@@ -108,12 +111,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 as msg: - raise CompileError(msg) - -@@ -171,22 +181,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 += 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) ---- Lib/_osx_support.py -+++ Lib/_osx_support.py -@@ -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 --git a/dev-python/pypy3-bin/files/2.4.0-ncurses6.patch b/dev-python/pypy3-bin/files/2.4.0-ncurses6.patch deleted file mode 100644 index 63a450ff42..0000000000 --- a/dev-python/pypy3-bin/files/2.4.0-ncurses6.patch +++ /dev/null @@ -1,34 +0,0 @@ -Patch by Vadim A. Misbakh-Soloviov (mva) -https://bugs.gentoo.org/show_bug.cgi?id=564454 - ---- lib_pypy/_curses.py.old 2016-01-18 19:13:00.241886442 +0000 -+++ lib_pypy/_curses.py 2016-01-18 19:26:01.061885605 +0000 -@@ -1,6 +1,7 @@ - """Reimplementation of the standard extension module '_curses' using cffi.""" - - import sys -+import platform - if sys.platform == 'win32': - #This module does not exist in windows - raise ImportError('No module named _curses') -@@ -10,12 +11,18 @@ - - ffi = FFI() - -+# Monkeypatch to make it build against ncurses-6. -+# Inspired by https://goo.gl/xvjQcd -+_type = "uint32_t" -+if platform.machine() == "x86_64": -+ _type = "unsigned" -+ - ffi.cdef(""" - typedef ... WINDOW; - typedef ... SCREEN; --typedef unsigned long mmask_t; -+typedef """+_type+""" mmask_t; - typedef unsigned char bool; --typedef unsigned long chtype; -+typedef """+_type+""" chtype; - typedef chtype attr_t; - - typedef struct diff --git a/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch b/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch deleted file mode 100644 index a92152ee84..0000000000 --- a/dev-python/pypy3-bin/files/pypy3-2.4.0-fix-tkinter-regression.patch +++ /dev/null @@ -1,74 +0,0 @@ -# HG changeset patch -# User Philip Jenvey <pjen...@underboss.org> -# Date 1414136649 25200 -# Branch py3k -# Node ID 8c340acffe279d63dd2df525173713b2054619c8 -# Parent a87e6542c186bdc7408ea027aed83c62820a9c49 -issue1899: fix broken bytes usage from default - -diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py ---- a/lib_pypy/_tkinter/app.py -+++ b/lib_pypy/_tkinter/app.py -@@ -439,7 +439,7 @@ - if isinstance(s, int): - return s - s = s.encode('utf-8') -- if '\x00' in s: -+ if b'\x00' in s: - raise TypeError - v = tkffi.new("int*") - res = tklib.Tcl_GetBoolean(self.interp, s, v) -@@ -451,7 +451,7 @@ - if isinstance(s, int): - return s - s = s.encode('utf-8') -- if '\x00' in s: -+ if b'\x00' in s: - raise TypeError - v = tkffi.new("int*") - res = tklib.Tcl_GetInt(self.interp, s, v) -@@ -463,7 +463,7 @@ - if isinstance(s, float): - return s - s = s.encode('utf-8') -- if '\x00' in s: -+ if b'\x00' in s: - raise TypeError - v = tkffi.new("double*") - res = tklib.Tcl_GetDouble(self.interp, s, v) -@@ -472,7 +472,7 @@ - return v[0] - - def exprboolean(self, s): -- if '\x00' in s: -+ if b'\x00' in s: - raise TypeError - v = tkffi.new("int*") - res = tklib.Tcl_ExprBoolean(self.interp, s, v) -@@ -481,7 +481,7 @@ - return v[0] - - def exprlong(self, s): -- if '\x00' in s: -+ if b'\x00' in s: - raise TypeError - v = tkffi.new("long*") - res = tklib.Tcl_ExprLong(self.interp, s, v) -@@ -490,7 +490,7 @@ - return v[0] - - def exprdouble(self, s): -- if '\x00' in s: -+ if b'\x00' in s: - raise TypeError - v = tkffi.new("double*") - res = tklib.Tcl_ExprDouble(self.interp, s, v) -@@ -499,7 +499,7 @@ - return v[0] - - def exprstring(self, s): -- if '\x00' in s: -+ if b'\x00' in s: - raise TypeError - res = tklib.Tcl_ExprString(self.interp, s) - if res == tklib.TCL_ERROR: diff --git a/dev-python/pypy3-bin/files/pypy3-2.4.0-libressl.patch b/dev-python/pypy3-bin/files/pypy3-2.4.0-libressl.patch deleted file mode 100644 index 5852939c50..0000000000 --- a/dev-python/pypy3-bin/files/pypy3-2.4.0-libressl.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 66bef80988c9efe60b61c6bc05f3206b4c3df7e8 Mon Sep 17 00:00:00 2001 -From: hasufell <hasuf...@gentoo.org> -Date: Mon, 12 Oct 2015 20:43:50 +0200 -Subject: [PATCH] Add LibreSSL support, patches backported from upstream - -https://bitbucket.org/pypy/pypy/pull-requests/333/deal-with-platforms-without-rand_egd-take/diff ---- - pypy/module/_ssl/interp_ssl.py | 34 +++++++++++++++----------- - pypy/module/_ssl/test/test_ssl.py | 8 +++--- - rpython/rlib/ropenssl.py | 6 ++++- - rpython/rtyper/tool/rffi_platform.py | 12 ++++++--- - rpython/rtyper/tool/test/test_rffi_platform.py | 24 +++++++++++++++++- - 5 files changed, 61 insertions(+), 23 deletions(-) - -diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py -index 0cac165..f210167 100644 ---- a/pypy/module/_ssl/interp_ssl.py -+++ b/pypy/module/_ssl/interp_ssl.py -@@ -310,20 +310,26 @@ if HAVE_OPENSSL_RAND: - res = libssl_RAND_status() - return space.wrap(res) - -- @unwrap_spec(path=str) -- def RAND_egd(space, path): -- """RAND_egd(path) -> bytes -- -- Queries the entropy gather daemon (EGD) on socket path. Returns number -- of bytes read. Raises socket.sslerror if connection to EGD fails or -- if it does provide enough data to seed PRNG.""" -- with rffi.scoped_str2charp(path) as socket_path: -- bytes = libssl_RAND_egd(socket_path) -- if bytes == -1: -- raise ssl_error(space, -- "EGD connection failed or EGD did not return " -- "enough data to seed the PRNG") -- return space.wrap(bytes) -+ if HAVE_OPENSSL_RAND_EGD: -+ @unwrap_spec(path=str) -+ def RAND_egd(space, path): -+ """RAND_egd(path) -> bytes -+ -+ Queries the entropy gather daemon (EGD) on socket path. Returns number -+ of bytes read. Raises socket.sslerror if connection to EGD fails or -+ if it does provide enough data to seed PRNG.""" -+ with rffi.scoped_str2charp(path) as socket_path: -+ bytes = libssl_RAND_egd(socket_path) -+ if bytes == -1: -+ raise ssl_error(space, -+ "EGD connection failed or EGD did not return " -+ "enough data to seed the PRNG") -+ return space.wrap(bytes) -+ else: -+ # Dummy func for platforms missing RAND_egd(). Most likely LibreSSL. -+ @unwrap_spec(path=str) -+ def RAND_egd(space, path): -+ raise ssl_error(space, "RAND_egd unavailable") - - - class SSLSocket(W_Root): -diff --git a/pypy/module/_ssl/test/test_ssl.py b/pypy/module/_ssl/test/test_ssl.py -index 3204610..9722fd5 100644 ---- a/pypy/module/_ssl/test/test_ssl.py -+++ b/pypy/module/_ssl/test/test_ssl.py -@@ -33,7 +33,8 @@ class AppTestSSL: - assert isinstance(_ssl.OPENSSL_VERSION_INFO, tuple) - assert len(_ssl.OPENSSL_VERSION_INFO) == 5 - assert isinstance(_ssl.OPENSSL_VERSION, str) -- assert 'openssl' in _ssl.OPENSSL_VERSION.lower() -+ lower_version = _ssl.OPENSSL_VERSION.lower() -+ assert 'openssl' in lower_version or "libressl" in lower_version - - def test_RAND_add(self): - import _ssl -@@ -64,8 +65,9 @@ class AppTestSSL: - - def test_sslwrap(self): - import ssl, _socket, sys, gc -- if sys.platform == 'darwin' or 'freebsd' in sys.platform: -- skip("hangs indefinitely on OSX & FreeBSD (also on CPython)") -+ if sys.platform == 'darwin' or 'freebsd' in sys.platform or \ -+ 'openbsd' in sys.platform: -+ skip("hangs indefinitely on OSX & BSD (also on CPython)") - s = _socket.socket() - ss = ssl.wrap_socket(s) - -diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py -index c36779d..6fe45d0 100644 ---- a/rpython/rlib/ropenssl.py -+++ b/rpython/rlib/ropenssl.py -@@ -168,6 +168,9 @@ OBJ_NAME = rffi.CArrayPtr(OBJ_NAME_st) - - HAVE_OPENSSL_RAND = OPENSSL_VERSION_NUMBER >= 0x0090500f - HAVE_SSL_CTX_CLEAR_OPTIONS = OPENSSL_VERSION_NUMBER >= 0x009080df -+HAVE_OPENSSL_RAND_EGD = rffi_platform.has('RAND_egd("/")', -+ '#include <openssl/rand.h>', -+ libraries=['ssl', 'crypto']) - - def external(name, argtypes, restype, **kw): - kw['compilation_info'] = eci -@@ -194,7 +197,8 @@ ssl_external('CRYPTO_set_id_callback', - if HAVE_OPENSSL_RAND: - ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE], lltype.Void) - ssl_external('RAND_status', [], rffi.INT) -- ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT) -+ if HAVE_OPENSSL_RAND_EGD: -+ ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT) - ssl_external('SSL_CTX_new', [SSL_METHOD], SSL_CTX) - ssl_external('SSL_get_SSL_CTX', [SSL], SSL_CTX) - ssl_external('TLSv1_method', [], SSL_METHOD) -diff --git a/rpython/rtyper/tool/rffi_platform.py b/rpython/rtyper/tool/rffi_platform.py -index 1760877..1d56c20 100755 ---- a/rpython/rtyper/tool/rffi_platform.py -+++ b/rpython/rtyper/tool/rffi_platform.py -@@ -17,12 +17,15 @@ from rpython.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, intmask - # - # Helpers for simple cases - --def eci_from_header(c_header_source, include_dirs=None): -+def eci_from_header(c_header_source, include_dirs=None, libraries=None): - if include_dirs is None: - include_dirs = [] -+ if libraries is None: -+ libraries = [] - return ExternalCompilationInfo( - post_include_bits=[c_header_source], -- include_dirs=include_dirs -+ include_dirs=include_dirs, -+ libraries=libraries, - ) - - def getstruct(name, c_header_source, interesting_fields): -@@ -75,9 +78,10 @@ def getintegerfunctionresult(function, args=None, c_header_source='', includes=[ - CConfig._compilation_info_.includes = includes - return configure(CConfig)['RESULT'] - --def has(name, c_header_source, include_dirs=None): -+def has(name, c_header_source, include_dirs=None, libraries=None): - class CConfig: -- _compilation_info_ = eci_from_header(c_header_source, include_dirs) -+ _compilation_info_ = \ -+ eci_from_header(c_header_source, include_dirs, libraries) - HAS = Has(name) - return configure(CConfig)['HAS'] - -diff --git a/rpython/rtyper/tool/test/test_rffi_platform.py b/rpython/rtyper/tool/test/test_rffi_platform.py -index bfa069e..4feae87 100644 ---- a/rpython/rtyper/tool/test/test_rffi_platform.py -+++ b/rpython/rtyper/tool/test/test_rffi_platform.py -@@ -271,12 +271,34 @@ def test_array(): - [("d_name", lltype.FixedSizeArray(rffi.CHAR, 1))]) - assert dirent.c_d_name.length == 32 - --def test_has(): -+def test_has_0001(): - assert rffi_platform.has("x", "int x = 3;") - assert not rffi_platform.has("x", "") - # has() should also not crash if it is given an invalid #include - assert not rffi_platform.has("x", "#include <some/path/which/cannot/exist>") - -+def test_has_0002(): -+ assert rffi_platform.has("pow", "#include <math.h>", libraries=["m"]) -+ -+def test_has_0003(): -+ """multiple libraries""" -+ assert rffi_platform.has("pow", "#include <math.h>", libraries=["m", "c"]) -+ -+def test_has_0004(): -+ """bogus symbol name""" -+ assert not rffi_platform.has("pow", "#include <math.h>", -+ libraries=["boguslibname"]) -+ -+def test_has_0005(): -+ """bogus symbol name and lib name""" -+ assert not rffi_platform.has("bogus_symbol_name", "#include <math.h>", -+ libraries=["boguslibname"]) -+ -+def test_has_0006(): -+ """missing include""" -+ assert not rffi_platform.has("pow", "", libraries=["m"]) -+ -+ - def test_verify_eci(): - eci = ExternalCompilationInfo() - rffi_platform.verify_eci(eci) --- -2.6.1 - diff --git a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild b/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild deleted file mode 100644 index 3a195e33db..0000000000 --- a/dev-python/pypy3-bin/pypy3-bin-2.4.0-r4.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# some random parts need python 2... -PYTHON_COMPAT=( python2_7 pypy ) -inherit eutils multilib pax-utils python-any-r1 unpacker versionator - -BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}-nossl2"; - -DESCRIPTION="A fast, compliant alternative implementation of Python 3 (binary package)" -HOMEPAGE="http://pypy.org/"; -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/pypy3-${PV}-src.tar.bz2 - amd64? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-nossl2-amd64+bzip2+jit+ncurses+shadowstack.tar.lz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-nossl2-amd64+bzip2+jit+ncurses.tar.lz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-nossl2-amd64+bzip2+ncurses.tar.lz - ) ) - ) - x86? ( - cpu_flags_x86_sse2? ( - jit? ( shadowstack? ( - ${BINHOST}/${P}-nossl2-x86+bzip2+jit+ncurses+shadowstack+sse2.tar.lz - ) ) - jit? ( !shadowstack? ( - ${BINHOST}/${P}-nossl2-x86+bzip2+jit+ncurses+sse2.tar.lz - ) ) - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-nossl2-x86+bzip2+ncurses+sse2.tar.lz - ) ) - ) - !cpu_flags_x86_sse2? ( - !jit? ( !shadowstack? ( - ${BINHOST}/${P}-nossl2-x86+bzip2+ncurses.tar.lz - ) ) - ) - )" - -# Supported variants -REQUIRED_USE="!jit? ( !shadowstack ) - x86? ( !cpu_flags_x86_sse2? ( !jit !shadowstack ) )" - -LICENSE="MIT" -SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="~amd64 ~x86" -IUSE="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= - 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/pypy3:0" -DEPEND="${RDEPEND} - app-arch/lzip - test? ( ${PYTHON_DEPS} )" -# doc? ( ${PYTHON_DEPS} -# dev-python/sphinx ) - -S=${WORKDIR}/pypy3-${PV}-src - -QA_PREBUILT=" - usr/lib*/pypy3/pypy-c - usr/lib*/pypy3/libpypy-c.so" - -src_prepare() { - epatch \ - "${FILESDIR}/4.0.0-gentoo-path.patch" \ - "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ - "${FILESDIR}/2.4.0-ncurses6.patch" \ - "${FILESDIR}/pypy3-2.4.0-libressl.patch" \ - "${FILESDIR}/pypy3-2.4.0-fix-tkinter-regression.patch" - - sed -e "s^@EPREFIX@^${EPREFIX}^" \ - -e "s^@libdir@^$(get_libdir)^" \ - -i lib-python/3/distutils/command/install.py || die - - # apply CPython stdlib patches - pushd lib-python/3 > /dev/null || die - epatch "${FILESDIR}"/2.4.0-21_all_distutils_c++.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 - mv pypy/module/cpyext/include/*.h include/ || die - mv pypy/module/cpyext/include/numpy 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 - - # ctypes config cache - # this one we need to do with python2 too... - "${PYTHON}" lib_pypy/ctypes_config_cache/rebuild.py \ - || die "Failed to rebuild ctypes config cache" -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE - - # Test runner requires Python 2 too. However, it spawns PyPy3 - # internally so that we end up testing the correct interpreter. - "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - local dest=/usr/$(get_libdir)/pypy3 - 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)/pypy3/pypy-c /usr/bin/pypy3 - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ - "${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ - "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ - "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ - "${ED%/}${dest}"/lib_pypy/_tkinter \ - "${ED%/}${dest}"/lib-python/*3/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)/pypy3/site-packages - python_export pypy3 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 cache - # Please keep in sync with pypy/tool/release/package.py! - "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)" - "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)" - if use gdbm; then - "${PYTHON}" -c "import _gdbm" || die "Failed to import gdbm (cffi)" - fi - if use sqlite; then - "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)" - fi - if use tk; then - "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)" - fi - - # 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/pypy3-bin/pypy3-bin-5.2.0_alpha1-r1.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.2.0_alpha1-r1.ebuild deleted file mode 100644 index 8fea012820..0000000000 --- a/dev-python/pypy3-bin/pypy3-bin-5.2.0_alpha1-r1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# some random parts need python 2... -PYTHON_COMPAT=( python2_7 pypy ) -inherit eutils multilib pax-utils python-any-r1 unpacker versionator - -CPY_PATCHSET_VERSION="3.3.5-0" -MY_P=pypy3.3-v${PV/_/-} -BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"; - -DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)" -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? ( 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" -SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="~amd64 ~x86" -IUSE="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= - 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/pypy3:0" -DEPEND="${RDEPEND} - app-arch/lzip - test? ( ${PYTHON_DEPS} )" -# doc? ( ${PYTHON_DEPS} -# dev-python/sphinx ) - -S=${WORKDIR}/${MY_P}-src - -QA_PREBUILT=" - usr/lib*/pypy3/pypy-c - usr/lib*/pypy3/libpypy-c.so" - -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/3/distutils/command/install.py || die - - # apply CPython stdlib patches - pushd lib-python/3 > /dev/null || die - epatch "${FILESDIR}"/5.2.0-distutils-c++.patch \ - "${WORKDIR}"/patches/24_all_sqlite-3.8.4.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 - mv pypy/module/cpyext/include/*.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 - - # Test runner requires Python 2 too. However, it spawns PyPy3 - # internally so that we end up testing the correct interpreter. - "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - local dest=/usr/$(get_libdir)/pypy3 - 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)/pypy3/pypy-c /usr/bin/pypy3 - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ - "${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \ - "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ - "${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \ - "${ED%/}${dest}"/lib_pypy/_tkinter \ - "${ED%/}${dest}"/lib-python/*3/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)/pypy3/site-packages - python_export pypy3 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, -# "lzma": "_lzma_build.py", -# "_decimal": "_decimal_build.py", - cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ) - 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}" -}
