From: Michał Górny Date: Sun, 12 Apr 2015 16:13:22 +0000 (+0000) Subject: Add KEYWORDS to 2.5.1. Remove 2.5.0 because of missing binpackage. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1640119a379dc6dead12794454c9d767bb1c3fc;p=gentoo.git Add KEYWORDS to 2.5.1. Remove 2.5.0 because of missing binpackage. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog index 486a056812cd..b277770988bf 100644 --- a/dev-python/pypy/ChangeLog +++ b/dev-python/pypy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pypy # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.85 2015/04/12 12:58:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.86 2015/04/12 16:13:21 mgorny Exp $ + + 12 Apr 2015; Michał Górny -pypy-2.5.0.ebuild, + pypy-2.5.1.ebuild: + Add KEYWORDS to 2.5.1. Remove 2.5.0 because of missing binpackage. *pypy-2.5.1 (12 Apr 2015) diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest index 5697a2145a6f..865712e313ba 100644 --- a/dev-python/pypy/Manifest +++ b/dev-python/pypy/Manifest @@ -9,30 +9,28 @@ AUX 2.5.0-shared-lib.patch 730 SHA256 9ab0d31d034a9980095c07dfc5a403e14ea8e41cbd AUX 2.5.0_all_distutils_cxx.patch 14852 SHA256 a920ec04b26cbcead3eea89e2b437be3ca70a5229d3da6ae8a56ea8f1047ff84 SHA512 0b1ec90e1603b0a2af000a43990df0a577ef79700c9707851b82b676531caec9b2f9c9b2c144724e4898dc1d7ea1d5779e932d01a18eaa2d4d9086e2a1b0c7f8 WHIRLPOOL e9648f08f8616fcad2fe2ce1788627adfa1aeb89b3f8b5d2857a73da987b2385ab467b3b3b576e82b02d3beafa4a62b217b7f90b59ed0332f325ebada0337f4e DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6 DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b -DIST pypy-2.5.0-src.tar.bz2 15065106 SHA256 8ff1e131d8fefd79032dd81bcf3fde927e152d3acde5105356f6ffc1aad33f81 SHA512 79615ee680d69ff85043f596232f7684407fff27c3f54c8237c1822c43ff63aaf0c8918b6950424a70b75727357b30f0fa88e90df15bd5945905d96f8f2d87b1 WHIRLPOOL 861492b526c5b8271729c51959250f95fc5d4ac6b37108873601a3c09b6cb6f264c764e180f9e913c3ffeebdfaad8a87dc4a3898e717cbea44ff72dff5071461 DIST pypy-2.5.1-src.tar.bz2 16740876 SHA256 ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a SHA512 ac4cab47566d7d4e1a293a680e0dffa301c99a8329c2e68f645f186c0266cbe8f045a03e392c0cc2112a16178037cd978b7867ad073bf5dd957dd19f4c818067 WHIRLPOOL 6f16c4090780081dfe1d4642186262c66d4ac1a4b3b8311e573bfa6029eb7aac0483b3e48cad5ce03879391a4e316c0186d33fac5e86d0024ff20cc6d4dc0dd3 EBUILD pypy-2.3.1-r2.ebuild 6543 SHA256 2ca2601c1972ed75145adfda371a45c329bf55e9f0165d387758f2d170589139 SHA512 f0308b0e90a78578efead7421d9d69268f5fb13e8f3e7410e562a0b41ec68e6b68d02346a6aa3f9f776d34092fc6c7849099d81134c32a3da5ec823bea9be5d0 WHIRLPOOL 88f3a8c501aa735349869bf7108328481e4b200f06bc1bbdc7285a6458b3010d0142cd8108891002d15fa6a8b430793fe07f733b36aea54489160e4fcd997105 EBUILD pypy-2.4.0.ebuild 6251 SHA256 80d15d914e754f227f32698da7063840869c9c634682a4a5f1876c696fd33475 SHA512 63ece3b05b65a91c28fca011e8f445c3ea1bdcb66720dcbd261288284ae5d3f31ebd4eb6d3325ddae541d4443489c5c705382332d508e8de81b1a644b4c2e2da WHIRLPOOL 3431631a99c28118afd4c97c3c8ff9c5a7b2af9b9651f35ae3c57df2687dc69bd3e6e79712d9b06763238bc64eb12e0aea56e861b2a26b7dac6bebb7ffeab913 -EBUILD pypy-2.5.0.ebuild 6281 SHA256 84dd357ec12c5d0cc2846b7283fd4357cd998351efaabecdd956234acd79bf8f SHA512 f33ebecac293491dbc14023ebfdbd20a0833ef0a7a5926914af773ac24ff77c29efd24bab877c8522f9d83030f5894984f70508614c272f769e14da4b07bfc1a WHIRLPOOL 1ddd8ecbb80fa36c2927ed6841e861201c6b81707259395c502f0384fd42ec1c6ac8f0ea664fc415211c0ac0c501572ac707a5d0e583017984bc035484ed8af6 -EBUILD pypy-2.5.1.ebuild 6245 SHA256 3fa8f14b4e5ad0ab02e1185e3cfdaec58b469a61212c69a21e43375e215ea74e SHA512 43b8a06d0a6a0638d61f24c0cc9e22a545e76e073890c84960ce99ee8fa596303bf64f4cd4e0e8c594aa7b84afff546aa0dcc945e478000fa3e04207d1226d66 WHIRLPOOL aa8a2ded3ea3e4a7433aaf1732369d5ab25ae07192879b8daa3c4c3f8e7037e882ec42534a68611cf0e867cb26595a7aaeafc6bc18e5b62f4ce3eb26295b197a -MISC ChangeLog 15660 SHA256 4f9ecbd6dec8693e45a6c120f2544c48afcb7e801d2025b97ad9fe2115d5813e SHA512 35771518397f2f526047ced3ddfce7d93875ff2a42a1a4ff830161ccf176885a277b825c6e40e570e19a6f7bd4f6387d782c9916f622647026212fafa24cf7b9 WHIRLPOOL 38e961af0d10c01b6fd29fd69c83c5e7a420f09b17d3ab9d839e060334f209908aad06fcf10690713e617a156b4132ef6a7eac66f69a0487146c12d717407af3 +EBUILD pypy-2.5.1.ebuild 6280 SHA256 baf5c491016bd7831b997d2a6a7df6a97963bb317209628355619b6ae884a383 SHA512 fb132088afe56068f18c25ede8dd4879e0ed243f74ff6cd56e9112ddbb961e81a1582b4e6a6d0cc88096be4e9b68403a3c27e15eea4f2873d8c33a284770b199 WHIRLPOOL 6a5caf21f94e662492156ebbb03b1525e9cc9f168f6399cf70c14e5634c0c93a0cb33c401b515b077622581b1ff39d9e017dd6fa74ebc17081a37b0ddebc32db +MISC ChangeLog 15821 SHA256 45887f450fdc172a039ff9394db089e4968e451c8340250211f7269d2bd54ae1 SHA512 0a1851bcdfd2f6e97bee35373e02a7627c36879bc73e4e92f0eb300eb5e9d42a09f9daccd5ae84aa4902c156fc43717303c07406dde55807bd67c2bd69309761 WHIRLPOOL d6c62279d0c80c8f4effe6b74ad99f0a5acd3a9feedac09348c6dfd4651ffee7d395ee5f21b92ad8a979b2b990205683a870742df6b76e58ddd985e1cfcbe82b MISC metadata.xml 814 SHA256 c48da602d1fd1b8319490eab43094d7b44f2db5d08d1158e804198feebeede89 SHA512 77b11b4275e1b160bceb050dc0621c9490541c20cfa7327dcdfa6089209f8e0d5e160b6b93c95a406596649d8fdbb9d004d632a6c0df4edde8ac4308a2067653 WHIRLPOOL 9762c2db20f2847ac5c35074ac83a566e3e27dc3d707433184ae3ef82ab2d31c335700e9ba674ffb457848452caedce3e8007d7a88f3e9a87c1a4715bbc216e9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVKmvdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVKpmiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOPkUQAIVH0LbXXDqr4+9MMTcWdaRh -EiaH5xrwDgr69xuIGGoQm35GnBuztUGdo9ED2CdY9Qcge3+aHVv4PQWvr1mp0ne1 -K5UN6yZqe0F0r3a49gOzSqZcnKJ78HfBjaBh+noSh7qmOU3JKvyjzOSvq75mPzXh -sqmATOlQn8XCpPWMGbAGvBi1jS7Bpou1VL7a02U6rUqdl12nbVo9CQGNuhggI2vS -sJAgS0ZtW9VkrmTsMl4nV6h/07eY9f+zluPtv55vUft2Cctcjh7GXCP1mKXQMp13 -pp0YkVE03HVKTr5tfdzAUhqogSwuTi0NF3n+lVm1dr5aEyRyNxioxTdeccL7u0NU -9QKlC5hydi825N9vJxTgnnRHwc07XSo9HqT59BGb7jrmxwZXF6pdRC+NRA1+cYWY -ITH8MrNG9Tz/1lIgn1Juwm//IJj2aOJlv+zTObueNpLZ21If59VpZmTxqMlcELFH -BNZ3vnzMCdOMNYTKj8g9blcKmH1kjFHVIgVMdGTqdpo7Jg+XLv+Z/McOrTWyaeTv -BSshPpwdXJ7wr6l3Np5jzQgghtcAmg/AOtxpoa/dC8dsf6IRNo5rDEC9aCY49D0V -E4iZlCv1x9k+rgJxLJRHpsm7pjEgZ5pqOYSpVCB6KDzAyS0rGU74gVA0eCifN/W1 -P5JqJI5ELbLULsDvEYy3 -=7Tit +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9nUQAKGjZTPjExi67ljoYyG+GBg+ +OPuIFOvQnENC6mB/snO/8SepowLF4rnM5MNtciLEFLmUsPqawsiRYGxkBQwCAyo3 +q9elVFJDFGOrCaaGMqVSGTgsswNp7ylVhuYjSJ7AmScYMDEZ01I7/E9Ij345702i +WDa+TvbK00D02k46RCIMy563a0Eb3nXj+DgCcsJTCo298Ny2R2IDgyn/s5QygCgc +krMR8E1aEzzGmgxMP482kGXSDRYyNIX3G6PgrWyWqsDvVkaKYAmR0nN630vfFvCq +kyTX9H+gqC5RTfSHL6Pdm8Wkq9jCvtScPe9EKGcLMjSsSMogdPBocfBiHT/LizEq +tVpX33MmIEVmI3Piofbu2CZHaKGa82obcayqbctkhGQmXgcIcMCo0X6Mvk0ipKRn +Va+H9xMaN6QKtxJbQhDevQ1yqkO58sfoS1YtJtlWh9vQygGVB/7UnO7yVtxIeo5D +J5HhsEtlqs822qkkxtUWVR/jpVYLeBrtuCELdAAkmDHDhI5C4sq7TreMSScc6AdJ +gRNf86oyyDrRYp7brUH3PHcso1BOdwhQq8I0AEvdDIoNmnqLFCi1pvvYHsPzUdnX +RFZxGRVdqn5A7BA/z8/k5e7h9s7YaTTTHXrpH4hX2vP0+DKXLZwWcT5mRCtzfvPy +5w1o+IVDUGEB9TRJ53o0 +=u6qt -----END PGP SIGNATURE----- diff --git a/dev-python/pypy/pypy-2.5.0.ebuild b/dev-python/pypy/pypy-2.5.0.ebuild deleted file mode 100644 index ec2309e28c7c..000000000000 --- a/dev-python/pypy/pypy-2.5.0.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.5.0.ebuild,v 1.1 2015/03/22 08:56:03 idella4 Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 pypy ) -inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator - -DESCRIPTION="A fast, compliant alternative implementation of the Python language" -HOMEPAGE="http://pypy.org/" -SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2" - -LICENSE="MIT" -SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk" - -RDEPEND=">=sys-libs/zlib-1.1.3:0= - virtual/libffi:0= - virtual/libintl:0= - dev-libs/expat:0= - dev-libs/openssl:0= - bzip2? ( app-arch/bzip2:0= ) - gdbm? ( sys-libs/gdbm:0= ) - ncurses? ( sys-libs/ncurses:5= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - !dev-python/pypy-bin:0" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) - ${PYTHON_DEPS} - test? ( dev-python/pytest )" -PDEPEND="app-admin/python-updater" - -S="${WORKDIR}/${P}-src" - -pkg_pretend() { - if use low-memory; then - if ! python_is_installed pypy; then - eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy" - eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:" - eerror - eerror " $ emerge -1v dev-python/pypy-bin" - eerror - eerror "before attempting to build dev-python/pypy[low-memory]." - die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory" - fi - - CHECKREQS_MEMORY="1750M" - use amd64 && CHECKREQS_MEMORY="3500M" - else - CHECKREQS_MEMORY="3G" - use amd64 && CHECKREQS_MEMORY="6G" - fi - - check-reqs_pkg_pretend -} - -pkg_setup() { - pkg_pretend - - if python_is_installed pypy; then - if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then - einfo "Using already-installed PyPy to perform the translation." - local EPYTHON=pypy - else - einfo "Using ${EPYTHON} to perform the translation. Please note that upstream" - einfo "recommends using PyPy for that. If you wish to do so, please unset" - einfo "the EPYTHON variable." - fi - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/1.9-scripts-location.patch" \ - "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ - "${FILESDIR}"/${PV}-shared-lib.patch # 517002 - - pushd lib-python/2.7 > /dev/null || die - epatch "${FILESDIR}"/${PV}_all_distutils_cxx.patch - popd > /dev/null || die - - epatch_user -} - -src_compile() { - tc-export CC - - local jit_backend - if use jit; then - jit_backend='--jit-backend=' - - # We only need the explicit sse2 switch for x86. - # On other arches we can rely on autodetection which uses - # compiler macros. Plus, --jit-backend= doesn't accept all - # the modern values... - - if use x86; then - if use cpu_flags_x86_sse2; then - jit_backend+=x86 - else - jit_backend+=x86-without-sse2 - fi - else - jit_backend+=auto - fi - fi - - local args=( - --shared - $(usex jit -Ojit -O2) - $(usex shadowstack --gcrootfinder=shadowstack '') - $(usex sandbox --sandbox '') - - ${jit_backend} - --make-jobs=$(makeopts_jobs) - - pypy/goal/targetpypystandalone - ) - - # Avoid linking against libraries disabled by use flags - local opts=( - bzip2:bz2 - ncurses:_minimal_curses - ) - - local opt - for opt in "${opts[@]}"; do - local flag=${opt%:*} - local mod=${opt#*:} - - args+=( - $(usex ${flag} --withmod --withoutmod)-${mod} - ) - done - - local interp=( "${PYTHON}" ) - if use low-memory; then - interp=( env PYPY_GC_MAX_DELTA=200MB - "${PYTHON}" --jit loop_longevity=300 ) - fi - - set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}" - echo -e "\033[1m${@}\033[0m" - "${@}" || die "compile error" - - use doc && emake -C pypy/doc/ html - pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" -} - -src_test() { - # (unset) - local -x PYTHONDONTWRITEBYTECODE - - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die -} - -src_install() { - einfo "Installing PyPy ..." - insinto "/usr/$(get_libdir)/pypy" - doins -r include lib_pypy lib-python pypy-c libpypy-c.so - fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so - pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so" - dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy - dodoc README.rst - - if ! use gdbm; then - rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die - fi - if ! use sqlite; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ - "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die - fi - if ! use tk; then - rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ - "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ - "${ED%/}${INSDESTTREE}"/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 ..." - - python_export pypy EPYTHON PYTHON PYTHON_SITEDIR - local PYTHON=${ED%/}${INSDESTTREE}/pypy-c - local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" - - echo "EPYTHON='${EPYTHON}'" > epython.py - 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%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die - find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die - - # compile the installed modules - python_optimize "${ED%/}${INSDESTTREE}" -} diff --git a/dev-python/pypy/pypy-2.5.1.ebuild b/dev-python/pypy/pypy-2.5.1.ebuild index bbf50148cbca..4702b1441fc4 100644 --- a/dev-python/pypy/pypy-2.5.1.ebuild +++ b/dev-python/pypy/pypy-2.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.5.1.ebuild,v 1.1 2015/04/12 12:58:04 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.5.1.ebuild,v 1.2 2015/04/12 16:13:21 mgorny Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2" LICENSE="MIT" SLOT="0/$(get_version_component_range 1-2 ${PV})" -KEYWORDS="" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk" RDEPEND=">=sys-libs/zlib-1.1.3:0=