From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-lang/Manifest.gz | Bin 17655 -> 17345 bytes dev-lang/R/Manifest | 10 +- dev-lang/R/R-3.4.1.ebuild | 4 +- dev-lang/R/R-3.5.3.ebuild | 6 +- dev-lang/R/R-3.6.0.ebuild | 6 +- dev-lang/R/R-3.6.2.ebuild | 207 ++++++ .../R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch | 11 + dev-lang/R/files/R-3.6.2-no-gzip-doc.patch | 10 + dev-lang/c-intercal/Manifest | 4 +- dev-lang/c-intercal/c-intercal-30.0.ebuild | 2 +- dev-lang/c-intercal/c-intercal-31.0.ebuild | 2 +- dev-lang/crystal/Manifest | 11 +- dev-lang/crystal/crystal-0.30.1.ebuild | 123 ---- dev-lang/crystal/crystal-0.32.1.ebuild | 121 ++++ ...tal-0.26.1-gentoo-tests-network-sandbox-3.patch | 26 - .../files/crystal-0.27.0-tcp-server-test.patch | 12 - .../crystal/files/crystal-0.27.1-verbose.patch | 7 - dev-lang/erlang/Manifest | 20 +- dev-lang/erlang/erlang-21.1.1.ebuild | 2 +- dev-lang/erlang/erlang-22.1.1.ebuild | 153 ---- dev-lang/erlang/erlang-22.1.4.ebuild | 2 +- dev-lang/erlang/erlang-22.1.7.ebuild | 153 ---- dev-lang/erlang/erlang-22.1.8-r1.ebuild | 2 +- dev-lang/erlang/erlang-22.1.8.ebuild | 153 ---- dev-lang/erlang/erlang-22.2.1-r1.ebuild | 153 ++++ dev-lang/erlang/erlang-22.2.2.ebuild | 154 ++++ dev-lang/erlang/erlang-22.2.ebuild | 2 +- dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch | 45 ++ dev-lang/erlang/metadata.xml | 8 + dev-lang/execline/Manifest | 2 +- dev-lang/execline/metadata.xml | 4 - dev-lang/gforth/Manifest | 2 +- dev-lang/gforth/gforth-0.7.3-r1.ebuild | 4 +- dev-lang/ghc/Manifest | 6 +- dev-lang/ghc/ghc-8.6.5.ebuild | 21 +- dev-lang/ghc/ghc-8.8.1.ebuild | 13 +- dev-lang/go/Manifest | 4 + dev-lang/go/go-1.12.15.ebuild | 246 +++++++ dev-lang/go/go-1.13.6.ebuild | 246 +++++++ dev-lang/hy/Manifest | 22 +- dev-lang/hy/hy-0.10.0.ebuild | 31 - dev-lang/hy/hy-0.10.1.ebuild | 31 - dev-lang/hy/hy-0.11.1.ebuild | 42 -- dev-lang/hy/hy-0.12.0.ebuild | 42 -- dev-lang/hy/hy-0.12.1.ebuild | 42 -- dev-lang/hy/hy-0.13.0.ebuild | 41 -- dev-lang/hy/hy-0.13.1.ebuild | 41 -- dev-lang/hy/hy-0.14.0.ebuild | 4 +- dev-lang/hy/hy-0.15.0.ebuild | 4 +- dev-lang/hy/hy-0.16.0.ebuild | 4 +- dev-lang/hy/hy-0.17.0.ebuild | 4 +- dev-lang/lazarus/Manifest | 2 +- dev-lang/lazarus/lazarus-1.8.4-r2.ebuild | 4 +- dev-lang/lisaac/Manifest | 2 +- dev-lang/lisaac/lisaac-0.13.1-r2.ebuild | 4 +- dev-lang/mercury/Manifest | 2 +- dev-lang/mercury/mercury-14.01.1-r1.ebuild | 6 +- dev-lang/micropython/Manifest | 2 +- dev-lang/micropython/micropython-1.9.4.ebuild | 2 + dev-lang/moarvm/Manifest | 10 +- dev-lang/moarvm/moarvm-2018.06-r1.ebuild | 62 -- dev-lang/moarvm/moarvm-2018.08-r1.ebuild | 62 -- dev-lang/moarvm/moarvm-2018.09-r1.ebuild | 62 -- dev-lang/moarvm/moarvm-2018.12-r1.ebuild | 62 -- dev-lang/moarvm/moarvm-2019.11.ebuild | 62 ++ dev-lang/mozart/Manifest | 4 +- dev-lang/mozart/mozart-1.4.0-r3.ebuild | 2 +- dev-lang/mozart/mozart-1.4.0-r4.ebuild | 2 +- dev-lang/nqp/Manifest | 10 +- dev-lang/nqp/nqp-2018.06-r1.ebuild | 159 ----- dev-lang/nqp/nqp-2018.08-r1.ebuild | 159 ----- dev-lang/nqp/nqp-2018.09-r1.ebuild | 159 ----- dev-lang/nqp/nqp-2018.12-r1.ebuild | 159 ----- dev-lang/nqp/nqp-2019.11.ebuild | 160 +++++ dev-lang/ocaml/Manifest | 2 + dev-lang/ocaml/ocaml-4.09.0.ebuild | 76 ++ dev-lang/opendylan-bin/Manifest | 19 - dev-lang/opendylan-bin/metadata.xml | 8 - dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild | 33 - dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild | 33 - dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild | 33 - dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild | 33 - dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild | 33 - dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild | 34 - dev-lang/opendylan/Manifest | 8 - dev-lang/opendylan/metadata.xml | 8 - dev-lang/opendylan/opendylan-2013.1-r1.ebuild | 100 --- dev-lang/opendylan/opendylan-2013.2.ebuild | 105 --- dev-lang/opendylan/opendylan-2014.1.ebuild | 101 --- dev-lang/opendylan/opendylan-9999.ebuild | 64 -- dev-lang/php/Manifest | 11 +- dev-lang/php/metadata.xml | 5 - dev-lang/php/php-5.6.40-r7.ebuild | 788 --------------------- dev-lang/php/php-7.2.26.ebuild | 751 ++++++++++++++++++++ dev-lang/php/php-7.3.13.ebuild | 752 ++++++++++++++++++++ dev-lang/php/php-7.4.1.ebuild | 742 +++++++++++++++++++ dev-lang/python-exec/Manifest | 4 +- dev-lang/python-exec/python-exec-2.4.6-r1.ebuild | 11 +- dev-lang/python-exec/python-exec-9999.ebuild | 11 +- dev-lang/python/Manifest | 58 +- dev-lang/python/files/3.6-disable-nis.patch | 21 - dev-lang/python/files/3.6.5-disable-nis.patch | 11 - .../files/python-3.4.3-ncurses-pkg-config.patch | 13 - .../files/python-3.5-distutils-OO-build.patch | 80 --- .../python/files/python-3.5.5-hash-unaligned.patch | 43 -- .../python-3.5.5-libressl-compatibility.patch | 69 -- .../python/files/python-3.6.5-hash-unaligned.patch | 42 -- .../python-3.6.5-libressl-compatibility.patch | 114 --- dev-lang/python/python-2.7.15.ebuild | 359 ---------- dev-lang/python/python-2.7.16.ebuild | 361 ---------- dev-lang/python/python-2.7.17-r1.ebuild | 363 ++++++++++ dev-lang/python/python-2.7.17.ebuild | 2 +- dev-lang/python/python-3.5.5.ebuild | 365 ---------- dev-lang/python/python-3.5.7.ebuild | 368 ---------- dev-lang/python/python-3.5.9.ebuild | 368 ---------- dev-lang/python/python-3.6.10.ebuild | 353 +++++++++ dev-lang/python/python-3.6.5.ebuild | 346 --------- dev-lang/python/python-3.6.8.ebuild | 349 --------- dev-lang/python/python-3.6.9.ebuild | 3 +- dev-lang/python/python-3.7.2.ebuild | 325 --------- dev-lang/python/python-3.7.3.ebuild | 328 --------- dev-lang/python/python-3.7.4-r1.ebuild | 328 --------- dev-lang/python/python-3.7.5-r1.ebuild | 5 +- dev-lang/python/python-3.7.5.ebuild | 328 --------- dev-lang/python/python-3.7.6.ebuild | 339 +++++++++ dev-lang/python/python-3.8.0.ebuild | 331 --------- dev-lang/python/python-3.8.1.ebuild | 342 +++++++++ dev-lang/python/python-3.9.0_alpha2.ebuild | 323 +++++++++ dev-lang/rakudo/Manifest | 12 +- dev-lang/rakudo/rakudo-2018.06.ebuild | 73 -- dev-lang/rakudo/rakudo-2018.08.ebuild | 73 -- dev-lang/rakudo/rakudo-2018.09.ebuild | 73 -- dev-lang/rakudo/rakudo-2018.12.ebuild | 73 -- dev-lang/rakudo/rakudo-2019.11.ebuild | 73 ++ dev-lang/rakudo/rakudo-9999.ebuild | 2 +- dev-lang/ruby/Manifest | 5 +- .../ruby/files/2.7/010-default-gem-location.patch | 20 + dev-lang/ruby/ruby-2.5.7.ebuild | 2 +- dev-lang/ruby/ruby-2.7.0.ebuild | 238 +++++++ dev-lang/rust-bin/Manifest | 62 +- dev-lang/rust-bin/rust-bin-1.34.2.ebuild | 172 ----- dev-lang/rust-bin/rust-bin-1.35.0.ebuild | 162 ----- dev-lang/rust-bin/rust-bin-1.36.0.ebuild | 158 ----- dev-lang/rust-bin/rust-bin-1.37.0.ebuild | 2 +- dev-lang/rust-bin/rust-bin-1.38.0.ebuild | 4 +- dev-lang/rust-bin/rust-bin-1.39.0.ebuild | 2 +- dev-lang/rust-bin/rust-bin-1.40.0.ebuild | 158 +++++ dev-lang/rust/Manifest | 72 +- dev-lang/rust/files/1.34.0-doc-build-fix.patch | 442 ------------ dev-lang/rust/files/1.34.0-libressl.patch | 29 - dev-lang/rust/files/1.40.0-add-soname.patch | 36 + dev-lang/rust/metadata.xml | 7 + dev-lang/rust/rust-1.34.2.ebuild | 342 --------- dev-lang/rust/rust-1.35.0.ebuild | 350 --------- dev-lang/rust/rust-1.36.0.ebuild | 326 --------- dev-lang/rust/rust-1.37.0.ebuild | 6 +- dev-lang/rust/rust-1.38.0.ebuild | 8 +- dev-lang/rust/rust-1.39.0.ebuild | 6 +- dev-lang/rust/rust-1.40.0-r1.ebuild | 342 +++++++++ dev-lang/rust/rust-1.40.0.ebuild | 329 +++++++++ dev-lang/scala/Manifest | 8 +- dev-lang/scala/files/scala-2.12.10-no-git.patch | 37 + dev-lang/scala/scala-2.12.10.ebuild | 198 ++++++ dev-lang/scala/scala-2.12.4.ebuild | 3 +- dev-lang/swi-prolog/Manifest | 14 +- dev-lang/swi-prolog/swi-prolog-8.1.14.ebuild | 100 --- dev-lang/swi-prolog/swi-prolog-8.1.15.ebuild | 106 --- dev-lang/swi-prolog/swi-prolog-8.1.16.ebuild | 106 --- dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild | 106 +++ dev-lang/swi-prolog/swi-prolog-8.1.18.ebuild | 106 +++ dev-lang/swi-prolog/swi-prolog-8.1.19.ebuild | 106 +++ dev-lang/swi-prolog/swi-prolog-8.1.20.ebuild | 106 +++ dev-lang/teyjus/Manifest | 4 +- dev-lang/teyjus/teyjus-2.1-r1.ebuild | 2 +- dev-lang/teyjus/teyjus-2.1.ebuild | 4 +- dev-lang/vala/Manifest | 20 +- dev-lang/vala/vala-0.36.18.ebuild | 38 - dev-lang/vala/vala-0.36.20.ebuild | 4 +- dev-lang/vala/vala-0.40.14.ebuild | 54 -- dev-lang/vala/vala-0.40.16.ebuild | 4 +- dev-lang/vala/vala-0.40.18.ebuild | 54 ++ dev-lang/vala/vala-0.42.7.ebuild | 54 -- dev-lang/vala/vala-0.44.11.ebuild | 52 ++ dev-lang/vala/vala-0.44.9.ebuild | 4 +- dev-lang/vala/vala-0.46.3.ebuild | 49 -- dev-lang/vala/vala-0.46.5.ebuild | 49 ++ dev-lang/zig/Manifest | 4 +- dev-lang/zig/zig-0.5.0.ebuild | 8 +- dev-lang/zig/zig-9999.ebuild | 8 +- 189 files changed, 7727 insertions(+), 10865 deletions(-) create mode 100644 dev-lang/R/R-3.6.2.ebuild create mode 100644 dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch create mode 100644 dev-lang/R/files/R-3.6.2-no-gzip-doc.patch delete mode 100644 dev-lang/crystal/crystal-0.30.1.ebuild create mode 100644 dev-lang/crystal/crystal-0.32.1.ebuild delete mode 100644 dev-lang/crystal/files/crystal-0.26.1-gentoo-tests-network-sandbox-3.patch delete mode 100644 dev-lang/crystal/files/crystal-0.27.0-tcp-server-test.patch delete mode 100644 dev-lang/crystal/files/crystal-0.27.1-verbose.patch delete mode 100644 dev-lang/erlang/erlang-22.1.1.ebuild delete mode 100644 dev-lang/erlang/erlang-22.1.7.ebuild delete mode 100644 dev-lang/erlang/erlang-22.1.8.ebuild create mode 100644 dev-lang/erlang/erlang-22.2.1-r1.ebuild create mode 100644 dev-lang/erlang/erlang-22.2.2.ebuild create mode 100644 dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch create mode 100644 dev-lang/go/go-1.12.15.ebuild create mode 100644 dev-lang/go/go-1.13.6.ebuild delete mode 100644 dev-lang/hy/hy-0.10.0.ebuild delete mode 100644 dev-lang/hy/hy-0.10.1.ebuild delete mode 100644 dev-lang/hy/hy-0.11.1.ebuild delete mode 100644 dev-lang/hy/hy-0.12.0.ebuild delete mode 100644 dev-lang/hy/hy-0.12.1.ebuild delete mode 100644 dev-lang/hy/hy-0.13.0.ebuild delete mode 100644 dev-lang/hy/hy-0.13.1.ebuild delete mode 100644 dev-lang/moarvm/moarvm-2018.06-r1.ebuild delete mode 100644 dev-lang/moarvm/moarvm-2018.08-r1.ebuild delete mode 100644 dev-lang/moarvm/moarvm-2018.09-r1.ebuild delete mode 100644 dev-lang/moarvm/moarvm-2018.12-r1.ebuild create mode 100644 dev-lang/moarvm/moarvm-2019.11.ebuild delete mode 100644 dev-lang/nqp/nqp-2018.06-r1.ebuild delete mode 100644 dev-lang/nqp/nqp-2018.08-r1.ebuild delete mode 100644 dev-lang/nqp/nqp-2018.09-r1.ebuild delete mode 100644 dev-lang/nqp/nqp-2018.12-r1.ebuild create mode 100644 dev-lang/nqp/nqp-2019.11.ebuild create mode 100644 dev-lang/ocaml/ocaml-4.09.0.ebuild delete mode 100644 dev-lang/opendylan-bin/Manifest delete mode 100644 dev-lang/opendylan-bin/metadata.xml delete mode 100644 dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild delete mode 100644 dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild delete mode 100644 dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild delete mode 100644 dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild delete mode 100644 dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild delete mode 100644 dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild delete mode 100644 dev-lang/opendylan/Manifest delete mode 100644 dev-lang/opendylan/metadata.xml delete mode 100644 dev-lang/opendylan/opendylan-2013.1-r1.ebuild delete mode 100644 dev-lang/opendylan/opendylan-2013.2.ebuild delete mode 100644 dev-lang/opendylan/opendylan-2014.1.ebuild delete mode 100644 dev-lang/opendylan/opendylan-9999.ebuild delete mode 100644 dev-lang/php/php-5.6.40-r7.ebuild create mode 100644 dev-lang/php/php-7.2.26.ebuild create mode 100644 dev-lang/php/php-7.3.13.ebuild create mode 100644 dev-lang/php/php-7.4.1.ebuild delete mode 100644 dev-lang/python/files/3.6-disable-nis.patch delete mode 100644 dev-lang/python/files/3.6.5-disable-nis.patch delete mode 100644 dev-lang/python/files/python-3.4.3-ncurses-pkg-config.patch delete mode 100644 dev-lang/python/files/python-3.5-distutils-OO-build.patch delete mode 100644 dev-lang/python/files/python-3.5.5-hash-unaligned.patch delete mode 100644 dev-lang/python/files/python-3.5.5-libressl-compatibility.patch delete mode 100644 dev-lang/python/files/python-3.6.5-hash-unaligned.patch delete mode 100644 dev-lang/python/files/python-3.6.5-libressl-compatibility.patch delete mode 100644 dev-lang/python/python-2.7.15.ebuild delete mode 100644 dev-lang/python/python-2.7.16.ebuild create mode 100644 dev-lang/python/python-2.7.17-r1.ebuild delete mode 100644 dev-lang/python/python-3.5.5.ebuild delete mode 100644 dev-lang/python/python-3.5.7.ebuild delete mode 100644 dev-lang/python/python-3.5.9.ebuild create mode 100644 dev-lang/python/python-3.6.10.ebuild delete mode 100644 dev-lang/python/python-3.6.5.ebuild delete mode 100644 dev-lang/python/python-3.6.8.ebuild delete mode 100644 dev-lang/python/python-3.7.2.ebuild delete mode 100644 dev-lang/python/python-3.7.3.ebuild delete mode 100644 dev-lang/python/python-3.7.4-r1.ebuild delete mode 100644 dev-lang/python/python-3.7.5.ebuild create mode 100644 dev-lang/python/python-3.7.6.ebuild delete mode 100644 dev-lang/python/python-3.8.0.ebuild create mode 100644 dev-lang/python/python-3.8.1.ebuild create mode 100644 dev-lang/python/python-3.9.0_alpha2.ebuild delete mode 100644 dev-lang/rakudo/rakudo-2018.06.ebuild delete mode 100644 dev-lang/rakudo/rakudo-2018.08.ebuild delete mode 100644 dev-lang/rakudo/rakudo-2018.09.ebuild delete mode 100644 dev-lang/rakudo/rakudo-2018.12.ebuild create mode 100644 dev-lang/rakudo/rakudo-2019.11.ebuild create mode 100644 dev-lang/ruby/files/2.7/010-default-gem-location.patch create mode 100644 dev-lang/ruby/ruby-2.7.0.ebuild delete mode 100644 dev-lang/rust-bin/rust-bin-1.34.2.ebuild delete mode 100644 dev-lang/rust-bin/rust-bin-1.35.0.ebuild delete mode 100644 dev-lang/rust-bin/rust-bin-1.36.0.ebuild create mode 100644 dev-lang/rust-bin/rust-bin-1.40.0.ebuild delete mode 100644 dev-lang/rust/files/1.34.0-doc-build-fix.patch delete mode 100644 dev-lang/rust/files/1.34.0-libressl.patch create mode 100644 dev-lang/rust/files/1.40.0-add-soname.patch delete mode 100644 dev-lang/rust/rust-1.34.2.ebuild delete mode 100644 dev-lang/rust/rust-1.35.0.ebuild delete mode 100644 dev-lang/rust/rust-1.36.0.ebuild create mode 100644 dev-lang/rust/rust-1.40.0-r1.ebuild create mode 100644 dev-lang/rust/rust-1.40.0.ebuild create mode 100644 dev-lang/scala/files/scala-2.12.10-no-git.patch create mode 100644 dev-lang/scala/scala-2.12.10.ebuild delete mode 100644 dev-lang/swi-prolog/swi-prolog-8.1.14.ebuild delete mode 100644 dev-lang/swi-prolog/swi-prolog-8.1.15.ebuild delete mode 100644 dev-lang/swi-prolog/swi-prolog-8.1.16.ebuild create mode 100644 dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild create mode 100644 dev-lang/swi-prolog/swi-prolog-8.1.18.ebuild create mode 100644 dev-lang/swi-prolog/swi-prolog-8.1.19.ebuild create mode 100644 dev-lang/swi-prolog/swi-prolog-8.1.20.ebuild delete mode 100644 dev-lang/vala/vala-0.36.18.ebuild delete mode 100644 dev-lang/vala/vala-0.40.14.ebuild create mode 100644 dev-lang/vala/vala-0.40.18.ebuild delete mode 100644 dev-lang/vala/vala-0.42.7.ebuild create mode 100644 dev-lang/vala/vala-0.44.11.ebuild delete mode 100644 dev-lang/vala/vala-0.46.3.ebuild create mode 100644 dev-lang/vala/vala-0.46.5.ebuild (limited to 'dev-lang') diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 126ee370afa9..0b1f4712c587 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 6e9930466e13..221695d4edd6 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,10 +1,14 @@ AUX R-3.4.1-parallel.patch 487 BLAKE2B bb596d66fab359511c6364ac06cbbe311decd3201292c55e3350e1fc3639c36049c88b1e90adf132da67e1835b646d882415559716727e62217b1c1c679711f0 SHA512 6bc59ebd6c0599110218a70a03030877df8a7fb70d17204a365330d9aa71f7b0688a2502c64b341c478061041da43eb0b0d08cfe63e3e394236142c7d148d778 AUX R-3.4.1-rmath-shared.patch 899 BLAKE2B 0aba9c1c5417531647bed3829d53909e6f3983dea3f3de149c0ef270a8bc4eddc46dab4cbdc7cce78c0c163446a4d3a014afc9bc571f0d4a61cfa6827e40f16b SHA512 20c62b774149ae1959d28217a1be6f30968562de3ad5e4a8d7bfc7c579ca5c35fcd1304d68e222be0a37cb6db9b946fbe82d21a26fecccbecea1401b8c0b25d4 +AUX R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch 469 BLAKE2B ee716b068316bbac0c07fe44bef739a491af5f4e90ba268cf7db428350763d498ab0b1bc9efa02ac885d0ac64aa5d076deaac094725766e340cbcd9d7e839b22 SHA512 cb7bc73fd0f1aa4159b25bc76318074662afddafdef8acc8caf20afb98da6c065c3bd0895c4a7a7f18a174d21d59c0f054a46aa513db1b5b622a110e7c54e171 +AUX R-3.6.2-no-gzip-doc.patch 443 BLAKE2B 1154e9f67f08e1d8b286152bd093789a0b94b3a2422bdb54d1d1d03729bd892811e68121309c41ef4323ed31efcea82f3e265b37445e9870bbd88c5413311345 SHA512 99678dbf809761a2991cd5cbe6ff5ba8d1c3e9388f69d94b30726caae4eee29ae50ee74aa24e3851d41559f804381ec18a2cd818b97b5417bf7ae660c93ad2a6 DIST R-3.4.1.tar.gz 30200109 BLAKE2B 03602e9a48759caee8ce047fa6273df7a54af089de4489e21953c0e3fc7bfdf720d924f1e0167d3dbf65f63ed42ac10dea8b45289b921cda1c0e6d25a0063ebb SHA512 19bd50c87dc001ef947c15c1760f27ac8986ff6b43c6d90d3093ae184e42963027ef06faf31ec57ac9e519af7a35a2f53f8ea23ef75d800ebbd02945cedc4651 DIST R-3.5.3.tar.gz 30205979 BLAKE2B 60dde4c1a7874df0b113630577d943d581d9e0844383a5cb7eda7f62470177d541704a888c33ded216f8b1f088cda493d7716693f5e2451effe3639ce2286dd1 SHA512 077cbd4bc9f19a3a2485afbd4d8e08e0754ddcb9a10164cbc8478f239d5ed0ffaf6796929f154cce1c8aea549c32d460049fc036dc326174d1dbb0a1ddb5f5ef DIST R-3.6.0.tar.gz 30449618 BLAKE2B 2fb2f1252f5ead97ab42eb1f71fa0be1e8aec2f6cce182956ec1c35b43b70b58f579faf5f3ca11efb8e9c24a9ed836b5b690cb23858249bc7f575aca4709bc3b SHA512 b2e17b909b6387abb964492e2e9370f913295ca7ac99bab0e965c43ed3c4635e27468c326fb2bca3c529b03c731b0170d9e777a194ad4d6c5a983c050223d8c8 +DIST R-3.6.2.tar.gz 33311930 BLAKE2B 53f344e80e017064a275c271d98be714e210193931a120e7ebc79ee6cf0ebc0c24c090acc25560998f26600c05305147816ab782632d99beaea83b3a9b5e2a21 SHA512 17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 -EBUILD R-3.4.1.ebuild 6307 BLAKE2B 56963ae2e76edb644639667bfdf3211cb884b13c903e635a946dc3e675c1025ffc18ce1b84de2085bb8727b4aeb0c0bba2b42bfb3590e9042d67a9ef825e3012 SHA512 d8c51ab334063f7b1bb148c3d0288f743a70b14947a0ea4d0e495977435f0547e96b82fc50f6e179f3dcb211c2b4171fb5bbd4212dac6aaaab0397339fc6a869 -EBUILD R-3.5.3.ebuild 6306 BLAKE2B 198df68c0ee06adbc10cbae13b18b60d222eda6cbbe32020ca04e324d68dfbaa3617852cc1eea2d15c324c3ddd84e0b366655b56be1b1ffc73cc63cfa197c21f SHA512 5950e847dc6ab3c16ffb879c6ed86d0c4f644cfd4fea5b250b735fee631dfeaa0cd62afd8fa28ca0874dbfb40d0a95ab98dc60289411d1b1956723b05dd1d3dc -EBUILD R-3.6.0.ebuild 6306 BLAKE2B 198df68c0ee06adbc10cbae13b18b60d222eda6cbbe32020ca04e324d68dfbaa3617852cc1eea2d15c324c3ddd84e0b366655b56be1b1ffc73cc63cfa197c21f SHA512 5950e847dc6ab3c16ffb879c6ed86d0c4f644cfd4fea5b250b735fee631dfeaa0cd62afd8fa28ca0874dbfb40d0a95ab98dc60289411d1b1956723b05dd1d3dc +EBUILD R-3.4.1.ebuild 6283 BLAKE2B 87469504881749122a9db87b227ec4be47439fef0080d872ce9c395e4168e06bbf92725f79c4cc36c81c0a0ae9dc7a99eeab2e92eb779575f394924bcc94cffc SHA512 dc3833f5e0312728c7b9c55e07c83533da0f97d76a0769d78d1146b9576b92b1a130571f6b2b02f841474e1110d1624458855e354e6e1b14688cebc458ee9f7a +EBUILD R-3.5.3.ebuild 6289 BLAKE2B a298e4c489687a7f085ae912d8c3cd2f828507a75cf1de6e6ccc96070e266bac44410241058be1d89b8cf7554e546fd85bd7b9df615c4d1080fcd7dafd17ec0e SHA512 53b5a749a55e8fb82ff1aa160d79ec50bac06fb7978aee3376bddf7a57f6826a964b938ec53775b8744dbeea3990ffa77f7a33e91c4dfa44304e71683ac41d71 +EBUILD R-3.6.0.ebuild 6289 BLAKE2B a298e4c489687a7f085ae912d8c3cd2f828507a75cf1de6e6ccc96070e266bac44410241058be1d89b8cf7554e546fd85bd7b9df615c4d1080fcd7dafd17ec0e SHA512 53b5a749a55e8fb82ff1aa160d79ec50bac06fb7978aee3376bddf7a57f6826a964b938ec53775b8744dbeea3990ffa77f7a33e91c4dfa44304e71683ac41d71 +EBUILD R-3.6.2.ebuild 6370 BLAKE2B 0a703870c07c856a130f04a6d6b4c34e7d45d8104b7b78a95a176c327d7a6cef5d8fc36972c693f65f5a2f08cfe8f41c1b333bd21bfe48ef87686935d40a1438 SHA512 43654976d259bbdcb67d9b5356899ffd27e54b7e5ea240804b2a51a33df98abc8f29e00758dc929d8e9bd742d61f545cbfcb2fe65c887d21f579bcec1b3557d6 MISC metadata.xml 1140 BLAKE2B 774221eb531b4e80f0650b627b9ce53d9a2daf6342b1f19579d2d046e1c83aa497cc764870406b7ea3cf6cbae899cb6d460af92991d62bc6aea8da026a441822 SHA512 297c7e17998f92fb836b0599ce5221aee1ba1e7b1504edb348a602b695faf381d51f32f6118f5ef4bb353f02e92ffc5b3520b8d317d3e30a68a3cce0254fa6b1 diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild index 703845547de2..7c3401e2fc95 100644 --- a/dev-lang/R/R-3.4.1.ebuild +++ b/dev-lang/R/R-3.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,7 +27,7 @@ CDEPEND=" >=dev-libs/libpcre-8.35:3= net-misc/curl virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) + || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) diff --git a/dev-lang/R/R-3.5.3.ebuild b/dev-lang/R/R-3.5.3.ebuild index 1d09832746b5..df86d7063895 100644 --- a/dev-lang/R/R-3.5.3.ebuild +++ b/dev-lang/R/R-3.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" @@ -28,7 +28,7 @@ CDEPEND=" net-libs/libtirpc net-misc/curl virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) + || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) diff --git a/dev-lang/R/R-3.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild index 1d09832746b5..df86d7063895 100644 --- a/dev-lang/R/R-3.6.0.ebuild +++ b/dev-lang/R/R-3.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" @@ -28,7 +28,7 @@ CDEPEND=" net-libs/libtirpc net-misc/curl virtual/blas:0 - || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) + || ( >=sys-apps/coreutils-8.15 app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) diff --git a/dev-lang/R/R-3.6.2.ebuild b/dev-lang/R/R-3.6.2.ebuild new file mode 100644 index 000000000000..b428a1112711 --- /dev/null +++ b/dev-lang/R/R-3.6.2.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib toolchain-funcs + +# latest git commit for R bash completion: https://github.com/deepayan/rcompletion +BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6 + +DESCRIPTION="Language and environment for statistical computing and graphics" +HOMEPAGE="http://www.r-project.org/" +SRC_URI=" + mirror://cran/src/base/R-3/${P}.tar.gz + https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion" + +LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" +REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" + +CDEPEND=" + app-arch/bzip2:0= + app-arch/xz-utils:0= + app-text/ghostscript-gpl + dev-libs/libpcre:3= + net-libs/libtirpc + net-misc/curl + virtual/blas:0 + || ( sys-apps/coreutils app-misc/realpath ) + cairo? ( x11-libs/cairo:0=[X=] x11-libs/pango:0= ) + icu? ( dev-libs/icu:= ) + jpeg? ( virtual/jpeg:0 ) + lapack? ( virtual/lapack:0 ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng:0= ) + readline? ( sys-libs/readline:0= ) + tiff? ( media-libs/tiff:0= ) + tk? ( dev-lang/tk:0= ) + X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" + +DEPEND="${CDEPEND} + virtual/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-fontsrecommended + )" + +RDEPEND="${CDEPEND} + sys-libs/zlib:0[minizip] + java? ( >=virtual/jre-1.5 )" + +RESTRICT="minimal? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.4.1-parallel.patch + "${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch + "${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch + "${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + if ! tc-check-openmp; then + ewarn "OpenMP is not available in your current selected compiler" + die "need openmp capable compiler" + fi + FORTRAN_NEED_OPENMP=1 + fi + fortran-2_pkg_setup + filter-ldflags -Wl,-Bdirect -Bdirect + # avoid using existing R installation + unset R_HOME + # Temporary fix for bug #419761 + if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then + append-flags -fno-ipa-cp-clone + fi +} + +src_prepare() { + default + + # fix packages.html for doc (gentoo bug #205103) + sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ + -i src/library/tools/R/Rd.R || die + + # fix Rscript path when installed (gentoo bug #221061) + sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT%/}/usr/$(get_libdir)/${PN}\"':" \ + -i src/unix/Makefile.in || die "sed unix Makefile failed" + + # fix HTML links to manual (gentoo bug #273957) + sed -e 's:\.\./manual/:manual/:g' \ + -i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" + + use lapack && \ + export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" + + if use X; then + export R_BROWSER="$(type -p xdg-open)" + export R_PDFVIEWER="$(type -p xdg-open)" + fi + use perl && \ + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" + + # don't search /usr/local + sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die + # Fix for Darwin (OS X) + if use prefix; then + if [[ ${CHOST} == *-darwin* ]] ; then + sed -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ + -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ + -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ + -e "/SHLIB_EXT/s/\.so/.dylib/" \ + -i configure.ac || die + # sort of "undo" 2.14.1-rmath-shared.patch + sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ + -i src/nmath/standalone/Makefile.in || die + else + append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" + fi + fi + AT_M4DIR=m4 + eautoreconf +} + +src_configure() { + # --with-system-tre \ + # tre is patched from upstream + econf \ + --enable-byte-compiled-packages \ + --enable-R-shlib \ + --disable-R-framework \ + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable java) \ + $(use_enable nls) \ + $(use_enable openmp) \ + $(use_enable profile R-profiling) \ + $(use_enable profile memory-profiling) \ + $(use_enable static-libs static) \ + $(use_enable static-libs R-static-lib) \ + $(use_with cairo) \ + $(use_with icu ICU) \ + $(use_with jpeg jpeglib) \ + $(use_with lapack) \ + $(use_with !minimal recommended-packages) \ + $(use_with png libpng) \ + $(use_with readline) \ + $(use_with tiff libtiff) \ + $(use_with tk tcltk) \ + $(use_with tk tk-config "${EPREFIX}"/usr/$(get_libdir)/tkConfig.sh) \ + $(use_with tk tcl-config "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \ + $(use_with X x) +} + +src_compile() { + export VARTEXFONTS="${T}/fonts" + emake AR="$(tc-getAR)" + emake -C src/nmath/standalone \ + shared $(use static-libs && echo static) AR="$(tc-getAR)" + use doc && emake info pdf +} + +src_install() { + default + emake -j1 -C src/nmath/standalone DESTDIR="${D}" install + + if use doc; then + emake DESTDIR="${D}" install-info install-pdf + dosym ../manual /usr/share/doc/${PF}/html/manual + fi + + cat > 99R <<-EOF + LDPATH=${EROOT%/}/usr/$(get_libdir)/${PN}/lib + R_HOME=${EROOT%/}/usr/$(get_libdir)/${PN} + EOF + doenvd 99R + newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${PN} + # The buildsystem has a different understanding of install_names than + # we require. Since it builds modules like shared objects (wrong), many + # objects (all modules) get an incorrect install_name. Fixing the build + # system here is not really trivial. + if [[ ${CHOST} == *-darwin* ]] ; then + local mod + pushd "${ED}"/usr/$(get_libdir)/R > /dev/null + for mod in $(find . -name "*.dylib") ; do + mod=${mod#./} + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" \ + "${mod}" + done + popd > /dev/null + fi + docompress -x /usr/share/doc/${PF}/{BioC_mirrors.csv,CRAN_mirrors.csv,KEYWORDS.db,NEWS.rds} +} + +pkg_postinst() { + if use java; then + einfo "Re-initializing java paths for ${P}" + R CMD javareconf + fi +} diff --git a/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch b/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch new file mode 100644 index 000000000000..2bcf50ccadb2 --- /dev/null +++ b/dev-lang/R/files/R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch @@ -0,0 +1,11 @@ +--- R-3.6.2-orig/src/unix/Makefile.in 2019-03-29 10:02:31.000000000 +1100 ++++ R-3.6.2/src/unix/Makefile.in 2020-01-13 22:39:14.506804106 +1100 +@@ -79,7 +79,7 @@ + -e "s:@rincludedir:$(rincludedir):" \ + -e "s:@rarch:$(R_ARCH):" \ + -e 's:@libsprivate:$(STATIC_LIBR_PC):' \ +- -e 's:@others:$(MAIN_LDFLAGS) $(LDFLAGS):' \ ++ -e 's:@others:$(MAIN_LDFLAGS):' \ + -e 's/@VERSION/$(VERSION)/' $(srcdir)/libR.pc.in \ + > "$(DESTDIR)$(libdir)/pkgconfig/libR.pc" + diff --git a/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch b/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch new file mode 100644 index 000000000000..c87b61780529 --- /dev/null +++ b/dev-lang/R/files/R-3.6.2-no-gzip-doc.patch @@ -0,0 +1,10 @@ +--- R-3.6.2-orig/doc/manual/Makefile.in 2019-03-29 10:02:40.000000000 +1100 ++++ R-3.6.2/doc/manual/Makefile.in 2020-01-13 22:17:31.324967094 +1100 +@@ -345,7 +345,6 @@ + @$(ECHO) "installing R info pages ..." + @for f in $(OBJECTS_INFO:.info=.info*); do \ + $(INSTALL_DATA) $${f} "$(DESTDIR)$(infodir)"; \ +- $(R_GZIPCMD) -f "$(DESTDIR)$(infodir)/$${f}"; \ + done + @$(ECHO) "updating '$(infodir)/dir' ..." + @for f in $(OBJECTS_INFO); do \ diff --git a/dev-lang/c-intercal/Manifest b/dev-lang/c-intercal/Manifest index f942a933e65c..7f0281ebbb3f 100644 --- a/dev-lang/c-intercal/Manifest +++ b/dev-lang/c-intercal/Manifest @@ -4,6 +4,6 @@ AUX c-intercal-30.0-yywrap.patch 282 BLAKE2B 0417757240a476c845398db4e2644c5333d AUX c-intercal-31.0-version.patch 330 BLAKE2B f7a18b5098c6969ea29c21513221e3dd6f6cce847ceca102f8d3a0713d18bbdfd11b1349b0463f7338ef69ccb2b08aa8162e91860b26338c577647728e1261db SHA512 cfb0c79e76b19938fda232cf508e32812aa4edad2eb6545eef84f6bdfd8304666911ca4042450c4642699a41a140f4e199acf0f8d9ab0f24ab8daa81a89d3393 DIST intercal-0.30.tar.gz 930759 BLAKE2B c8c9b77c31901da8f7dbd5a76c2d6fa900962c69f4ca56835f750f40370d5161f6311cbe5473cdb7342772c1cc5317e51d91e174cb16985565adacd001fc1f29 SHA512 e82f52082a73e0eb6116026f78fdcc38369f54af828b9ed0d3ca6ed6c40550bfa81db4ca7c4d09015b5db5104a1c06229cfed52e1d202c3a7443f933fbcc0498 DIST intercal-0.31.tar.gz 940950 BLAKE2B 9a23229b1d7f0524b164a4b66bcab4fdf67a04ba1e411365a46a90d646867fe92d6e328935b406673809535a895becde934fb6cf2e8380943eb8f19473fcedab SHA512 ca5c10be880ce2470d7dd3404fa5a314bd7bcab45cf4908f7108eb1baa50339b876e135251d991527881b564027c63dc38d74a154cbd00d606261013d2b01262 -EBUILD c-intercal-30.0.ebuild 1666 BLAKE2B 3e75704a59f4b2c71f276c1203228e08b0cad4ff806863cc37bdbdfe79b40646133b58c98c3742a2c72561c3a8ff8261889919eeaa8b3ae2d70ce91c967fc54e SHA512 c78e0dd77d3831c5c901b3873f78d917c3d4f9662fdee52a9327bda5ca019e88cae584b03131272c6fa0a4e41f630eff6c6ba2a305d0fcaa8fbc1866288f6f74 -EBUILD c-intercal-31.0.ebuild 1643 BLAKE2B 2a35d025378ad1dff94e0df26e7c9a083c40a49522d4e7cc7d431de09ae5c2fb4efe5b9a0014dae30c7bb6cf6304b1a6e9b3ad66aa34f97ab861e648cd05cc1c SHA512 236f1ba6ad72987744418ac36c9daa19888c888caa066c75f17113560318c1e3023be2f2e85f9024d73cd6dd837b73da291ab2bfc91d5462842dae055b71295b +EBUILD c-intercal-30.0.ebuild 1679 BLAKE2B 958eb5d642f9ec4d3dd86f7d92dd5b05d57c0704d2dcb790b9092ca309c27daab6d03e55b79f8456bcac1ac9d4efd007d1c66b906db7d1bdb89d6fbec5479139 SHA512 d2e53e0de70ecca549e65a4dd0862228fb904fc5fcb404dfc76a28f65b2e2f2d6bdc486384f871d178e9036f2af75102b687de03b4eef93f7744ace7a9f6d4fa +EBUILD c-intercal-31.0.ebuild 1656 BLAKE2B f6a26583c91c48bce21462e54f09528d24eaa3a2ecb85d838df01a7b6cf51a92b323614c3df3d8ad3fab2c50159e388afdee2dc74cddd1b31b6307634c5cc8ac SHA512 feb90dfd415884128597c484b5a3bfb44d511c709452e24e3969908eebc94af0fa7b960f27028e1faae2f8e5fdf336b77097f5015a0d132c596cceadbf80f726 MISC metadata.xml 592 BLAKE2B 8d07802ff5f3cbedb9643b61c469214284c5d21dbaf7aa2afa1c706cf0c9ebe0af2903f3bada0145fd0fe648fe46678919a730f88a2c38c84d149416a8095b11 SHA512 d2b9dad8dd7a03744904ccee87ba17ed726b0005b6bd685d7b926b4657e57c9456d8a7f57deedf260efd543b42c157c13876cf6942cd1f47fee88f0782dac13d diff --git a/dev-lang/c-intercal/c-intercal-30.0.ebuild b/dev-lang/c-intercal/c-intercal-30.0.ebuild index 26692e4f5704..dc79132dad03 100644 --- a/dev-lang/c-intercal/c-intercal-30.0.ebuild +++ b/dev-lang/c-intercal/c-intercal-30.0.ebuild @@ -32,7 +32,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="emacs examples" -RDEPEND="emacs? ( virtual/emacs )" +RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" DEPEND="${RDEPEND} sys-devel/flex virtual/yacc" diff --git a/dev-lang/c-intercal/c-intercal-31.0.ebuild b/dev-lang/c-intercal/c-intercal-31.0.ebuild index d8304c53a3d3..fa55b57e11b6 100644 --- a/dev-lang/c-intercal/c-intercal-31.0.ebuild +++ b/dev-lang/c-intercal/c-intercal-31.0.ebuild @@ -32,7 +32,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="emacs examples" -RDEPEND="emacs? ( virtual/emacs )" +RDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" BDEPEND="${RDEPEND} sys-devel/flex virtual/yacc" diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest index 469e9f21793d..6b56cbb75aa1 100644 --- a/dev-lang/crystal/Manifest +++ b/dev-lang/crystal/Manifest @@ -1,24 +1,21 @@ AUX crystal-0.22.0-blocking-stdio-hack.patch 564 BLAKE2B ca388a6e18ef26d03bd0ef25f30a5424dbd814387e832a6f8a1e8f1097f180a4f3393df5c2d733259cb46f0be3e466d2496baa9b9e76eb2e4bb5968882cba513 SHA512 51df3a464efc7b34db970854577d89027177179cb4e72fdf74b6c9ae754749e30c93155bb18a5daf22db78b0f8985ec341092a95435f8de19800c33bca2f983e -AUX crystal-0.26.1-gentoo-tests-network-sandbox-3.patch 1058 BLAKE2B 715639da29dafee6ecfcdf309f3149d9ed6387904bb50d8cb4bfef295c2d675fee78f0a436e4ab0d6a23e1eb94fec6ef9e549cb415f578ca0578792e54d0d759 SHA512 eef5d10dab52726378a8168726e4b757f1b6523defb86b76624c63ce159e43b18b037b1e51f2e5bcd7a8101d4c5adfa3b61aa7be2e9850b642ec26f7989cad3d AUX crystal-0.26.1-gentoo-tests-sandbox.patch 943 BLAKE2B 5998c494c55f1039111ed0d45839a694e44dd0a5539a81333dad39b632cb07839cf9fab0810d8e7d9eac12bd63f57a4222db95cd254cc5e3543a202c187c30a3 SHA512 236e77761b1a7d8e1c680334c42fcf59e8460185688e0b0c4382e6f8113c04154d4384e91783270fe0e77e4dac2a81e3ff3b983de0489ca4a8b157fe87606378 AUX crystal-0.27.0-extra-spec-flags.patch 493 BLAKE2B 84270f431db778bfe4b3b9b291278960ad8e7f18a4e519eb38aea55f2777cd5bc183e2a7035b4364586bf69ca3ec40d52dcf0d5e5fcaf04ef91cd3d1efff2000 SHA512 95390bdc9e594bb8496a807287ea8225cfc13a1ad7d49a42c791cb94f641939b0002ec7dcdeb8d62565906c035c40e9e0d744ea7e8f4695dd07b66e5b66327da AUX crystal-0.27.0-gentoo-tests-long-unix-2.patch 469 BLAKE2B 66bcc1d0dd9582cac4ba89a2ccc2c7a2ac3ff4994cd687191470f2d481f9a6e3a91aaaf705f92f7600118a9cda015a9554056520502df7ae6462e111665c7330 SHA512 d840ac343ef566e404dc84e908bead5a020dfd88b8c0432f17bceea8d710d435626dc72b4be6622dbcd683a149bca16e781320cf74fc3f2598f84d169c6f7faa AUX crystal-0.27.0-gentoo-tests-long-unix.patch 3317 BLAKE2B df1040abdb587ac3fffb8129d4f1bafc492e38ad5dcfdea5cfbf4426849b099c4d94dac61c93ae7fcae46b60dea1809f52ad373efcd89796a3c1f119614063c1 SHA512 a9ed819a864465e062b4d6a568f14fbb8adc1db01071c79164dede8b2b8d83e07b785cd8196826097de5119e0bdc7d6e194cf4e10cc677bd2bdf158d124c2ad2 AUX crystal-0.27.0-max-age-0-test.patch 632 BLAKE2B d41416f4045b23d0a9c4e11e525d8537277090ee316d01cab9cce0373b07583b9e80a495c8f4db997fc4f1b15b17c080d590f8cb8b6f454dc1c0d1d48015a127 SHA512 7608cb37850e52af406fab0378f0748af7db9239f878720041d56751ce36e0f5874a79b1a971fdc6f261292d23868e3e35c9ddb0d3c10c2bb987767954a77988 -AUX crystal-0.27.0-tcp-server-test.patch 377 BLAKE2B 47e9985c9ecc93483bc0d7e970ebb62648ec5778924d055c345ef2ceadb19f07e23c63767ccd62251df1e63bcaca4cf270730b32f24bfd7a6422939911edfe8a SHA512 7c5f0c97b80bf9cffe0b385a02ea2a8573fa88c174eda49a4adab46376e0ef9c957b16c72ca77386f8b88a98356565a31976113f2a78fa3b7bec85b16b692f58 -AUX crystal-0.27.1-verbose.patch 771 BLAKE2B 556cc08a2aac777e4c7a4ac93b8cf5e14c3f2a39977fd2d182862ff4ede15160e68d229f1c02ab07267b868e327eea29c1bfcac85e57dfb88c547f77c3b00c6a SHA512 75390816c5dca49ce12ef6d2f0dd81e7e56ceac41b3389f0459ae26d3de41b51ffa06f083fe75e7e1d9fbc207e5ecee5c4a2722536bf71f9220d527d5558aaa0 AUX crystal-0.29.0-no-usr-lib.patch 431 BLAKE2B 7fbc7e84f2b9f398204270ce7deec29c78853777abea14c7ff6714123aff4f3fa511761dcbb9f41e36c16d3e280590df0a6b21e9ee0fd86b615292576f735cf1 SHA512 3462556b4176d7781e40aca8dd1831fc39597a3621c10eedb18ddce1a1769a3f8a9fce681644f2d819b4cafce4980af2bbcee77b65a40b8e05da8821cbc2be70 AUX crystal-0.31.0-verbose.patch 701 BLAKE2B 34b74f073edf2979074cfa9042c73945b4856c33ae5037a30e8e096c17939d4d041d569ef01236db5162ffd5574b6b5ba591861d7777c3cd70882f224108ce5c SHA512 c78d636ed7646fdab9ca5335ecd43ddaafeb8b7f0749a323e7d495df1e1d08093ab3cac582a7f2ddff1437da326c873d74ca7b474388e6cf3421e1318e2e5484 -DIST crystal-0.30.1-1-linux-i686.tar.gz 31972575 BLAKE2B 75350799d836110448f56a7b0f49ad27fdeef0f1da169cc15b411482649538e48c3895b169a1deb4c5691f97329ad70a126396425fd096f0dbd83db7e989e4b2 SHA512 9ede9ed7522a82270d91c316b9b98d8ab2d497def2432b99e2d2f21175e978b5b984df92c9637b4600ef27b6e84bd7bc7a5a1b227b17538804a1bc52dabdf84a -DIST crystal-0.30.1-1-linux-x86_64.tar.gz 30166159 BLAKE2B b58e69f9f00e15c3b6e7e259179903f6f210f463c89b8d50a99b1a7d413092585afddf94cac3a461c041c3d91301aac8e61dbab37282a29f781a34367a1d9ddb SHA512 31f06163951fb6ede70eb41f6047c96a74293754bba360b428bf162b1661eed47f8b426327f074f3523ae16b073e8ae5f5e0e6b36ebf83031fa5a0b414b41648 -DIST crystal-0.30.1.tar.gz 2153037 BLAKE2B e5cb2d49688aba75f684ea9fea7e6b0e85eb124f55bf00472595ba83bedd50a8042c5b3c40358254c3fdec3bce2f351ca5e6d385a7841d33f44b934844fd89b1 SHA512 62ddb0dc45385d52d7fdd593f85ec4bef2451aa9a48aabe0115ffe8cfe820e6665b2d51d097339fe931d8599bb6c62c7ddfcaae36a199db0726df4e246af6eab DIST crystal-0.31.1-1-linux-i686.tar.gz 28667084 BLAKE2B 50964072d9335f96effce812cd261760dd308ee50628a47e2694f0a34b6dce210d5a00b978b0537bcd24cc2fc6dd82637c05dc0596ba0322e1297b97ea14bc78 SHA512 2353d10bce6983459afae526b516290eba44e2d6b5943911b8da657a36a0bbd422bd4efe61f2205e178355a2898e90ac9927c64ffba1e8edae4615a01ea9ad40 DIST crystal-0.31.1-1-linux-x86_64.tar.gz 26998394 BLAKE2B 37ecfe9f130b1e9e52686c52474fcef599a348a7d9f1885c3fe41302a1d6d760ada5a153978397c7ec43b2bb4442bb3fc1c2f8d5eed9b4141858455673170544 SHA512 433ac13f9f541dd5b58c1db5e063e23058a87ed325cabc0a4165c42edf18a5f9f126ea4e1d9627357d47c5e3f392131e1f7aab22c34dce3b02e3fdca49658b5b DIST crystal-0.31.1.tar.gz 2191156 BLAKE2B 072e14fed34cc411cd6d9a57b8c5184e5974257869ef41f9bd12401ab473186f699bfbac438af97dd8e4e8cf749ebdbf35050882e9dc14be75392d50763902a8 SHA512 d44ce5653aa2877d85685bd897888cd7675eb02897363f71627ac19589447889af8e73a1d8acb2108e0356939cd515022fd2b92d019014714428d92666ad0f37 DIST crystal-0.32.0-1-linux-i686.tar.gz 30066630 BLAKE2B 06054c08c3d06a5d76b707d825e8a95b879f7426660ed1bf340737cf3b5a1a7d7e50107dd3030057dcc08eed0bcadc391d55f23dc53f3fdca69a60dee07e29d7 SHA512 e9a089c0cb30977902ecb729bf90cfe132708058d46c01446b4ebb8af9f8d19a66169717f9e7dd87fcbf3ab4328a9e539dbff93dbca60050ddce0a7d7a708628 DIST crystal-0.32.0-1-linux-x86_64.tar.gz 27352543 BLAKE2B b181c29b2ed70517b0ef0a3f9533b67bc20354fe8e98e075eb42ea6ba5ac94485718b65c2fe720953983d868410aea1f879c6242ac58b2f0931dc987203d05b5 SHA512 1ba010f25ea88888b5145f39a63bdc5cc3977577742961e540ffba2ee113754cbf1d2c504c7b4f7a2af82ae3cd8c0053b740a5f379efffb154a96fc8d9edd5cf DIST crystal-0.32.0.tar.gz 2223709 BLAKE2B fafca329085efba8e9f3164ea3250cbe0fc067177f6c842a30ae040385353cbb28cff8a642eb0a28ed65fb4c53efa7e03994654983108568ad94cda8370b9b7e SHA512 e4c386e95ca4c93870807221cb741ae41bf2f96dbc91f3799c02c1f99c17568804a62fb7c8ddfd297b5ab2805939323dfc00a71584af534c8a8dcd54dbd7510c -EBUILD crystal-0.30.1.ebuild 3126 BLAKE2B 950c93484e987c26edf6fed0c41880e2ef7dcc089943f13e1bced6865b43d9f9a84c4d99afe91dff7dfac383b045dd07553c38cc7e23392d7dae2e2bbcc4dac7 SHA512 ae78901676c5d96a9bcb2c48e102aa2d33284b693ba104cd0485d11656de99aa4be3fd64fa21afb856cb6ab3fb52ce545254ac6fccdcd40221dbd015e5df5124 +DIST crystal-0.32.1-1-linux-i686.tar.gz 30062609 BLAKE2B 658cd453465a1c4de44c0b010593aa19a68b93569482202baba948dc58f018d38cbefda083592145a141e7dfc574eddb7ccf0a41613a7a7d5ea8d12ed8f72d08 SHA512 34127ad25a1e290b8f17fa7de9465083955ae16a049bab8a927f90df4f2c87c7a59e2c8123f7ec0d0de691130e51749b104ccf11ea68005c267ab98c322156f3 +DIST crystal-0.32.1-1-linux-x86_64.tar.gz 27348617 BLAKE2B 96410f00843d21cea4ed6f8d4896438334f577b6e593e72a0be23d3e1a460199bffc456ddb675a257c5a973353c1a8d28f69263b8517e0009e54d2f2f19535fe SHA512 85524c38cd91fbe56ab7d14c3a05a1a3f3e3fc0f618e5fa5af010716f76b1dc0cc415cbc67e16c99fd2e8860412d7e2566f510c751de0ad4373361edbcee0475 +DIST crystal-0.32.1.tar.gz 2225383 BLAKE2B 81cdda508945ebea481c3ad784ecdccffe25e4726d2f63feb1a4995b48041fbf2cbe226bebcbf9f9627d2161d167ccb502626a9d51f787dc8e48fd607f310ff8 SHA512 d83575f4c7953054824f13516cdc04bd7576bf7165754d96a9f4970e2a6cbf779b4db6806d3eeac465ed0c223c203ef95fc3bda70d1ef9f7c96ec96cd076283d EBUILD crystal-0.31.1.ebuild 3011 BLAKE2B a97675d76141c4e2fa36b0643cd3174f6cffdb78d5608ffde9eed50627f7d8bd047d828e02bc34d3492736a3b0ae045e08603a50bbaa568709364a8cb69e9e90 SHA512 2989793274aeb9d37a1468c4a419b0fefc463c66fc7dcc97eea6ea59e2fcb7e545897ea4dfb21903210cb0e6da24903f3669a636ce57ea76cb4ed337cf49db8d EBUILD crystal-0.32.0.ebuild 3011 BLAKE2B d2d0ad755ccda9eab4d3daedb6771f67732876d9cfb246939b0c1dd6a45c6a8c9af7368163615368210d9b5a33385cb3788b79bd989b1ca821d42ebf349306a1 SHA512 0adb45e03fb600bd4d231ffbd3efe4d9c932d4c2a0044dea5850155eea352c1bd62d57230be2590705d8cfa5221070da073a1139099276085151a372ef51facd +EBUILD crystal-0.32.1.ebuild 3011 BLAKE2B d2d0ad755ccda9eab4d3daedb6771f67732876d9cfb246939b0c1dd6a45c6a8c9af7368163615368210d9b5a33385cb3788b79bd989b1ca821d42ebf349306a1 SHA512 0adb45e03fb600bd4d231ffbd3efe4d9c932d4c2a0044dea5850155eea352c1bd62d57230be2590705d8cfa5221070da073a1139099276085151a372ef51facd MISC metadata.xml 995 BLAKE2B 00f6cfc63cec16ab8c6f983316f5872e63573f2d680da810b9b97d88c2ff6e21c15327a1508d62234e324f7145ca248a9ce1aa7286b0e34d9ee3dcba1481ff25 SHA512 da6a6f834b0d961477b95045756c539df7a968fe240f9f0c1c8183eef3052dddefb8d20547d668b07fece74c96b94bbf18baaac59e7328ff322355227d1adf02 diff --git a/dev-lang/crystal/crystal-0.30.1.ebuild b/dev-lang/crystal/crystal-0.30.1.ebuild deleted file mode 100644 index cebd1d37ade4..000000000000 --- a/dev-lang/crystal/crystal-0.30.1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 llvm multiprocessing toolchain-funcs - -BV=${PV}-1 -BV_AMD64=${BV}-linux-x86_64 -BV_X86=${BV}-linux-i686 - -DESCRIPTION="The Crystal Programming Language" -HOMEPAGE="https://crystal-lang.org" -SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz - amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz ) - x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc debug examples blocking-stdio-hack +xml +yaml" - -RESTRICT=test # not stable for day-to-day runs - -LLVM_MAX_SLOT=8 - -# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382 -DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} - dev-libs/boehm-gc[static-libs,threads] - dev-libs/libatomic_ops - dev-libs/libevent - dev-libs/libpcre - sys-libs/libunwind - dev-libs/pcl - dev-libs/gmp:0 -" -RDEPEND="${DEPEND} - xml? ( dev-libs/libxml2 ) - yaml? ( dev-libs/libyaml ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.27.1-verbose.patch - "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch - "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-network-sandbox-3.patch - "${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch - #"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch - "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch - "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch - "${FILESDIR}"/${PN}-0.27.0-tcp-server-test.patch - "${FILESDIR}"/${PN}-0.29.0-no-usr-lib.patch -) - -src_prepare() { - default - - use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch -} - -src_compile() { - local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin - if [[ ! -d ${bootstrap_path} ]]; then - eerror "Binary tarball does not contain expected directory:" - die "'${bootstrap_path}' path does not exist." - fi - - emake \ - $(usex debug "" release=1) \ - progress=true \ - stats=1 \ - threads=$(makeopts_jobs) \ - verbose=1 \ - \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - AR=$(tc-getAR) \ - \ - PATH="${bootstrap_path}:${PATH}" \ - CRYSTAL_PATH=src \ - CRYSTAL_CONFIG_VERSION=${PV} \ - CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal" - use doc && emake docs -} - -src_test() { - # EXTRA_SPEC_FLAGS is useful to debug individual tests - # as part of full build: - # USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal - emake spec \ - $(usex debug "" release=1) \ - progress=true \ - stats=1 \ - threads=$(makeopts_jobs) \ - verbose=1 \ - \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - AR=$(tc-getAR) \ - \ - CRYSTAL_PATH=src \ - CRYSTAL_CONFIG_VERSION=${PV} \ - \ - "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}" -} - -src_install() { - insinto /usr/$(get_libdir)/crystal - doins -r src/. - dobin .build/crystal - - insinto /usr/share/zsh/site-functions - newins etc/completion.zsh _crystal - - use examples && dodoc -r samples - - if use doc ; then - docinto api - dodoc -r docs/. - fi - - newbashcomp etc/completion.bash ${PN} -} diff --git a/dev-lang/crystal/crystal-0.32.1.ebuild b/dev-lang/crystal/crystal-0.32.1.ebuild new file mode 100644 index 000000000000..bc3abe915acb --- /dev/null +++ b/dev-lang/crystal/crystal-0.32.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 llvm multiprocessing toolchain-funcs + +BV=${PV}-1 +BV_AMD64=${BV}-linux-x86_64 +BV_X86=${BV}-linux-i686 + +DESCRIPTION="The Crystal Programming Language" +HOMEPAGE="https://crystal-lang.org" +SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz + amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz ) + x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc debug examples blocking-stdio-hack +xml +yaml" + +RESTRICT=test # not stable for day-to-day runs + +LLVM_MAX_SLOT=9 + +# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382 +DEPEND=" + sys-devel/llvm:${LLVM_MAX_SLOT} + dev-libs/boehm-gc[static-libs,threads] + dev-libs/libatomic_ops + dev-libs/libevent + dev-libs/libpcre + sys-libs/libunwind + dev-libs/pcl + dev-libs/gmp:0 +" +RDEPEND="${DEPEND} + xml? ( dev-libs/libxml2 ) + yaml? ( dev-libs/libyaml ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.31.0-verbose.patch + "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch + "${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch + #"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch + "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch + "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch + "${FILESDIR}"/${PN}-0.29.0-no-usr-lib.patch +) + +src_prepare() { + default + + use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch +} + +src_compile() { + local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin + if [[ ! -d ${bootstrap_path} ]]; then + eerror "Binary tarball does not contain expected directory:" + die "'${bootstrap_path}' path does not exist." + fi + + emake \ + $(usex debug "" release=1) \ + progress=true \ + stats=1 \ + threads=$(makeopts_jobs) \ + verbose=1 \ + \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + AR=$(tc-getAR) \ + \ + PATH="${bootstrap_path}:${PATH}" \ + CRYSTAL_PATH=src \ + CRYSTAL_CONFIG_VERSION=${PV} \ + CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal" + use doc && emake docs +} + +src_test() { + # EXTRA_SPEC_FLAGS is useful to debug individual tests + # as part of full build: + # USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal + emake spec \ + $(usex debug "" release=1) \ + progress=true \ + stats=1 \ + threads=$(makeopts_jobs) \ + verbose=1 \ + \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + AR=$(tc-getAR) \ + \ + CRYSTAL_PATH=src \ + CRYSTAL_CONFIG_VERSION=${PV} \ + \ + "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}" +} + +src_install() { + insinto /usr/$(get_libdir)/crystal + doins -r src/. + dobin .build/crystal + + insinto /usr/share/zsh/site-functions + newins etc/completion.zsh _crystal + + use examples && dodoc -r samples + + if use doc ; then + docinto api + dodoc -r docs/. + fi + + newbashcomp etc/completion.bash ${PN} +} diff --git a/dev-lang/crystal/files/crystal-0.26.1-gentoo-tests-network-sandbox-3.patch b/dev-lang/crystal/files/crystal-0.26.1-gentoo-tests-network-sandbox-3.patch deleted file mode 100644 index eb1b84ce618c..000000000000 --- a/dev-lang/crystal/files/crystal-0.26.1-gentoo-tests-network-sandbox-3.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/spec/std/http/server/server_spec.cr b/spec/std/http/server/server_spec.cr -index 9de0c3f..59882db 100644 ---- a/spec/std/http/server/server_spec.cr -+++ b/spec/std/http/server/server_spec.cr -@@ -400,7 +400,9 @@ module HTTP - end - - describe "#bind_tls" do -- it "binds SSL server context" do -+ # gentoo's FEATURES=network-sandbox blocks external network: -+ # connect: Connection timed out (Errno) -+ pending "binds SSL server context" do - server = Server.new do |context| - context.response.puts "Test Server (#{context.request.headers["Host"]?})" - context.response.close -@@ -512,7 +514,9 @@ module HTTP - end - {% end %} - -- it "handles exception during SSL handshake (#6577)" do -+ # gentoo's FEATURES=network-sandbox blocks external network: -+ # connect: Connection timed out (Errno) -+ pending "handles exception during SSL handshake (#6577)" do - server = SilentErrorHTTPServer.new do |context| - context.response.print "ok" - context.response.close diff --git a/dev-lang/crystal/files/crystal-0.27.0-tcp-server-test.patch b/dev-lang/crystal/files/crystal-0.27.0-tcp-server-test.patch deleted file mode 100644 index 8f61c8aeef47..000000000000 --- a/dev-lang/crystal/files/crystal-0.27.0-tcp-server-test.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/spec/std/http/server/server_spec.cr -+++ b/spec/std/http/server/server_spec.cr -@@ -524,7 +524,8 @@ module HTTP - end - - describe "#close" do -- it "closes gracefully" do -+ # fails under gentoo's sandbox -+ pending "closes gracefully" do - server = Server.new do |context| - context.response.flush - context.response.puts "foo" diff --git a/dev-lang/crystal/files/crystal-0.27.1-verbose.patch b/dev-lang/crystal/files/crystal-0.27.1-verbose.patch deleted file mode 100644 index 33c3c5d61c41..000000000000 --- a/dev-lang/crystal/files/crystal-0.27.1-verbose.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -29,3 +29,3 @@ SOURCES := $(shell find src -name '*.cr') - SPEC_SOURCES := $(shell find spec -name '*.cr') --override FLAGS += -D preview_overflow -D compiler_rt $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" ) -+override FLAGS += -D preview_overflow -D compiler_rt $(if $(release),--release )$(if $(stats),--stats )$(if $(progress),--progress )$(if $(threads),--threads $(threads) )$(if $(debug),-d )$(if $(static),--static )$(if $(LDFLAGS),--link-flags="$(LDFLAGS)" )$(if $(verbose),--verbose ) - SPEC_FLAGS := $(if $(verbose),-v )$(if $(junit_output),--junit_output $(junit_output) ) diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 6c0cb476dd76..b9b0a5c3bd81 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -8,13 +8,14 @@ AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab5 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab AUX erlang-20.3.2-dont-ignore-LDFLAGS.patch 1337 BLAKE2B 7272c96b1ee947a98f0a5b1f3bd1fce11e8d02f121348208196ae60af965dfde7fac15263ca0a58df96dff21785a1a63f4fc10f7e7e10c0f68a618e760e5ffd7 SHA512 59d39b1680ac3406e4c37f81a0207588208a873279920258235af54700f80bd67584c3e55c9278f893cd7813573bbec8b13195e47ba00101fc578d5a2b40fa34 AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24 +AUX erlang-22.2.2-gcc-10.patch 2963 BLAKE2B ea83306f31011d75119c8dc9dba0eb531f093151242aec5a4aef658cd1eebcb6600dbc2f86f1b1a5714d77f6cc2136385950bfb85eef462c38cfb25ce2cf57bd SHA512 b285418d474fca8d85da214575ecb3b05c41ae5c73323516e9cb3320da7276375c180a9b4a92359b0003313639d8cc2df265e4e9b4b9051823b059dd61a5d651 AUX erlang-add-epmd-pid-file-creation-for-openrc.patch 2359 BLAKE2B 54a3148144bcbb9a4dd68e89fd609a09a9e9a0a9c7a71a4e9eaafc12632e23da44411d72c1590e482fda73d5464b1071386aa564b8d9a73b032b62c474d20570 SHA512 301aed1980a8638a8cd069ecb6e968e5c15d3e82b38580861a0ed6a2fc7a9505d99525a53a6ac19c2d9b786703aac6bf51751275a6a7fafd8f530c07ea0c7e8c AUX erlang-custom-autoconf.patch 398 BLAKE2B c99d3bc311bbca379786b9e4d29ee4983354a069508328c95e99a62bdfb8d15dbf372124acdf66c603f64acd9cabeb146e5bd5ec1e1ffd09af125fc4a076abdc SHA512 b82e09d0cd686c07b9d370e397edda10bd96435e70f4a0995ec06638e237e3b8fd0e1195ecc036b51367ffa36a0b4db5a2b1fe5d389a0b97e19d32aec51755d9 DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c573966e7565d98aa6ba986ce42eb955a46130b9f33dbb415f48de5c179b308a8b06b345a844afcb2700f7e3f257f27e SHA512 dc11aace126aad5411b0d583579fe95a7263be328612fdc9f9c02d917aef7ea7a128b1e54ddcf7a52232980d2c81fc8e90ae5a8806ee5ae6ea97f00a9cf3faab -DIST erlang-22.1.1.tar.gz 54951145 BLAKE2B 917813f750eacd3dc7da25f1fa9e1f9c55e6cf1b88ba4e5576caae8554bbac667c87830935c7ddd58723f61e54f3c99ae4ef08660344035dea460e92a40832cc SHA512 ee1a3bb355ffd083c3355caf60189799d322cff2a01314ba5df141ccdc4de45dbfe3967e661e3dfbcf14fc04dc1f855d7a3660f9b2daa2451a83422eda7cba39 DIST erlang-22.1.4.tar.gz 54957524 BLAKE2B 8960dd63eb7ae18544d8b6809760543b276ec230d5a9051d1888269770f6c44b379b6ba85ce9106f7d37b76c41b7683a545ba80569e33195e3e9211f6ced4ee3 SHA512 271a188d46a79cd1c43c3b8059b77c0802af624ff88c6916e0b84994040750d9792f0416937ed98e874256562f27d858916239d79f93b545c98b9703e5018f7b -DIST erlang-22.1.7.tar.gz 54969082 BLAKE2B 4168b93e146de3dd22ec0d6088d2a2b62dc1a3d96d3c2859f65ef721a32f24ef74fb6baf3467da7b2c5b13a3b8d62602d3e94ddd359f091f548f958d9b8a77ea SHA512 72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05 DIST erlang-22.1.8.tar.gz 54967877 BLAKE2B cb022e3c5f577605872e7689639fced6c1f6cb7600314f5939107605f0767ca080c65c2f9e0695a04bf53a9e0727553d854a9df57f09ce5f4a958ebd035756e7 SHA512 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda +DIST erlang-22.2.1.tar.gz 55742915 BLAKE2B cfb49a07289f66ee8bcdc37452c88ec60c90b92febb7d41538166916989e80b612f13bae4ae2ba305aa12c790a74bcd9dc8412207413ba512537193811d177ad SHA512 4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4 +DIST erlang-22.2.2.tar.gz 55743605 BLAKE2B f316b78f33d81f05d22eb4eab52756a46c39df31ce93bf57ddbc6d663d0165f6cdcb4de2e4a70308024e7648a54267364ec19c94c425d643d03dc741112acaff SHA512 c38ecfcbc7ca66d45b5a2dad9a03d9c2a3a504d9ac85635de93975b03056a3d59edf462c296349f657534d935bcc1ea4321b771fb216f54f723d9db438437e42 DIST erlang-22.2.tar.gz 55736930 BLAKE2B bcd67ea4ef5c358d4f0bcbec977e2c60a3b0f1ccccb2d38c35ba1908ed9d96727c83ab6cb6dc69ce90ffc6772e34de68014cc66ec8c3bfcda852844a4f6b1548 SHA512 a192da8ee02588c44e5c04bf2933c95672f596ca10f485c2c41d0c97563c90b5ea24fa02da61e007595f25a80557e6513372db3059bb7e394647a4c11f4cd41e DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f DIST erlang_doc_html_22.1.tar.gz 33824830 BLAKE2B 2d50802fff81eba8bcf5f630da49d68d7cb2098175012e12f13941e69949a109c9f601c3cfaa2700b669415cd0c6c15961d8e4dd94b9b228cee17b661fe5400a SHA512 cc24927a4ff98b04d8f93fbc46bb36ffb34570521e4f31154b778dc17cf1cff60869239c26c327d7a9360c06528f9b380a302b39fa47285e50dfd4656b508202 @@ -22,11 +23,10 @@ DIST erlang_doc_html_22.2.tar.gz 33943680 BLAKE2B 4a0df88fe99c882272b07b928541f4 DIST erlang_doc_man_21.1.tar.gz 1317726 BLAKE2B 5e5c2b77a41da6ab9ae1264ba5824a9f3bda6d3b7a824b372e01356888db437ed9e45bf987d678aca3fd8d0f0e6dce25080c7a2aaa4e061936f1e6ac4717e843 SHA512 94c6191ba9f42bffeb398e865026fbc79f3b233389c7d471f0c680799aa3669e97ab5305cd53f26d6525aed33d738ebfc4eb79a8f1a0b29dc4b79a2a37a29a4f DIST erlang_doc_man_22.1.tar.gz 1355169 BLAKE2B eca02e36709587d59099dd87263b3ffcea55002cbcbf0a9980fface3cc30cb4ce0210fbdf80c8957da7a09a3b866ca81be22fd577f7f948562ef4e4ca516cbf5 SHA512 4f590f82293c97529c827c042bce673e6777c577e52e0e1876a8d6c1a0dc774c09637e85e3562f9a8af44372219d57174c002cc12a9646ae015c7bb1da34c750 DIST erlang_doc_man_22.2.tar.gz 1359216 BLAKE2B 943d8ac1d0ceab41e252cab18248b74592d90305a39a41c21421efb1a0c031b5b2dd430274bb6f23a5334aba87df65975549c83778afa6334826552b1e42e8b0 SHA512 94cdceda3f8710bf44e78eef854e9399a802d82051a49544abd75d9367240b268c5e58b4d62170fa044d850fc04f998594cd1fc312bec867ac6395b292c94ad4 -EBUILD erlang-21.1.1.ebuild 4633 BLAKE2B dbfcd2e556fa00ff7c1c0b442b234465a9876e98769132081fdcd05f13960a4ea5cba2c68776fa435f09ef91533538808569a25046706178df0d7a3477341c56 SHA512 68789a64ab677d7215f7796d3d4a1c1dd7001101174fc948c2c596fff01dbf3d3233407c88c21f19991c2390d51f8388da9fb3abccebec2697c6677c63adc7fb -EBUILD erlang-22.1.1.ebuild 4348 BLAKE2B 5dc3c69cec88ba337f41e7b3ee8cff509069f7eb5ed63876121585b7acf94dc37ff59ae5f0ada079d3233eca2f44d6c1c50b01a35a79bded7490ac60eaa582d5 SHA512 0883d5b255b900b793ddbb75e232b5fe78a5395735d06d373bdc79eeac74bb541d71f09d0dd8b52efa48f7ccb3a5804b7fe2c623988effbddc8bc6901f7c17fe -EBUILD erlang-22.1.4.ebuild 4348 BLAKE2B 5dc3c69cec88ba337f41e7b3ee8cff509069f7eb5ed63876121585b7acf94dc37ff59ae5f0ada079d3233eca2f44d6c1c50b01a35a79bded7490ac60eaa582d5 SHA512 0883d5b255b900b793ddbb75e232b5fe78a5395735d06d373bdc79eeac74bb541d71f09d0dd8b52efa48f7ccb3a5804b7fe2c623988effbddc8bc6901f7c17fe -EBUILD erlang-22.1.7.ebuild 4353 BLAKE2B 8b85b20bae49936fce217a2417672545eb2fb8b3c7b536511d66c51ab13e79e6cd409fc6c99dbedf5d307d3629f9f06ccf0ace5df33eec3fb8d535681c6db4a7 SHA512 340923ad048e0dea4851efd8951d0073bcb8973570d091324bb02b4b007b329a67e6242c9aad74023f920118dbcbc219395842a00e4fbd465ed7817d8f88b042 -EBUILD erlang-22.1.8-r1.ebuild 4353 BLAKE2B 3742467938825c56aa48ba67d754348214c668b609d3b20d6d195a4e9bee427d0259ead08152298ac6614a5045718ef91bd82b65ff5f662a597df108fd2de6db SHA512 b5cb897fd7916fcf509e14182e94d65b99fc92329d8ceaf855060373e1d9f6e6aa27f4c11a41eb65d59b2b555cb2c45a2f091344ba90af74459dc49437458108 -EBUILD erlang-22.1.8.ebuild 4353 BLAKE2B 8b85b20bae49936fce217a2417672545eb2fb8b3c7b536511d66c51ab13e79e6cd409fc6c99dbedf5d307d3629f9f06ccf0ace5df33eec3fb8d535681c6db4a7 SHA512 340923ad048e0dea4851efd8951d0073bcb8973570d091324bb02b4b007b329a67e6242c9aad74023f920118dbcbc219395842a00e4fbd465ed7817d8f88b042 -EBUILD erlang-22.2.ebuild 4353 BLAKE2B 3742467938825c56aa48ba67d754348214c668b609d3b20d6d195a4e9bee427d0259ead08152298ac6614a5045718ef91bd82b65ff5f662a597df108fd2de6db SHA512 b5cb897fd7916fcf509e14182e94d65b99fc92329d8ceaf855060373e1d9f6e6aa27f4c11a41eb65d59b2b555cb2c45a2f091344ba90af74459dc49437458108 -MISC metadata.xml 684 BLAKE2B fff20139a02c18f3bc978ed0b3920f32fc9b54ef58c809fe504284e74fdb490a6534d90d7835159a57065cd2a0404e1468c5c925ebdc65968c61ba09926f4dbf SHA512 0e85aeb8b4e13fcdd98bb2547bf448504d9cd86399d1afc580629c7f0364595b15f96a05a4727fd7ceee615111c2e533b126548389222945f6c61190d77b215c +EBUILD erlang-21.1.1.ebuild 4646 BLAKE2B 50adc94870a8efc3d0762bcfd3dd21e9edb746ec0313fd9dd5f30fdffbb4441fd1967a47937c3d23cd7e2b6b10554208448ac52b4a2302e9fa28149226678087 SHA512 66b7743c497112da8a4c56cd6f9279e3ea88c672d0a6d2b311e828e7e057f2ff2950816dc294bd87e98d3f589bb67c0c0c24633a34df183a10ef61967aea2f7e +EBUILD erlang-22.1.4.ebuild 4361 BLAKE2B 8d8464af12fab6da99c5f38bd08c6be8cf6437d0fd3753be01016cc16051dcf2a98a9f80e6e42bdb02e7d283bd4bc396d5913054d8cd904dbe1d0946766a4c0a SHA512 9df155d85f34054933bc09c0fcfdd08146f70b68f8f8e778994ed9a4d654131ec94e68cf166d725af6aa9bfdf99f8ebff326871e7b3dd88bb6c529e9c306f190 +EBUILD erlang-22.1.8-r1.ebuild 4366 BLAKE2B 53b7920bc68a73e7a34246e7d768f64e80a38c609da7f3602fe884470b1538f72ab48c2aa7e587eaca1bb3cb9fc647126ec9af1c3a92c438a72b8ccf7d35ef9c SHA512 a22d1f7cc97e7195fe1588a9434e2e576ee4d43b3dbad442bca5138637222c029a8cf190524e451abff387e1761be5b27ffd22ce421c503bbb114d429f04a1da +EBUILD erlang-22.2.1-r1.ebuild 4366 BLAKE2B 53b7920bc68a73e7a34246e7d768f64e80a38c609da7f3602fe884470b1538f72ab48c2aa7e587eaca1bb3cb9fc647126ec9af1c3a92c438a72b8ccf7d35ef9c SHA512 a22d1f7cc97e7195fe1588a9434e2e576ee4d43b3dbad442bca5138637222c029a8cf190524e451abff387e1761be5b27ffd22ce421c503bbb114d429f04a1da +EBUILD erlang-22.2.2.ebuild 4407 BLAKE2B b280cd3d3720ff21d79bbe7555f360a993d411afe07f602b46d4c665ccd56ea78000eaa66bfc749b45871c209611cf5255c3078ea6625b5603097ec321dcbf7f SHA512 fb3ca493119d9250eb072bc682be1d322649abe50039e5276424e05d3564779e00e99b84873e3d4b3487dab53419bfb7cba0fc53fe917955ad9193e892f6a63a +EBUILD erlang-22.2.ebuild 4366 BLAKE2B 53b7920bc68a73e7a34246e7d768f64e80a38c609da7f3602fe884470b1538f72ab48c2aa7e587eaca1bb3cb9fc647126ec9af1c3a92c438a72b8ccf7d35ef9c SHA512 a22d1f7cc97e7195fe1588a9434e2e576ee4d43b3dbad442bca5138637222c029a8cf190524e451abff387e1761be5b27ffd22ce421c503bbb114d429f04a1da +MISC metadata.xml 905 BLAKE2B c1277904d14789138212ad1c83291d30301558aba707d1eb43765573c32617bfcb0eea43acc80225870cf2fbab011920b64bbecbdd28d414d73eb3c86a00937c SHA512 f79228f075fc6ac58785bc8a6c574546674b7ddd6c4f7420cb616414cf5178c2fa08284668b0d863ae3638891567184d1e8a490e31c4e093724ebff5c177a461 diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild index 45a87c37a08e..8eae33756bb8 100644 --- a/dev-lang/erlang/erlang-21.1.1.ebuild +++ b/dev-lang/erlang/erlang-21.1.1.ebuild @@ -28,7 +28,7 @@ IUSE="doc emacs +hipe java +kpoll libressl odbc pgo sctp ssl systemd tk wxwidget RDEPEND=" sys-libs/ncurses:0 sys-libs/zlib - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) diff --git a/dev-lang/erlang/erlang-22.1.1.ebuild b/dev-lang/erlang/erlang-22.1.1.ebuild deleted file mode 100644 index 8e47b9bf050d..000000000000 --- a/dev-lang/erlang/erlang-22.1.1.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" - -inherit elisp-common java-pkg-opt-2 systemd wxwidgets - -# NOTE: If you need symlinks for binaries please tell maintainers or -# open up a bug to let it be created. - -UPSTREAM_V="$(ver_cut 1-2)" - -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" -HOMEPAGE="https://www.erlang.org/" -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" - -LICENSE="Apache-2.0" -# We use this subslot because Compiled HiPE Code can be loaded on the exact -# same build of ERTS that was used when compiling the code. See -# http://erlang.org/doc/system_principles/misc.html for more information. -SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" - -RDEPEND=" - acct-group/epmd - acct-user/epmd - sys-libs/ncurses:0 - sys-libs/zlib - emacs? ( virtual/emacs ) - java? ( >=virtual/jdk-1.8:* ) - odbc? ( dev-db/unixODBC ) - sctp? ( net-misc/lksctp-tools ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - systemd? ( sys-apps/systemd ) - tk? ( dev-lang/tk:0 ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) -" -DEPEND="${RDEPEND} - dev-lang/perl -" - -S="${WORKDIR}/otp-OTP-${PV}" - -PATCHES=( - "${FILESDIR}/18.2.1-wx3.0.patch" - "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" -) - -SITEFILE=50"${PN}"-gentoo.el - -src_prepare() { - default - - ./otp_build autoconf || die -} - -src_configure() { - use wxwidgets && setup-wxwidgets - - local myconf=( - --disable-builtin-zlib - $(use_enable hipe) - $(use_enable kpoll kernel-poll) - $(use_with java javac) - $(use_enable sctp) - $(use_with ssl ssl "${EPREFIX}"/usr) - $(use_enable ssl dynamic-ssl-lib) - $(use_enable systemd) - $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") - ) - econf "${myconf[@]}" -} - -src_compile() { - emake - - if use emacs ; then - pushd lib/tools/emacs &>/dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - local path="$1" - local var_name="$2" - sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" -} - -src_install() { - local erl_libdir_rel="$(get_libdir)/erlang" - local erl_libdir="/usr/${erl_libdir_rel}" - local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" - local erl_erts_ver="$(extract_version erts VSN)" - local my_manpath="/usr/share/${PN}/man" - - [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" - [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - - emake INSTALL_PREFIX="${D}" install - - if use doc ; then - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) - docompress -x /usr/share/doc/${PF} - else - local DOCS=("README.md") - fi - - einstalldocs - - dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl - dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc - dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript - dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call - dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp - - ## Clean up the no longer needed files - rm "${ED}/${erl_libdir}/Install" || die - - insinto "${my_manpath}" - doins -r "${WORKDIR}"/man/* - # extend MANPATH, so the normal man command can find it - # see bug 189639 - newenvd - "90erlang" <<-_EOF_ - MANPATH="${my_manpath}" - _EOF_ - - if use emacs ; then - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - fi - - newinitd "${FILESDIR}"/epmd.init-r2 epmd - newconfd "${FILESDIR}"/epmd.confd-r1 epmd - use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/erlang/erlang-22.1.4.ebuild b/dev-lang/erlang/erlang-22.1.4.ebuild index 8e47b9bf050d..83d78ce48e10 100644 --- a/dev-lang/erlang/erlang-22.1.4.ebuild +++ b/dev-lang/erlang/erlang-22.1.4.ebuild @@ -30,7 +30,7 @@ RDEPEND=" acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) diff --git a/dev-lang/erlang/erlang-22.1.7.ebuild b/dev-lang/erlang/erlang-22.1.7.ebuild deleted file mode 100644 index 36b698f35975..000000000000 --- a/dev-lang/erlang/erlang-22.1.7.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" - -inherit elisp-common java-pkg-opt-2 systemd wxwidgets - -# NOTE: If you need symlinks for binaries please tell maintainers or -# open up a bug to let it be created. - -UPSTREAM_V="$(ver_cut 1-2)" - -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" -HOMEPAGE="https://www.erlang.org/" -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" - -LICENSE="Apache-2.0" -# We use this subslot because Compiled HiPE Code can be loaded on the exact -# same build of ERTS that was used when compiling the code. See -# http://erlang.org/doc/system_principles/misc.html for more information. -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" - -RDEPEND=" - acct-group/epmd - acct-user/epmd - sys-libs/ncurses:0 - sys-libs/zlib - emacs? ( virtual/emacs ) - java? ( >=virtual/jdk-1.8:* ) - odbc? ( dev-db/unixODBC ) - sctp? ( net-misc/lksctp-tools ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - systemd? ( sys-apps/systemd ) - tk? ( dev-lang/tk:0 ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) -" -DEPEND="${RDEPEND} - dev-lang/perl -" - -S="${WORKDIR}/otp-OTP-${PV}" - -PATCHES=( - "${FILESDIR}/18.2.1-wx3.0.patch" - "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" -) - -SITEFILE=50"${PN}"-gentoo.el - -src_prepare() { - default - - ./otp_build autoconf || die -} - -src_configure() { - use wxwidgets && setup-wxwidgets - - local myconf=( - --disable-builtin-zlib - $(use_enable hipe) - $(use_enable kpoll kernel-poll) - $(use_with java javac) - $(use_enable sctp) - $(use_with ssl ssl "${EPREFIX}"/usr) - $(use_enable ssl dynamic-ssl-lib) - $(use_enable systemd) - $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") - ) - econf "${myconf[@]}" -} - -src_compile() { - emake - - if use emacs ; then - pushd lib/tools/emacs &>/dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - local path="$1" - local var_name="$2" - sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" -} - -src_install() { - local erl_libdir_rel="$(get_libdir)/erlang" - local erl_libdir="/usr/${erl_libdir_rel}" - local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" - local erl_erts_ver="$(extract_version erts VSN)" - local my_manpath="/usr/share/${PN}/man" - - [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" - [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - - emake INSTALL_PREFIX="${D}" install - - if use doc ; then - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) - docompress -x /usr/share/doc/${PF} - else - local DOCS=("README.md") - fi - - einstalldocs - - dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl - dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc - dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript - dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call - dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp - - ## Clean up the no longer needed files - rm "${ED}/${erl_libdir}/Install" || die - - insinto "${my_manpath}" - doins -r "${WORKDIR}"/man/* - # extend MANPATH, so the normal man command can find it - # see bug 189639 - newenvd - "90erlang" <<-_EOF_ - MANPATH="${my_manpath}" - _EOF_ - - if use emacs ; then - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - fi - - newinitd "${FILESDIR}"/epmd.init-r2 epmd - newconfd "${FILESDIR}"/epmd.confd-r1 epmd - use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/erlang/erlang-22.1.8-r1.ebuild b/dev-lang/erlang/erlang-22.1.8-r1.ebuild index 9f0146d89695..3ffd63edd06e 100644 --- a/dev-lang/erlang/erlang-22.1.8-r1.ebuild +++ b/dev-lang/erlang/erlang-22.1.8-r1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) diff --git a/dev-lang/erlang/erlang-22.1.8.ebuild b/dev-lang/erlang/erlang-22.1.8.ebuild deleted file mode 100644 index 36b698f35975..000000000000 --- a/dev-lang/erlang/erlang-22.1.8.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -WX_GTK_VER="3.0" - -inherit elisp-common java-pkg-opt-2 systemd wxwidgets - -# NOTE: If you need symlinks for binaries please tell maintainers or -# open up a bug to let it be created. - -UPSTREAM_V="$(ver_cut 1-2)" - -DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" -HOMEPAGE="https://www.erlang.org/" -SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz - http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz - doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" - -LICENSE="Apache-2.0" -# We use this subslot because Compiled HiPE Code can be loaded on the exact -# same build of ERTS that was used when compiling the code. See -# http://erlang.org/doc/system_principles/misc.html for more information. -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" - -RDEPEND=" - acct-group/epmd - acct-user/epmd - sys-libs/ncurses:0 - sys-libs/zlib - emacs? ( virtual/emacs ) - java? ( >=virtual/jdk-1.8:* ) - odbc? ( dev-db/unixODBC ) - sctp? ( net-misc/lksctp-tools ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - systemd? ( sys-apps/systemd ) - tk? ( dev-lang/tk:0 ) - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) -" -DEPEND="${RDEPEND} - dev-lang/perl -" - -S="${WORKDIR}/otp-OTP-${PV}" - -PATCHES=( - "${FILESDIR}/18.2.1-wx3.0.patch" - "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" -) - -SITEFILE=50"${PN}"-gentoo.el - -src_prepare() { - default - - ./otp_build autoconf || die -} - -src_configure() { - use wxwidgets && setup-wxwidgets - - local myconf=( - --disable-builtin-zlib - $(use_enable hipe) - $(use_enable kpoll kernel-poll) - $(use_with java javac) - $(use_enable sctp) - $(use_with ssl ssl "${EPREFIX}"/usr) - $(use_enable ssl dynamic-ssl-lib) - $(use_enable systemd) - $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") - ) - econf "${myconf[@]}" -} - -src_compile() { - emake - - if use emacs ; then - pushd lib/tools/emacs &>/dev/null || die - elisp-compile *.el - popd &>/dev/null || die - fi -} - -extract_version() { - local path="$1" - local var_name="$2" - sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" -} - -src_install() { - local erl_libdir_rel="$(get_libdir)/erlang" - local erl_libdir="/usr/${erl_libdir_rel}" - local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" - local erl_erts_ver="$(extract_version erts VSN)" - local my_manpath="/usr/share/${PN}/man" - - [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" - [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" - - emake INSTALL_PREFIX="${D}" install - - if use doc ; then - local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) - docompress -x /usr/share/doc/${PF} - else - local DOCS=("README.md") - fi - - einstalldocs - - dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl - dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc - dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript - dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call - dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp - - ## Clean up the no longer needed files - rm "${ED}/${erl_libdir}/Install" || die - - insinto "${my_manpath}" - doins -r "${WORKDIR}"/man/* - # extend MANPATH, so the normal man command can find it - # see bug 189639 - newenvd - "90erlang" <<-_EOF_ - MANPATH="${my_manpath}" - _EOF_ - - if use emacs ; then - elisp-install erlang lib/tools/emacs/*.{el,elc} - sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die - elisp-site-file-install "${T}/${SITEFILE}" - fi - - newinitd "${FILESDIR}"/epmd.init-r2 epmd - newconfd "${FILESDIR}"/epmd.confd-r1 epmd - use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/erlang/erlang-22.2.1-r1.ebuild b/dev-lang/erlang/erlang-22.2.1-r1.ebuild new file mode 100644 index 000000000000..3ffd63edd06e --- /dev/null +++ b/dev-lang/erlang/erlang-22.2.1-r1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0" + +inherit elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +# We use this subslot because Compiled HiPE Code can be loaded on the exact +# same build of ERTS that was used when compiling the code. See +# http://erlang.org/doc/system_principles/misc.html for more information. +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + acct-group/epmd + acct-user/epmd + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( >=app-editors/emacs-23.1:* ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + tk? ( dev-lang/tk:0 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}/18.2.1-wx3.0.patch" + "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf || die +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(use_enable systemd) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r2 epmd + newconfd "${FILESDIR}"/epmd.confd-r2 epmd + use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/erlang-22.2.2.ebuild b/dev-lang/erlang/erlang-22.2.2.ebuild new file mode 100644 index 000000000000..97a529061f4c --- /dev/null +++ b/dev-lang/erlang/erlang-22.2.2.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +WX_GTK_VER="3.0" + +inherit elisp-common java-pkg-opt-2 systemd wxwidgets + +# NOTE: If you need symlinks for binaries please tell maintainers or +# open up a bug to let it be created. + +UPSTREAM_V="$(ver_cut 1-2)" + +DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)" +HOMEPAGE="https://www.erlang.org/" +SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz + http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz + doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )" + +LICENSE="Apache-2.0" +# We use this subslot because Compiled HiPE Code can be loaded on the exact +# same build of ERTS that was used when compiling the code. See +# http://erlang.org/doc/system_principles/misc.html for more information. +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" + +RDEPEND=" + acct-group/epmd + acct-user/epmd + sys-libs/ncurses:0 + sys-libs/zlib + emacs? ( >=app-editors/emacs-23.1:* ) + java? ( >=virtual/jdk-1.8:* ) + odbc? ( dev-db/unixODBC ) + sctp? ( net-misc/lksctp-tools ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7d:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + systemd? ( sys-apps/systemd ) + tk? ( dev-lang/tk:0 ) + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] ) +" +DEPEND="${RDEPEND} + dev-lang/perl +" + +S="${WORKDIR}/otp-OTP-${PV}" + +PATCHES=( + "${FILESDIR}/18.2.1-wx3.0.patch" + "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" + "${FILESDIR}/${PN}-22.2.2-gcc-10.patch" +) + +SITEFILE=50"${PN}"-gentoo.el + +src_prepare() { + default + + ./otp_build autoconf || die +} + +src_configure() { + use wxwidgets && setup-wxwidgets + + local myconf=( + --disable-builtin-zlib + $(use_enable hipe) + $(use_enable kpoll kernel-poll) + $(use_with java javac) + $(use_enable sctp) + $(use_with ssl ssl "${EPREFIX}"/usr) + $(use_enable ssl dynamic-ssl-lib) + $(use_enable systemd) + $(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null") + ) + econf "${myconf[@]}" +} + +src_compile() { + emake + + if use emacs ; then + pushd lib/tools/emacs &>/dev/null || die + elisp-compile *.el + popd &>/dev/null || die + fi +} + +extract_version() { + local path="$1" + local var_name="$2" + sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed" +} + +src_install() { + local erl_libdir_rel="$(get_libdir)/erlang" + local erl_libdir="/usr/${erl_libdir_rel}" + local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)" + local erl_erts_ver="$(extract_version erts VSN)" + local my_manpath="/usr/share/${PN}/man" + + [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" + [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" + + emake INSTALL_PREFIX="${D}" install + + if use doc ; then + local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) + docompress -x /usr/share/doc/${PF} + else + local DOCS=("README.md") + fi + + einstalldocs + + dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl + dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc + dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript + dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call + dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp + + ## Clean up the no longer needed files + rm "${ED}/${erl_libdir}/Install" || die + + insinto "${my_manpath}" + doins -r "${WORKDIR}"/man/* + # extend MANPATH, so the normal man command can find it + # see bug 189639 + newenvd - "90erlang" <<-_EOF_ + MANPATH="${my_manpath}" + _EOF_ + + if use emacs ; then + elisp-install erlang lib/tools/emacs/*.{el,elc} + sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \ + "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die + elisp-site-file-install "${T}/${SITEFILE}" + fi + + newinitd "${FILESDIR}"/epmd.init-r2 epmd + newconfd "${FILESDIR}"/epmd.confd-r2 epmd + use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-lang/erlang/erlang-22.2.ebuild b/dev-lang/erlang/erlang-22.2.ebuild index 9f0146d89695..3ffd63edd06e 100644 --- a/dev-lang/erlang/erlang-22.2.ebuild +++ b/dev-lang/erlang/erlang-22.2.ebuild @@ -30,7 +30,7 @@ RDEPEND=" acct-user/epmd sys-libs/ncurses:0 sys-libs/zlib - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) java? ( >=virtual/jdk-1.8:* ) odbc? ( dev-db/unixODBC ) sctp? ( net-misc/lksctp-tools ) diff --git a/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch b/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch new file mode 100644 index 000000000000..9a7d5939419e --- /dev/null +++ b/dev-lang/erlang/files/erlang-22.2.2-gcc-10.patch @@ -0,0 +1,45 @@ +https://github.com/erlang/otp/pull/2503 + +From 9fad0c9b71808458e857cbd3871cf80f46a75af1 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Tue, 14 Jan 2020 23:15:01 +0000 +Subject: [PATCH] ei_portio.h: avoid ODR violation of + 'ei_default_socket_callbacks' + +Noticed as a build failure against fresh gcc-master: + +``` +LD otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(eirecv.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(send_reg.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(epmd_port.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +ld: otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_portio.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: multiple definition of `ei_default_socket_callbacks'; otp/lib/erl_interface/obj/x86_64-unknown-linux-gnu/libei.a(ei_connect.o):otp/lib/erl_interface/src/misc/ei_portio.h:50: first defined here +collect2: error: ld returned 1 exit status +make[3]: *** [x86_64-unknown-linux-gnu/Makefile:669: otp/lib/erl_interface/bin/x86_64-unknown-linux-gnu/erl_call] Error 1 +``` + +The failure looks legitimate: `ei_default_socket_callbacks` is a +struct defined in 'ei_portio.h' and in 'ei_portio.c'. + +The change flips 'ei_portio.h' definition to declaration. + +Signed-off-by: Sergei Trofimovich +--- + lib/erl_interface/src/misc/ei_portio.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/erl_interface/src/misc/ei_portio.h ++++ b/lib/erl_interface/src/misc/ei_portio.h +@@ -47,7 +47,7 @@ int ei_writev_fill_ctx_t__(ei_socket_callbacks *cbs, void *ctx, const struct iov + int ei_socket_callbacks_have_writev__(ei_socket_callbacks *cbs); + #endif + +-ei_socket_callbacks ei_default_socket_callbacks; ++extern ei_socket_callbacks ei_default_socket_callbacks; + + #define EI_FD_AS_CTX__(FD) \ + ((void *) (long) (FD)) +-- +2.25.0 + diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml index 9c2e0b7c1bda..d5a2bb56fca6 100644 --- a/dev-lang/erlang/metadata.xml +++ b/dev-lang/erlang/metadata.xml @@ -5,6 +5,14 @@ slyfox@gentoo.org Sergei Trofimovich + + arkamar@atlas.cz + Petr Vaněk + + + proxy-maint@gentoo.org + Proxy Maintainers + HIgh Performance Erlang extension Enable kernel polling support diff --git a/dev-lang/execline/Manifest b/dev-lang/execline/Manifest index 56347745a910..d32f48842257 100644 --- a/dev-lang/execline/Manifest +++ b/dev-lang/execline/Manifest @@ -10,4 +10,4 @@ EBUILD execline-2.3.0.4.ebuild 1295 BLAKE2B 00c156c18fbffd8a09272af21cd1b347f8fc EBUILD execline-2.5.0.1.ebuild 1190 BLAKE2B 9a158994fd21364aec75557447d50142d15bc995b5f4097d8d52dc441864caee948717fbffccb134f35f772bc83723ab20d3b4f1bb85a0e737aff182958ea3aa SHA512 00eb25af751c6efd32869019fe3d6370ae5728f911d1c9db7949cdd046f4c5cc9d5d025e044dd68637ed49a80db2641f912a73ef0de9c53383767454cc0022f0 EBUILD execline-2.5.1.0.ebuild 1080 BLAKE2B 1f45e168287f3415bb446d48d82839b0e9f964cec05b133b5fa348ed56c7a7fd2e401a2792e1bff865f3ab1dedc9f0cac9590d62038deb6669d9ceff0fe5c117 SHA512 851915f49495857e511c28e793f595c3fc4b014c0b63104b9146c4998a6093fee3739d04305483dbc25fff8fe1149e2066d7a93bd764ba4eff7400dddac54858 EBUILD execline-2.5.3.0.ebuild 1080 BLAKE2B f889a23e2612927cf728152cb257c6ed9909379984a2a4e364b3feaa298b17784b28198bcb1b09d2e318eacaade953f7fdc525a68c954427b1ffc49911213cd1 SHA512 049185ea68bf63531203810b5240a11bc13f90e5cdc6ce5c957cec119b29d43a7c63d00aedefdbf44008bef9f52ae186fcc132ba46f36e464cb70003a159cdbe -MISC metadata.xml 808 BLAKE2B 493e9369dca91a49b964006f1abc1a9285a03115b60c13312f83be014d8a8a3a8ab4b3a5b4c21fda6850c317da52440a0f9b5d8fdc5d3536b35d84c059b71731 SHA512 aa5d0e5f6898c853818187a40791e1fed0fce3f3e9429329d9a4224e9fa25165a2336a3202080404c531e8cba718bf6da158b49c108874bf8b72e6d21c9cd31f +MISC metadata.xml 705 BLAKE2B d38fae3fcca0f1201505075efd5ffd0b3ba023676c7ec7b7fff18b7d1d1c382892352f23044b5f77251f55d3031ae8bd264fcd1c97e38be8a61f036bd0874f9d SHA512 5ced86895a2819ff2a8528d8ba37371684f5196ba300980ea6322f24d11207c4bc76ab0532a8c983923098e19f155a73219306c1e1e0c717465e72de423a0f3d diff --git a/dev-lang/execline/metadata.xml b/dev-lang/execline/metadata.xml index a3625cad2322..a7ad08494c85 100644 --- a/dev-lang/execline/metadata.xml +++ b/dev-lang/execline/metadata.xml @@ -5,10 +5,6 @@ williamh@gentoo.org William Hubbs - - aranea@aixah.de - Luis Ressel - samuel@sholland.org Samuel Holland diff --git a/dev-lang/gforth/Manifest b/dev-lang/gforth/Manifest index 58da5e581a06..384da287c8a4 100644 --- a/dev-lang/gforth/Manifest +++ b/dev-lang/gforth/Manifest @@ -1,5 +1,5 @@ AUX 50gforth-gentoo.el 200 BLAKE2B 1e3faf9b1c8cee5644e49941c0ab46d1f9a53911c50bee6f79f155678c432ce2c0ee27355496d75c489ca61fe2fac74441142eaccd563a4b5e0e426889aa8b30 SHA512 4bb26614777a8147d3bc869ee5db4ebbb594aaf7456c315e077a982dbb9f972cd15ddb977515036ca07594995b623cba35daade1abfcd3a2cdddac7ffbdf4027 AUX gforth-0.7.0-make-elc.patch 437 BLAKE2B 614b8b5a718be0f3cf3802b75ac38e845b3583dab6d8554c9ba08b1768f3818ed760e1b69389fd3cc99418ac30c5579c29491a43778e5cfcfd5f41eeb39e3e20 SHA512 d4d2c0eefe6ecc0fdc8c58147262324292c905e3cafb360a5d7c4e6eac92798ec416fffae21834f9d29c1e9117a500891285e6a0ff5405346d4a5e63c10f1bce DIST gforth-0.7.3.tar.gz 2523433 BLAKE2B 1ba9095af7958aabf0d671f982c483f2046392fd9872678a58f314357875d286bee7f0d7bc38e9b21331acda80fd285c0489fed44d59c148ff6ec6b6bea7c174 SHA512 f034234acfb0fc727f28b564432219a100b916c6df4b847794a55b2fc3b8ed8714eca6de0df67c7c427b7c2bb4dd00f65cfd34e6eb60181e41ab84fea30304e4 -EBUILD gforth-0.7.3-r1.ebuild 1053 BLAKE2B 80cbe8e9bded579517a55c10c024ee638b54687bc9b64d92e07f43bd1be633ee722f06191bb6f857cb71c39ffbc8428a759fa7fa5121e11c251ccbe105dc64b7 SHA512 567f2417a8e65ff24db48dced2e838b5c484c6e6c1d86207e3777c17f193874f041b40e675746488641c8b0b9c7554b2b7479a1482788f3df3de1e653f241d07 +EBUILD gforth-0.7.3-r1.ebuild 1063 BLAKE2B 7be6a241597f625b9e1d13804fe7623624ee14caccd752d72109b6e811f8d6edb6ed0d07bb88738b87a3f5971c9fd0ec0d39b2ca7ff44a0496e95f2b63a238e3 SHA512 f65986500bfeb9bfe5406656de778148b746d8f57182de43c25b8313c6337b1ee374f6c7dbaba914f7289dc9b54edbb1fa54ca86de36dab85f589e55fe7f5334 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd diff --git a/dev-lang/gforth/gforth-0.7.3-r1.ebuild b/dev-lang/gforth/gforth-0.7.3-r1.ebuild index 0a50f9613e86..2697a44780a7 100644 --- a/dev-lang/gforth/gforth-0.7.3-r1.ebuild +++ b/dev-lang/gforth/gforth-0.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris" IUSE="emacs" DEPEND="dev-libs/ffcall - emacs? ( virtual/emacs )" + emacs? ( >=app-editors/emacs-23.1:* )" RDEPEND="${DEPEND}" SITEFILE="50${PN}-gentoo.el" diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest index 907bb5e8e9d7..94f36bc1adf2 100644 --- a/dev-lang/ghc/Manifest +++ b/dev-lang/ghc/Manifest @@ -87,8 +87,10 @@ DIST ghc-bin-8.4.3-x86_64-pc-linux-gnu.tbz2 117537996 BLAKE2B 2be0102fcc0f1fef5a DIST ghc-bin-8.6.4-i686-pc-linux-gnu.tbz2 121639881 BLAKE2B 51d223b654ff23bbdd594801f4ec92b016a58b952ba98007abb56c1c4b184a672e51eb9847b42160febcc4ada0f28f18325cc27f8a025dd9fcf656e3bab73918 SHA512 6b58b080c5fb18ea7b76632b4b48726af61b52d8829f57a2ddd55e6bc109c1fe1a133d2a0ca974a168ffee0013a6dfdc4922577bad01c50a42dad8b9db70e061 DIST ghc-bin-8.6.4-x86_64-pc-linux-gnu.tbz2 121695747 BLAKE2B 39c745f5f9946bbae622e09bbdabdde4d62eec472fe14e693f37cba6b93ff66e4e56f66df8f0f073686339d252dce71f79f4c2aaef620c3dffbc26a67b1119c3 SHA512 c60bac50e7879bda1d6dcc7c1f12fdac915b18c3ebbfcfad575b2b01fcb57a487496ce7935f7ee4ae934162209ab66370fbcc8a4f021628e5f9a2aa7ef95e119 DIST ghc-bin-8.6.5-i686-pc-linux-gnu.tbz2 121938050 BLAKE2B 17b6d15af21390e28a025505da76d39a2f8656f74c88a81fc75e7c8e799e54171c0d964d8a977c01576603a781c139b5363ea79eeaa2252622913d2a08a79f0e SHA512 9eb33b4670ee15f53c988885a119f3ef7be896ddcb318019628cdd04e21ec0c61876e08466d9d10d6cb1e16d89cd318e0ba42f0f0ae512f48590fe87483739cd +DIST ghc-bin-8.6.5-powerpc64le-unknown-linux-gnu.tbz2 173549697 BLAKE2B 296bf4e0745f56dfefc3ffc96b4e492ddbfd8bcbbc28a8bc9b3172c616d0e7da1081834384ab69e387808331b607104f015632d59963a87f4e257f290ff286c3 SHA512 81261614a7939adb0ffad3657cd33588ff729bb1e3a7dd228cf869afc1f21b74cb4dce6369a4c4cdc9f45f8d8ae64f25d71cd0f2dc34f36d3022afc149538a78 DIST ghc-bin-8.6.5-x86_64-pc-linux-gnu.tbz2 121728723 BLAKE2B 6620b2a116b5696dd2d776350a43251c093e117338a4407ae8c41ae27763a4614d7e761b2684b90aa9317dafe7cb67481a6bc141c812d335d5231724ae3db2a7 SHA512 69681eab137f6713339f8912d0d92f6af865630053bcd7a32cb8a31e01628e969951db976533196794fe39e0e57f0fcd8778d9fc9fed4f4231e965b9a603dd8e DIST ghc-bin-8.8.1-i686-pc-linux-gnu.tbz2 120789855 BLAKE2B 386f37696d956078fad5cad50cbf5b9d9d7765615a1d9cc91a376fb5394648afe8ca956e24ef210f2ff0e51f339b63b16a50f6dc35f30babf019aa57de50b27b SHA512 193c29889693befba863d3c5a26d38d8182bb7e1932b61115dc0a21b6582f818b05db144a9fae5aee06af2044ea59f884825cf1081b62a1c67feb3041d184d3a +DIST ghc-bin-8.8.1-powerpc64le-unknown-linux-gnu.tbz2 173653088 BLAKE2B 6c29777b596b35fee8e3a17f965e6a21dc40dc2387988f55d4ca5fef0ea9677b558ed210054216a6578b93fbf844df9e407770df184f707f8203f846f4929d2d SHA512 d338b8912c1632410c43a0df75ce69f961924a7c51049a3ac27c22f7c6cfc07388815813713d594fc38b721127df80b65f72b1b0cc6fbf0e10fa15970b8b6f46 DIST ghc-bin-8.8.1-x86_64-pc-linux-gnu.tbz2 119317594 BLAKE2B 98f0fb262ac485dcfd6a8a67304912ffad2bf2634111fcc3b60346697a836867006bbacaab1e1be0cd5be34b4595d12bec13af644c451c10f7e3843ebaf5922f SHA512 e6acb11755db18fd86a346de642b8579a6b48b303c19795949757f5e351ad3b8892906e989dc57a7fd4471d0efe30fc8175df5bac741d7faecfe42a855a67980 DIST hoopl-3.10.2.0.tar.gz 241940 BLAKE2B 0ed7bf80486767c81415f99da8780a525401c388dea0b3f380bbecceae9cc7f66d8b5d0d7b31f8cb41796309b7a93adb113485efd14882f8af321989ce900a9b SHA512 083baa8a5eb53247aff8d5b9b2144e0f63adb9400934297bbd80bfcec607dd90a34def4301045a60472ef10b0fb90ab84692fc08f786e7f806c28afdab1ef66a DIST transformers-0.4.3.0.tar.gz 28632 BLAKE2B 92cabcb654bb11854a3bffbb1262f5cd62eda1aff447157086a61ebc451ebf2fddec53b6a2cc058174f24f0f0e32df671d3717e30a542c8dc90cb87e327d990c SHA512 c3ec0893ebba4fbd6087c3202e919552c4a9bff3350b5c0589e7ebb18751a515d98b8cac15b0a3252906ea72b5a0eb09b7fe88c8da88b09d6ce4fbf0f50b2780 @@ -101,6 +103,6 @@ EBUILD ghc-8.4.1.ebuild 24618 BLAKE2B 7a0d7dc1076ae580db5fc42df6bf03d03452ffeffb EBUILD ghc-8.4.2.ebuild 24843 BLAKE2B 5169665b1042741251bee3518a1f66f04ad0bed20ca90720091d4013e2c335e13b8c267fcd4adfbfbdee03fba7d980a3c377db9f52056c3870cb80785e5125f5 SHA512 88716c59e726b8faf59f444fd6d91a26f839b968fb41f60e96d4ae37a3815745f9220c8ca34a7a9cd79963efd31c1177b023d2dd3d328f70459307889fefdedc EBUILD ghc-8.4.3.ebuild 24788 BLAKE2B 898e4ce54eb995a687b812b7a8fecea6c39fdb1bcc3bdf36b621ed880d252c8efeb8c5866828d2c127eb4b2f40bc2e6fa4171e0da264500bec088a72dffa76a2 SHA512 81688cb74ab3860e01d6daa023f295400a51d40c06a1878d05d252589824fdfd56a46841e269a8cad2aef1aaf447c43e922580446ef69981fd8a98eaccaf0d61 EBUILD ghc-8.6.4.ebuild 25288 BLAKE2B 9465a1b030d93a7f19e342f170adda744b70bbe5c501ce8f67ddfc0ac0e16a63279dfab7b771ccdc280e5533859134dd4c642dd20753c861f97db7c234715ce8 SHA512 e1ab5166aadfaf04dd684bbc3b0cb205c3f657cc78dee1996cdac98dc085387b64d655447ee224b23c063e1c9d92ed1efe8c21fffc20d33407b261bc58b501b0 -EBUILD ghc-8.6.5.ebuild 25316 BLAKE2B 93b663911955d64699111142722475d7efbdd55e77e4e500648744d6111d394761641065b0968ee5c6c4f929026637afd6c4c8e83e1d9eec5926198552d77d8e SHA512 94df32c9f17acf2ffd48c2a783ddeddba213775c88187ec83baa67454ad53a6b8d50de79daddf9bdec9e06a809feadd59457ff6733dcc1644c498ea3454b5fff -EBUILD ghc-8.8.1.ebuild 26172 BLAKE2B cf3a963cdc1e74426539eb36ca6ef63aff29189d07dae646eb35a641ccd8e7dbaacf8c7e0f56565499dbefa781f91e8a94003a230a6d6a4ae956d891bd396b0a SHA512 7e58237d5b371295e2737c491806d7bd592bef154333dab8195288e206adb24632d7f2f3b915a157e7474f04203039cc4f6257b24e5c3e8cf7a425c241d7bb8b +EBUILD ghc-8.6.5.ebuild 25606 BLAKE2B 53ebf37e1c8412e086fc483bf3f83c40b2faeca68a0475a15cad38b9f75d94bc885017cca5e607ee766204968b4429c4b6c2acde7b462e367391284cec6c3d17 SHA512 b7d88e4075252c7492e8cc87c3761499b93f43c4858566e47d1929ca2ee68dd05c3560650c319d2cb448687127f90250277dc7c8f756a92290f60722b152edca +EBUILD ghc-8.8.1.ebuild 26258 BLAKE2B 58f3e1dfd326a36a5f4b1befaf7b70a09f24cb764e722e517ee7e27e35f3df4425b61d56bcc9f582ac1e94ac53f2cd6ede7c01ff8e999980496f11e67267ffce SHA512 45eb991e899bf3d4fe61e98635f78ae9ffecc5435ba7be621b410a2df3be560e1208e0993be5e2a019b79b6ab19a02c1b18e79f4b4d3af1d1dd9d45d2c4d32c5 MISC metadata.xml 878 BLAKE2B aa6aa11c4c60763eb1d29253a6b63057ce98b16dce26d46de216064809665330102cb5313258197a95dda4be91ff843fbe778090110460883f5a367fe4837afd SHA512 97c636844d70431fc41a39318d2d29bf686fab362d0f962a95039c740ef91c6642f229539f34493e7a3f300211d6550a5a976d84d0fcef6f7dfaf026bcbc62e2 diff --git a/dev-lang/ghc/ghc-8.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild index 63cc1241c218..2e4e523c095c 100644 --- a/dev-lang/ghc/ghc-8.6.5.ebuild +++ b/dev-lang/ghc/ghc-8.6.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -30,7 +30,7 @@ BIN_PV=${PV} arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" #arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" #arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" -#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" +arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )" #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" @@ -46,7 +46,10 @@ yet_binary() { amd64) return 0 ;; #ia64) return 0 ;; #ppc) return 0 ;; - #ppc64) return 0 ;; + ppc64) + use big-endian && return 1 + return 0 + ;; #sparc) return 0 ;; x86) return 0 ;; *) return 1 ;; @@ -73,15 +76,17 @@ LICENSE="BSD" SLOT="0/${PV}" # to be rekeyworded when most of revdeps are updated #KEYWORDS="~amd64 ~x86" -IUSE="doc ghcbootstrap ghcmakebinary +gmp profile test" -RESTRICT="!test? ( test )" +IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test" IUSE+=" binary" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/perl-5.6.1 dev-libs/gmp:0= sys-libs/ncurses:0=[unicode] + elfutils? ( dev-libs/elfutils ) !ghcmakebinary? ( virtual/libffi:= ) + numa? ( sys-process/numactl ) " # This set of dependencies is needed to run @@ -484,6 +489,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-7.8.3-prim-lm.patch eapply "${FILESDIR}"/${PN}-8.0.2-no-relax-everywhere.patch eapply "${FILESDIR}"/${PN}-8.4.2-allow-cross-bootstrap.patch + eapply "${FILESDIR}"/${PN}-8.6.5-numa.patch # a bunch of crosscompiler patches # needs newer version: @@ -632,7 +638,10 @@ src_configure() { einfo "Final mk/build.mk:" cat mk/build.mk || die - econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot + econf ${econf_args[@]} \ + --enable-bootstrap-with-devel-snapshot \ + $(use elfutils && echo --enable-dwarf-unwind) \ + $(use_enable numa) if [[ ${PV} == *9999* ]]; then GHC_PV="$(grep 'S\[\"PACKAGE_VERSION\"\]' config.status | sed -e 's@^.*=\"\(.*\)\"@\1@')" diff --git a/dev-lang/ghc/ghc-8.8.1.ebuild b/dev-lang/ghc/ghc-8.8.1.ebuild index b91c9d0ba44d..7b8c9321190f 100644 --- a/dev-lang/ghc/ghc-8.8.1.ebuild +++ b/dev-lang/ghc/ghc-8.8.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,7 +30,7 @@ BIN_PV=${PV} arch_binaries="$arch_binaries amd64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-x86_64-pc-linux-gnu.tbz2 )" #arch_binaries="$arch_binaries ia64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )" #arch_binaries="$arch_binaries ppc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc.tbz2 )" -#arch_binaries="$arch_binaries ppc64? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-ppc64.tbz2 )" +arch_binaries="$arch_binaries ppc64? ( !big-endian? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-powerpc64le-unknown-linux-gnu.tbz2 ) )" #arch_binaries="$arch_binaries sparc? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-sparc.tbz2 )" arch_binaries="$arch_binaries x86? ( https://slyfox.uni.cx/~slyfox/distfiles/ghc-bin-${PV}-i686-pc-linux-gnu.tbz2 )" @@ -46,7 +46,10 @@ yet_binary() { amd64) return 0 ;; #ia64) return 0 ;; #ppc) return 0 ;; - #ppc64) return 0 ;; + ppc64) + use big-endian && return 1 + return 0 + ;; #sparc) return 0 ;; x86) return 0 ;; *) return 1 ;; @@ -72,9 +75,9 @@ BUMP_LIBRARIES=( LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="" -IUSE="doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test" -RESTRICT="!test? ( test )" +IUSE="big-endian doc elfutils ghcbootstrap ghcmakebinary +gmp numa profile test" IUSE+=" binary" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-lang/perl-5.6.1 diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index 016d272e3e97..0b8924f5e9d0 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -11,11 +11,15 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324 DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d DIST go1.12.13.src.tar.gz 21980338 BLAKE2B 205bee35a947ccd08f36547530e3de7928f5f3970be89580ddff80f7710dd1dcf4f292c10ec93c27717ce25ce2575f7151129430b80d1fb927872f891166d8db SHA512 a8210ba909c1bb26799625bbf648204dbef5a9f91af323277f76caee489f5912a08e9de686b71fe97d30c7dc171d5f4bcf8a2c2227d02353cfbb7d292c9efc22 DIST go1.12.14.src.tar.gz 20726032 BLAKE2B 2defecd29568974c1618ce0da42d9e28ef41904ed3f759b51c7e392ed9dea950a4984efa333e52b413fab3dac8270bb99f60e113712bfc648c4c9af0e19aba7d SHA512 6cd225282fbade8bd7e96789744c7db07f223f5309358ca3768c95c34a099b44bd9ba9adc2ce293a5bbd608237ae6473b86e7bb451db395c647809fc2750dd4c +DIST go1.12.15.src.tar.gz 20726294 BLAKE2B d123fc2328bf9db8f7337108e3d6857c31e10829096d47fb58519861b68bc0e2bdc9f032fc076666124ab418d3f37026107d6a853021fecbf26138bf00963572 SHA512 887e331c73b9d174e4a707a85be389fa0de43c77bc191ef5e0fe326ac7285374404450ca081cb8e92514a973d25d0314ca74eb17c8e53f8386e1798edd9d41aa DIST go1.13.4.src.tar.gz 21619153 BLAKE2B 2efc86fd0830b9c8935c856244baaec1e63232dd08b696544da900927ba56fd686b5899ec1640fbcbb21c8c5ac9581cfde3fcb5c06ccfabd0fd2f181b398da46 SHA512 e8155cdceca2ebefd386feef98223bbdc92d9316f7188d4ba701cf43a723b75a9bf67a1eb92ac80987b7a113a2fb6981ef235292bec7dd3964805b7c33abdbb1 DIST go1.13.5.src.tar.gz 21629437 BLAKE2B c39a52e73136a322a1b6b4ee6888672848ff2b3278d8034ec25b93101fff2b63212d66c065d3d974ca7e8686cba8a9ea9c4fedb23cad51b6cd76adae6db6eb42 SHA512 bc9ddb12855c66dba5fe859bd13b7b3163259b8a8b0d3cbf6892e528ae4c6418c6b4c0d49838e7a5fc2e9f404484899b8f30c45e49e7d30109093025b62ed6c0 +DIST go1.13.6.src.tar.gz 21631050 BLAKE2B 8923021d5ff785f5422ee204ee81c986fc066a878a347bc73625974f05045689f694f76147c9bf7956dc59d6e3d3a543f0970e0716df8cd4f6556c28fe23808b SHA512 dffb6e06eea0b1541901dfbed8d28e8cc1eac3184dc40a19ed3637737df796a67a2e7170b228e1003d36b14e6f0f13bb8be9d2a702834a9c06228d1821659528 EBUILD go-1.12.13.ebuild 6436 BLAKE2B 6f52ccf741bd999cca536d599abe82ba955d0563fde091fd4f2244355ac6c12669750c595b0fbb6b8e50afd35f8101fcabc99b28826be77f626a4df0a76b9528 SHA512 5ee9fd4957f0302ecd931ee87b3b6dc30ba4e010bf5c1e33e94a70197af90f3d6d6c198336205d7a13eb6dee39b103d823483ee28281619adefea0ed38c91025 EBUILD go-1.12.14.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.12.15.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f EBUILD go-1.13.4.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f EBUILD go-1.13.5.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f +EBUILD go-1.13.6.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f EBUILD go-9999.ebuild 6440 BLAKE2B d18087c473db165632af20bb3787e6feadf24fde6854d4f493ab110ddf67fa3fa285ac676ffde752ddc8cfe0fd2c012acd310b958633ab894a513f44b134854f SHA512 6949c83e29ffb41bac9317b8ffa2d2ae3b990327db2716ed6285cc0053f54935f8e377bf9f45e63cd7d5f2f980d67941ea781f6ed7e65917b9ce0e109021116f MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf diff --git a/dev-lang/go/go-1.12.15.ebuild b/dev-lang/go/go-1.12.15.ebuild new file mode 100644 index 000000000000..5e3547cfeada --- /dev/null +++ b/dev-lang/go/go-1.12.15.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +MY_PV=${PV/_/} + +inherit toolchain-funcs + +BOOTSTRAP_VERSION="bootstrap-1.8" +BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist" +BOOTSTRAP_URI=" + ${BOOTSTRAP_DIST}/go-linux-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-arm64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-ppc64le-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-s390x-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-linux-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-freebsd-386-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-darwin-amd64-${BOOTSTRAP_VERSION}.tbz + ${BOOTSTRAP_DIST}/go-solaris-amd64-${BOOTSTRAP_VERSION}.tbz +" + +case ${PV} in +*9999*) + EGIT_REPO_URI="https://github.com/golang/go.git" + inherit git-r3 + ;; +*) + SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " + S="${WORKDIR}"/go + case ${PV} in + *_beta*|*_rc*) ;; + *) + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + # The upstream tests fail under portage but pass if the build is + # run according to their documentation [1]. + # I am restricting the tests on released versions until this is + # solved. + # [1] https://golang.org/issues/18442 + RESTRICT="test" + ;; + esac +esac + +# If gccgo or a previously installed version of dev-lang/go is not being +# used to build Go, there is no way to know the architecture or operating system +# of the build machine, so we need to download all of our bootstrap +# archives to allow this ebuild to work under crossdev. +# +# https://bugs.gentoo.org/671394 +SRC_URI+="!gccgo? ( !system-bootstrap? ( ${BOOTSTRAP_URI} ) )" + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://golang.org" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="gccgo system-bootstrap" + +BDEPEND="gccgo? ( >=sys-devel/gcc-5[go] )" +RDEPEND="!=app-editors/emacs-23.1 )" RDEPEND="${DEPEND}" diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 8ca5a92ae914..811e834a19b9 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -1,5 +1,5 @@ AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071 DIST mercury-14.01.1-gentoo-patchset-4.tar.gz 4903 BLAKE2B 3301e220a5d4461c268bf68f1596e2204b4f0931b20c027fcdd35128af20317eb32d646b64fceebd4958e7e4c7efd2fd289e7f57013c1f78f80ee6b97da5d91d SHA512 3fbf75fb88c8fdebefcf847acb7959fe582503922f0cbb6c234f18a56cea8153eaf2325db3b827e8cc802803c9ecf9e755493a895c4a15445dc406ac143d0200 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c -EBUILD mercury-14.01.1-r1.ebuild 5618 BLAKE2B 4927ef283d123ebab4c1c427f6d4ec2ccc90b7d3d2e760b381158912543b1a0e5f7ae30e26cf3f7a3b2202319380469e57ae55daef95a01eabcf9caaa48d794d SHA512 3077841c51816fc180bda350c91e76f84dc644fe65fe5bc5157ecbe24a4624d373bbd83bbff5a913fb919e9c14772c046cac587a3c07444f09c9fdf6fd0b6651 +EBUILD mercury-14.01.1-r1.ebuild 5627 BLAKE2B 475e0b60bd1888e78649fd2b886898904ee90da0cb82bde039c20c55e9fe28fb84f6e7fdf910a6b25e6e25862a54fa17c83b0cf4f8cb2db5089ff5101978ce5e SHA512 bdaa68f72c06c72a8a625b6034440fa8aefeb4720af0b7561f8d64d32906add5f648563582963ef2e1058d4a87a701d5057d9988767f80aa44795ad811a48635 MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild index 25c4317109dd..595078fd7f7c 100644 --- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild +++ b/dev-lang/mercury/mercury-14.01.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -29,7 +29,7 @@ DEPEND="!dev-libs/mpatrol doc? ( sys-apps/texinfo )" RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" + emacs? ( >=app-editors/emacs-23.1:* )" S="${WORKDIR}"/${MY_P} @@ -47,7 +47,7 @@ src_prepare() { "${S}"/scripts/Mmake.vars.in \ || die "sed libdir failed" - cd "${S}" || die + cd "${S}" || die eautoconf xdg_environment_reset diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest index 0af70791a1b2..a8c925fb9c12 100644 --- a/dev-lang/micropython/Manifest +++ b/dev-lang/micropython/Manifest @@ -6,5 +6,5 @@ DIST micropython-1.9.3.tar.gz 17311734 BLAKE2B 31ebdedc402af53b205a854aa61b59c69 DIST micropython-1.9.4.tar.gz 18957648 BLAKE2B bc4dc4ef6623adbda64c9e03137860a7b9ce7d2d181434cb993438752ec39a4ea7cf7cf7a14736c57bdc2ea9c3f856b0dbe2d92fc0e1cbef99112427583ad665 SHA512 9995c983c93fb1280e60d7c52a10930a6a3de8d589a0f4264a9a4a4fede7c37e27ed4871c4c9092aec3fb33028064beb8c5eb19b7956e8f0c5d3b2a82ffa9932 EBUILD micropython-1.11.ebuild 1099 BLAKE2B 1899b0063ccb85b383deeacb0a6cf2cf5ef785eaf5e9c3bd7ac2981805d475ddf31c58274887858c4aa3731fb68f8b6e7a70fb29b158aafe3ae9b0a235e9a2ef SHA512 02ff5c432ffeb1b4e11b30df00abe107513a7e52f6d9b5a1b242ce55037b8b989e2d151012bb105336b6fd8e563de308fa52dd02b38caf3599eb433790ceda36 EBUILD micropython-1.9.3.ebuild 1182 BLAKE2B f95a492598c7bc565690299f5ac2cfa8766c0c1d7a942cde30b3c31ee4b4e527591bc79a974eaf3fe75ceed6e6fe7aea8fc84977c7a120cbcfd13e7d0c599012 SHA512 f0c3d330403f3c502af2ec9ba19017cce0a2863064266a864d7ff6e6d8aae7fbeb6523e1e21319a5ef01034d70cd753a49f7a337f1017b9b691f25eba8334028 -EBUILD micropython-1.9.4.ebuild 1185 BLAKE2B 5aaa3b12f1bdd38675788a2461687e5a325b75321b84d3a0cfea03b0e5d5e7326f029e5550deddfa0d59b87c56d5147af5918786859361fd2598fb50ffb08043 SHA512 958558a96134ccd057fdbe6c01f51a4f1e266f34caede0621f5091e40d960535913df45816ee3ac23780668987a92e9c4ee2f3aae34fbd975d3d82d6af14e3fa +EBUILD micropython-1.9.4.ebuild 1220 BLAKE2B 7af0abeb80554f8aefe41aa5a9447c0caf38608027b0864fd9533b0a46f6748adc5ea02061cfbefba4cdd22f9e9aa85d13a947f4fcbc0a07e5cdc495495c123e SHA512 1155e8ba449f26264621a25356f2abad4df342e0d90e9da39c3117ac47372ffe237b5997da6b28692a3d7cf5c3c9d6e4496b03499a25e30d77fb1f72fc138ba6 MISC metadata.xml 1347 BLAKE2B c121e2eafde4ab3c49a352ab96ffbcc042ecddb5a765f3192589a41f5b3bc5f92e6a6f1a58df21ef2812424aac94e6cd579cfe1d29b4dd16983048768f1694ed SHA512 e8dd8f7cc3d0c570da6b9982596e39891e78e302581dbc0601d622831f976f16b9e9f78d7e0b55ae58ed3c81c3e7113a4217ca1671cdd8929f0b34b4647efc3a diff --git a/dev-lang/micropython/micropython-1.9.4.ebuild b/dev-lang/micropython/micropython-1.9.4.ebuild index ac529849faa7..0b1864dde7f3 100644 --- a/dev-lang/micropython/micropython-1.9.4.ebuild +++ b/dev-lang/micropython/micropython-1.9.4.ebuild @@ -47,6 +47,8 @@ src_install() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install popd > /dev/null || die + dobin "${S}/mpy-cross/mpy-cross" + # remove .git files find tools -type f -name '.git*' -exec rm {} \; || die diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest index 98224a8ea2cd..ba6732ba65db 100644 --- a/dev-lang/moarvm/Manifest +++ b/dev-lang/moarvm/Manifest @@ -1,17 +1,11 @@ AUX fix-quoting.patch 1089 BLAKE2B b42de8144ff2555dbb6986ab1d6b62ab6125e8f0fa8ca78ded2d8a0aa0d053ff4c52506cbd50f18a2e9cd8b7a8314f5a859ef55e7578d2ded4c80643cd4351ed SHA512 b7fe948f82c1c32b2b1c86a68409ae4d24927dc783476354b3ffa56e8448c5bb4d3727f1d8c37ed01685869d9636eb15776f92ae2f5f1206db98e954a948912f -DIST MoarVM-2018.06.tar.gz 5002170 BLAKE2B 7c30dc54724c13538621fbf710d6bc1bd7d8b211824d4b5262685c95602c4910b7f7f6d59e52b0595d23dc9a68954fd1213055d72a20b418bf205ac770d05b67 SHA512 5d256cd7a49472e106326281059f8e9f8eb7591d116bfcdd33daeada42764774362ab8802edf889c5d875d438518ee9f243f5e44f451c9cf3495f7c7641be700 -DIST MoarVM-2018.08.tar.gz 5047553 BLAKE2B bcb3350e4a063958eee508885784f3f8eda20f7952759c084d4c0237c70afc4944836607c138e3df2e3a71fa3820190718ab1dd48851ae4a9f267562b9dbf87d SHA512 048fe4f333b017f21dbac34eb385f0569f566ec5ebba9f0e9ee217d325b61fc3542e39e0f1db6fc2cbfa48b09b1acb16c79f02fbe34ed8a5a1946927528c0570 -DIST MoarVM-2018.09.tar.gz 5070458 BLAKE2B 6c391907eb7bcda7eb6629d9f1aea16414fa9ee62d97ec3c72cea6c9b8f6323ef2869e560d8574d30b339889aff92ad73cfd174f9b23f4a98ef359873e053a94 SHA512 14d5ca1f6a8c77ee89fd05d66057b640b1e222391fded17631a4e11801de25e1fb3eb6b8b4dd977990e64952f7067482bf405a9ef5ebb6fdacdfa7c11bee21b1 -DIST MoarVM-2018.12.tar.gz 5238765 BLAKE2B ac0a7ba8107bcf79cfa58011c0968b5c960d9b2f2e59754b25a2f29e66f86e1d2524e16bce84323f2426f264476a4f3d307761c340ca6f09d3983eacde336704 SHA512 b55efc942a581e1d14a571b44a58a76e18f01ca1fabb4c68476003bb42fd4f3663fd532e75814cad6f7b1e1cf5562fe6b1aa68b956c1d8e6769e9dc1bce2b0a7 DIST MoarVM-2019.03.tar.gz 5136086 BLAKE2B 695e5528934002b17f547a281482dc0015b3901b2c9626ce6fcf8aaa2df07c293f501871311ee3be47d009b972ca22a268bb34c859fde6a13566e8d03d1d3f04 SHA512 aa50dcf1499e83247c4c490384f80896160d08fb72a5a6da1f91748c6dc343fa30dcf35adca3e9e8329a2919026a4bdb299129865abf611ce49d73d05cce4285 DIST MoarVM-2019.07.1.tar.gz 5189731 BLAKE2B 3dde716f6911fb8392346b34763439c37866da34361875e7bf1d9d15a4e2b1d9c1dbb668c42611172dcfd6c9060f9c95ec4bac0e5ac614af3038cc4752d9b6d9 SHA512 c8ffaf962191a60f643e6e1b765ec700664988ffc629765c273baf32d2748763480f9fd7a2d978b7f99d3ba4bf962775f4dca40053ace2ddd8cd0bffbd977d84 DIST MoarVM-2019.07.tar.gz 5187102 BLAKE2B a9c56453edf5b5834d33187aea6eabacac9a721e7a27471a02b82585560ffbb5bb8807ae8c738f3138c5b0453217ad101aab23bef2c8b727cd2f8a56574abfd5 SHA512 ff5370cb2c7dc4357825f02387757e36a5e03b711021c896043ba5f68e573308146a0d94c7855ec9b4860906a3b0720d316d119ca5bbda908f17d3f4f14f4999 -EBUILD moarvm-2018.06-r1.ebuild 1500 BLAKE2B df181c41d8056d8de35d81b6e51f75733fb2c66ae90e1a4a134f45021a5a244162be11691df40988b755d4fd17ef9d2b35416fa394836493100ac4c5ad422afc SHA512 a6680f07bd2f048fcf3ad99d4ab4980a6259924ae271674d31b4b8296687a174870f1b839307cffdaa8329d8219aba4a8cec5d3f8cf1c0f407026ac0bb90b0f9 -EBUILD moarvm-2018.08-r1.ebuild 1500 BLAKE2B df181c41d8056d8de35d81b6e51f75733fb2c66ae90e1a4a134f45021a5a244162be11691df40988b755d4fd17ef9d2b35416fa394836493100ac4c5ad422afc SHA512 a6680f07bd2f048fcf3ad99d4ab4980a6259924ae271674d31b4b8296687a174870f1b839307cffdaa8329d8219aba4a8cec5d3f8cf1c0f407026ac0bb90b0f9 -EBUILD moarvm-2018.09-r1.ebuild 1500 BLAKE2B df181c41d8056d8de35d81b6e51f75733fb2c66ae90e1a4a134f45021a5a244162be11691df40988b755d4fd17ef9d2b35416fa394836493100ac4c5ad422afc SHA512 a6680f07bd2f048fcf3ad99d4ab4980a6259924ae271674d31b4b8296687a174870f1b839307cffdaa8329d8219aba4a8cec5d3f8cf1c0f407026ac0bb90b0f9 -EBUILD moarvm-2018.12-r1.ebuild 1500 BLAKE2B df181c41d8056d8de35d81b6e51f75733fb2c66ae90e1a4a134f45021a5a244162be11691df40988b755d4fd17ef9d2b35416fa394836493100ac4c5ad422afc SHA512 a6680f07bd2f048fcf3ad99d4ab4980a6259924ae271674d31b4b8296687a174870f1b839307cffdaa8329d8219aba4a8cec5d3f8cf1c0f407026ac0bb90b0f9 +DIST MoarVM-2019.11.tar.gz 5709053 BLAKE2B 5214a041d02fa9feebf50996460b4a73634bf69dc24edbda72d29fe3045504dde809143ba6edf57602a5207e45a02e9a69cfecd2dca0bb5922e5560dca4e5861 SHA512 d7d7d21ff0e3896b7cb869ea1298f9ff1b041b68062ac509d4571246f96985de0ad48d881f7c988e1ed470c4c5f859f36916bfd764cbc0e988c249682b0b8b41 EBUILD moarvm-2019.03-r1.ebuild 1500 BLAKE2B df181c41d8056d8de35d81b6e51f75733fb2c66ae90e1a4a134f45021a5a244162be11691df40988b755d4fd17ef9d2b35416fa394836493100ac4c5ad422afc SHA512 a6680f07bd2f048fcf3ad99d4ab4980a6259924ae271674d31b4b8296687a174870f1b839307cffdaa8329d8219aba4a8cec5d3f8cf1c0f407026ac0bb90b0f9 EBUILD moarvm-2019.07-r1.ebuild 1515 BLAKE2B 55b2ffc73338a82251bc4b51b4399bf210c72eb1b26aa953e548111db85d0215b24c223d02bc316d8dea2cc422d07e62f70d8a3ff7e9c5245e8e42c0e987fd16 SHA512 e2da2b2e6fc0ddf405e2692facb8e544fa54d94d98c25216406c74d9dcf1990c70b363b4b6fa1a32b8b5d2b34e1e3060028fdf179825b6ab90abe288fb86d9df EBUILD moarvm-2019.07.1-r1.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b +EBUILD moarvm-2019.11.ebuild 1452 BLAKE2B 332ec11c368b9859dfa0761d7efa6cce35e06c089c032f0938122c254423c52796ccf03a89663abe39529331b50c0d16439c096879a27a4c34d8ceb07d618976 SHA512 70a8cdcad28b08c530f686e33272393913250ed670b7e9980dd03ad5299578f0d0cd564ebccf8b4d465dfd28c939a8d7a93f663dcbcfe5adf7fcc4bf274bc6d4 EBUILD moarvm-9999.ebuild 1765 BLAKE2B c961aadfb1fc6bc4cf4c73821a86f65e7f3ec82025701541bc55dcbe9449c4e7e15eed7be28992b75fad058b65d936e1248a9668e1b0619e9dc53f9306db419b SHA512 3845ff95d15475502a5c9541463d767e1e00875d53589209bb02ae24e494d6ebdfed393080935d592275a8c73e73cd2f889381298b85c93abe08089e67a41b4b MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b diff --git a/dev-lang/moarvm/moarvm-2018.06-r1.ebuild b/dev-lang/moarvm/moarvm-2018.06-r1.ebuild deleted file mode 100644 index 70a0082df833..000000000000 --- a/dev-lang/moarvm/moarvm-2018.06-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - >=dev-libs/libuv-1.26 - dev-lang/lua:= - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - MAKEOPTS+=" NOISY=1" - use doc && DOCS+=( docs/* ) - local prefix="${EPREFIX%/}/usr" - local libdir="${EPREFIX%/}/usr/$(get_libdir)" - einfo "--prefix '${prefix}'" - einfo "--libdir '${libdir}'" - local myconfigargs=( - "--prefix=${prefix}" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=${libdir}" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2018.08-r1.ebuild b/dev-lang/moarvm/moarvm-2018.08-r1.ebuild deleted file mode 100644 index 70a0082df833..000000000000 --- a/dev-lang/moarvm/moarvm-2018.08-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - >=dev-libs/libuv-1.26 - dev-lang/lua:= - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - MAKEOPTS+=" NOISY=1" - use doc && DOCS+=( docs/* ) - local prefix="${EPREFIX%/}/usr" - local libdir="${EPREFIX%/}/usr/$(get_libdir)" - einfo "--prefix '${prefix}'" - einfo "--libdir '${libdir}'" - local myconfigargs=( - "--prefix=${prefix}" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=${libdir}" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2018.09-r1.ebuild b/dev-lang/moarvm/moarvm-2018.09-r1.ebuild deleted file mode 100644 index 70a0082df833..000000000000 --- a/dev-lang/moarvm/moarvm-2018.09-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - >=dev-libs/libuv-1.26 - dev-lang/lua:= - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - MAKEOPTS+=" NOISY=1" - use doc && DOCS+=( docs/* ) - local prefix="${EPREFIX%/}/usr" - local libdir="${EPREFIX%/}/usr/$(get_libdir)" - einfo "--prefix '${prefix}'" - einfo "--libdir '${libdir}'" - local myconfigargs=( - "--prefix=${prefix}" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=${libdir}" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2018.12-r1.ebuild b/dev-lang/moarvm/moarvm-2018.12-r1.ebuild deleted file mode 100644 index 70a0082df833..000000000000 --- a/dev-lang/moarvm/moarvm-2018.12-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org" -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - >=dev-libs/libuv-1.26 - dev-lang/lua:= - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - MAKEOPTS+=" NOISY=1" - use doc && DOCS+=( docs/* ) - local prefix="${EPREFIX%/}/usr" - local libdir="${EPREFIX%/}/usr/$(get_libdir)" - einfo "--prefix '${prefix}'" - einfo "--libdir '${libdir}'" - local myconfigargs=( - "--prefix=${prefix}" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=${libdir}" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2019.11.ebuild b/dev-lang/moarvm/moarvm-2019.11.ebuild new file mode 100644 index 000000000000..7ca933ccf7b4 --- /dev/null +++ b/dev-lang/moarvm/moarvm-2019.11.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic + +MY_PN="MoarVM" +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + inherit git-r3 + KEYWORDS="" + S="${WORKDIR}/${P}" +else + SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_PN}-${PV}" +fi + +DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" +HOMEPAGE="http://moarvm.org" +LICENSE="Artistic-2" +SLOT="0" + +#USE=optimize triggers makefile bug +IUSE="asan clang debug doc +jit static-libs ubsan" + +RDEPEND="dev-libs/libatomic_ops + >=dev-libs/libuv-1.26 + dev-lang/lua:= + virtual/libffi" +DEPEND="${RDEPEND} + clang? ( >=sys-devel/clang-3.1 ) + dev-lang/perl" + +DOCS=( CREDITS README.markdown ) + +# Tests are conducted via nqp +RESTRICT=test + +src_configure() { + MAKEOPTS+=" NOISY=1" + use doc && DOCS+=( docs/* ) + local prefix="${EPREFIX%/}/usr" + local libdir="${EPREFIX%/}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" + local myconfigargs=( + "--prefix" "${prefix}" + "--has-libuv" + "--has-libatomic_ops" + "--has-libffi" + "--libdir" "${libdir}" + "--compiler" "$(usex clang clang gcc)" + "$(usex asan --asan)" + "$(usex debug --debug --no-debug)" + "$(usex static-libs --static)" + "$(usex ubsan --ubsan)" + ) + + perl Configure.pl "${myconfigargs[@]}" moarshared || die +} diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest index ce10e69f1de2..ccfd5a3e02fc 100644 --- a/dev-lang/mozart/Manifest +++ b/dev-lang/mozart/Manifest @@ -2,6 +2,6 @@ AUX 50mozart-gentoo.el 482 BLAKE2B f98c3c44f0e9ddfad7ee957e4c0dd3b24a01905ce0928 DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9e42dfe09b5b902fdfe6c8e8dcebe7198eaaf0e89cbb101ec3765713db0fbddb6f3b9741ed927af98df48aed496d7864f6bc5f6999 SHA512 99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51dafeeee8462 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229 -EBUILD mozart-1.4.0-r3.ebuild 2894 BLAKE2B 6f026769a720aab6c301530041015195efa3997a8a80df1b1cee00425ac581054005109dca73a7ee4681673745314b0f5b67c74456732eb875f5c6a2fa1149d4 SHA512 e888b5fbce71d17ba4f8ec8ff53614ba3f62e9f3e02d2c706d01b372a101bc1f674e4aa7c5d1c8ab48f4ce0d2b462c7944650ddb7f66e8722d468229b7721c9d -EBUILD mozart-1.4.0-r4.ebuild 2886 BLAKE2B bf1ee4cc38bf48de2c996cf97af3b0ff86ce60da0d77c0e7771b86bc9b3428325eaceb615b6aaa90db1b6b57bfc46d4fef7d8f7ee948fabcd34d6cc8afd8e4f4 SHA512 3506e05c23b75fd287e59a468bc81469d72329b8bde81cbc4496f6da399aa4918fb5a0e3a26132957bb7bcbe7253030d8c467da87d0d9ec5cac2c0ee4c22cf17 +EBUILD mozart-1.4.0-r3.ebuild 2907 BLAKE2B 51d3f72aa2e7fa96029a9ff8abb21f52153dbaf044a6a9c84ea6c9ab6431447e5b2c469166bede84c5f6fb9e2a3b62a059424d569f455eb9723db7cff1783a7f SHA512 f860e6013bb7e8efeecb8ec020f7884718e082ea7917b70e9c9343961ae0f72d188b256ce647897d7e2f284dc6ac3cb349ace59eaf00fd69d775f43fae11b11f +EBUILD mozart-1.4.0-r4.ebuild 2899 BLAKE2B 39c2530e3a87f38a29291ff44e861b287d1413463c1c7fcd80ccf611cbd9d8ea3f6c976f92fe3136ecce7453f9194dd99999e1600cf8ca81e8226e130ea51ef4 SHA512 c1324e8ae65b5f23d0727bc6a5c87238d5413df4ac31c45e9e8259531bf2cacf7764e9646a9ace1427fe197995c4a79d972131e39c0204ec6bc04c927930acf3 MISC metadata.xml 248 BLAKE2B 15dcca8e423036aaf3d73f9557507d39f7a22a6fa36d83405d8180df441adc50b9d61f8dd720a9d0045f5b3e6ebc9785fcf8f1340c253b2d277404672d395c1b SHA512 b296da55efb17a1040203bc1f5f3bfa8160711fdb72f0543739e6efe48b75427c082eb6c405d99b3256e8d536d3d29f71fdd0fd8d281cb9a9967060ea467a034 diff --git a/dev-lang/mozart/mozart-1.4.0-r3.ebuild b/dev-lang/mozart/mozart-1.4.0-r3.ebuild index 8f96e42f8843..44dbcac31907 100644 --- a/dev-lang/mozart/mozart-1.4.0-r3.ebuild +++ b/dev-lang/mozart/mozart-1.4.0-r3.ebuild @@ -24,7 +24,7 @@ RDEPEND=" dev-lang/perl dev-libs/gmp:0= sys-libs/zlib - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm ) tcl? ( tk? ( diff --git a/dev-lang/mozart/mozart-1.4.0-r4.ebuild b/dev-lang/mozart/mozart-1.4.0-r4.ebuild index f94dc9760e3b..ab9ddf42868e 100644 --- a/dev-lang/mozart/mozart-1.4.0-r4.ebuild +++ b/dev-lang/mozart/mozart-1.4.0-r4.ebuild @@ -24,7 +24,7 @@ RDEPEND=" dev-lang/perl dev-libs/gmp:0= sys-libs/zlib - emacs? ( virtual/emacs ) + emacs? ( >=app-editors/emacs-23.1:* ) gdbm? ( sys-libs/gdbm ) tcl? ( tk? ( diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest index a0f34346890d..f17010dcc340 100644 --- a/dev-lang/nqp/Manifest +++ b/dev-lang/nqp/Manifest @@ -1,14 +1,8 @@ -DIST nqp-2018.06.official.tar.gz 3795050 BLAKE2B 9c5be1a93f5bba632778125fe3c13431606ef01b654775f890aef27c8bfd220930079cb820e933fdae2d151a7c3bacd57bd4f139547cd938e5c1eb0c54b16f19 SHA512 6b4a74098a3d55931a3c8934029f0e97e388b90c1babef023023e1bf3203dbe53b928155d24ecb6a3a54a3228e72a18a2a2747cd8389497569e24e22d489c68c -DIST nqp-2018.08.official.tar.gz 3770932 BLAKE2B 2425c28a8192fe0d992650fe3d9c79e198c69abfece17276d62225cfa2029916af1ec7568f626a1a67eadc886a1544154af3c015370a67eb1e13e5da35e08bd8 SHA512 663b52677c49eb4b6c5f4ed68de821d9adbe4e3fbcabf2174227b1d3dfafffa357f720557b18a5fbd121c46704dda117395c996a78af70eb367f1b23d8b2564f -DIST nqp-2018.09.official.tar.gz 3798897 BLAKE2B d9ac40be8f864a7c9a35cd21dde188396b15465568d7642dbd5dddc3468edc09b6e2f7997fb08a189e160cd5ec004cb4efdcee9262e23b6bb32650eb17d93c14 SHA512 5a673430c2dce5d51f90fd8da18636d1abfd5e841f8530a51020beaffd83635a77090e52968bcbcdee361681a436834490bd2f5c383b21972cf40a9d88b28020 -DIST nqp-2018.12.official.tar.gz 3930041 BLAKE2B 35876f63461aadc634e8ad3fd1a46aff4ead788ebf0d741eb1ff6a82e9227fd5edbcd1f733c184083f73073f2ac1a8dab094f2f8fe177183663697dc13da3065 SHA512 56b7821fc0164c8e8fcf58a16aa96c75347aa078cb3bf7f8f6c41df26338e51e2ddb6984049908de83126861c7406c4504e073e7203409c3f37b129661b8c2f8 DIST nqp-2019.03.official.tar.gz 3951058 BLAKE2B 237b8cc0105396fc96349a0dd34502ab45fb7d02089dd2ef5aad2554610b4090adf11679271869e5ae06abfa509210959ae8762fbee30dfe6190d6a74ce32591 SHA512 248768c1b1c0f5e5bd19183404e2a1aa28ab488b05db0b1ed0f0bcceca8b9830885762e763ea38cdd2b54d975d2663e1defe236907096aabc5b668818d293533 DIST nqp-2019.07.1.tar.gz 3937612 BLAKE2B 71f5ddadaa70d7eeadc122ef50f90c13bf7e3a1a4262069ee8564f739e99dfb780359e1155a28f61f90dd1cc419379e366d7274c9567a4319bd841005c3a51a9 SHA512 90c9cfbc3de165ba8c0b4653a849a6faafef9e3862743c3675277c25bc4578522a97a663a4ed7529831fa0b617c7412fcfe67b3e3ff1fc5994f6c42cdf7a4bc5 -EBUILD nqp-2018.06-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb -EBUILD nqp-2018.08-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb -EBUILD nqp-2018.09-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb -EBUILD nqp-2018.12-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb +DIST nqp-2019.11.tar.gz 3942494 BLAKE2B 241c4131fc94d7055b51a44b7be824fb53a00fc51370f59dcba1d92655de66e2db536c622084bf9466d9d753d5ad804411b4af07b2767ad1a4f09e065c6693f8 SHA512 3b9fea9d9c4d2ae2ca065536bcca5b483067f9e723c3a89c7e238199c0f52ea6ba23ae4429dacbd42bea69dccbbc836efe5046d1691185d5452f30912f4e6a40 EBUILD nqp-2019.03-r1.ebuild 3652 BLAKE2B 98256f4c5d360e3702c9afccb52fb2deafb0acc00e734498f279a624ea369b409dd1a703e80a2c3e864c50cbce722c5a7f19baa510b44f44cc3e6f6485d0e55c SHA512 b26d0662ee6c72592052b89abe6cdd6d2509f9a8b917c19fd695f1b2fef42860b7331637356e1e61e2325b0a4ce69a5892acc901cea9d43e9937ddfc202e35cb EBUILD nqp-2019.07.1.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6 +EBUILD nqp-2019.11.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6 EBUILD nqp-9999.ebuild 3649 BLAKE2B 61c3ee8cb3bf94c237f88983827101e382d3ad917f3b9420320dd6dd084c58948bcc67065c63aad7a7526838234489d4488010e102915d69e7b97f45a6051806 SHA512 0d44d1b29f60588a01b48990411eb1a3c3878e34760137d3c64c96311d5f2f2405b2d8dba467fa7feefa392557f6fdfcb2edfbdcf714b809ffdd555f648281e6 MISC metadata.xml 634 BLAKE2B 1ef5daf7c995ddad1df4b2c7d33ecfc7a4cd146cb518314f88d58e370ede9e986bb47747b10952cf0ee6d587fe5925ba5b0086006182f3e16bd114d49e1a0f3a SHA512 a093877d22e76bbbced97c7752ed76d6aa110eb8d0676f97ae3d38ad79ab7b8ba770243b64e618b588faebf179713813fe6fc8ec7371c695c9f0979f6bce3dc0 diff --git a/dev-lang/nqp/nqp-2018.06-r1.ebuild b/dev-lang/nqp/nqp-2018.06-r1.ebuild deleted file mode 100644 index 663242f61de6..000000000000 --- a/dev-lang/nqp/nqp-2018.06-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="https://rakudo.org" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.8 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.8 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=${EPREFIX%/}/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2018.08-r1.ebuild b/dev-lang/nqp/nqp-2018.08-r1.ebuild deleted file mode 100644 index 663242f61de6..000000000000 --- a/dev-lang/nqp/nqp-2018.08-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="https://rakudo.org" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.8 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.8 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=${EPREFIX%/}/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2018.09-r1.ebuild b/dev-lang/nqp/nqp-2018.09-r1.ebuild deleted file mode 100644 index 663242f61de6..000000000000 --- a/dev-lang/nqp/nqp-2018.09-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="https://rakudo.org" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.8 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.8 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=${EPREFIX%/}/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2018.12-r1.ebuild b/dev-lang/nqp/nqp-2018.12-r1.ebuild deleted file mode 100644 index 663242f61de6..000000000000 --- a/dev-lang/nqp/nqp-2018.12-r1.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 multibuild - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/perl6/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.official.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" -HOMEPAGE="https://rakudo.org" - -LICENSE="Artistic-2" -SLOT="0" -IUSE="doc clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="java? ( - dev-java/asm:4 - dev-java/jline:0 - dev-java/jna:4 - ) - moar? ( ~dev-lang/moarvm-${PV}[clang=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.8 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.8 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream jars" - java-pkg_clean 3rdparty/ - - # Don't use jars we just deleted. - sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ - src/vm/jvm/runners/nqp-j || die -} - -src_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=${EPREFIX%/}/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # Set JAVA_PKG_JARDEST early. - java-pkg_init_paths_ - - # Upstream sets the classpath to this location. Perhaps it's - # used to locate the additional libraries? - java-pkg_addcp "${JAVA_PKG_JARDEST}" - - insinto "${JAVA_PKG_JARDEST}" - local jar - - for jar in *.jar; do - if has ${jar} ${PN}.jar ${PN}-runtime.jar; then - # jars for NQP itself. - java-pkg_dojar ${jar} - else - # jars used by NQP. - doins ${jar} - fi - done - - # Upstream uses -Xbootclasspath/a, which is faster due to lack - # of verification, but gjl isn't flexible enough yet. :( - java-pkg_dolauncher ${PN}-j --main ${PN} - dosym ${PN}-j /usr/bin/${PN} - dobin tools/jvm/eval-client.pl - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2019.11.ebuild b/dev-lang/nqp/nqp-2019.11.ebuild new file mode 100644 index 000000000000..c6689cf62d83 --- /dev/null +++ b/dev-lang/nqp/nqp-2019.11.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit java-pkg-opt-2 multibuild + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/perl6/${PN}.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://github.com/perl6/${PN}/releases/download/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" +HOMEPAGE="https://rakudo.org" + +LICENSE="Artistic-2" +SLOT="0" +IUSE="doc clang java +moar test" +RESTRICT="!test? ( test )" +REQUIRED_USE="|| ( java moar )" + +CDEPEND="java? ( + dev-java/asm:4 + dev-java/jline:0 + dev-java/jna:4 + ) + moar? ( ~dev-lang/moarvm-${PV}[clang=] )" +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.8 )" +DEPEND="${CDEPEND}" +BDEPEND="${CDEPEND} + clang? ( sys-devel/clang ) + java? ( >=virtual/jdk-1.8 ) + dev-lang/perl" + +pkg_pretend() { + if has_version dev-lang/rakudo || has_version dev-lang/nqp; then + ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" + ewarn "already being installed. So if it fails, try uninstalling both" + ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." + ewarn "(see Bug #584394)" + fi +} + +java_prepare() { + # Don't clean stage0 jars. + einfo "Cleaning upstream jars" + java-pkg_clean 3rdparty/ + + # Don't use jars we just deleted. + sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \ + src/vm/jvm/runners/nqp-j || die +} + +src_prepare() { + MULTIBUILD_VARIANTS=() + use moar && MULTIBUILD_VARIANTS+=( moar ) + use java && MULTIBUILD_VARIANTS+=( jvm ) + + multibuild_copy_sources + + # This will pull in conditional java_prepare + default +} + +nqp_configure() { + pushd "${BUILD_DIR}" > /dev/null || die + local myconfargs=( + "--backend=${MULTIBUILD_VARIANT}" + "--prefix=${EPREFIX%/}/usr" ) + + perl Configure.pl "${myconfargs[@]}" || die + popd || die +} + +nqp_compile() { + if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then + emake -j1 \ + -C "${BUILD_DIR}" \ + THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ + JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" + elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then + emake -j1 \ + -C "${BUILD_DIR}" + fi +} + +nqp_test() { + emake -j1 \ + -C "${BUILD_DIR}" \ + test +} + +nqp_install() { + # This is the actual reason we need multibuild.eclass. + # We need to distinguish the install procedure for MoarVM and JVM backends. + case "${MULTIBUILD_VARIANT}" in + moar) + emake \ + DESTDIR="${ED}" \ + -C "${BUILD_DIR}" \ + install + ;; + jvm) + pushd "${BUILD_DIR}" > /dev/null || die + # Set JAVA_PKG_JARDEST early. + java-pkg_init_paths_ + + # Upstream sets the classpath to this location. Perhaps it's + # used to locate the additional libraries? + java-pkg_addcp "${JAVA_PKG_JARDEST}" + + insinto "${JAVA_PKG_JARDEST}" + local jar + + for jar in *.jar; do + if has ${jar} ${PN}.jar ${PN}-runtime.jar; then + # jars for NQP itself. + java-pkg_dojar ${jar} + else + # jars used by NQP. + doins ${jar} + fi + done + + # Upstream uses -Xbootclasspath/a, which is faster due to lack + # of verification, but gjl isn't flexible enough yet. :( + java-pkg_dolauncher ${PN}-j --main ${PN} + dosym ${PN}-j /usr/bin/${PN} + dobin tools/jvm/eval-client.pl + popd > /dev/null || die + ;; + *) + die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." + ;; + esac +} + +src_configure() { + multibuild_foreach_variant nqp_configure +} + +src_compile() { + multibuild_foreach_variant nqp_compile +} + +src_test() { + multibuild_foreach_variant nqp_test +} + +src_install() { + multibuild_foreach_variant nqp_install + + dodoc CREDITS README.pod + use doc && dodoc -r docs/* +} diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index a07301d3c244..e1483f178256 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -3,8 +3,10 @@ AUX ocaml-rebuild.sh 1120 BLAKE2B 6f88a9f2b99fae7f89b884bb08d2c6ad6a0e14d4a8fd06 AUX ocaml.conf 177 BLAKE2B da070848d9e3a30ad303c296f55de87c30fd15feee3304ccc1d1f844d83c5a646664cd4d9958375ead2324e25bb88280fdb78f9e4230eeb8cd5825eed6f2f91d SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4 DIST ocaml-4.04.2.tar.gz 4061873 BLAKE2B 756936592c7e0c87da27f154f07850eb3e4b2ed46ff3b36ff57541375840cd56b170dbe646ef6682f63d4e15ae209d3c125581803641f07403e9eb838c265519 SHA512 8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225 +DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B 5e76a198c2f5ca9f231d4e80499d784cf061ec79bf6b5e3aac917e1260d1f2b927f0f8015d39c01ce4fd481d32a5d211c31e081a7ab87ba1e7c7d5def95bc0fb SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 EBUILD ocaml-4.04.2-r1.ebuild 3533 BLAKE2B 65e12c5762403a60f52a1b1b837ce6892b30bbcff7339d355b94460bf3a12fb02d357f80c97f10cb25bb003e9c91bfffd3715f272bb45ddb410e7bf418cada19 SHA512 b09035f95bc3b172c01bd293585c8a50e1e9582de0cc44c185f7c07d1dbf0e3db20a029b9aec58c526ef3032d3ac00b0d9a42a06005d3e5e9ccfa0a535e1d4c5 EBUILD ocaml-4.05.0-r1.ebuild 3692 BLAKE2B f8f81b2c8127e5e3b8fc4b37ce9e0e01bf63e4b09c0727d20dfe36dd038ff4261f3383d7f63710eb73405d5eb6b6ab348bd88bc62665b8be7aee34b9a89c1802 SHA512 ab7bc8419507ff59eed35628183a0ea79319648adee66ec42313ad74df8b5a0c1e87db273cbe87d9e67b19a900eba0c473d3e167afc9c97490cb496b4c529cb4 +EBUILD ocaml-4.09.0.ebuild 2142 BLAKE2B 413fe2aa718faeff59ed28baecef24d2ea19f11fb52913237c86a82575f1ec05d253bebfe25a30020594548dcfe14be7e939a5f07ed7f80d2a37a61238328e54 SHA512 21f773d1fdbc89920c46956b9e409cfb6e92ece1105e916fe1a7659ef5c8a6aaf78f75203cdbbf26fc8c164fc2189fb11c95c7bbfa54bc104505d24125b38fee MISC metadata.xml 605 BLAKE2B 30bf74c9300280f432ca8ae675b756e9b95a8e683c56eebae7fab890071c616bcc2a2fae516e31c593c0e626061aba603909b073ff6c3fea4d09e7fce40f3f83 SHA512 298d96d5685b1e79e1baab1e393ef083fa270d147a24ae2a35fa424b311dbf45931673dbf44974a946cd3423d62ce66df6d36017dcf6cb3275770c1cf6215c10 diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild b/dev-lang/ocaml/ocaml-4.09.0.ebuild new file mode 100644 index 000000000000..c39cc2aee83d --- /dev/null +++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +HOMEPAGE="https://ocaml.org/" +SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles" + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="emacs flambda latex +ocamlopt spacetime xemacs" + +RDEPEND="sys-libs/binutils-libs:= + spacetime? ( sys-libs/libunwind:= )" +BDEPEND="${RDEPEND} + virtual/pkgconfig" +PDEPEND="emacs? ( app-emacs/ocaml-mode ) + xemacs? ( app-xemacs/ocaml )" + +src_prepare() { + default + # Upstream build ignores LDFLAGS in several places. + sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \ + -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \ + -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \ + Makefile.config.in || die "LDFLAGS fix failed" + # ${P} overrides upstream build's own P due to a wrong assignment operator. + sed -i -e 's/^P ?=/P =/' stdlib/StdlibModules || die "P fix failed" +} + +src_configure() { + local opt=( + --bindir="${EPREFIX}/usr/bin" + --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml" + --mandir="${EPREFIX}/usr/share/man" + --prefix="${EPREFIX}/usr" + $(use_enable flambda) + $(use_enable spacetime) + ) + econf ${opt[@]} +} + +src_compile() { + if use ocamlopt ; then + emake world.opt + else + emake world + fi +} + +src_test() { + if use ocamlopt ; then + # OCaml tests only work when run sequentially + emake -j1 -C testsuite all + else + ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests." + fi +} + +src_install() { + default + dodir /usr/include + # Create symlink for header files + dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml + dodoc Changes README.adoc + # Create envd entry for latex input files + if use latex ; then + echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc" + doenvd "${T}/99ocamldoc" + fi + # Install ocaml-rebuild portage set + insinto /usr/share/portage/config/sets + doins "${FILESDIR}/ocaml.conf" +} diff --git a/dev-lang/opendylan-bin/Manifest b/dev-lang/opendylan-bin/Manifest deleted file mode 100644 index 0a6fb8659690..000000000000 --- a/dev-lang/opendylan-bin/Manifest +++ /dev/null @@ -1,19 +0,0 @@ -DIST opendylan-2011.1-x86-linux.tar.bz2 31908698 BLAKE2B 8373c5cd88ddf44ae754c537427b308a0a6e639b07c883f8d357a62b1f8635cd99328d3abdc71b79f7af0271248db768c385bc7cecc3c686e0e5d6fbee9f8b6d SHA512 345d97d71e34fd7cd923c9f53b65cb33d7edab4f2d946fd7cf9430df63cafc361ff854d444edde9d40c94bc16a3899979a34346a9ca60b9fd20e2745ff27a33b -DIST opendylan-2011.1-x86_64-linux.tar.bz2 36493244 BLAKE2B 669e874649dcb664ae064dc2079856f1670507599af9738653c46a68d72be9aff9541f5a20dac1450bfebae928d9560c64de6a5c15d98d87a70b7842a2d3e611 SHA512 4241df29a762c73262ab7856aa2e7dc1b302719cf96de3a5d4878e5d7c5e15308d89b5c82d6379fb48b6badad03027427c013f27c690b6d8a372628ce81cda91 -DIST opendylan-2012.1-x86-linux.tar.bz2 32874377 BLAKE2B 52b1b0ec84e1fd4918b0ae9058bee23511b66ddc267f927f989127a0a0c37ee79bebcd7f817cc7f4fd06e986f5c3bbd61a78198173f08409b91c8c39d61ecd36 SHA512 3ba1744e3dc62ab8ede681f7317ebfb3ec80bb35dd10f8c0f24fe2f77abb86157a939a69f7585a88f82233563388014cc2a686d8e2cd15c73d314d496356cb69 -DIST opendylan-2012.1-x86_64-linux.tar.bz2 47535071 BLAKE2B f9806113e117cf544456001ea9e69e382d59131c555cab662c78c5a2a1bb786997633da7a2067f505c8ea964da0efc49344b3cdbbd52f80821255dde5d8da156 SHA512 53b36b9ec1eff40bb9572f8a9118d18ba6674798c053678abf326d947a9e8d5dc51e2d89e9fa9dc58dd61f0c83e5d3cab4acec2af2968edbe196b8c7fe9599dc -DIST opendylan-2013.1-x86-linux.tar.bz2 32974920 BLAKE2B 18c2d3a4aee44ea943c15a622eca21103ca235133437037dd5cef8a05457095ea70b3121f83145fd96b91ff0bfcb177efb9cc4865559c743eeeb5efb25d32fe6 SHA512 a3b78c2c78cb0fe73a7a7d3bf13c28d9a44d451ace6c5fc9c18e67a1ed04afbb1dab1a2679279bec4fe4de7d68afc6e8fba051de5b9f26b472ee42393ed1547d -DIST opendylan-2013.1-x86_64-linux.tar.bz2 47675706 BLAKE2B 990cf5b240393204c82f52997359e32446729be67f0d4342e630fdcd1c7f768990476fec83fd79dc48b20d84baff606bf3d8028ed8025740f80032280f892f32 SHA512 f60dc7ee49f382375843d5887956541362461350acbd75f2e3af82887ef1bc2a5373f8db5cf0838aa627223036eb36558d3484b03f7128abbab030fc3cc717f5 -DIST opendylan-2013.2-x86-linux.tar.bz2 32953359 BLAKE2B c482cbf7498120b789e7216ca682d6d60d5a0c74746fffe5a27b59d9d51b877960e7658d7e8d3af7ba4128573b645ba901e9de1a45c76f29985a86a6fff0bb8d SHA512 e54ac273e6ca257df260efea9b680a99b53c01521b01afc6612902becc3e5a119dd3b0872124c098444d1a00ae1b436f186999ef04bf4efca484ebd9c70be346 -DIST opendylan-2013.2-x86_64-linux.tar.bz2 48471480 BLAKE2B 49dd5cd1f8e0756031933aaf595ca0b7a2525e58cd67952ddaf50ef9ae83e971655479fea3e47f5c10ba610253b8945b6f0e25219dbeff05d27687881d07559c SHA512 cac4205e47bee41dfa99cf059897025a60942fb0e73c970f26fffba7c77ceebcd789e0acb110ad636d6b8ebac947632e9d28e8d0887e4d4b7be2bc2791c1eeac -DIST opendylan-2014.1-x86-linux.tar.bz2 42086000 BLAKE2B 7c56962867348f8ec4de74bf37a52ebe0dd0b7aaab242217e660599667b5fbb498e83b14b21dec2622c1dbc7437edb434105105127da37e63917fce17d3a1829 SHA512 8411db8cf56b6b4dad11d29ab49f3d9d21d93b05af2c45a5fee0cea1a56eb471b40cb6cbd622f1db995284c499a1c5a5b7d509e31ae6f4f4afe1595a2f4aab79 -DIST opendylan-2014.1-x86_64-linux.tar.bz2 49625384 BLAKE2B a2fdf67efe41c0f91e071b83bb03c214bb596cba1e051a4014677c822f9d34a4d3efea21c3e8cb230b065c75e8ae040e157f5d1ecc48a0531fb152852ed6948d SHA512 4d88ab8c6916e82465d846b32a86da0ec654d40a2a1310a7b05897d9bfa325c839713f46f62081b968793b3713a61cb74158c405cb724fa5fdf4c97596e1c6bf -DIST opendylan-2019.1-x86-linux.tar.bz2 48674460 BLAKE2B 24bb8a47c36fb55972a72c49acca74808dd9091eca9cf6dd2c0a2f3e650dc4f52d323b38f1bb064830b90859b130425a9369fd5791b6f1dd8e3b2123103331c1 SHA512 74338f8f5eb7ad886624ce206fc30689e087aa3620b724af0ef34be006f937c9228ea4cdf86b0b96b496f6506d07e90ae7d3429b01c7c9e1a80bd1118edfc437 -DIST opendylan-2019.1-x86_64-linux.tar.bz2 66704263 BLAKE2B 062c8ebec898594cbb8e446b30a5b1b37541c5a4e193f0f7afe7c73b90ac5c35a58dd4caa407f22708a0d2fd39ecf5ebd50a0eaf519b842997a524b15f7ee7f5 SHA512 172ad77c3e6f4e2248c9c27e28a7d9769578ab65c42af0228eaec41d9f950a284c44673191b48f527dcb2232a4dfa2dfec118a51b79e2e4742c1a7d157e07842 -EBUILD opendylan-bin-2011.1.ebuild 923 BLAKE2B cf5bb054863e6b7be1929ce426eda2b68dc5f2ee167075c8f25a0a3b50711bcd9c314f5528bcc93db3e948f9c4d8bb908b1d3357032a1ea9e99271ea57b2527a SHA512 ef393f9fa0ea4ae7bee05dadca1315c577c9abd7f2ff72d3ddf9de51d3ca1c89883330539a2aa143e83be22a8178db891536d47b4d6b19a4ecc8552d246c1edc -EBUILD opendylan-bin-2012.1.ebuild 923 BLAKE2B 767041264e40a077b4c49be94da284837775305d638ad34cf4c837a6e1f5ecbc94c7d0efe2d0ae8279a6b0ab3af4c43bc48718b01c4805f4d2954e104c767ef9 SHA512 e8179745eea213675f816df256463661dde069ae57c11980357b540ce84770e9fc2e4101d4955b3fb7cbec62dce754d467000dbcaad6a3d818518b4a4b900a81 -EBUILD opendylan-bin-2013.1.ebuild 923 BLAKE2B 885136b342ac640e173b375ca84e7f59908714c418bae5f0312011ca00518dbd07ab98ff336bea2375b213c5edbc61de5a0df3483f26a2d9a78d54edcb312a57 SHA512 d35c9362abea48d4b44f7b5d630cbd43bf2ab584cf09221b5a282962794b62a3c215aa36267247d03b7e7ce2eb1b6ecb97c6af09acf05162637332828741a3a0 -EBUILD opendylan-bin-2013.2.ebuild 923 BLAKE2B eee0d59111a98d7d2c51748c230297bd1d406165a9eefe90e6141284b5229267266430b4a20882e01c8fcc183fdb88df9eec2a0ae2e2a2e1e55a15812239bcb6 SHA512 944b22fa0cd09adedf85def45dcdbb90499f047ae33fbbaa6fe6992f55f39157e5a0b2c39eba6deccd82fe06216a8d4df99270ff455c598dfcd60f5f737c242d -EBUILD opendylan-bin-2014.1.ebuild 922 BLAKE2B 801323b005be4f5ce50e86d9c83a51c6a201cf17128523a70861913061becdf53e12cb7e36c80dd77269f332c4e899e2efe8e5083ae91ff087595154bf20d2eb SHA512 8ce55c0176921a96c7aec46b9fb4d52842e180d56fd1b876fbbb8d17b3c07952d2001ad3f35882c3717d32206d49289732f41d11a9d2b32ad91e145919ce13de -EBUILD opendylan-bin-2019.1.ebuild 942 BLAKE2B 8e77d046d7f3be9baaf811d23a63be03b9c5af0c9682c32464887f5f1811962d39d62a646ccbfd7302b360a6d59216b0ebc4c1c7125e3bd2d3785bd2386216ea SHA512 292072e1c243fe5563e15ff324a4ed271981cbca511d85c6673161bdcac115c41e4f3f69cd1201c130c7e13eedbac5b0d936e7a6bf2b471ae59d1beab6bd65f7 -MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 diff --git a/dev-lang/opendylan-bin/metadata.xml b/dev-lang/opendylan-bin/metadata.xml deleted file mode 100644 index 40aa45df2b01..000000000000 --- a/dev-lang/opendylan-bin/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - patrick@gentoo.org - Patrick Lauer - - diff --git a/dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild deleted file mode 100644 index 34cbd5bb0e9c..000000000000 --- a/dev-lang/opendylan-bin/opendylan-bin-2011.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="OpenDylan language runtime environment (prebuilt)" - -MY_PN="opendylan" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://opendylan.org" -SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-linux.tar.bz2 ) - x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )" -LICENSE="Opendylan" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="dev-libs/boehm-gc" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { :; } -src_compile() { :; } - -src_install() { - # this is a precompiled tarball - mkdir -p "${D}/opt/${MY_P}" - cp -ar "${S}"/* "${D}/opt/${MY_P}" || die "Failed to copy stuff" - mkdir -p "${D}/etc/env.d/opendylan" - echo "export PATH=/opt/opendylan-2011.1/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan-bin" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild deleted file mode 100644 index b614e1799771..000000000000 --- a/dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="OpenDylan language runtime environment (prebuilt)" - -MY_PN="opendylan" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://opendylan.org" -SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-linux.tar.bz2 ) - x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )" -LICENSE="Opendylan" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="dev-libs/boehm-gc" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { :; } -src_compile() { :; } - -src_install() { - # this is a precompiled tarball - mkdir -p "${D}/opt/${MY_P}" - cp -ar "${S}"/* "${D}/opt/${MY_P}" || die "Failed to copy stuff" - mkdir -p "${D}/etc/env.d/opendylan" - echo "export PATH=/opt/opendylan-2012.1/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan-bin" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild deleted file mode 100644 index 8bd7c2014816..000000000000 --- a/dev-lang/opendylan-bin/opendylan-bin-2013.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="OpenDylan language runtime environment (prebuilt)" - -MY_PN="opendylan" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://opendylan.org" -SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-linux.tar.bz2 ) - x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )" -LICENSE="Opendylan" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="dev-libs/boehm-gc" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { :; } -src_compile() { :; } - -src_install() { - # this is a precompiled tarball - mkdir -p "${D}/opt/${MY_P}" - cp -ar "${S}"/* "${D}/opt/${MY_P}" || die "Failed to copy stuff" - mkdir -p "${D}/etc/env.d/opendylan" - echo "export PATH=/opt/opendylan-2013.1/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan-bin" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild deleted file mode 100644 index 1863fb7604d3..000000000000 --- a/dev-lang/opendylan-bin/opendylan-bin-2013.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -DESCRIPTION="OpenDylan language runtime environment (prebuilt)" - -MY_PN="opendylan" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://opendylan.org" -SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-linux.tar.bz2 ) - x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )" -LICENSE="Opendylan" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="dev-libs/boehm-gc" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { :; } -src_compile() { :; } - -src_install() { - # this is a precompiled tarball - mkdir -p "${D}/opt/${MY_P}" - cp -ar "${S}"/* "${D}/opt/${MY_P}" || die "Failed to copy stuff" - mkdir -p "${D}/etc/env.d/opendylan" - echo "export PATH=/opt/opendylan-2013.2/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan-bin" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild deleted file mode 100644 index 4ddfd8439d60..000000000000 --- a/dev-lang/opendylan-bin/opendylan-bin-2014.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="OpenDylan language runtime environment (prebuilt)" - -MY_PN="opendylan" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://opendylan.org" -SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-linux.tar.bz2 ) - x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )" -LICENSE="Opendylan" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="dev-libs/boehm-gc" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { :; } -src_compile() { :; } - -src_install() { - # this is a precompiled tarball - mkdir -p "${D}/opt/${MY_P}" - cp -ar "${S}"/* "${D}/opt/${MY_P}" || die "Failed to copy stuff" - mkdir -p "${D}/etc/env.d/opendylan" - echo "export PATH=/opt/opendylan-${PV}/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan-bin" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild b/dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild deleted file mode 100644 index b2aad75799da..000000000000 --- a/dev-lang/opendylan-bin/opendylan-bin-2019.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="OpenDylan language runtime environment (prebuilt)" - -MY_PN="opendylan" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://opendylan.org" -SRC_URI="amd64? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86_64-linux.tar.bz2 ) - x86? ( http://opendylan.org/downloads/${MY_PN}/${PV}/${MY_P}-x86-linux.tar.bz2 )" -LICENSE="Opendylan" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="" - -DEPEND="dev-libs/boehm-gc - sys-libs/libunwind" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_configure() { :; } -src_compile() { :; } - -src_install() { - # this is a precompiled tarball - mkdir -p "${D}/opt/${MY_P}" - cp -ar "${S}"/* "${D}/opt/${MY_P}" || die "Failed to copy stuff" - mkdir -p "${D}/etc/env.d/opendylan" - echo "export PATH=/opt/opendylan-${PV}/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan-bin" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan/Manifest b/dev-lang/opendylan/Manifest deleted file mode 100644 index 96a8b7fbea91..000000000000 --- a/dev-lang/opendylan/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -DIST opendylan-2013.1-sources.tar.bz2 8441356 BLAKE2B 5dad47af5ccd5bb760c8fd0e83faf6442f43b47c985731cd3b2fae5644f5dbc96150050f3fa19110391ae36bbd1a68d0e51ae6d5ac95407c38a3fcfebf8425cf SHA512 f5168bb9a4d2bcd372667406f2f07ed5972f3e773a5766c5f74421d6ffd10901a43cf9d6604ad2ae14d80f1b84e856f4fdca3e1546a87053939f470005a87a2f -DIST opendylan-2013.2-sources.tar.bz2 9174284 BLAKE2B 124af65a76c3f795a90f8220ca499fa822e329e33be2b322d63b77a82880e18b3b665968a726ecbfa1888c29b62b9a11f3a568b222ef18dfab38c3ae05bfdf23 SHA512 f846a1d80f78b887815d2f2983314dbf6b5f424164dba9bc6ac456b40f31ab02aeb073a447df8f02b3fad6bcf6401a889abaac400d58db8e0adebcdd4e177a4d -DIST opendylan-2014.1-sources.tar.bz2 8232321 BLAKE2B 45535287a2d85617e0461da4dfcd93f1f95249a7c191732624129174c6696411b3cf2a3cd85bb9eaa26c3723689d1ebfbb812fabb3a8d3e2ac5cfd7f4ee284f9 SHA512 576616cad0eb6ff8606a394834ad325858a5f45a8427adb0eefc9ebf883ab1522ec66dff6e591a367390d49f53acd160becad62679edc610ccfe63c9a3795cfc -EBUILD opendylan-2013.1-r1.ebuild 3113 BLAKE2B 226032fa9b4d44831cc6d7fd35a70cf15e2e7d90ecc94333037bb57cb30e1d9a9ebcf08cb1bffc4396c3da3173799465bcc00252e42b1790de6e01225e21b51b SHA512 87456cc061a5c96f76b4a7627cb786ced699614963223c86e9b6c1ffcf4058a0e9525d640d8c2af291278f64161d21b83c53b475fb80450e3668a2cf5905b30c -EBUILD opendylan-2013.2.ebuild 3332 BLAKE2B 01cd337e01cc90ef9465995d5df73b4cc76f2ba7ffca9a439cf0ff2e34bbbcd7f9f56db88fe0ccf88f22dbdb0597f86a93306a7fab18d52fdb326938a21306a4 SHA512 d355ebaf9f1d8686ec6718992ec39f973503ed5880ac6262f5b35944d0fa62dc77b19e3aadb73922a6c1d179719d452acc114cec4aba1dfd4f105228c18f4060 -EBUILD opendylan-2014.1.ebuild 3215 BLAKE2B 3a153fbf2f21247a257aea485fdbf09ce2906277a7baeb129d105b3324bd92010dc58aacc8fdc83e10af9f992d7f46a4816d8baa48a2846a433b31b78c38f87a SHA512 bed7f864c1bf3fd76ad640e3cd02a34977dbf14b65a68076ef002e4fc7dec8a1ca15085b5e8b71c05ffc58ab4b3be6a40d5bb9aedbf1afd35303e2bf1a72e467 -EBUILD opendylan-9999.ebuild 1748 BLAKE2B a342d7b3c13c996c56ae9b29e79d45641dcee92e42408977b13fd1b90a48674cd95e14d0d31fb2933055838c7088be722b1ee900094b8a1982a15de60b9aade8 SHA512 746405340ae55100f3a1e89c480923e3a5c9297e012d321cb51ccacc10449a843c6ff80edaa0176b8f47fd327d4a1f550d8de80ee62d5a167e89782fc43604f8 -MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 diff --git a/dev-lang/opendylan/metadata.xml b/dev-lang/opendylan/metadata.xml deleted file mode 100644 index 40aa45df2b01..000000000000 --- a/dev-lang/opendylan/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - patrick@gentoo.org - Patrick Lauer - - diff --git a/dev-lang/opendylan/opendylan-2013.1-r1.ebuild b/dev-lang/opendylan/opendylan-2013.1-r1.ebuild deleted file mode 100644 index 78ee3789828b..000000000000 --- a/dev-lang/opendylan/opendylan-2013.1-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools - -DESCRIPTION="OpenDylan language runtime environment" -HOMEPAGE="http://opendylan.org" -SRC_URI="http://opendylan.org/downloads/${PN}/${PV}/${P}-sources.tar.bz2" - -LICENSE="Opendylan" -SLOT="0" -# not tested on x86 -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -# the boehm-gc check is "wrong" and reported upstream -# but for now static-libs useflag is needed -DEPEND="app-arch/unzip - dev-libs/boehm-gc - dev-lang/perl - dev-perl/XML-Parser - || ( dev-lang/opendylan-bin dev-lang/opendylan ) - x86? ( :" $i - done - done - fi -} - -src_configure() { - if has_version =dev-lang/opendylan-bin-2013.1; then - PATH=/opt/opendylan-2013.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2012.1; then - PATH=/opt/opendylan-2012.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2011.1; then - PATH=/opt/opendylan-2011.1/bin/:$PATH - else - PATH=/opt/opendylan/bin:$PATH - fi - if use amd64; then - econf --prefix=/opt/opendylan - else - econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ - fi - if use x86; then - # Includedir, pointing at something wrong - sed -i -e 's:-I$(MPS)/code:-I$(MPS):' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps path" - sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mmdw.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" - sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mpsplan.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" - sed -i -e 's~$(MPS_LIB)/mpsplan.a~/usr/lib/mpsplan.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" - sed -i -e 's~$(MPS_LIB)/mmdw.a~/usr/lib/mmdw.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" - fi -} - -src_compile() { - ulimit -s 32000 # this is naughty build system - emake -j1 3-stage-bootstrap -} - -src_install() { - ulimit -s 32000 # this is naughty build system - # because of Makefile weirdness it rebuilds quite a bit here - # upstream has been notified - emake -j1 DESTDIR="${D}" install - mkdir -p "${D}/etc/env.d/opendylan/" - echo "export PATH=/opt/opendylan/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan/opendylan-2013.2.ebuild b/dev-lang/opendylan/opendylan-2013.2.ebuild deleted file mode 100644 index 60566f683474..000000000000 --- a/dev-lang/opendylan/opendylan-2013.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools toolchain-funcs - -DESCRIPTION="OpenDylan language runtime environment" -HOMEPAGE="http://opendylan.org" -SRC_URI="http://opendylan.org/downloads/${PN}/${PV}/${P}-sources.tar.bz2" - -LICENSE="Opendylan" -SLOT="0" -# not tested on x86 -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -# the boehm-gc check is "wrong" and reported upstream -# but for now static-libs useflag is needed -DEPEND="app-arch/unzip - dev-libs/boehm-gc[threads] - dev-lang/perl - dev-perl/XML-Parser - || ( dev-lang/opendylan-bin dev-lang/opendylan ) - x86? ( :" $i - done - done - fi -} - -src_configure() { - if has_version =dev-lang/opendylan-bin-2013.2; then - PATH=/opt/opendylan-2013.2/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2013.1; then - PATH=/opt/opendylan-2013.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2012.1; then - PATH=/opt/opendylan-2012.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2011.1; then - PATH=/opt/opendylan-2011.1/bin/:$PATH - else - PATH=/opt/opendylan/bin:$PATH - fi - - if use amd64; then - econf --prefix=/opt/opendylan - else - econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ - fi - if use x86; then - # Includedir, pointing at something wrong - sed -i -e 's:-I$(MPS)/code:-I$(MPS):' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps path" - sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mmdw.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" - sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mpsplan.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" - sed -i -e 's~$(MPS_LIB)/mpsplan.a~/usr/lib/mpsplan.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" - sed -i -e 's~$(MPS_LIB)/mmdw.a~/usr/lib/mmdw.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" - fi -} - -src_compile() { - ulimit -s 32000 # this is naughty build system - emake -j1 3-stage-bootstrap -} - -src_install() { - ulimit -s 32000 # this is naughty build system - # because of Makefile weirdness it rebuilds quite a bit here - # upstream has been notified - emake -j1 DESTDIR="${D}" install - mkdir -p "${D}/etc/env.d/opendylan/" - echo "export PATH=/opt/opendylan/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan/opendylan-2014.1.ebuild b/dev-lang/opendylan/opendylan-2014.1.ebuild deleted file mode 100644 index 9bf1ebb1bece..000000000000 --- a/dev-lang/opendylan/opendylan-2014.1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools toolchain-funcs - -DESCRIPTION="OpenDylan language runtime environment" -HOMEPAGE="http://opendylan.org" -SRC_URI="http://opendylan.org/downloads/${PN}/${PV}/${P}-sources.tar.bz2" - -LICENSE="Opendylan" -SLOT="0" -# not tested on x86 -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -# the boehm-gc check is "wrong" and reported upstream -# but for now static-libs useflag is needed -DEPEND="app-arch/unzip - dev-libs/boehm-gc[threads] - dev-lang/perl - dev-perl/XML-Parser - || ( dev-lang/opendylan-bin dev-lang/opendylan ) - x86? ( :" $i - done - done - fi -} - -src_configure() { - if has_version =dev-lang/opendylan-bin-2014.1; then - PATH=/opt/opendylan-2014.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2013.2; then - PATH=/opt/opendylan-2013.2/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2013.1; then - PATH=/opt/opendylan-2013.1/bin/:$PATH - else - PATH=/opt/opendylan/bin:$PATH - fi - - if use amd64; then - econf --prefix=/opt/opendylan - else - econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ - fi - if use x86; then - # Includedir, pointing at something wrong - sed -i -e 's:-I$(MPS)/code:-I$(MPS):' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps path" - sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mmdw.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" - sed -i -e 's~(cd $(MPS)/code; make -f lii4gc.gmk mpsplan.a)~:;~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps building" - sed -i -e 's~$(MPS_LIB)/mpsplan.a~/usr/lib/mpsplan.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" - sed -i -e 's~$(MPS_LIB)/mmdw.a~/usr/lib/mmdw.a~' sources/lib/run-time/pentium-linux/Makefile || die "Couldn't fix mps clone" - fi -} - -src_compile() { - ulimit -s 32000 # this is naughty build system - emake -j1 3-stage-bootstrap -} - -src_install() { - ulimit -s 32000 # this is naughty build system - # because of Makefile weirdness it rebuilds quite a bit here - # upstream has been notified - emake -j1 DESTDIR="${D}" install - mkdir -p "${D}/etc/env.d/opendylan/" - echo "export PATH=/opt/opendylan/bin:\$PATH" > "${D}/etc/env.d/opendylan/99-opendylan" || die "Failed to add env settings" -} diff --git a/dev-lang/opendylan/opendylan-9999.ebuild b/dev-lang/opendylan/opendylan-9999.ebuild deleted file mode 100644 index adf7e63d28bd..000000000000 --- a/dev-lang/opendylan/opendylan-9999.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -EGIT_SUBMODULES=( '*' ) -EGIT_REPO_URI="https://github.com/dylan-lang/opendylan.git" - -inherit autotools git-r3 - -DESCRIPTION="OpenDylan language runtime environment" -HOMEPAGE="http://opendylan.org" - -LICENSE="Opendylan" -SLOT="0" -IUSE="" -RESTRICT="test" - -DEPEND="dev-libs/boehm-gc[threads] - dev-lang/perl - dev-perl/XML-Parser - || ( dev-lang/opendylan-bin dev-lang/opendylan )" -RDEPEND="${DEPEND}" - -src_prepare() { - mkdir -p build-aux - elibtoolize && eaclocal || die "Fail" - automake --foreign --add-missing # this one dies wrongfully - eautoconf || die "Fail" - - # quick hack - sed -i -e 's:/usr/local:/usr:' admin/builds/fdmake.pl || die -} - -src_configure() { - if has_version =dev-lang/opendylan-bin-2014.1; then - PATH=/opt/opendylan-2014.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2013.2; then - PATH=/opt/opendylan-2013.2/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2013.1; then - PATH=/opt/opendylan-2013.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2012.1; then - PATH=/opt/opendylan-2012.1/bin/:$PATH - elif has_version =dev-lang/opendylan-bin-2011.1; then - PATH=/opt/opendylan-2011.1/bin/:$PATH - else - PATH=/opt/opendylan/bin/:$PATH - fi - econf --prefix=/opt/opendylan -} - -src_compile() { - ulimit -s 32000 # this is naughty build system - emake -j1 -} - -src_install() { - ulimit -s 32000 # this is naughty build system - # because of Makefile weirdness it rebuilds quite a bit here - # upstream has been notified - emake -j1 DESTDIR="${D}" install - mkdir -p "${D}/etc/env.d/opendylan/" - echo "export PATH=/opt/opendylan/bin:\$PATH" > "${D}/etc/env.d/opendylan/opendylan" || die "Failed to add env settings" -} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 701645cbf39c..4706496914f7 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -5,19 +5,22 @@ AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875 AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b -DIST php-5.6.40.tar.xz 12472236 BLAKE2B f41147eaec9b15e965540f9e871691cc88848dd619bae6af85e7bba0130b71ce91bad5cdbbadbb537c42df83369f5c731007339a9d9e21e689e913c135201afc SHA512 997b5a952a60cf9166671cc91fcc34c674dd62bfd5cb0a9cdf3fdf2d088b5d19943d94c1cf193f8ab71fc4957d9a9a4c7c2fb8826f937501c1c0a0858f10e329 DIST php-7.1.33.tar.xz 12370228 BLAKE2B 610f501c1729ca3f5fa6f104b9f229046cf1e497f2fdc1194b80b4a5f9ca7f799dc6a458de34dd7a87976b7252ba2f548a8d689e4b2a45c025f1807ab8489f12 SHA512 ed37a79e3402c767f20e55c1cbe27957cc78240eafc719fffccd7d29ae10a45112aa0f29082f56133cd9c25f2750e9e57246d95b4f38d766f49bd29d1397eb1d DIST php-7.2.24.tar.xz 12302284 BLAKE2B 3c864e72d9fce1f13295385e20708a632087b2e4ffdc9e0012191cb2e17a3530f26797ad03c595bea60cccf850fe17028f2a379e50f32bd4db82530e0fcd727f SHA512 39597b8328cb4d5284288bdce8dd9c7ef8446e46914de93203700efaf67f85ad5b69df777bea14eef9160b233fb79bcb60f6750c0df011bbf610b62a524689e3 DIST php-7.2.25.tar.xz 12278980 BLAKE2B f556263e5ae00694e76a54d364aa31c33e51277e3ddaaf59a8dc6453cd2ea82d2229ad54149925cbbb2ed7983887652fb3c3c6e7be5a04192b7a619b0c4c7eab SHA512 b803284ef3aac178646095200c4bb3635d6dcaffd967ea94960905cec9a76835f745606d45e383b917d7e6b118708bc05025728444a3123d3c09e06350cb277b +DIST php-7.2.26.tar.xz 12309176 BLAKE2B 2208aee696fc2aed50b4f08f2dd7ca0f70d9913c22091687f6c694a343e4b5fd5e1f0d0b6b127fe0c00c5611cb60e627c2257a1fad9bff6e9fc8bb921e1eb57d SHA512 457e3420120135e311a22cd11529d5a3efc5885af4f298196f403093141801619d4dcdb38d6a4a5f8d9dcfa619688d8fdf33fea4a30e2d885e987b739a268f12 DIST php-7.3.11.tar.xz 12092412 BLAKE2B 0f326b85756cfb5ca96a43d7bfbe8aebd3bb9e9ede06734fb00dc3551372d53befba9e87f5f6a0b0b9e62d35a2eedacd1fa500e1eeff908e05ff52be730c61b4 SHA512 150cb202efc4cc1df042a2cbb9368a2d29aefd1d0cf1a0b0bd7238ba5cb6c4b828e23f2d42b4ecd77dd54f73141a33fc3b36ca0764320e9ba470c9549a7f0291 DIST php-7.3.12.tar.xz 12095212 BLAKE2B a0377883103dc0fa7625297f4b7f4777fc6d72b85abf60444366444aba44a526ac80ec68baf6981ad9b3f27ed26aec4a4f91f48e685393601f54118bb7903cb5 SHA512 e3022da2c9c216793c9f44d530a7217f51fd1d99a3dfb203eecc4a149fd29ab31facccfc2fb67af8241c9a83d3543020fcfce403dfc12142b03fa7458d600be3 +DIST php-7.3.13.tar.xz 12102012 BLAKE2B 32a346470ea0d0a3db873ae94b5e4dcc650c25e24db244ea94417f092e0458a0825cb99e9c3429000ee5cbd50120824d9bd2a58a7ed2ada1f39c6d7c41b2ba08 SHA512 d0624b3b841fed49d9cea56b17e7c8c7abf8e6572832b6f86c98f48c23f86690c310b460eae27a6fcd41fbfbc2e8a4b56f6bfb0c738fa1db36ce3795454d7798 DIST php-7.4.0.tar.xz 10232208 BLAKE2B 2282ab5c177d362f03f370e71dcaf925aa7752b0c1656d292760961adb4027e34f73a44c97ab5760956e466457241509f0dc6e5d9387898815a1bc88cdf45a9e SHA512 a44ce901b64a5f3f973ed323987e570e5459923149a34d0aa036990c3a42956d28b836a25dc3baef0d90aaee432df08a72d59966174218163b9579493027115c -DIST php-patches-7.1.33bp.tar.bz2 39945 BLAKE2B 9f7137f61b7ea07cc263b054401a319042f5a40d6cdaf3561a45778ae009e3279c72f2a6a0f9c97805bc39acef1c8c9d72d290c2ce873f44209fb2d65d620810 SHA512 8e36fb57bdadfcc4e976ecb7dc8f44290dc3b507eb27f4445aa2c8eba528e7cb53286e7fd9b1b9141f12fd6e29278282e4f0eb6445ed06046dd48a1d5d1bc789 -EBUILD php-5.6.40-r7.ebuild 22949 BLAKE2B edefc9413e2532d976e0a07213bc41f7caf824db711ba116d64d55f736d3a72c80b656cd61911ea094d6e1d426b385018729baa79c06878e85d7fb169227bc90 SHA512 154bf266ab5de69b0c34792bc8bf9126568ecb5a764690e5df71c850cde8e20c8174517d32e2279cf31cc6903920e09f5f61e3f3d26d3c0a4fd4e38e0bf60e57 +DIST php-7.4.1.tar.xz 10245600 BLAKE2B fcbb7de0e9ab74820ca8fdd234cd20908ed8e559e6eeffd576e285a5f4b4b31506ec2e11cc5926464257e08289207462f4b373833b8130500e0944f64dbf6cf5 SHA512 2dd152bdca52ece160feff799622fd4bdd88e0664f629e6149fd14ede6c304dfc40c164fcd9200c041b26342d6248010cf9b53e30c1a8d31640dc3b24d25c4da EBUILD php-7.1.33.ebuild 21952 BLAKE2B 308fb26d287263b32ee5468a2d54339b6d90da423b7993f6245d53eaa5d19e7481de4d169330ed3b351512a2ad8ba2c08251caa804162cdce3bf60b7d558eef5 SHA512 c4ac237f9f16a76da5985dbce698f7f6cf35500bdea63ab2ec312b83c7ab91e0aa771a99b1d2c54de754a3fd07032b03efbef86c7460054684936569eeaacae9 EBUILD php-7.2.24.ebuild 22483 BLAKE2B 4792051b594739d66a707db8f739250392b55a81e75648a29ebd7f947e135a65793cf670a1d98f01e0855c03aa28968350c00bb038bb7869d648f5d9e81a85aa SHA512 e32db1261e1c84c95af3fa7efda055e64fb7d3cc25adc68559efd8fd1b97b88fa417b0c6e9c5e0da0458787854296c51b4b38176afff8924a5c658272053b10a EBUILD php-7.2.25.ebuild 22492 BLAKE2B bc80b08c3b55bfb160cc4a2927b92b3899d953fb40eb1cda4a0bdca2c3d7e10d527b38a7d76688118dbe179e49147d9c1548546e4308d21fb90ea48b97258be1 SHA512 ec8d2518697a5f555ca1a9577a848dc081bc7f9c43aeb1d2bdc52074cf921614ff51a19cadbaf2bedac60c5b86d988843a2fefcd6a20dc68bd79181e14ab5155 +EBUILD php-7.2.26.ebuild 22484 BLAKE2B e7dfa632c584569ea062cf04bc866e8c5568e765716998ba0fa36e5512c83dc8e1208b8d91e6376048684c302a29e5c51a23346b721a72dc21aa843506d00dee SHA512 98f4536809adaf002f89f8e58b72d992d77c87067079deebe79c9e044f0bb0d7c88ac2fe5a86e0856c2733934b175dc97adf68c66ae8195c327baa4fef43cb8f EBUILD php-7.3.11.ebuild 22495 BLAKE2B 95cc23e098281aba451c63cc02fbf8fb61f80e8afc65f4b3336ad2632a5c15ba9ce11c5af439368a837b6f82a9a4d73677ef080c651cddbddfe7f7496c31dbc2 SHA512 696ae412747384e80f05b015b33072621a9d4105a022a7b9b951ab5133ea072149c7cd6ad3414822e5abaa29d28ee9043ea041d80965cdab2bf87c8eb0b474d3 EBUILD php-7.3.12.ebuild 22504 BLAKE2B a2f77798a742e52f0e811e29ca71c46522c4c042f1eddd6337c4f466d6765dbe11cbfd4aba74015cbec009484a1f1a98f978d83232a132033ab77e452a2bb0b6 SHA512 35f9106761084d0a9520635a1116d672a27290902a9ba31c92ff4db39c65b201cb7a951377587ae5b6ce2da9186080ba0af3b7cf9bf7ed4d1289a6e7fb815bd1 +EBUILD php-7.3.13.ebuild 22495 BLAKE2B 95cc23e098281aba451c63cc02fbf8fb61f80e8afc65f4b3336ad2632a5c15ba9ce11c5af439368a837b6f82a9a4d73677ef080c651cddbddfe7f7496c31dbc2 SHA512 696ae412747384e80f05b015b33072621a9d4105a022a7b9b951ab5133ea072149c7cd6ad3414822e5abaa29d28ee9043ea041d80965cdab2bf87c8eb0b474d3 EBUILD php-7.4.0.ebuild 21183 BLAKE2B 9762575bb045ac7121a80df9e54ad5d25e0f033340bbeb9beba62f4e3744fa08b1d865e3a3febec6a20bb991fb8dbf0de9d4083a1b938178120d8778b290a1e0 SHA512 de0bb4a496ab689ab35ae8ef487e55591715739abfe9e2ba48aea27e5a3470b0817dfb2c332b501a21e1b305ab39a9c2933d8e4eeed61ec480811e118c9642cc -MISC metadata.xml 3352 BLAKE2B 155c08bb52b049c3f79557d27ab6be9402cd35797cd385d53fc8c239c0eca089f65e106d54beca0642b8d182bfd0e172886b863a692575e9002140af7a62fa08 SHA512 f37c4c7b709bf91da6db41b0468c36cebffc630dabdcf4d43259017be5cf0577bb329ed0e206ff14d68bacc33425fba4789fc13fa34aa61acccce9fda11eee86 +EBUILD php-7.4.1.ebuild 21183 BLAKE2B 9762575bb045ac7121a80df9e54ad5d25e0f033340bbeb9beba62f4e3744fa08b1d865e3a3febec6a20bb991fb8dbf0de9d4083a1b938178120d8778b290a1e0 SHA512 de0bb4a496ab689ab35ae8ef487e55591715739abfe9e2ba48aea27e5a3470b0817dfb2c332b501a21e1b305ab39a9c2933d8e4eeed61ec480811e118c9642cc +MISC metadata.xml 3103 BLAKE2B 539d1725f936871d02271dc355e837dbc051e1c7c480c3ce46c897820a89af10f73a83350145bff9991b47ce6a9f9919f7d3948a6997a523b4583ed08c8d9de6 SHA512 3799371bd28fb31292b691440b67940a03d16657b686e0f3f45ff4367214a7534842532cdeaf3e05ba31a7825d3cbb60ebc9b93325aca717d1fc818de9a8ea07 diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml index 47de79c79a95..462b7c8d5b42 100644 --- a/dev-lang/php/metadata.xml +++ b/dev-lang/php/metadata.xml @@ -26,9 +26,6 @@ Add dbm support for .ini files Enable JSON support Add SASL support for the PHP LDAP extension - - Use libmyslclient driver for mysql, mysqli, PDO_Mysql (not recommended) - Enable support for dev-db/lmdb db backend Enables the intl extension for extended internalization support @@ -52,7 +49,6 @@ Enable support for crypto through dev-libs/libsodium - Add support for Sybase-CT Support for System V-compatible inter-process communication @@ -62,7 +58,6 @@ Enable XMLReader support Enable XMLWriter support Enable the XSL extension - Enable webp support for GD in php-5.x Add support for Web Distributed Data eXchange Enable webp support for GD in php-7.x Enable ZIP file encryption from dev-libs/libzip diff --git a/dev-lang/php/php-5.6.40-r7.ebuild b/dev-lang/php/php-5.6.40-r7.ebuild deleted file mode 100644 index 80f4eacde0ce..000000000000 --- a/dev-lang/php/php-5.6.40-r7.ebuild +++ /dev/null @@ -1,788 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools flag-o-matic systemd - -PATCH_V="7.1.33bp" - -DESCRIPTION="The PHP language runtime engine" -HOMEPAGE="https://secure.php.net/" -SRC_URI="https://php.net/distributions/${P}.tar.xz - https://gitweb.gentoo.org/proj/php-patches.git/snapshot/php-patches-${PATCH_V}.tar.bz2" - -LICENSE="PHP-3.01 - BSD - Zend-2.0 - bcmath? ( LGPL-2.1+ ) - fpm? ( BSD-2 ) - gd? ( gd ) - unicode? ( BSD-2 LGPL-2.1 )" - -SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} acl bcmath berkdb bzip2 calendar cdb cjk - coverage crypt +ctype curl debug - enchant exif +fileinfo +filter firebird - +flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl - mhash mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -# The supported (that is, autodetected) versions of BDB are listed in -# the ./configure script. Other versions *work*, but we need to stick to -# the ones that can be detected to avoid a repeat of bug #564824. -COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - fpm? ( acl? ( sys-apps/acl ) ) - apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) - berkdb? ( || ( sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 ) ) - bzip2? ( app-arch/bzip2:0= ) - cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) - cjk? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) - coverage? ( dev-util/lcov ) - crypt? ( >=dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib:0= - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) - gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) - gmp? ( dev-libs/gmp:0= ) - iconv? ( virtual/libiconv ) - imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( =dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql:* ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline:0= ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib:0= ) - ) - unicode? ( dev-libs/oniguruma:= ) - vpx? ( media-libs/libvpx:0= ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib:0= - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib:0= ) - zlib? ( sys-libs/zlib:0= ) -" - -RDEPEND="${COMMON_DEPEND} - virtual/mta - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - >=sys-devel/bison-3.0.1 - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Without USE=readline or libedit, the interactive "php -a" CLI will hang. -REQUIRED_USE=" - || ( cli cgi fpm apache2 embed ) - cli? ( ^^ ( readline libedit ) ) - truetype? ( gd zlib ) - vpx? ( gd zlib ) - cjk? ( gd zlib ) - exif? ( gd zlib ) - xpm? ( gd zlib ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - recode? ( !imap !mysql !mysqli !libmysqlclient ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - sharedmem? ( !threads ) -" - -PHP_MV="$(ver_cut 1)" - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - # Always install the production INI file, bug 611214. - local phpinisrc="php.ini-production-${phpsapi}" - cp php.ini-production "${phpinisrc}" || die - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" php.ini - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ - "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ - "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - if [[ "${sapi}" == "fpm" ]] ; then - einfo "Installing FPM config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - doins sapi/fpm/php-fpm.conf - fi - - dodoc php.ini-{development,production} -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - local patchdir="${WORKDIR}/php-patches-${PATCH_V}" - - eapply "${patchdir}/" - - # Copy test binaries from patches - local ext_src - for ext_src in exif iconv ; do - cp "${patchdir}/${ext_src}/"* "ext/${ext_src}/tests/" || die - done - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \ - || die - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - eapply_user - - # Force rebuilding aclocal.m4 - rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" - - mv configure.in configure.ac || die - - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # The php-fpm config file wants localstatedir to be ${EPREFIX}/var - # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. - local our_conf=( - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}/man" - --infodir="${PHP_DESTDIR}/info" - --libdir="${PHP_DESTDIR}/lib" - --with-libdir="$(get_libdir)" - --localstatedir="${EPREFIX}/var" - --without-pear - $(use_enable threads maintainer-zts) - ) - - our_conf+=( - $(use_enable bcmath bcmath) - $(use_with bzip2 bz2 "${EPREFIX}/usr") - $(use_enable calendar calendar) - $(use_enable coverage gcov) - $(use_enable ctype ctype) - $(use_with curl curl "${EPREFIX}/usr") - $(use_enable xml dom) - $(use_with enchant enchant "${EPREFIX}/usr") - $(use_enable exif exif) - $(use_enable fileinfo fileinfo) - $(use_enable filter filter) - $(use_enable ftp ftp) - $(use_with nls gettext "${EPREFIX}/usr") - $(use_with gmp gmp "${EPREFIX}/usr") - $(use_enable hash hash) - $(use_with mhash mhash "${EPREFIX}/usr") - $(use_with iconv iconv \ - $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) - $(use_enable intl intl) - $(use_enable ipv6 ipv6) - $(use_enable json json) - $(use_with kerberos kerberos "${EPREFIX}/usr") - $(use_enable xml libxml) - $(use_with xml libxml-dir "${EPREFIX}/usr") - $(use_enable unicode mbstring) - $(use_with crypt mcrypt "${EPREFIX}/usr") - $(use_with mssql mssql "${EPREFIX}/usr") - $(use_with unicode onig "${EPREFIX}/usr") - $(use_with ssl openssl "${EPREFIX}/usr") - $(use_with ssl openssl-dir "${EPREFIX}/usr") - $(use_enable pcntl pcntl) - $(use_enable phar phar) - $(use_enable pdo pdo) - $(use_enable opcache opcache) - $(use_with postgres pgsql "${EPREFIX}/usr") - $(use_enable posix posix) - $(use_with spell pspell "${EPREFIX}/usr") - $(use_with recode recode "${EPREFIX}/usr") - $(use_enable simplexml simplexml) - $(use_enable sharedmem shmop) - $(use_with snmp snmp "${EPREFIX}/usr") - $(use_enable soap soap) - $(use_enable sockets sockets) - $(use_with sqlite sqlite3 "${EPREFIX}/usr") - $(use_with sybase-ct sybase-ct "${EPREFIX}/usr") - $(use_enable sysvipc sysvmsg) - $(use_enable sysvipc sysvsem) - $(use_enable sysvipc sysvshm) - $(use_with tidy tidy "${EPREFIX}/usr") - $(use_enable tokenizer tokenizer) - $(use_enable wddx wddx) - $(use_enable xml xml) - $(use_enable xmlreader xmlreader) - $(use_enable xmlwriter xmlwriter) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}/usr") - $(use_enable zip zip) - $(use_with zlib zlib "${EPREFIX}/usr") - $(use_enable debug debug) - ) - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - our_conf+=( "--enable-dba${shared}" ) - fi - - # DBA drivers support - our_conf+=( - $(use_with cdb cdb) - $(use_with berkdb db4 "${EPREFIX}/usr") - $(use_enable flatfile flatfile) - $(use_with gdbm gdbm "${EPREFIX}/usr") - $(use_enable inifile inifile) - $(use_with qdbm qdbm "${EPREFIX}/usr") - ) - - # Support for the GD graphics library - our_conf+=( - $(use_with truetype freetype-dir "${EPREFIX}/usr") - $(use_with truetype t1lib "${EPREFIX}/usr") - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg-dir "${EPREFIX}/usr") - $(use_with gd png-dir "${EPREFIX}/usr") - $(use_with xpm xpm-dir "${EPREFIX}/usr") - $(use_with vpx vpx-dir "${EPREFIX}/usr") - ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_with gd gd) ) - - # IMAP support - if use imap ; then - our_conf+=( - $(use_with imap imap "${EPREFIX}/usr") - $(use_with ssl imap-ssl "${EPREFIX}/usr") - ) - fi - - # Interbase/firebird support - our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) - - # LDAP support - if use ldap ; then - our_conf+=( - $(use_with ldap ldap "${EPREFIX}/usr") - $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") - ) - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - our_conf+=( $(use_with mysql mysql "${mysqllib}") ) - our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) - - local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" - if use mysql || use mysqli ; then - our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) - fi - - # ODBC support - our_conf+=( - $(use_with odbc unixODBC "${EPREFIX}/usr") - $(use_with iodbc iodbc "${EPREFIX}/usr") - ) - - # Oracle support - our_conf+=( $(use_with oci8-instant-client oci8) ) - - # PDO support - if use pdo ; then - our_conf+=( - $(use_with mssql pdo-dblib) - $(use_with mysql pdo-mysql "${mysqllib}") - $(use_with postgres pdo-pgsql) - $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") - $(use_with firebird pdo-firebird "${EPREFIX}/usr") - $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") - $(use_with oci8-instant-client pdo-oci) - ) - fi - - # readline/libedit support - our_conf+=( - $(use_with readline readline "${EPREFIX}/usr") - $(use_with libedit libedit "${EPREFIX}/usr") - ) - - # Session support - if use session ; then - our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) - else - our_conf+=( $(use_enable session session) ) - fi - - # Use pic for shared modules such as apache2's mod_php - our_conf+=( --with-pic ) - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - our_conf+=( - --with-pcre-regex="${EPREFIX}/usr" - --with-pcre-dir="${EPREFIX}/usr" - ) - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Cache the ./configure test results between SAPIs. - our_conf+=( --cache-file="${T}/config.cache" ) - - # Support user-passed configuration parameters - our_conf+=( ${EXTRA_ECONF:-} ) - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" || die - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - # The BUILD_DIR variable is used to determine where to output - # the files that autotools creates. This was all originally - # based on the autotools-utils eclass. - BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" - cp -a "${S}" "${BUILD_DIR}" || die - cd "${BUILD_DIR}" || die - - local sapi_conf=( - --with-config-file-path="${PHP_INI_DIR}" - --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" - ) - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( "--enable-${sapi}" ) - if [[ "fpm" == "${sapi}" ]] ; then - sapi_conf+=( - $(use_with acl fpm-acl) - $(use_with systemd fpm-systemd) - ) - fi - else - sapi_conf+=( "--disable-${sapi}" ) - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) - else - sapi_conf+=( --without-apxs2 ) - fi - ;; - esac - done - - # Construct the $myeconfargs array by concatenating $our_conf - # (the common args) and $sapi_conf (the SAPI-specific args). - local myeconfargs=( "${our_conf[@]}" ) - myeconfargs+=( "${sapi_conf[@]}" ) - - pushd "${BUILD_DIR}" > /dev/null || die - econf "${myeconfargs[@]}" - popd > /dev/null || die - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index #nowarn - addpredict /var/lib/net-snmp/mib_indexes #nowarn - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || \ - die "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index #nowarn - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" || die - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir "/usr/share/php${PHP_MV}" - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" || die - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" \ - "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" - else - dobin "${source}" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" \ - "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ - "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ - "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ - "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null || die - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - elog - elog "To enable PHP in apache, you will need to add \"-D PHP\" to" - elog "your apache2 command. OpenRC users can append that string to" - elog "APACHE2_OPTS in /etc/conf.d/apache2." - elog - elog "The apache module configuration file 70_mod_php.conf is" - elog "provided (and maintained) by eselect-php." - elog - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} || die - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - # Remove dead symlinks for SAPIs that were just disabled. For - # example, if the user has the cgi SAPI enabled, then he has an - # eselect-php symlink for it. If he later reinstalls PHP with - # USE="-cgi", that symlink will break. This call to eselect is - # supposed to remove that dead link per bug 572436. - eselect php cleanup || die - - if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then - elog "To build extensions for this version of PHP, you will need to" - elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." - elog - fi - - # Warn about the removal of PHP_INI_VERSION if the user has it set. - if [[ -n "${PHP_INI_VERSION}" ]]; then - ewarn 'The PHP_INI_VERSION variable has been phased out. You may' - ewarn 'remove it from your configuration at your convenience. See' - ewarn - ewarn ' https://bugs.gentoo.org/611214' - ewarn - ewarn 'for more information.' - fi - - elog "For details on how version slotting works, please see" - elog "the wiki:" - elog - elog " https://wiki.gentoo.org/wiki/PHP" - elog -} - -pkg_postrm() { - # This serves two purposes. First, if we have just removed the last - # installed version of PHP, then this will remove any dead symlinks - # belonging to eselect-php. Second, if a user upgrades slots from - # (say) 5.6 to 7.0 and depcleans the old slot, then this will update - # his existing symlinks to point to the new 7.0 installation. The - # latter is bug 432962. - # - # Note: the eselect-php package may not be installed at this point, - # so we can't die() if this command fails. - eselect php cleanup -} diff --git a/dev-lang/php/php-7.2.26.ebuild b/dev-lang/php/php-7.2.26.ebuild new file mode 100644 index 000000000000..60a55509348f --- /dev/null +++ b/dev-lang/php/php-7.2.26.ebuild @@ -0,0 +1,751 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd autotools + +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://php.net/" +SRC_URI="https://php.net/distributions/${P}.tar.xz" + +LICENSE="PHP-3.01 + BSD + Zend-2.0 + bcmath? ( LGPL-2.1+ ) + fpm? ( BSD-2 ) + gd? ( gd ) + unicode? ( BSD-2 LGPL-2.1 )" + +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2 phpdbg" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk + coverage +ctype curl debug + enchant exif +fileinfo +filter firebird + +flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb + mhash mssql mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session session-mm sharedmem + +simplexml snmp soap sockets sodium spell sqlite ssl + sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" + +# The supported (that is, autodetected) versions of BDB are listed in +# the ./configure script. Other versions *work*, but we need to stick to +# the ones that can be detected to avoid a repeat of bug #564824. +COMMON_DEPEND=" + >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + fpm? ( acl? ( sys-apps/acl ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 ) ) + bzip2? ( app-arch/bzip2:0= ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + coverage? ( dev-util/lcov ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( =sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + lmdb? ( dev-db/lmdb:= ) + mssql? ( dev-db/freetds[mssql] ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + recode? ( app-text/recode ) + session-mm? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + sodium? ( dev-libs/libsodium:= ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) + tokyocabinet? ( dev-db/tokyocabinet ) + truetype? ( =media-libs/freetype-2* ) + unicode? ( dev-libs/oniguruma:= ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + webp? ( media-libs/libwebp:0= ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( x11-libs/libXpm ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib:0= ) + zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( sys-libs/zlib:0= ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/mta + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +# Bison isn't actually needed when building from a release tarball +# However, the configure script will warn if it's absent or if you +# have an incompatible version installed. See bug 593278. +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + >=sys-devel/bison-3.0.1" + +BDEPEND="virtual/pkgconfig" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +REQUIRED_USE=" + || ( cli cgi fpm apache2 embed phpdbg ) + cli? ( ^^ ( readline libedit ) ) + truetype? ( gd zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysqli !mysql ) + session-mm? ( session !threads ) + mysql? ( hash || ( mysqli pdo ) ) + mysqli? ( hash ) + zip-encryption? ( zip ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/php-freetype-2.9.1.patch" + "${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch" +) + +PHP_MV="$(ver_cut 1)" + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + # Always install the production INI file, bug 611214. + local phpinisrc="php.ini-production-${phpsapi}" + cp php.ini-production "${phpinisrc}" || die + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ + -i "${phpinisrc}" || die + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" php.ini + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ + "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + if [[ "${sapi}" == "fpm" ]] ; then + einfo "Installing FPM config files php-fpm.conf and www.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + doins sapi/fpm/php-fpm.conf + insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" + doins sapi/fpm/www.conf + fi + + dodoc php.ini-{development,production} +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + default + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' + + # Bug 669566 - necessary so that build tools are updated for commands like pecl + # Force rebuilding aclocal.m4 + rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" + eautoreconf +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var + # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. + local our_conf=( + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}/man" + --infodir="${PHP_DESTDIR}/info" + --libdir="${PHP_DESTDIR}/lib" + --with-libdir="$(get_libdir)" + --localstatedir="${EPREFIX}/var" + --without-pear + $(use_enable threads maintainer-zts) + ) + + our_conf+=( + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(use_enable bcmath bcmath) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar calendar) + $(use_enable coverage gcov) + $(use_enable ctype ctype) + $(use_with curl curl "${EPREFIX}/usr") + $(use_enable xml dom) + $(use_with enchant enchant "${EPREFIX}/usr") + $(use_enable exif exif) + $(use_enable fileinfo fileinfo) + $(use_enable filter filter) + $(use_enable ftp ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(use_enable hash hash) + $(use_with mhash mhash "${EPREFIX}/usr") + $(use_with iconv iconv \ + $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) + $(use_enable intl intl) + $(use_enable ipv6 ipv6) + $(use_enable json json) + $(use_with kerberos kerberos "${EPREFIX}/usr") + $(use_enable xml libxml) + $(use_with xml libxml-dir "${EPREFIX}/usr") + $(use_enable unicode mbstring) + $(use_with unicode onig "${EPREFIX}/usr") + $(use_with ssl openssl "${EPREFIX}/usr") + $(use_with ssl openssl-dir "${EPREFIX}/usr") + $(use_enable pcntl pcntl) + $(use_enable phar phar) + $(use_enable pdo pdo) + $(use_enable opcache opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix posix) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_with recode recode "${EPREFIX}/usr") + $(use_enable simplexml simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap soap) + $(use_enable sockets sockets) + $(use_with sodium sodium "${EPREFIX}/usr") + $(use_with sqlite sqlite3 "${EPREFIX}/usr") + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer tokenizer) + $(use_enable wddx wddx) + $(use_enable xml xml) + $(use_enable xmlreader xmlreader) + $(use_enable xmlwriter xmlwriter) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}/usr") + $(use_enable zip zip) + $(use_with zip-encryption libzip "${EPREFIX}/usr") + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable debug debug) + ) + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm || use lmdb || use tokyocabinet ; then + our_conf+=( "--enable-dba${shared}" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + $(use_with lmdb lmdb "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype-dir "${EPREFIX}/usr") + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg-dir "${EPREFIX}/usr") + $(use_with gd png-dir "${EPREFIX}/usr") + $(use_with xpm xpm-dir "${EPREFIX}/usr") + ) + if use webp; then + our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) + fi + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_with gd gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # Interbase/firebird support + our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") + ) + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) + + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + if use mysql || use mysqli ; then + our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) + fi + + # ODBC support + our_conf+=( + $(use_with odbc unixODBC "${EPREFIX}/usr") + $(use_with iodbc iodbc "${EPREFIX}/usr") + ) + + # Oracle support + our_conf+=( $(use_with oci8-instant-client oci8) ) + + # PDO support + if use pdo ; then + our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mysql pdo-mysql "${mysqllib}") + $(use_with postgres pdo-pgsql) + $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit libedit "${EPREFIX}/usr") + ) + + # Session support + if use session ; then + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable session session) ) + fi + + # Use pic for shared modules such as apache2's mod_php + our_conf+=( --with-pic ) + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + # --with-pcre-valgrind cannot be enabled with system pcre + # Many arches don't support pcre-jit + our_conf+=( + --with-pcre-regex="${EPREFIX}/usr" + --with-pcre-dir="${EPREFIX}/usr" + --without-pcre-valgrind + --without-pcre-jit + ) + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Cache the ./configure test results between SAPIs. + our_conf+=( --cache-file="${T}/config.cache" ) + + # Support user-passed configuration parameters + our_conf+=( ${EXTRA_ECONF:-} ) + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" || die + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + # The BUILD_DIR variable is used to determine where to output + # the files that autotools creates. This was all originally + # based on the autotools-utils eclass. + BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" + cp -a "${S}" "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local sapi_conf=( + --with-config-file-path="${PHP_INI_DIR}" + --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" + ) + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm|phpdbg) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( "--enable-${sapi}" ) + if [[ "fpm" == "${sapi}" ]] ; then + sapi_conf+=( + $(use_with acl fpm-acl) + $(use_with systemd fpm-systemd) + ) + fi + else + sapi_conf+=( "--disable-${sapi}" ) + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) + else + sapi_conf+=( --without-apxs2 ) + fi + ;; + esac + done + + # Construct the $myeconfargs array by concatenating $our_conf + # (the common args) and $sapi_conf (the SAPI-specific args). + local myeconfargs=( "${our_conf[@]}" ) + myeconfargs+=( "${sapi_conf[@]}" ) + + pushd "${BUILD_DIR}" > /dev/null || die + econf "${myeconfargs[@]}" + popd > /dev/null || die + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || \ + die "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index #nowarn + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" || die + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir "/usr/share/php${PHP_MV}" + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" || die + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp${PHP_MV}$(get_libname)" \ + "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" + else + dobin "${source}" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use opcache ; then + into "${PHP_DESTDIR#${EPREFIX}}" + dolib.so "modules/opcache$(get_libname)" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" \ + "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ + "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + fi + + if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then + export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ + "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ + "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null || die + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + elog + elog "To enable PHP in apache, you will need to add \"-D PHP\" to" + elog "your apache2 command. OpenRC users can append that string to" + elog "APACHE2_OPTS in /etc/conf.d/apache2." + elog + elog "The apache module configuration file 70_mod_php.conf is" + elog "provided (and maintained) by eselect-php." + elog + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} || die + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + # Remove dead symlinks for SAPIs that were just disabled. For + # example, if the user has the cgi SAPI enabled, then he has an + # eselect-php symlink for it. If he later reinstalls PHP with + # USE="-cgi", that symlink will break. This call to eselect is + # supposed to remove that dead link per bug 572436. + eselect php cleanup || die + + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Warn about the removal of PHP_INI_VERSION if the user has it set. + if [[ -n "${PHP_INI_VERSION}" ]]; then + ewarn 'The PHP_INI_VERSION variable has been phased out. You may' + ewarn 'remove it from your configuration at your convenience. See' + ewarn + ewarn ' https://bugs.gentoo.org/611214' + ewarn + ewarn 'for more information.' + fi + + elog "For details on how version slotting works, please see" + elog "the wiki:" + elog + elog " https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_postrm() { + # This serves two purposes. First, if we have just removed the last + # installed version of PHP, then this will remove any dead symlinks + # belonging to eselect-php. Second, if a user upgrades slots from + # (say) 5.6 to 7.0 and depcleans the old slot, then this will update + # his existing symlinks to point to the new 7.0 installation. The + # latter is bug 432962. + # + # Note: the eselect-php package may not be installed at this point, + # so we can't die() if this command fails. + eselect php cleanup +} diff --git a/dev-lang/php/php-7.3.13.ebuild b/dev-lang/php/php-7.3.13.ebuild new file mode 100644 index 000000000000..79917af499c0 --- /dev/null +++ b/dev-lang/php/php-7.3.13.ebuild @@ -0,0 +1,752 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd autotools + +MY_PV=${PV/_rc/RC} +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://php.net/" +SRC_URI="https://php.net/distributions/${P}.tar.xz" + +LICENSE="PHP-3.01 + BSD + Zend-2.0 + bcmath? ( LGPL-2.1+ ) + fpm? ( BSD-2 ) + gd? ( gd ) + unicode? ( BSD-2 LGPL-2.1 )" + +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2 phpdbg" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk + coverage +ctype curl debug + enchant exif +fileinfo +filter firebird + +flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb + mhash mssql mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session session-mm sharedmem + +simplexml snmp soap sockets sodium spell sqlite ssl + sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib" + +# The supported (that is, autodetected) versions of BDB are listed in +# the ./configure script. Other versions *work*, but we need to stick to +# the ones that can be detected to avoid a repeat of bug #564824. +COMMON_DEPEND=" + >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] + >=dev-libs/libpcre2-10.30[unicode] + fpm? ( acl? ( sys-apps/acl ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 ) ) + bzip2? ( app-arch/bzip2:0= ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + coverage? ( dev-util/lcov ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( =sys-libs/zlib-1.2.0.4 ) + gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + lmdb? ( dev-db/lmdb:= ) + mssql? ( dev-db/freetds[mssql] ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + recode? ( app-text/recode ) + session-mm? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + sodium? ( dev-libs/libsodium:= ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) + tokyocabinet? ( dev-db/tokyocabinet ) + truetype? ( =media-libs/freetype-2* ) + unicode? ( dev-libs/oniguruma:= ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + webp? ( media-libs/libwebp:0= ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( x11-libs/libXpm ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( >=sys-libs/zlib-1.2.0.4:0= ) + zip-encryption? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/mta + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +# Bison isn't actually needed when building from a release tarball +# However, the configure script will warn if it's absent or if you +# have an incompatible version installed. See bug 593278. +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + >=sys-devel/bison-3.0.1" + +BDEPEND="virtual/pkgconfig" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +REQUIRED_USE=" + || ( cli cgi fpm apache2 embed phpdbg ) + cli? ( ^^ ( readline libedit ) ) + truetype? ( gd zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysqli !mysql ) + session-mm? ( session !threads ) + mysql? ( || ( mysqli pdo ) ) + zip-encryption? ( zip ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/php-freetype-2.9.1.patch" +) + +PHP_MV="$(ver_cut 1)" + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + # Always install the production INI file, bug 611214. + local phpinisrc="php.ini-production-${phpsapi}" + cp php.ini-production "${phpinisrc}" || die + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ + -i "${phpinisrc}" || die + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" php.ini + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ + "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + if [[ "${sapi}" == "fpm" ]] ; then + einfo "Installing FPM config files php-fpm.conf and www.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + doins sapi/fpm/php-fpm.conf + insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" + doins sapi/fpm/www.conf + fi + + dodoc php.ini-{development,production} +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + default + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' + + # Bug 669566 - necessary so that build tools are updated for commands like pecl + # Force rebuilding aclocal.m4 + rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" + eautoreconf +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var + # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. + local our_conf=( + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}/man" + --infodir="${PHP_DESTDIR}/info" + --libdir="${PHP_DESTDIR}/lib" + --with-libdir="$(get_libdir)" + --localstatedir="${EPREFIX}/var" + --without-pear + $(use_enable threads maintainer-zts) + ) + + our_conf+=( + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(use_enable bcmath bcmath) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar calendar) + $(use_enable coverage gcov) + $(use_enable ctype ctype) + $(use_with curl curl "${EPREFIX}/usr") + $(use_enable xml dom) + $(use_with enchant enchant "${EPREFIX}/usr") + $(use_enable exif exif) + $(use_enable fileinfo fileinfo) + $(use_enable filter filter) + $(use_enable ftp ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(use_enable hash hash) + $(use_with mhash mhash "${EPREFIX}/usr") + $(use_with iconv iconv \ + $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) + $(use_enable intl intl) + $(use_enable ipv6 ipv6) + $(use_enable json json) + $(use_with kerberos kerberos "${EPREFIX}/usr") + $(use_enable xml libxml) + $(use_with xml libxml-dir "${EPREFIX}/usr") + $(use_enable unicode mbstring) + $(use_with unicode onig "${EPREFIX}/usr") + $(use_with ssl openssl "${EPREFIX}/usr") + $(use_with ssl openssl-dir "${EPREFIX}/usr") + $(use_enable pcntl pcntl) + $(use_enable phar phar) + $(use_enable pdo pdo) + $(use_enable opcache opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix posix) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_with recode recode "${EPREFIX}/usr") + $(use_enable simplexml simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap soap) + $(use_enable sockets sockets) + $(use_with sodium sodium "${EPREFIX}/usr") + $(use_with sqlite sqlite3 "${EPREFIX}/usr") + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer tokenizer) + $(use_enable wddx wddx) + $(use_enable xml xml) + $(use_enable xmlreader xmlreader) + $(use_enable xmlwriter xmlwriter) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}/usr") + $(use_enable zip zip) + $(use_with zip-encryption libzip "${EPREFIX}/usr") + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable debug debug) + ) + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm || use lmdb || use tokyocabinet ; then + our_conf+=( "--enable-dba${shared}" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + $(use_with lmdb lmdb "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype-dir "${EPREFIX}/usr") + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg-dir "${EPREFIX}/usr") + $(use_with gd png-dir "${EPREFIX}/usr") + $(use_with xpm xpm-dir "${EPREFIX}/usr") + ) + if use webp; then + our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) + fi + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_with gd gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # Interbase/firebird support + our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") + ) + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) + + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + if use mysql || use mysqli ; then + our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) + fi + + # ODBC support + our_conf+=( + $(use_with odbc unixODBC "${EPREFIX}/usr") + $(use_with iodbc iodbc "${EPREFIX}/usr") + ) + + # Oracle support + our_conf+=( $(use_with oci8-instant-client oci8) ) + + # PDO support + if use pdo ; then + our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mysql pdo-mysql "${mysqllib}") + $(use_with postgres pdo-pgsql) + $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit libedit "${EPREFIX}/usr") + ) + + # Session support + if use session ; then + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable session session) ) + fi + + # Use pic for shared modules such as apache2's mod_php + our_conf+=( --with-pic ) + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + # --with-pcre-valgrind cannot be enabled with system pcre + # Many arches don't support pcre-jit + our_conf+=( + --with-pcre-regex="${EPREFIX}/usr" + --with-pcre-dir="${EPREFIX}/usr" + --without-pcre-valgrind + --without-pcre-jit + ) + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Cache the ./configure test results between SAPIs. + our_conf+=( --cache-file="${T}/config.cache" ) + + # Support user-passed configuration parameters + our_conf+=( ${EXTRA_ECONF:-} ) + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" || die + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + # The BUILD_DIR variable is used to determine where to output + # the files that autotools creates. This was all originally + # based on the autotools-utils eclass. + BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" + cp -a "${S}" "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local sapi_conf=( + --with-config-file-path="${PHP_INI_DIR}" + --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" + ) + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm|phpdbg) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( "--enable-${sapi}" ) + if [[ "fpm" == "${sapi}" ]] ; then + sapi_conf+=( + $(use_with acl fpm-acl) + $(use_with systemd fpm-systemd) + ) + fi + else + sapi_conf+=( "--disable-${sapi}" ) + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) + else + sapi_conf+=( --without-apxs2 ) + fi + ;; + esac + done + + # Construct the $myeconfargs array by concatenating $our_conf + # (the common args) and $sapi_conf (the SAPI-specific args). + local myeconfargs=( "${our_conf[@]}" ) + myeconfargs+=( "${sapi_conf[@]}" ) + + pushd "${BUILD_DIR}" > /dev/null || die + econf "${myeconfargs[@]}" + popd > /dev/null || die + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || \ + die "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index #nowarn + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" || die + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir "/usr/share/php${PHP_MV}" + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" || die + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp${PHP_MV}$(get_libname)" \ + "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" + else + dobin "${source}" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use opcache ; then + into "${PHP_DESTDIR#${EPREFIX}}" + dolib.so "modules/opcache$(get_libname)" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" \ + "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ + "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + fi + + if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then + export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ + "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ + "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null || die + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + elog + elog "To enable PHP in apache, you will need to add \"-D PHP\" to" + elog "your apache2 command. OpenRC users can append that string to" + elog "APACHE2_OPTS in /etc/conf.d/apache2." + elog + elog "The apache module configuration file 70_mod_php.conf is" + elog "provided (and maintained) by eselect-php." + elog + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} || die + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + # Remove dead symlinks for SAPIs that were just disabled. For + # example, if the user has the cgi SAPI enabled, then he has an + # eselect-php symlink for it. If he later reinstalls PHP with + # USE="-cgi", that symlink will break. This call to eselect is + # supposed to remove that dead link per bug 572436. + eselect php cleanup || die + + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Warn about the removal of PHP_INI_VERSION if the user has it set. + if [[ -n "${PHP_INI_VERSION}" ]]; then + ewarn 'The PHP_INI_VERSION variable has been phased out. You may' + ewarn 'remove it from your configuration at your convenience. See' + ewarn + ewarn ' https://bugs.gentoo.org/611214' + ewarn + ewarn 'for more information.' + fi + + elog "For details on how version slotting works, please see" + elog "the wiki:" + elog + elog " https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_postrm() { + # This serves two purposes. First, if we have just removed the last + # installed version of PHP, then this will remove any dead symlinks + # belonging to eselect-php. Second, if a user upgrades slots from + # (say) 5.6 to 7.0 and depcleans the old slot, then this will update + # his existing symlinks to point to the new 7.0 installation. The + # latter is bug 432962. + # + # Note: the eselect-php package may not be installed at this point, + # so we can't die() if this command fails. + eselect php cleanup +} diff --git a/dev-lang/php/php-7.4.1.ebuild b/dev-lang/php/php-7.4.1.ebuild new file mode 100644 index 000000000000..e40c1d79c014 --- /dev/null +++ b/dev-lang/php/php-7.4.1.ebuild @@ -0,0 +1,742 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +WANT_AUTOMAKE="none" + +inherit flag-o-matic systemd autotools + +MY_PV=${PV/_rc/RC} +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="https://php.net/" +SRC_URI="https://php.net/distributions/${P}.tar.xz" + +LICENSE="PHP-3.01 + BSD + Zend-2.0 + bcmath? ( LGPL-2.1+ ) + fpm? ( BSD-2 ) + gd? ( gd ) + unicode? ( BSD-2 LGPL-2.1 )" + +SLOT="$(ver_cut 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +S="${WORKDIR}/${PN}-${MY_PV}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2 phpdbg" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk + coverage +ctype curl debug + enchant exif ffi +fileinfo +filter firebird + +flatfile ftp gd gdbm gmp +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb + mhash mssql mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline selinux +session session-mm sharedmem + +simplexml snmp soap sockets sodium spell sqlite ssl + sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +REQUIRED_USE=" + || ( cli cgi fpm apache2 embed phpdbg ) + cli? ( ^^ ( readline libedit ) ) + !cli? ( ?? ( readline libedit ) ) + truetype? ( gd zlib ) + webp? ( gd zlib ) + cjk? ( gd zlib ) + exif? ( gd zlib ) + xpm? ( gd zlib ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + xmlrpc? ( xml iconv ) + xmlreader? ( xml ) + xmlwriter? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + qdbm? ( !gdbm ) + session-mm? ( session !threads ) + mysql? ( || ( mysqli pdo ) ) + firebird? ( pdo ) + mssql? ( pdo ) +" + +RESTRICT="!test? ( test )" + +# The supported (that is, autodetected) versions of BDB are listed in +# the ./configure script. Other versions *work*, but we need to stick to +# the ones that can be detected to avoid a repeat of bug #564824. +COMMON_DEPEND=" + >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] + >=dev-libs/libpcre2-10.30[unicode] + fpm? ( acl? ( sys-apps/acl ) ) + apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) + argon2? ( app-crypt/argon2:= ) + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 ) ) + bzip2? ( app-arch/bzip2:0= ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + coverage? ( dev-util/lcov ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( =virtual/libffi-3.0.11 ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= ) + gdbm? ( >=sys-libs/gdbm-1.8.0:0= ) + gmp? ( dev-libs/gmp:0= ) + iconv? ( virtual/libiconv ) + imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] ) + intl? ( dev-libs/icu:= ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl ) + libedit? ( dev-libs/libedit ) + lmdb? ( dev-db/lmdb:= ) + mssql? ( dev-db/freetds[mssql] ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + session-mm? ( dev-libs/mm ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + sodium? ( dev-libs/libsodium:= ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) + tokyocabinet? ( dev-db/tokyocabinet ) + truetype? ( =media-libs/freetype-2* ) + unicode? ( dev-libs/oniguruma:= ) + webp? ( media-libs/libwebp:0= ) + xml? ( >=dev-libs/libxml2-2.7.6 ) + xpm? ( x11-libs/libXpm ) + xslt? ( dev-libs/libxslt ) + zip? ( >=dev-libs/libzip-1.2.0:= ) + zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/mta + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +# Bison isn't actually needed when building from a release tarball +# However, the configure script will warn if it's absent or if you +# have an incompatible version installed. See bug 593278. +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + >=sys-devel/bison-3.0.1" + +BDEPEND="virtual/pkgconfig" + +PHP_MV="$(ver_cut 1)" + +PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" ) + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + # Always install the production INI file, bug 611214. + local phpinisrc="php.ini-production-${phpsapi}" + cp php.ini-production "${phpinisrc}" || die + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ + -i "${phpinisrc}" || die + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" php.ini + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ + "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + if [[ "${sapi}" == "fpm" ]] ; then + einfo "Installing FPM config files php-fpm.conf and www.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + doins sapi/fpm/php-fpm.conf + insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" + doins sapi/fpm/www.conf + fi + + dodoc php.ini-{development,production} +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + default + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' + + # Emulate buildconf to support cross-compilation + rm -fr aclocal.m4 autom4te.cache config.cache \ + configure main/php_config.h.in || die + eautoconf --force + eautoheader +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var + # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. + local our_conf=( + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}/man" + --infodir="${PHP_DESTDIR}/info" + --libdir="${PHP_DESTDIR}/lib" + --with-libdir="$(get_libdir)" + --localstatedir="${EPREFIX}/var" + --without-pear + $(use_enable threads maintainer-zts) + ) + + our_conf+=( + $(use_with argon2 password-argon2 "${EPREFIX}/usr") + $(use_enable bcmath) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar) + $(use_enable coverage gcov) + $(use_enable ctype) + $(use_with curl) + $(use_enable xml dom) + $(use_with enchant) + $(use_enable exif) + $(use_with ffi) + $(use_enable fileinfo) + $(use_enable filter) + $(use_enable ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(use_with mhash mhash "${EPREFIX}/usr") + $(use_with iconv iconv \ + $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr")) + $(use_enable intl) + $(use_enable ipv6) + $(use_enable json) + $(use_with kerberos) + $(use_with xml libxml) + $(use_enable unicode mbstring) + $(use_with ssl openssl) + $(use_enable pcntl) + $(use_enable phar) + $(use_enable pdo) + $(use_enable opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_enable simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap) + $(use_enable sockets) + $(use_with sodium) + $(use_with sqlite sqlite3) + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer) + $(use_enable xml) + $(use_enable xmlreader) + $(use_enable xmlwriter) + $(use_with xmlrpc) + $(use_with xslt xsl) + $(use_with zip) + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable debug) + ) + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm || use lmdb || use tokyocabinet ; then + our_conf+=( "--enable-dba" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + $(use_with tokyocabinet tcadb "${EPREFIX}/usr") + $(use_with lmdb lmdb "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype) + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg) + $(use_with xpm) + $(use_with webp) + ) + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_enable gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl) + ) + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) + + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + if use mysql || use mysqli ; then + our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) + fi + + # ODBC support + if use odbc && use iodbc ; then + our_conf+=( + --without-unixODBC + --with-iodbc + $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr") + ) + elif use odbc ; then + our_conf+=( + --with-unixODBC="${EPREFIX}/usr" + --without-iodbc + $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr") + ) + else + our_conf+=( + --without-unixODBC + --without-iodbc + --without-pdo-odbc + ) + fi + + # Oracle support + our_conf+=( $(use_with oci8-instant-client oci8) ) + + # PDO support + if use pdo ; then + our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mysql pdo-mysql "${mysqllib}") + $(use_with postgres pdo-pgsql) + $(use_with sqlite pdo-sqlite) + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit) + ) + + # Session support + if use session ; then + our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable session) ) + fi + + # Use pic for shared modules such as apache2's mod_php + our_conf+=( --with-pic ) + + # we use the system copy of pcre + # --with-external-pcre affects ext/pcre + # Many arches don't support pcre-jit + our_conf+=( + --with-external-pcre + --without-pcre-jit + ) + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Cache the ./configure test results between SAPIs. + our_conf+=( --cache-file="${T}/config.cache" ) + + # Support user-passed configuration parameters + our_conf+=( ${EXTRA_ECONF:-} ) + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" || die + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + # The BUILD_DIR variable is used to determine where to output + # the files that autotools creates. This was all originally + # based on the autotools-utils eclass. + BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" + cp -a "${S}" "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local sapi_conf=( + --with-config-file-path="${PHP_INI_DIR}" + --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" + ) + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm|phpdbg) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( "--enable-${sapi}" ) + if [[ "fpm" == "${sapi}" ]] ; then + sapi_conf+=( + $(use_with acl fpm-acl) + $(use_with systemd fpm-systemd) + ) + fi + else + sapi_conf+=( "--disable-${sapi}" ) + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) + else + sapi_conf+=( --without-apxs2 ) + fi + ;; + esac + done + + # Construct the $myeconfargs array by concatenating $our_conf + # (the common args) and $sapi_conf (the SAPI-specific args). + local myeconfargs=( "${our_conf[@]}" ) + myeconfargs+=( "${sapi_conf[@]}" ) + + pushd "${BUILD_DIR}" > /dev/null || die + econf "${myeconfargs[@]}" + popd > /dev/null || die + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index #nowarn + addpredict /var/lib/net-snmp/mib_indexes #nowarn + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || \ + die "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index #nowarn + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" || die + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir "/usr/share/php${PHP_MV}" + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" || die + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp${PHP_MV}$(get_libname)" \ + "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" + else + dobin "${source}" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use opcache ; then + into "${PHP_DESTDIR#${EPREFIX}}" + dolib.so "modules/opcache$(get_libname)" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" \ + "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ + "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" + fi + + if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then + export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ + "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ + "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null || die + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + elog + elog "To enable PHP in apache, you will need to add \"-D PHP\" to" + elog "your apache2 command. OpenRC users can append that string to" + elog "APACHE2_OPTS in /etc/conf.d/apache2." + elog + elog "The apache module configuration file 70_mod_php.conf is" + elog "provided (and maintained) by eselect-php." + elog + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} || die + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + # Remove dead symlinks for SAPIs that were just disabled. For + # example, if the user has the cgi SAPI enabled, then he has an + # eselect-php symlink for it. If he later reinstalls PHP with + # USE="-cgi", that symlink will break. This call to eselect is + # supposed to remove that dead link per bug 572436. + eselect php cleanup || die + + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Warn about the removal of PHP_INI_VERSION if the user has it set. + if [[ -n "${PHP_INI_VERSION}" ]]; then + ewarn 'The PHP_INI_VERSION variable has been phased out. You may' + ewarn 'remove it from your configuration at your convenience. See' + ewarn + ewarn ' https://bugs.gentoo.org/611214' + ewarn + ewarn 'for more information.' + fi + + elog "For details on how version slotting works, please see" + elog "the wiki:" + elog + elog " https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_postrm() { + # This serves two purposes. First, if we have just removed the last + # installed version of PHP, then this will remove any dead symlinks + # belonging to eselect-php. Second, if a user upgrades slots from + # (say) 5.6 to 7.0 and depcleans the old slot, then this will update + # his existing symlinks to point to the new 7.0 installation. The + # latter is bug 432962. + # + # Note: the eselect-php package may not be installed at this point, + # so we can't die() if this command fails. + eselect php cleanup +} diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest index 20c44f982fdb..26ee81ffa709 100644 --- a/dev-lang/python-exec/Manifest +++ b/dev-lang/python-exec/Manifest @@ -1,4 +1,4 @@ DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050 -EBUILD python-exec-2.4.6-r1.ebuild 4693 BLAKE2B 7306b1dfd0aab4aae021515447cbfd997f8adedff1682b08d85ca769aa4c97897da46fc01e0d1f4f868cd528dd6b926bd60e45dea55f718c29cc49fbd53e31bd SHA512 863c2e665fa64f9798574bbdf1045bf71bb4d871b4597514816cc826116b350bf3638c40c2ed6891a5eb44542036699ae0f22a0105c87a0417652096907abe90 -EBUILD python-exec-9999.ebuild 4510 BLAKE2B 85c32e0ddd596272424d0c511dfeff5656badff0a0bbcbb596c0d38dc08c63bffed41d7237403d8bc19c204e500ce2b6ce102bdcd588ca08593436898a5a6011 SHA512 aeff34fe79ee3f082a8743cd4ecc6ed0f7abc3f63bc1009f66228e4f146b54449d94aa92404e5bb075f9d5eea042e5a5958c20378107fffd7ee14a01a010bc39 +EBUILD python-exec-2.4.6-r1.ebuild 4377 BLAKE2B abba1b30b5aa43dfc042eb6d57acfda3aabbd33c2ad296543b1d5742c07fd32b1ffacb47cd189f616b913953d27792539db0a16bf9ed52914bbef5878c620511 SHA512 c548d9463810b4b84638bc12465bbd9ecc64341f1322998dff3870570656e197f0f705a224f0bd79bc6bdf6592a105186bdd02f76998576ff8d6e44de86bc5ea +EBUILD python-exec-9999.ebuild 4194 BLAKE2B 1e26b4721983a44f89fa9e0e924573437a0aef49281bc20f76280ba32c5ca4e49e59c3073ee9eb5f0b564c27d130123f6c92f15a15b7c25532502d3dc42c0d2c SHA512 be43da3820f9d82f0fff4b12a344d6cf05bd46a8d2dc563c13182517c0fe29be31ab7a2fa811f5ff727d295e6c6ed0d8375078a9d47d453a85fb730a68bb4b9b MISC metadata.xml 589 BLAKE2B 7f9fa9750915db8b546b52a560a7fd8d9a63c4f310e423ebdc0508fe9b14363001b30f3c3db26f6d05eec8a44176d62a9335153dff2d55a41a31d3b428cc9ca6 SHA512 2ac0223af0a2cf95d2b18ef415eadb325af0094e4ec361a414b0d68b203dc1c937d3d680af96bdad1e8a48cb5786683bdbbd451f47a0f3a777c075e1690ccf7a diff --git a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild index 9125b6ba9965..f55531bf88ab 100644 --- a/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild +++ b/dev-lang/python-exec/python-exec-2.4.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,15 +15,6 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sp # Internal Python project hack. Do not copy it. Ever. IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" -# eselect-python because of /usr/bin/python* collisions and new config -# python versions because of missing $scriptdir/python* symlinks -RDEPEND=" - ! -Date: Sun, 5 Jun 2016 08:18:01 +0200 -Subject: [PATCH] distutils: make -OO enable both opt-1 and opt-2 optimization - -Bug: http://bugs.python.org/issue27226 -Bug: https://bugs.gentoo.org/585060 ---- - Lib/distutils/command/build_py.py | 8 ++++---- - Lib/distutils/command/install_lib.py | 12 ++++++------ - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py -index cf0ca57..838d4e4 100644 ---- a/Lib/distutils/command/build_py.py -+++ b/Lib/distutils/command/build_py.py -@@ -315,9 +315,9 @@ class build_py (Command): - if self.compile: - outputs.append(importlib.util.cache_from_source( - filename, optimization='')) -- if self.optimize > 0: -+ for opt in range(1, self.optimize + 1): - outputs.append(importlib.util.cache_from_source( -- filename, optimization=self.optimize)) -+ filename, optimization=opt)) - - outputs += [ - os.path.join(build_dir, filename) -@@ -387,8 +387,8 @@ class build_py (Command): - if self.compile: - byte_compile(files, optimize=0, - force=self.force, prefix=prefix, dry_run=self.dry_run) -- if self.optimize > 0: -- byte_compile(files, optimize=self.optimize, -+ for opt in range(1, self.optimize + 1): -+ byte_compile(files, optimize=opt, - force=self.force, prefix=prefix, dry_run=self.dry_run) - - class build_py_2to3(build_py, Mixin2to3): -diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py -index 6154cf0..049b662 100644 ---- a/Lib/distutils/command/install_lib.py -+++ b/Lib/distutils/command/install_lib.py -@@ -24,8 +24,8 @@ class install_lib(Command): - # 2) compile .pyc only (--compile --no-optimize; default) - # 3) compile .pyc and "opt-1" .pyc (--compile --optimize) - # 4) compile "opt-1" .pyc only (--no-compile --optimize) -- # 5) compile .pyc and "opt-2" .pyc (--compile --optimize-more) -- # 6) compile "opt-2" .pyc only (--no-compile --optimize-more) -+ # 5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more) -+ # 6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more) - # - # The UI for this is two options, 'compile' and 'optimize'. - # 'compile' is strictly boolean, and only decides whether to -@@ -132,8 +132,8 @@ class install_lib(Command): - byte_compile(files, optimize=0, - force=self.force, prefix=install_root, - dry_run=self.dry_run) -- if self.optimize > 0: -- byte_compile(files, optimize=self.optimize, -+ for opt in range(1, self.optimize + 1): -+ byte_compile(files, optimize=opt, - force=self.force, prefix=install_root, - verbose=self.verbose, dry_run=self.dry_run) - -@@ -167,9 +167,9 @@ class install_lib(Command): - if self.compile: - bytecode_files.append(importlib.util.cache_from_source( - py_file, optimization='')) -- if self.optimize > 0: -+ for opt in range(1, self.optimize + 1): - bytecode_files.append(importlib.util.cache_from_source( -- py_file, optimization=self.optimize)) -+ py_file, optimization=opt)) - - return bytecode_files - --- -2.8.3 - diff --git a/dev-lang/python/files/python-3.5.5-hash-unaligned.patch b/dev-lang/python/files/python-3.5.5-hash-unaligned.patch deleted file mode 100644 index c418f40b7da4..000000000000 --- a/dev-lang/python/files/python-3.5.5-hash-unaligned.patch +++ /dev/null @@ -1,43 +0,0 @@ -The hash implementation casts the input pointer to uint64_t* and directly reads -from this, which may cause unaligned accesses. Use memcpy() instead so this code -will not crash with SIGBUS on sparc. - ---- a/Python/pyhash.c 2017-11-29 10:21:20.283094068 +0100 -+++ b/Python/pyhash.c 2017-11-29 10:24:26.733087813 +0100 -@@ -372,7 +372,7 @@ siphash24(const void *src, Py_ssize_t sr - PY_UINT64_T k0 = _le64toh(_Py_HashSecret.siphash.k0); - PY_UINT64_T k1 = _le64toh(_Py_HashSecret.siphash.k1); - PY_UINT64_T b = (PY_UINT64_T)src_sz << 56; -- const PY_UINT64_T *in = (PY_UINT64_T*)src; -+ const PY_UINT8_T *in = (PY_UINT8_T*)src; - - PY_UINT64_T v0 = k0 ^ 0x736f6d6570736575ULL; - PY_UINT64_T v1 = k1 ^ 0x646f72616e646f6dULL; -@@ -381,12 +381,14 @@ siphash24(const void *src, Py_ssize_t sr - - PY_UINT64_T t; - PY_UINT8_T *pt; -- PY_UINT8_T *m; -+ const PY_UINT8_T *m; - - while (src_sz >= 8) { -- PY_UINT64_T mi = _le64toh(*in); -- in += 1; -- src_sz -= 8; -+ PY_UINT64_T mi; -+ memcpy(&mi, in, sizeof(mi)); -+ mi = _le64toh(mi); -+ in += sizeof(mi); -+ src_sz -= sizeof(mi); - v3 ^= mi; - DOUBLE_ROUND(v0,v1,v2,v3); - v0 ^= mi; -@@ -394,7 +396,7 @@ siphash24(const void *src, Py_ssize_t sr - - t = 0; - pt = (PY_UINT8_T *)&t; -- m = (PY_UINT8_T *)in; -+ m = in; - switch (src_sz) { - case 7: pt[6] = m[6]; - case 6: pt[5] = m[5]; diff --git a/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch b/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch deleted file mode 100644 index 67d57d0c138b..000000000000 --- a/dev-lang/python/files/python-3.5.5-libressl-compatibility.patch +++ /dev/null @@ -1,69 +0,0 @@ -# From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 Mon Sep 17 00:00:00 2001 -# From: Christian Heimes -# Date: Sat, 24 Mar 2018 18:38:14 +0100 -# Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0 -# (GH-6210) (GH-6214) -# -# LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects -# LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and -# LibreSSL < 2.7. - -# Documentation updates and fixes for failing tests will be provided in -# another patch set. - -# Signed-off-by: Christian Heimes . -# (cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) - -# Co-authored-by: Christian Heimes -# Patch modified by Aaron Bauman for 3.5.5 - ---- a/Modules/_ssl.c 2018-04-13 18:33:17.397649561 -0400 -+++ b/Modules/_ssl.c 2018-04-13 18:40:22.319852014 -0400 -@@ -101,6 +101,12 @@ - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -129,16 +135,18 @@ - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - - static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) -@@ -187,7 +195,7 @@ - { - return store->param; - } --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { diff --git a/dev-lang/python/files/python-3.6.5-hash-unaligned.patch b/dev-lang/python/files/python-3.6.5-hash-unaligned.patch deleted file mode 100644 index d096887cbfb7..000000000000 --- a/dev-lang/python/files/python-3.6.5-hash-unaligned.patch +++ /dev/null @@ -1,42 +0,0 @@ -The hash implementation casts the input pointer to uint64_t* and directly reads -from this, which may cause unaligned accesses. Use memcpy() instead so this code -will not crash with SIGBUS on sparc. - ---- a/Python/pyhash.c 2017-11-29 10:21:20.283094068 +0100 -+++ b/Python/pyhash.c 2017-11-29 10:24:26.733087813 +0100 -@@ -369,7 +369,7 @@ - uint64_t k0 = _le64toh(_Py_HashSecret.siphash.k0); - uint64_t k1 = _le64toh(_Py_HashSecret.siphash.k1); - uint64_t b = (uint64_t)src_sz << 56; -- const uint64_t *in = (uint64_t*)src; -+ const uint8_t *in = (uint8_t*)src; - - uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; - uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; -@@ -378,11 +378,13 @@ - - uint64_t t; - uint8_t *pt; -- uint8_t *m; -+ const uint8_t *m; - - while (src_sz >= 8) { -- uint64_t mi = _le64toh(*in); -- in += 1; -- src_sz -= 8; -+ uint64_t mi; -+ memcpy(&mi, in, sizeof(mi)); -+ mi = _le64toh(mi); -+ in += sizeof(mi); -+ src_sz -= sizeof(mi); - v3 ^= mi; - DOUBLE_ROUND(v0,v1,v2,v3); -@@ -391,7 +393,7 @@ - - t = 0; - pt = (uint8_t *)&t; -- m = (uint8_t *)in; -+ m = in; - switch (src_sz) { - case 7: pt[6] = m[6]; /* fall through */ - case 6: pt[5] = m[5]; /* fall through */ diff --git a/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch b/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch deleted file mode 100644 index 2f9e6a2bef24..000000000000 --- a/dev-lang/python/files/python-3.6.5-libressl-compatibility.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 8d89a385b71a2e4cce0fba0cfc8d91b63485edc5 Mon Sep 17 00:00:00 2001 -From: Christian Heimes -Date: Sat, 24 Mar 2018 18:38:14 +0100 -Subject: [PATCH] [3.6] bpo-33127: Compatibility patch for LibreSSL 2.7.0 - (GH-6210) (GH-6214) - -LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects -LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and -LibreSSL < 2.7. - -Documentation updates and fixes for failing tests will be provided in -another patch set. - -Signed-off-by: Christian Heimes . -(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) - -Co-authored-by: Christian Heimes ---- - Lib/test/test_ssl.py | 1 + - .../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 + - Modules/_ssl.c | 24 ++++++++++++------- - Tools/ssl/multissltests.py | 3 ++- - 4 files changed, 20 insertions(+), 9 deletions(-) - create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst - -diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py -index 8dd3b41450..9785a59a7e 100644 ---- a/Lib/test/test_ssl.py -+++ b/Lib/test/test_ssl.py -@@ -1687,6 +1687,7 @@ class SimpleBackgroundTests(unittest.TestCase): - self.assertEqual(len(ctx.get_ca_certs()), 1) - - @needs_sni -+ @unittest.skipUnless(hasattr(ssl, "PROTOCOL_TLSv1_2"), "needs TLS 1.2") - def test_context_setget(self): - # Check that the context of a connected socket can be replaced. - ctx1 = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) -diff --git a/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst -new file mode 100644 -index 0000000000..635aabbde0 ---- /dev/null -+++ b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst -@@ -0,0 +1 @@ -+The ssl module now compiles with LibreSSL 2.7.1. -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index c54e43c2b4..5e007da858 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -106,6 +106,12 @@ struct py_ssl_library_code { - - #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) - # define OPENSSL_VERSION_1_1 1 -+# define PY_OPENSSL_1_1_API 1 -+#endif -+ -+/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ -+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL -+# define PY_OPENSSL_1_1_API 1 - #endif - - /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 -@@ -152,16 +158,18 @@ struct py_ssl_library_code { - #define INVALID_SOCKET (-1) - #endif - --#ifdef OPENSSL_VERSION_1_1 --/* OpenSSL 1.1.0+ */ --#ifndef OPENSSL_NO_SSL2 --#define OPENSSL_NO_SSL2 --#endif --#else /* OpenSSL < 1.1.0 */ --#if defined(WITH_THREAD) -+/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ -+#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) - #define HAVE_OPENSSL_CRYPTO_LOCK - #endif - -+#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) -+#define OPENSSL_NO_SSL2 -+#endif -+ -+#ifndef PY_OPENSSL_1_1_API -+/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ -+ - #define TLS_method SSLv23_method - #define TLS_client_method SSLv23_client_method - #define TLS_server_method SSLv23_server_method -@@ -227,7 +235,7 @@ SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s) - return s->tlsext_tick_lifetime_hint; - } - --#endif /* OpenSSL < 1.1.0 or LibreSSL */ -+#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ - - - enum py_ssl_error { -diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py -index ce5bbd8530..ba4529ae06 100755 ---- a/Tools/ssl/multissltests.py -+++ b/Tools/ssl/multissltests.py -@@ -57,8 +57,9 @@ LIBRESSL_OLD_VERSIONS = [ - ] - - LIBRESSL_RECENT_VERSIONS = [ -- "2.5.3", - "2.5.5", -+ "2.6.4", -+ "2.7.1", - ] - - # store files in ../multissl --- -2.17.0 - diff --git a/dev-lang/python/python-2.7.15.ebuild b/dev-lang/python/python-2.7.15.ebuild deleted file mode 100644 index c8f7aeab5900..000000000000 --- a/dev-lang/python/python-2.7.15.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="2.7.15" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - berkdb? ( || ( - sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${SLOT}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${SLOT%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/python${SLOT}" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - ln -s "../../../bin/python${SLOT}-config" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${SLOT}" "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${SLOT}" "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${SLOT}" "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-2.7.16.ebuild b/dev-lang/python/python-2.7.16.ebuild deleted file mode 100644 index 4ec6308a22cb..000000000000 --- a/dev-lang/python/python-2.7.16.ebuild +++ /dev/null @@ -1,361 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="2.7.16" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="2.7" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - berkdb? ( || ( - sys-libs/db:5.3 - sys-libs/db:5.1 - sys-libs/db:4.8 - sys-libs/db:4.7 - sys-libs/db:4.6 - sys-libs/db:4.5 - sys-libs/db:4.4 - sys-libs/db:4.3 - sys-libs/db:4.2 - ) ) - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1 ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} - newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${SLOT}:" \ - -i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${SLOT}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${SLOT%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/python${SLOT}" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - ln -s "../../../bin/python${SLOT}-config" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${SLOT}" "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${SLOT}" "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${SLOT}" "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-2.7.17-r1.ebuild b/dev-lang/python/python-2.7.17-r1.ebuild new file mode 100644 index 000000000000..cadc834964dd --- /dev/null +++ b/dev-lang/python/python-2.7.17-r1.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-2.7.17-r1" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + >=sys-libs/zlib-1.1.3:= + virtual/libffi:= + virtual/libintl + berkdb? ( || ( + sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 + ) ) + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +pkg_setup() { + if use berkdb; then + ewarn "'bsddb' module is out-of-date and no longer maintained inside" + ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally" + ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module" + ewarn "is provided by dev-python/bsddb3." + else + if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then + ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]" + ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]." + ewarn "You might need to migrate your databases." + fi + fi +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Lib/sysconfig.py \ + Lib/test/test_site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + # dbm module can be linked against berkdb or gdbm. + # Defaults to gdbm when both are enabled, #204343. + local disable + use berkdb || use gdbm || disable+=" dbm" + use berkdb || disable+=" _bsddb" + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + if tc-is-cross-compiler; then + # Force some tests that try to poke fs paths. + export ac_cv_file__dev_ptc=no + export ac_cv_file__dev_ptmx=yes + fi + + # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile. + tc-export CXX + # The configure script fails to use pkg-config correctly. + # http://bugs.python.org/issue15506 + export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG) + + # Set LDFLAGS so we link modules with -lpython2.7 correctly. + # Needed on FreeBSD unless Python 2.7 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + if use berkdb; then + dbmliborder+="${dbmliborder:+:}bdb" + fi + + local myeconfargs=( + # The check is broken on clang, and gives false positive: + # https://bugs.gentoo.org/596798 + # (upstream dropped this flag in 3.2a4 anyway) + ac_cv_opt_olimit_ok=no + + --with-fpectl + --enable-shared + $(use_enable ipv6) + $(use_with threads) + $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --with-system-expat + --with-system-ffi + --without-ensurepip + ) + + OPT="" econf "${myeconfargs[@]}" + + if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + # Avoid invoking pgen for cross-compiles. + touch Include/graminit.h Python/graminit.c + + emake + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="distutils gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + # Daylight saving time problem + # https://bugs.python.org/issue22067 + # https://bugs.gentoo.org/610628 + local -x TZ=UTC + + # Rerun failed tests in verbose mode (regrtest -w). + emake test EXTRATESTOPTS="-w" < /dev/tty + local result="$?" + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/$(get_libdir)/python${PYVER} + + emake DESTDIR="${D}" altinstall + + sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die + + # Fix collisions between different slots of Python. + mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die + mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die + mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die + rm "${ED}/usr/bin/smtpd.py" || die + + use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die + use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} + + use threads || rm -r "${libdir}/multiprocessing" || die + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/python${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + ln -s "../../../bin/python${PYVER}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-2.7.17.ebuild b/dev-lang/python/python-2.7.17.ebuild index b9c9ec73ec81..2aba9a4f6033 100644 --- a/dev-lang/python/python-2.7.17.ebuild +++ b/dev-lang/python/python-2.7.17.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="2.7" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" IUSE="-berkdb bluetooth build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. diff --git a/dev-lang/python/python-3.5.5.ebuild b/dev-lang/python/python-3.5.5.ebuild deleted file mode 100644 index 66e8fbadbe74..000000000000 --- a/dev-lang/python/python-3.5.5.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.5.4-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.5/3.5m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.5.7.ebuild b/dev-lang/python/python-3.5.7.ebuild deleted file mode 100644 index 8d7fe9a0b02f..000000000000 --- a/dev-lang/python/python-3.5.7.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.5.4-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.5/3.5m" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.5.9.ebuild b/dev-lang/python/python-3.5.9.ebuild deleted file mode 100644 index 44cd7a604772..000000000000 --- a/dev-lang/python/python-3.5.9.ebuild +++ /dev/null @@ -1,368 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -WANT_LIBTOOL="none" - -inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV/_/}" -PATCHSET_VERSION="3.5.4-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.5/3.5m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.6.10.ebuild b/dev-lang/python/python-3.6.10.ebuild new file mode 100644 index 000000000000..43dc80e812fe --- /dev/null +++ b/dev-lang/python/python-3.6.10.ebuild @@ -0,0 +1,353 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.6.10" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + >=sys-libs/zlib-1.1.3:= + virtual/libffi:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + Lib/distutils/command/install.py \ + Lib/distutils/sysconfig.py \ + Lib/site.py \ + Lib/sysconfig.py \ + Lib/test/test_site.py \ + Makefile.pre.in \ + Modules/Setup.dist \ + Modules/getpath.c \ + configure.ac \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --with-fpectl + --enable-shared + $(use_enable ipv6) + $(use_with threads) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" + + if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then + eerror "configure has detected that the sem_open function is broken." + eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777." + die "Broken sem_open function (bug 496328)" + fi +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/$(get_libdir)/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use threads || rm -r "${libdir}/multiprocessing" || die + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.6.5.ebuild b/dev-lang/python/python-3.6.5.ebuild deleted file mode 100644 index 4d67b4d47a31..000000000000 --- a/dev-lang/python/python-3.6.5.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="3.6.4" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.6/3.6m" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.6.8.ebuild b/dev-lang/python/python-3.6.8.ebuild deleted file mode 100644 index fabbf47dc28e..000000000000 --- a/dev-lang/python/python-3.6.8.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="3.6.8" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.6/3.6m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}etc/conf.d/pydoc-${PYVER}" "${ED}etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" \ - "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" \ - "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" \ - "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" \ - "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.6.9.ebuild b/dev-lang/python/python-3.6.9.ebuild index 2c900db4f4fc..41d346eb2cbc 100644 --- a/dev-lang/python/python-3.6.9.ebuild +++ b/dev-lang/python/python-3.6.9.ebuild @@ -44,8 +44,7 @@ RDEPEND="app-arch/bzip2:0= dev-tcltk/blt:0= dev-tcltk/tix ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!=dev-libs/expat-2.1:0= )" # bluetooth requires headers from bluez DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) diff --git a/dev-lang/python/python-3.7.2.ebuild b/dev-lang/python/python-3.7.2.ebuild deleted file mode 100644 index 8982ff6d7bb0..000000000000 --- a/dev-lang/python/python-3.7.2.ebuild +++ /dev/null @@ -1,325 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="3.7.2" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.7/3.7m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - sys-apps/util-linux:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.7.3.ebuild b/dev-lang/python/python-3.7.3.ebuild deleted file mode 100644 index d5def2f23517..000000000000 --- a/dev-lang/python/python-3.7.3.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="3.7.3-0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~mgorny/dist/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.7/3.7m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - sys-apps/util-linux:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.7.4-r1.ebuild b/dev-lang/python/python-3.7.4-r1.ebuild deleted file mode 100644 index 6ddae2e9d0b7..000000000000 --- a/dev-lang/python/python-3.7.4-r1.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="3.7.4-1" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.7/3.7m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - sys-apps/util-linux:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.7.5-r1.ebuild b/dev-lang/python/python-3.7.5-r1.ebuild index a247fe6460d0..207683a35c2e 100644 --- a/dev-lang/python/python-3.7.5-r1.ebuild +++ b/dev-lang/python/python-3.7.5-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz LICENSE="PSF-2" SLOT="3.7/3.7m" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86" IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -45,8 +45,7 @@ RDEPEND="app-arch/bzip2:0= dev-tcltk/blt:0= dev-tcltk/tix ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!=dev-libs/expat-2.1:0= )" # bluetooth requires headers from bluez DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) diff --git a/dev-lang/python/python-3.7.5.ebuild b/dev-lang/python/python-3.7.5.ebuild deleted file mode 100644 index 6ddae2e9d0b7..000000000000 --- a/dev-lang/python/python-3.7.5.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PATCHSET_VERSION="3.7.4-1" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" - -LICENSE="PSF-2" -SLOT="3.7/3.7m" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:0= - app-arch/xz-utils:0= - sys-apps/util-linux:0= - >=sys-libs/zlib-1.1.3:0= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:0= ) - readline? ( >=sys-libs/readline-4.1:0= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - tk? ( - >=dev-lang/tcl-8.0:0= - >=dev-lang/tk-8.0:0= - dev-tcltk/blt:0= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:0= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc, pyvenv - ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die - ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.7.6.ebuild b/dev-lang/python/python-3.7.6.ebuild new file mode 100644 index 000000000000..df19e80b7cb0 --- /dev/null +++ b/dev-lang/python/python-3.7.6.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.7.6" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libffi:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.8.0.ebuild b/dev-lang/python/python-3.8.0.ebuild deleted file mode 100644 index 9428510a9d1d..000000000000 --- a/dev-lang/python/python-3.8.0.ebuild +++ /dev/null @@ -1,331 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -WANT_LIBTOOL="none" - -inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs - -MY_P="Python-${PV}" -PYVER=$(ver_cut 1-2) -PATCHSET_VERSION="3.8.0" - -DESCRIPTION="An interpreted, interactive, object-oriented programming language" -HOMEPAGE="https://www.python.org/" -SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - https://dev.gentoo.org/~mgorny/dist/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" -S="${WORKDIR}/${MY_P}" - -LICENSE="PSF-2" -SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" -RESTRICT="!test? ( test )" - -# Do not add a dependency on dev-lang/python to this ebuild. -# If you need to apply a patch which requires python for bootstrapping, please -# run the bootstrap code on your dev box and include the results in the -# patchset. See bug 447752. - -RDEPEND="app-arch/bzip2:= - app-arch/xz-utils:= - sys-apps/util-linux:= - >=sys-libs/zlib-1.1.3:= - virtual/libffi:= - virtual/libintl - gdbm? ( sys-libs/gdbm:0=[berkdb] ) - ncurses? ( >=sys-libs/ncurses-5.2:= ) - readline? ( >=sys-libs/readline-4.1:= ) - sqlite? ( >=dev-db/sqlite-3.3.8:3= ) - ssl? ( - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) - ) - tk? ( - >=dev-lang/tcl-8.0:= - >=dev-lang/tk-8.0:= - dev-tcltk/blt:= - dev-tcltk/tix - ) - xml? ( >=dev-libs/expat-2.1:= ) - !!/dev/null) - newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py - - newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} - newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} - sed \ - -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ - -e "s:@PYDOC@:pydoc${PYVER}:" \ - -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ - "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # for python-exec - local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) - - # if not using a cross-compiler, use the fresh binary - if ! tc-is-cross-compiler; then - local -x PYTHON=./python - local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} - else - vars=( PYTHON "${vars[@]}" ) - fi - - python_export "python${PYVER}" "${vars[@]}" - echo "EPYTHON='${EPYTHON}'" > epython.py || die - python_domodule epython.py - - # python-exec wrapping support - local pymajor=${PYVER%.*} - mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die - ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${D}${PYTHON_SCRIPTDIR}/python-config" || die - # 2to3, pydoc - ln -s "../../../bin/2to3-${PYVER}" "${D}${PYTHON_SCRIPTDIR}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${D}${PYTHON_SCRIPTDIR}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" "${D}${PYTHON_SCRIPTDIR}/idle" || die - fi -} - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then - python_updater_warning="1" - fi -} - -eselect_python_update() { - if [[ -z "$(eselect python show)" || ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then - eselect python update - fi - - if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then - eselect python update --python${PV%%.*} - fi -} - -pkg_postinst() { - eselect_python_update - - if [[ "${python_updater_warning}" == "1" ]]; then - ewarn "You have just upgraded from an older version of Python." - ewarn - ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." - fi -} - -pkg_postrm() { - eselect_python_update -} diff --git a/dev-lang/python/python-3.8.1.ebuild b/dev-lang/python/python-3.8.1.ebuild new file mode 100644 index 000000000000..cc9a3439c5bc --- /dev/null +++ b/dev-lang/python/python-3.8.1.ebuild @@ -0,0 +1,342 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${PV}-r2" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libffi:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then + python_updater_warning="1" + fi +} + +eselect_python_update() { + if [[ -z "$(eselect python show)" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then + eselect python update + fi + + if [[ -z "$(eselect python show --python${PV%%.*})" || \ + ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]] + then + eselect python update --python${PV%%.*} + fi +} + +pkg_postinst() { + eselect_python_update + + if [[ "${python_updater_warning}" == "1" ]]; then + ewarn "You have just upgraded from an older version of Python." + ewarn + ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules." + fi +} + +pkg_postrm() { + eselect_python_update +} diff --git a/dev-lang/python/python-3.9.0_alpha2.ebuild b/dev-lang/python/python-3.9.0_alpha2.ebuild new file mode 100644 index 000000000000..d27153afa53e --- /dev/null +++ b/dev-lang/python/python-3.9.0_alpha2.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \ + toolchain-funcs + +MY_P="Python-${PV/_alpha/a}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-${PV}" + +DESCRIPTION="An interpreted, interactive, object-oriented programming language" +HOMEPAGE="https://www.python.org/" +SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" +RESTRICT="!test? ( test )" + +# Do not add a dependency on dev-lang/python to this ebuild. +# If you need to apply a patch which requires python for bootstrapping, please +# run the bootstrap code on your dev box and include the results in the +# patchset. See bug 447752. + +RDEPEND="app-arch/bzip2:= + app-arch/xz-utils:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libffi:= + virtual/libintl + gdbm? ( sys-libs/gdbm:=[berkdb] ) + ncurses? ( >=sys-libs/ncurses-5.2:= ) + readline? ( >=sys-libs/readline-4.1:= ) + sqlite? ( >=dev-db/sqlite-3.3.8:3= ) + ssl? ( + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + ) + tk? ( + >=dev-lang/tcl-8.0:= + >=dev-lang/tk-8.0:= + dev-tcltk/blt:= + dev-tcltk/tix + ) + xml? ( >=dev-libs/expat-2.1:= )" +# bluetooth requires headers from bluez +DEPEND="${RDEPEND} + bluetooth? ( net-wireless/bluez ) + test? ( app-arch/xz-utils[extra-filters(+)] ) + virtual/pkgconfig + !sys-devel/gcc[libffi(-)]" +RDEPEND+=" !build? ( app-misc/mime-types )" +PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +pkg_pretend() { + use test && check-reqs_pkg_pretend + + ewarn "This is an early developer preview of Python 3.9. New features" + ewarn "can still be added up to 2020-05-18. It's not suitable for production" + ewarn "use, and it is not supported for Gentoo packages." +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_prepare() { + # Ensure that internal copies of expat, libffi and zlib are not used. + rm -fr Modules/expat || die + rm -fr Modules/_ctypes/libffi* || die + rm -fr Modules/zlib || die + + local PATCHES=( + "${WORKDIR}/${PATCHSET}" + ) + + default + + sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ + setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" + + eautoreconf +} + +src_configure() { + local disable + # disable automagic bluetooth headers detection + use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no + use gdbm || disable+=" gdbm" + use ncurses || disable+=" _curses _curses_panel" + use readline || disable+=" readline" + use sqlite || disable+=" _sqlite3" + use ssl || export PYTHON_DISABLE_SSL="1" + use tk || disable+=" _tkinter" + use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat. + export PYTHON_DISABLE_MODULES="${disable}" + + if ! use xml; then + ewarn "You have configured Python without XML support." + ewarn "This is NOT a recommended configuration as you" + ewarn "may face problems parsing any XML documents." + fi + + if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then + einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}" + fi + + if [[ "$(gcc-major-version)" -ge 4 ]]; then + append-flags -fwrapv + fi + + filter-flags -malign-double + + # https://bugs.gentoo.org/show_bug.cgi?id=50309 + if is-flagq -O3; then + is-flagq -fstack-protector-all && replace-flags -O3 -O2 + use hardened && replace-flags -O3 -O2 + fi + + # https://bugs.gentoo.org/700012 + if is-flagq -flto || is-flagq '-flto=*'; then + append-cflags $(test-flags-CC -ffat-lto-objects) + fi + + # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile. + tc-export CXX + + # Set LDFLAGS so we link modules with -lpython3.2 correctly. + # Needed on FreeBSD unless Python 3.2 is already installed. + # Please query BSD team before removing this! + append-ldflags "-L." + + # Fix implicit declarations on cross and prefix builds. Bug #674070. + use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw + + local dbmliborder + if use gdbm; then + dbmliborder+="${dbmliborder:+:}gdbm" + fi + + local myeconfargs=( + --enable-shared + $(use_enable ipv6) + --infodir='${prefix}/share/info' + --mandir='${prefix}/share/man' + --with-computed-gotos + --with-dbmliborder="${dbmliborder}" + --with-libc= + --enable-loadable-sqlite-extensions + --without-ensurepip + --with-system-expat + --with-system-ffi + ) + + OPT="" econf "${myeconfargs[@]}" +} + +src_compile() { + # Ensure sed works as expected + # https://bugs.gentoo.org/594768 + local -x LC_ALL=C + + emake CPPFLAGS= CFLAGS= LDFLAGS= + + # Work around bug 329499. See also bug 413751 and 457194. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E python + else + pax-mark m python + fi +} + +src_test() { + # Tests will not work when cross compiling. + if tc-is-cross-compiler; then + elog "Disabling tests due to crosscompiling." + return + fi + + # Skip failing tests. + local skipped_tests="gdb" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + + local -x PYTHONDONTWRITEBYTECODE= + + emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty + local result=$? + + for test in ${skipped_tests}; do + mv "${T}/test_${test}.py" "${S}"/Lib/test + done + + elog "The following tests have been skipped:" + for test in ${skipped_tests}; do + elog "test_${test}.py" + done + + elog "If you would like to run them, you may:" + elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'" + elog "and run the tests separately." + + if [[ ${result} -ne 0 ]]; then + die "emake test failed" + fi +} + +src_install() { + local libdir=${ED}/usr/lib/python${PYVER} + + emake DESTDIR="${D}" altinstall + + # Remove static library + rm "${ED}"/usr/$(get_libdir)/libpython*.a || die + + sed \ + -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \ + -e "s/\(PY_LDFLAGS=\).*/\1/" \ + -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed" + + # Fix collisions between different slots of Python. + rm "${ED}/usr/$(get_libdir)/libpython3.so" || die + + # Cheap hack to get version with ABIFLAGS + local abiver=$(cd "${ED}/usr/include"; echo python*) + if [[ ${abiver} != python${PYVER} ]]; then + # Replace python3.X with a symlink to python3.Xm + rm "${ED}/usr/bin/python${PYVER}" || die + dosym "${abiver}" "/usr/bin/python${PYVER}" + # Create python3.X-config symlink + dosym "${abiver}-config" "/usr/bin/python${PYVER}-config" + # Create python-3.5m.pc symlink + dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc" + fi + + # python seems to get rebuilt in src_install (bug 569908) + # Work around it for now. + if has_version dev-libs/libffi[pax_kernel]; then + pax-mark E "${ED}/usr/bin/${abiver}" + else + pax-mark m "${ED}/usr/bin/${abiver}" + fi + + use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die + use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die + + dodoc Misc/{ACKS,HISTORY,NEWS} + + if use examples; then + docinto examples + find Tools -name __pycache__ -exec rm -fr {} + || die + dodoc -r Tools + fi + insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510 + local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \ + emake --no-print-directory -s -f - 2>/dev/null) + newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py + + newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER} + newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER} + sed \ + -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \ + -e "s:@PYDOC@:pydoc${PYVER}:" \ + -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ + "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" + + # for python-exec + local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR ) + + # if not using a cross-compiler, use the fresh binary + if ! tc-is-cross-compiler; then + local -x PYTHON=./python + local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD} + else + vars=( PYTHON "${vars[@]}" ) + fi + + python_export "python${PYVER}" "${vars[@]}" + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die + ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die + # python-config and pythonX-config + # note: we need to create a wrapper rather than symlinking it due + # to some random dirname(argv[0]) magic performed by python-config + cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${D}${PYTHON_SCRIPTDIR}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${D}${PYTHON_SCRIPTDIR}/idle" || die + fi +} diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest index 699e3ad3f8c7..3876bc9e0d5e 100644 --- a/dev-lang/rakudo/Manifest +++ b/dev-lang/rakudo/Manifest @@ -1,13 +1,7 @@ AUX rakudo-2016.04-jna-lib.patch 970 BLAKE2B 28947a57089f3e53333d6dad83b9ff62411b1bb090f2301d6d415cf9e3eef5b6a96dfbaf94020c249e24cca707655522929114ecb032bb4e701d6a3c7ad46810 SHA512 3e76c33e08911fc9105fc8e6f046a8af133ec956aad1537653ee335f0068d4428a9c8be45af45ed3eccae58f1be38579614bac278deb00ea143829e6d98d38c6 -DIST rakudo-2018.06.tar.gz 3520888 BLAKE2B 68d568650aef1dcc4bf84843232db0d8f918684c69d80028acd12846fb913dd9600bed2b42ec55019d752370672de3f2fe81c498ffc892ab03954630a2158ea0 SHA512 574b074b4a2412b4e020906645787b9e57160a9e87c58b73771b1a3732a39a5b961d778d25a8099a8da5e7b3df57b84599df64cd65089a63fe236f3cae06355d -DIST rakudo-2018.08.tar.gz 3541161 BLAKE2B af283a2d05b067d1bb8f6f8413dc3f88f2c44b6fcc32a9238b27288de613bd9b56b5e200a72402e3ac5f3189a6fb5a3bc39fa66812663bc5d04f5b047166dc6d SHA512 0d4145cf372843514d4ea23f2f9768b6740b10bf19fca2a1878db3babb9e842599b4134c7cb75be08f9fd15c4f93dc4c73fc9f8bdfe370ec8efb059ed7737459 -DIST rakudo-2018.09.tar.gz 3547819 BLAKE2B 50f7fb96eba9f03bff2bc455c3f1d19e29338971a9b6f638d1068ef06dca1fd8e1bd25cd3ecae085fad91950314c0a68af8080ae542d052d280f777d7efebe20 SHA512 da00486d64a10c1892949cb243da96e1379570dbc17e4ee2f6b5fc6524e628cec7a1c243f47e0eb211259467c1e95e62ea309474bdcaaf598f945a95a7d1a19c -DIST rakudo-2018.12.tar.gz 4109828 BLAKE2B ce991995940aaf83688732a37f9689eae372f33c51a80fe5ce4cc845c6984e198b8f197005b4c8d2c75abeedced994b22c6bb01a6ea110b86f0dcabfbc10be17 SHA512 a18f08ce313178cd73b87f6137b0c460ab93fbe26b457f8aa77313d3fa8d4c2f6059402920d8832018dcf8596a63d1c4df70260ce48533f5212c9133af519256 DIST rakudo-2019.03.tar.gz 4128971 BLAKE2B 0b1eeb4ebcf7abdbc477cf1b64a6b1f85821e03a953b71aca53ac4fdc88bf3c8df0ecbc95c687ab6686a4cdd4ddb6c7caf89c97ed407d4c0b45203b65397aa11 SHA512 c6b77bbc7d806a399adccccc98c273063c90756967769cd288a161317cc81151dff4feb1219b534aeec5d60e4344fd1f7e166cfc3b90389fd550b2862178f447 -EBUILD rakudo-2018.06.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51 -EBUILD rakudo-2018.08.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51 -EBUILD rakudo-2018.09.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51 -EBUILD rakudo-2018.12.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51 +DIST rakudo-2019.11.tar.gz 4651014 BLAKE2B 4e95b834d074efcf515e4b1e6776ef4a34398dcc4536e315b759dcb56565e64e19e2cf513b97b85974639b3c3b9968129a6781bbafb37fded98f108c32d06ceb SHA512 6d058fe1e1630023f14ac910ade75f22b963f9eb8e524a8c9006a6df8e0764f283f2c8bd4af4a303b2151e6078fccd8b3cb6c388f70e38d6e9465505eefafdb4 EBUILD rakudo-2019.03.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51 -EBUILD rakudo-9999.ebuild 1739 BLAKE2B 3731925eea2cfb909f723f82eba9b435e53d2fdbc3ef2bfa767064299623dcc1fbf47e18184023518d06ee04d54b8c3a7082c3d2f05392842b1201cd0197892e SHA512 7fe4b4b7b43630630baae67c7f6880889eacadf2d39e9cd5ebcca8dbf7dd23abb0a2af4f6f5108e3690184970e27cfcb87be984349d3e30bc7c33d5105520003 +EBUILD rakudo-2019.11.ebuild 1641 BLAKE2B 84b7903b29f4257bd634e9f01b9012339c9dc877dce3b0d4c232a593f527180b266ee9579b2964bbd2442a750ae3b4c22f75078b0af6b3f2d02843768480c4f8 SHA512 6631c3ec81979a5c7957eadfc2ddb90ceef44726317f1da9d1b0c09b3791521f92ec7723031fe58c3deea5ee53547935a9ef31642f2953d6410ff686c6debf51 +EBUILD rakudo-9999.ebuild 1746 BLAKE2B 2063c9732b199850cba67d4bac684b2c995b168b62495146db99dd7aa5b7df514f367db0767d5ec6f4fc0b201d6e294af50c245ce2614775365eb44b8bdb4b76 SHA512 9afa18d381aff995afba49a83a482a746693a089d486c247103e0be260101e5a70c6d495c3ae42812eaff6ef66392e842c20fa3c138b882f20746b07b5bed78c MISC metadata.xml 513 BLAKE2B 90fdc5cdf5182b707681ce28a7e4b06c1e8e1a05f848e072de4abc5e8f074ec9becd41c117880bba60e00eebe69a4ab1639b39b0a29307d65d6be09784ee6a18 SHA512 d0144523717581bc13a12b8b8edff0ec03800fe1bda313725a4db37bc70e26c3cf566426e48eb6ecf58f8653f6c51f375ea31d915d75bcf37fc0772251047e7a diff --git a/dev-lang/rakudo/rakudo-2018.06.ebuild b/dev-lang/rakudo/rakudo-2018.06.ebuild deleted file mode 100644 index cd8697211547..000000000000 --- a/dev-lang/rakudo/rakudo-2018.06.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="https://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2018.08.ebuild b/dev-lang/rakudo/rakudo-2018.08.ebuild deleted file mode 100644 index cd8697211547..000000000000 --- a/dev-lang/rakudo/rakudo-2018.08.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="https://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2018.09.ebuild b/dev-lang/rakudo/rakudo-2018.09.ebuild deleted file mode 100644 index cd8697211547..000000000000 --- a/dev-lang/rakudo/rakudo-2018.09.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="https://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2018.12.ebuild b/dev-lang/rakudo/rakudo-2018.12.ebuild deleted file mode 100644 index cd8697211547..000000000000 --- a/dev-lang/rakudo/rakudo-2018.12.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit java-pkg-opt-2 - -DESCRIPTION="A compiler for the Perl 6 programming language" -HOMEPAGE="https://rakudo.org" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" - inherit git-r3 - KEYWORDS="" -else - SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Artistic-2" -SLOT="0" -# TODO: add USE="javascript" once that's usable in nqp -IUSE="clang java +moar test" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( java moar )" - -CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - >=dev-lang/perl-5.10" - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - if use java; then - NQP=$(java-pkg_getjars --with-dependencies nqp) - fi -} - -src_compile() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" -} - -src_install() { - emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install -} - -src_test() { - RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default -} diff --git a/dev-lang/rakudo/rakudo-2019.11.ebuild b/dev-lang/rakudo/rakudo-2019.11.ebuild new file mode 100644 index 000000000000..cd8697211547 --- /dev/null +++ b/dev-lang/rakudo/rakudo-2019.11.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit java-pkg-opt-2 + +DESCRIPTION="A compiler for the Perl 6 programming language" +HOMEPAGE="https://rakudo.org" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="Artistic-2" +SLOT="0" +# TODO: add USE="javascript" once that's usable in nqp +IUSE="clang java +moar test" +RESTRICT="!test? ( test )" +REQUIRED_USE="|| ( java moar )" + +CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]" +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.7 )" +DEPEND="${CDEPEND} + clang? ( sys-devel/clang ) + java? ( >=virtual/jdk-1.7 ) + >=dev-lang/perl-5.10" + +pkg_pretend() { + if has_version dev-lang/rakudo; then + ewarn "Rakudo is known to fail compilation/installation with Rakudo" + ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," + ewarn "then do a new installation." + ewarn "(see Bug #584394)" + fi +} + +src_configure() { + local backends + use moar && backends+="moar," + use java && backends+="jvm" + + local myargs=( + "--prefix=/usr" + "--sysroot=/" + "--sdkroot=/" + "--backends=${backends}" + ) + + perl Configure.pl "${myargs[@]}" || die + + if use java; then + NQP=$(java-pkg_getjars --with-dependencies nqp) + fi +} + +src_compile() { + emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" +} + +src_install() { + emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install +} + +src_test() { + RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default +} diff --git a/dev-lang/rakudo/rakudo-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild index bc57e9847276..ef5a4f463e9b 100644 --- a/dev-lang/rakudo/rakudo-9999.ebuild +++ b/dev-lang/rakudo/rakudo-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 KEYWORDS="" else - SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" + SRC_URI="https://rakudo.org/downloads/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 2e74da06ca2f..f1d85bf0faf3 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -12,10 +12,13 @@ AUX 2.5/011-no-gems.patch 3139 BLAKE2B ce05d6ef90001b3011167ba0827ef7852173fa508 AUX 2.6/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8 AUX 2.6/009_no-gems.patch 1261 BLAKE2B 359d0a73c374e5c464eb0343d33272244bb88ba200977007a93f3c3c776779a013174fc2c97717e4ae4a1495011d3baae80e68b07433eab1320955a49aed8b59 SHA512 1607b9c2021e5b5f08cf28c64d3f3ddd077bc47df02a353182a9bc70dc6831ea18e8681d9808bb6841939d64082ae4966081014ee110d2090ec67ffe8faa9b8b AUX 2.6/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7 +AUX 2.7/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7 DIST ruby-2.4.9.tar.xz 10078316 BLAKE2B ad83adf6b884a9a36e83cc754077f706afa221a9e8b81d92f6b6a1b829dc0350bdacd67b0b4e1e196a17e3f7d1c65f1e9b38e245aeddf089576eaca7d051701b SHA512 9046575315c29c789427c2d00c832f0c0970e47fd158bbe8e4f2df5cff2ea9c06c65c3493adb4656e5b32ebfdc546092911f98a8ad7f698bc001c290db5888c7 DIST ruby-2.5.7.tar.xz 11296440 BLAKE2B 6f3590f30c7b196145a83490abed24b0059521374a03086646186b20670bfed548ea744c910c8eda0d11607d8673644d7fb23ff9091dd2f6dfcbc43080fe0f97 SHA512 63b7c75fab44cd1bd22f22ddec00c740cf379ac7240da0dfafcec54347766695faef47428ce1c433fd77fa96992e976c984697067fa526236d383b12adc9ce75 DIST ruby-2.6.5.tar.xz 11553580 BLAKE2B 07739a92ff17467fe6d31bb4dce56ae35fd9c67bb697ebc00b4845474c75d8377c77916e6e129512cfffcf76bd60e6327e818e899b6160f3222912654d5eb118 SHA512 e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db +DIST ruby-2.7.0.tar.xz 11990900 BLAKE2B 0f4969780618979190a92ca317963f825d854ecb437e7031cb7848b04bc9cb9532145968e33f5b8022449bccd1b0828b87a0ed0c0a09b182e2484d0811975a0d SHA512 dd5690c631bf3a2b76cdc06902bcd76a89713a045e136debab9b8a81ff8c433bbb254aa09e4014ca1cf85a69ff4bcb13de11da5e40c224e7268be43ef2194af7 EBUILD ruby-2.4.9.ebuild 6537 BLAKE2B 874675626d2bbd45a816586d5df7a93d04e305a5c43f888eab9cee5f8b84d8f0f581358fd81653879865361d6adbfa9708d93628189b423c83de28c164404f95 SHA512 3f51faaf6b037f0285b43508ee28862d24fff80d2a66f01d1a68ef91fb319545918e7a3f8e127ca588fd51f00439474ab2fbd285f02a73dc0fdefb7a3367a745 -EBUILD ruby-2.5.7.ebuild 6326 BLAKE2B 6e658c61bc3da248ee4c0973fe820e5ac5d2f11540c2e36b21610bd20be182a21cb69372491c0d0a7a8ece2e2cd95437b8c011b1b73126d563798a47d51fee8b SHA512 8ed376276ef60591cf92013e64b8a5877817087cd79105edc8d7419832a272878d963e23b4141234ba14ddb8f09575cb4b32bbbf6ea2d721203cfc3fba5c45f6 +EBUILD ruby-2.5.7.ebuild 6325 BLAKE2B b97cb852974c9e690eb2e1cd3853d3ad338066c567e4861aa5c3947fbbb8fc55583f5af0195acc1f653e381cdd72312531c146d890460add65c56568e29ea1e1 SHA512 f6e033b66c21f4da71859bca0bb7c860683b3837ddac4d1a1669de5e5cb0ce750f24068cabe82382ead8f22e5dfd537a73af4b0317b8f41baf763417a096d70c EBUILD ruby-2.6.5.ebuild 6749 BLAKE2B f4302b035fb22dbd28d6e09b9e5c5489ec0b261e05cfdec070b976a2b1c586f03dbaf71493ac7f4a4f9d9c9f25d216b778c7bea2fe2553406d6b3e19ca9acf6a SHA512 1f103835b19b0e2eaad6962ba8866d15cafdfa88ff6d6ea23774844224571fa5884d32a169bc9eb8a7549b4914b497cccd1c142f57598a2cb43df8c6de3bbf5f +EBUILD ruby-2.7.0.ebuild 6875 BLAKE2B 2d1a6565e0bb8c63ffc9aa6c653263aaceb43de12e39c177cddfde992f8d2193322f0bacf6ba752c53b492cdd817b030421fa6a9d19498f98c4e543074949b25 SHA512 362cdc9e7c820f08bdf0a9067f6ad02b779fdf50756dc461120da6b49d71cbaad19a1aac51721037b8cf6a3f6a7aabdad1ed60e93572823af72accea81319f7a MISC metadata.xml 445 BLAKE2B c3b5fae44894da3c78d024a376522aa2ef486cd9435351ddd7fa8b7c9afdc36969251a3b043d5890a368616f0736ae80e2a65a7342b327f30eb3497c5c02d28a SHA512 3818ac938dd6f8a05e18662f83af542fb29af00a476362592afa86bc537a74ddd0abe275784340539b2cd38f97ad1fce8b8c427c65d61c05a90b2118f2d16a91 diff --git a/dev-lang/ruby/files/2.7/010-default-gem-location.patch b/dev-lang/ruby/files/2.7/010-default-gem-location.patch new file mode 100644 index 000000000000..7a50c35ff6c9 --- /dev/null +++ b/dev-lang/ruby/files/2.7/010-default-gem-location.patch @@ -0,0 +1,20 @@ +--- a/tool/rbinstall.rb.~1~ 2019-01-24 02:00:07.000000000 +0100 ++++ b/tool/rbinstall.rb 2019-02-03 08:39:49.778007118 +0100 +@@ -806,7 +806,7 @@ + end + + def install_default_gem(dir, srcdir) +- gem_dir = Gem.default_dir ++ gem_dir = ENV['GEM_DESTDIR'] + directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) + prepare "default gems from #{dir}", gem_dir, directories + +@@ -844,7 +844,7 @@ + end + + install?(:ext, :comm, :gem, :'bundled-gems') do +- gem_dir = Gem.default_dir ++ gem_dir = ENV['GEM_DESTDIR'] + directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) + prepare "bundled gems", gem_dir, directories + install_dir = with_destdir(gem_dir) diff --git a/dev-lang/ruby/ruby-2.5.7.ebuild b/dev-lang/ruby/ruby-2.5.7.ebuild index 992d04bc501d..a67e2f39422c 100644 --- a/dev-lang/ruby/ruby-2.5.7.ebuild +++ b/dev-lang/ruby/ruby-2.5.7.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/" SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz" LICENSE="|| ( Ruby-BSD BSD-2 )" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86" IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" RDEPEND=" diff --git a/dev-lang/ruby/ruby-2.7.0.ebuild b/dev-lang/ruby/ruby-2.7.0.ebuild new file mode 100644 index 000000000000..99daef051964 --- /dev/null +++ b/dev-lang/ruby/ruby-2.7.0.ebuild @@ -0,0 +1,238 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib + +MY_P="${PN}-$(ver_cut 1-3)" +S=${WORKDIR}/${MY_P} + +SLOT=$(ver_cut 1-2) +MY_SUFFIX=$(ver_rs 1 '' ${SLOT}) +RUBYVERSION=${SLOT}.0 + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="https://www.ruby-lang.org/" +SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz" + +LICENSE="|| ( Ruby-BSD BSD-2 )" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs tk xemacs" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm:= ) + jemalloc? ( dev-libs/jemalloc ) + jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( + dev-lang/tcl:0=[threads] + dev-lang/tk:0=[threads] + ) + dev-libs/libyaml + virtual/libffi:= + sys-libs/readline:0= + sys-libs/zlib + >=app-eselect/eselect-ruby-20171225 +" + +DEPEND="${RDEPEND}" + +BUNDLED_GEMS=" + >=dev-ruby/minitest-5.13.0[ruby_targets_ruby27] + >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27] + >=dev-ruby/power_assert-1.1.5[ruby_targets_ruby27] + >=dev-ruby/rake-13.0.1[ruby_targets_ruby27] + >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27] + >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27] +" + +PDEPEND=" + ${BUNDLED_GEMS} + virtual/rubygems[ruby_targets_ruby27] + >=dev-ruby/bundler-2.1.0[ruby_targets_ruby27] + >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27] + >=dev-ruby/json-2.0.2[ruby_targets_ruby27] + rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] ) + xemacs? ( app-xemacs/ruby-modes )" + +src_prepare() { + # 005 does not compile bigdecimal and is questionable because it + # compiles ruby in a non-standard way, may be dropped + eapply "${FILESDIR}"/2.7/010*.patch + + einfo "Unbundling gems..." + cd "$S" + # Remove bundled gems that we will install via PDEPEND, bug + # 539700. + rm -fr gems/* || die + # Don't install CLI tools since they will clash with the gem + rm -f bin/{racc,racc2y,y2racc} || die + sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die + + einfo "Removing bundled libraries..." + rm -fr ext/fiddle/libffi-3.2.1 || die + + eapply_user + + eautoreconf +} + +src_configure() { + local modules= myconf= + + # -fomit-frame-pointer makes ruby segfault, see bug #150413. + filter-flags -fomit-frame-pointer + # In many places aliasing rules are broken; play it safe + # as it's risky with newer compilers to leave it as it is. + append-flags -fno-strict-aliasing + # SuperH needs this + use sh && append-flags -mieee + + # Socks support via dante + if use socks5 ; then + # Socks support can't be disabled as long as SOCKS_SERVER is + # set and socks library is present, so need to unset + # SOCKS_SERVER in that case. + unset SOCKS_SERVER + fi + + # Increase GC_MALLOC_LIMIT if set (default is 8000000) + if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then + append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" + fi + + # ipv6 hack, bug 168939. Needs --enable-ipv6. + use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" + + # Determine which modules *not* to build depending in the USE flags. + if ! use berkdb ; then + modules="${modules},dbm" + fi + if ! use gdbm ; then + modules="${modules},gdbm" + fi + if ! use ssl ; then + modules="${modules},openssl" + fi + if ! use tk ; then + modules="${modules},tk" + fi + + # Provide an empty LIBPATHENV because we disable rpath but we do not + # need LD_LIBRARY_PATH by default since that breaks USE=multitarget + # #564272 + INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ + --program-suffix=${MY_SUFFIX} \ + --with-soname=ruby${MY_SUFFIX} \ + --docdir=${EPREFIX}/usr/share/doc/${P} \ + --enable-shared \ + --enable-pthread \ + --disable-rpath \ + --with-out-ext="${modules}" \ + $(use_with jemalloc jemalloc) \ + $(use_enable jit jit-support ) \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + --enable-ipv6 \ + $(use_enable static-libs static) \ + $(use_enable static-libs install-static-library) \ + $(use_with static-libs static-linked-ext) \ + $(use_enable debug) \ + ${myconf} \ + --enable-option-checking=no + + # Makefile is broken because it lacks -ldl + rm -rf ext/-test-/popen_deadlock || die +} + +src_compile() { + emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" +} + +src_test() { + emake -j1 V=1 test + + elog "Ruby's make test has been run. Ruby also ships with a make check" + elog "that cannot be run until after ruby has been installed." + elog + if use rubytests; then + elog "You have enabled rubytests, so they will be installed to" + elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" + elog "than root, and you must place them into a writeable directory." + elog "Then call: " + elog + elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" + else + elog "Enable the rubytests USE flag to install the make check tests" + fi +} + +src_install() { + # Remove the remaining bundled gems. We do this late in the process + # since they are used during the build to e.g. create the + # documentation. + rm -rf ext/json || die + rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die + + # Ruby is involved in the install process, we don't want interference here. + unset RUBYOPT + + local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) + + LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" + for d in $(find "${S}/ext" -type d) ; do + RUBYLIB="${RUBYLIB}:$d" + done + export LD_LIBRARY_PATH RUBYLIB + + # Create directory for the default gems + local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}" + mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed" + + emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install + + # Remove installed rubygems and rdoc copy + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + + if use doc; then + emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc + fi + + if use examples; then + dodoc -r sample + fi + + dodoc ChangeLog NEWS doc/NEWS* README* + + if use rubytests; then + pushd test + insinto /usr/share/${PN}-${SLOT}/test + doins -r . + popd + fi +} + +pkg_postinst() { + if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then + eselect ruby set ruby${MY_SUFFIX} + fi + + elog + elog "To switch between available Ruby profiles, execute as root:" + elog "\teselect ruby set ruby(23|24|...)" + elog +} + +pkg_postrm() { + eselect ruby cleanup +} diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index b6e023b36c3d..65dce885302c 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -1,42 +1,3 @@ -DIST rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz 120868188 BLAKE2B d843cce81338b2b3765c973f06dca83161fefed129efefe94efad663b5ddef54aa092bf5977ba7bca74519b008796e60486cf8b193ec2a2dead3add66295d41f SHA512 7103362b8840d094661a16053d8f07eba413c369bf3a2b686313875aa97c30b35697fceefbfc90dffd5cfd4de946e7f848f2b791736443639b30bb75709b7122 -DIST rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz 122563056 BLAKE2B 05e73de7d58723affef3f272e646245a97b17373cc960d5e1be0365919ad3879e08bd9012126e41235b97a758bb57fa4e67fcd11e2f29322af9ab039fc3e2dfd SHA512 d6c055e8ba0fd494797a55d2a6df1eec2a6361c0b081e4b7cb06e42a03a644e4de49c7b17dc8cb6484f3271517f2bd50935bc72ead486531b5b370a1c576b12a -DIST rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz 122858592 BLAKE2B aebe65fb64044c342f525749eb5d67217f459712aa72d49497062af461901a6e92d21b00e05439bd0753228b876f521198a8b005b116b5121ec3dd812df4bec8 SHA512 5cc2612988182b68d9b220d6d7620fc0b064a9d347825d4677959b7e43820647ff25651427db3a5c72401ab8d0c14e2976921d71ddbe0a5b540cf045241cd727 -DIST rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz 124601212 BLAKE2B 7ab258783070d3ba1e27431faf36a8c75d0afae935bc4ba08bf1e6b7f080d56cb3a9ac3de8b91ff9885e2df2ccebdf29de80b99548c610ea30c157103b920434 SHA512 fe5be9a345d10ee2b3a47986977be91cd2dd94f2076571f810ac21cea36f79f073eb16915c090861cf46c6835f86db64c2ed1ef036f911b3be829d7927ecb747 -DIST rust-1.34.2-i686-unknown-linux-gnu.tar.xz 169581332 BLAKE2B 75f1fc4c52e81cb9c7f95d18d9aff2439bfc698444321d92f09d5a47e493d693f2cae3d8ee56ccff59ca967a0a2a53828559eefce1398a2450fe39c95397e3e2 SHA512 056243d226cd9a36dfcd266f2aba88adde58dbcfa87f20613183c5dcc514bb413e25f6d6963494dc141f4e91649b17b1db91e6a9d313af7ef7b1893b64337c33 -DIST rust-1.34.2-mips-unknown-linux-gnu.tar.xz 113493608 BLAKE2B 10df3e2eb9fd9200bab1ca94eafd80f680c94bd21589f72fd660e9d819a6615cc83e47ac70df87712e252946f58df30824be992f16ca707b72451898e1884e99 SHA512 ec100071fbd8373baf41f0f517497b9923a77ebea8257d2fdcc9a4488d7ec6d59c0b517f4d922a0f7f699d701510d32d49c1e699c69a94f571f73ba46fe795f3 -DIST rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz 119118112 BLAKE2B 8ba04a90e82bf7d830c750350570dde8cfa0646f1ea10c583927cc6c7ceeb935fb4035248d8a3ac4a477a858a32d3753811e2893220b8b3919e882213dd63373 SHA512 bb3c5e8ce24895a07984059fca53f4737777a78d350312292877b8e1c21a7a84320f1fee4d64c9d684d14be5fe500494d38ef3f5ab4e4f0e84cbd3f3d30a8586 -DIST rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz 115776696 BLAKE2B dfe09e60be47c6cbe183e4f4bb358cd6d1fe0872114d6a663ee95cd063155f99688bdf23b5c7230b626351654da8f38c7b763099b8d6c2707e185449267c137c SHA512 91348409dfdb63b82e6b6a3097d181485f05f0dfb6cd3bd80785da2eea23f493a90a4e07e660dbc14e9c887ff7e27bc0d13203c78feece5aca219e439a9c18cf -DIST rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz 116817940 BLAKE2B bd7fcc7e0e8844d23e73bb8bc07f7454d234d4fc96d6549399c399845af147debbfbcdea2c53d1ad5a28126d6c9cc20178634290fb837f0537947f64d688df75 SHA512 b8009e9ab2e9167cce8e1911ec0bebc9959a89bafcb645637f2a55af15a2f4f5d4fa20d6b38b7ae572480f3d3817392b8c6386b6ed589b34dd0a02529da2a459 -DIST rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz 125735384 BLAKE2B c25d43fa630e9b95692bcb493064f592a12ecee700538671192f04cfdf443a5d046493662c88d91f62cc1eba94e80ec9b6bed9949af9a8bc83788521832336d4 SHA512 d1ab37d68c0b52e3780ea133f8ba4d5b823c7f874bbf15f97f304c21405b1fdbde3d28e83381f08095fca8e2ea615f46accad725ee854ad9db168ab4629e30a3 -DIST rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz 129619832 BLAKE2B df76b7c08941ae2cb512ba656b09a7b87e1e656badbadf58d64ab5f9133e7248a63873675ac44f16207107a0f68da6089706b46af94154c0bd51aed655f8b578 SHA512 3c881e7bcf622237f279855ebaeb544f4df9bfe5bc1f74578093d67befed8f027692ea56dc773c653bef8a124e9ebac2544d0c197a0e3a1ec8da63ef9d434412 -DIST rust-1.34.2-s390x-unknown-linux-gnu.tar.xz 134376720 BLAKE2B 3eb1452bc0f5d6cbe5547f18ad039c54d4fee44e8c24e35f3399272755cd293df008db2c7dded32c7853944e43de7a4d337b7408835445a4916dbf55d14a7b3e SHA512 181f58b00cdccb205be853f5d00fc0a0c939b7e4dc801717b21ece0f714a8f3b501f1196eb2e3f3081932a0417a6218763c3d095cdd036e9f202cc41291876a1 -DIST rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz 157279864 BLAKE2B c25fcb6168e16a4deb19a8ca9b3d91966194f4c8d2e60933226fab015b64a819f6e56a6b51b6e9457ce80efaf5bf71f2eed2f3e6e39bef5856524e33d0a5637b SHA512 64d6b7da08ffd877c10d819605a37b0bc178c4ab80e2f7449f3d5ac9254a438e148da3729408b4c9429ed499d7f142c9d2926f5c916e0a32bebaaefe4b0a09a6 -DIST rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz 132705960 BLAKE2B 134e71195a69f891d7b60bd2ad24468beb0796480d2a48707058b085a6f9255bc092578015be89dd29cebbf1b5f49221735dcedd0cb79a1975220531e5f4d364 SHA512 9231e4acf26dc19a31c6c9623c939eafd0fdefc18debb8569baae36d3ad3410e21097ae2306b5adc48bc5e219da1dc1df38569e1d0ae9b0178d5a2e815c20db8 -DIST rust-1.35.0-arm-unknown-linux-gnueabi.tar.xz 134286432 BLAKE2B 3cc7e664e4d59f0a7ec5153b67c95ccd78c40b2d32a30f2082d8c8370d9e41a47d9e60b0b1182a4e4f8d0e81fb276a16092e4c7911da4479ef0998b0d36ac273 SHA512 e16a4484e1788b4b2cd14482c7717fbc3cfc0b38cf0a483ad4d1bba174ba8b9e631cb6a04fd442e05ee6c9c8291dc344c64b0ced10e342bf75c9ad6b63480723 -DIST rust-1.35.0-arm-unknown-linux-gnueabihf.tar.xz 134633256 BLAKE2B 0487f81ea9635c037a601cce5a55dc4f54eb14adef5056e3e2e83086fa0a4384e92179cbe3ae476d0b9a7e0860a718265fa0261f6dd762444812e3263037e18e SHA512 229d206f30387109649a434c23a8b9af14c2942691cba3a22ca3d76ca76942bd0ad44e0660dd72bdd9a00214a9fa6c140691bd5dd879af35cf2abf9f4a7cbac8 -DIST rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz 136384068 BLAKE2B db8ba39772e150d829cb9c86f20c89c09b1c6a2c996fe5300e265704a0557e8cd879690ede2f03e4ba03d5201a368c65b53a471d581e7ae95646b50992fd4fa8 SHA512 4d80fdc7483566999d8c38b6772c1f1c6cf0f537f68bff9dd9ed68931afab569e02fc9d5ed2999fb1d3478113527840676d903630f93c3d79c30fdba0b98a2bb -DIST rust-1.35.0-i686-unknown-linux-gnu.tar.xz 173765732 BLAKE2B f55ffa1742bc68c733d8392cafe592a937f0a07e3dd50b63aa7479839c0f18d1eecabe897d962635f5dca669053a7a28b5dc2c7d736f581dad9d7ed508bf5ddc SHA512 33a603f638ced850c4572cc81041b1ab47d95a062c66ea24695e449cca7ac6353757c794a85af4a15e43e0ce091c7cc47dbd01fd30e23e1bae6ced194a08a667 -DIST rust-1.35.0-mips-unknown-linux-gnu.tar.xz 126071936 BLAKE2B d0c34edac3e3a36e096efc51116b5073dc7bbbceee6373c2c9720150fe64a6d1e19450590f63b89111f7e93b72af3cc838215a153fbd069d6a66236ce65265f9 SHA512 a70490da14da69c7700c446925875babd8bf6ba0f81c4bf3b838676439a88be1d7cc49290b265f56fad84c8d31fc95c90a46164feeed5b7853751eb71678ad5c -DIST rust-1.35.0-mips64-unknown-linux-gnuabi64.tar.xz 135622404 BLAKE2B 63c4334c08a774a47712ff5781ebebb0ecef828ad26542f22e96a74ae31ca2ac946b02f835403596bb00ba3d6d4bd7b736a34626e97d43aef631b936bdc0d467 SHA512 cd5525846129eaa09ebf8c91ff5ec098241ba3c75539d09d415b09945c18d60cafacce6263def1c3c647cceb28750fac7f2210366a8a8f3e8b30c4e4dd79f96f -DIST rust-1.35.0-mipsel-unknown-linux-gnu.tar.xz 128447920 BLAKE2B 896586031be5be6cf8f2b1d9729a594f99b42c8af72ab1e91c45b2716dd70279c6126290209262175e26ba12a9644fc7007f640155aebc226c568684256113c7 SHA512 42a3828eb1124fde0026be35885034dbcafedaa0ccc02202778f488e89dc4c3f5085341f5892f46f74f4dd2c541c579470ca25ba7315c2316bff7e7a293f2340 -DIST rust-1.35.0-powerpc-unknown-linux-gnu.tar.xz 128414412 BLAKE2B 4bedb0d572c615d763a0d2c21aea60b59b985193cd43c4d649b8c945728d65606ba3f40f4a0a2fd0524bbe8a4895787efabc6fe4517b070e321f2a2588b06740 SHA512 ea9b908f3ddc1b659b1dcdfa937bda410a2778f2133c797258eac46b73b7f44a0ab12d99a02549f8dd4de243bf3ddbe4279f132a8cb66389ed30af3cf7692652 -DIST rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz 139462276 BLAKE2B b99ee8f5f0f372f975e1f690a9e2dea67840220a3f893189672e004045332cecf1823fba3d155348a70c200649a8ff7891bf08fe2f726e69003a71165ea8dfa5 SHA512 a89094b58ffdb4940e51c4c2e5f5efa094d7d6c1a2b2382397dbfb05eeaf99e9329a8e7c51da602a6b8935ebb4f6df475a1873748139d9f9a97b8bd40c49849b -DIST rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz 143826544 BLAKE2B ff5f814515034b382faf40dc0d95623ec57c4f063ded1bb89364594736269744f5409c978de24fa29f6a061d1489179456a90847f5ce8de1f684df22fda68b75 SHA512 3b63dac50a92693d13066aa6e96de05fceb2da6c07834adfab8c12e6a78f59051dfa008062b1d2ad410a009e2164fc716d689231e552379e419161d1620d0066 -DIST rust-1.35.0-s390x-unknown-linux-gnu.tar.xz 152808372 BLAKE2B 96a1e2b96b6a1faf5a3125494b17c4d5f95ea618a5ff8f7ddb7506ebef4fd6cf7f9a2ae961657b7b969a5f3cbc870c805c6634163e7f5fc71e058ea4528e19a0 SHA512 11539eb25e474bbaa8e57f21c3f64506859bc86baec74df24bb4aaf5361745840b82ff715fc54fbd6ba654a8f7fd4f064af0538b983dd489cd69498bd70d1bf7 -DIST rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz 161491264 BLAKE2B ed336829cfe4199750798352e4e338f307033ea0eb5db9ab68f9cf7465d86edbd1218d3e929c775822fd5db3d73a5d75c6e9b5ca45ed6b474bffe403f39f71a0 SHA512 49976ac2fbac5b1709c4a7f3785eb99ab827464ec4d99ee7190df16c3be23e98de606566b57df2231a15097c7fe984e0d19496ce7478ccc1f0f2c7aeb32ecb04 -DIST rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz 139261576 BLAKE2B f8f0ac14c397253298bb321fef83e78fb839e647fa8a9ff891f16e3a1723e1ee69e59686357751b3b4c1a1d1e28632c2047be8795f8a27733ee4bbe8ff71e105 SHA512 77ffd9aa0dfdbb886a51c8d17e3e348c777226e859a48374dad8be20b9a3c7130c7f46d9173753e4ac4a264b45610767ba2625df4192773913892a13a255d3d6 -DIST rust-1.36.0-arm-unknown-linux-gnueabi.tar.xz 140294440 BLAKE2B 25d0ea284d20f93bc82618c61abcd4281835e914426e3e9998ff80d233af4cbb938c05bd3dc9422c3f212f24a08f6bea3f67691860acd8cce60d9f7015556381 SHA512 e1dd8200ade615bcedcc1372d4833c037435a47311ca8a20ebbf914d80add818bf70adadf2b6d33d5a4f04eb4994722978b6b3f83dc6a7cc3c98aea52f244405 -DIST rust-1.36.0-arm-unknown-linux-gnueabihf.tar.xz 140715096 BLAKE2B effed4996df93d2defa843b3356d80abb9a3a69990f5d6c7d6c38f18ad39d2b46618d64007014be931762ab31c2c46a747cc2705b3cd0ec66e7fa888ecfaf81a SHA512 dfabb476a1f31755eea4a0b976991ea083682463e4538f2b7f34dcfa4b6220b82d81fdf4c677294899d5cd740a8a3e012d1b0bb424ae529c05ce92802cf18959 -DIST rust-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz 142315532 BLAKE2B bb6ca7c0af1691c82dd64fcd563573c815147457a69fd0ddef238db4bc5f0ccc7c7ea72429c9d7401db3d431674da70e86183ebad83e7153adad4287de385ac6 SHA512 b31e34f44df17d89f9f2a609a5b5b2320f43691e06ead257d893766abf8764a158adff0265dd60bf1f63dd98f0bf6bc64ae3b9e9f45200fbd7dfcaec3ba85d01 -DIST rust-1.36.0-i686-unknown-linux-gnu.tar.xz 182609496 BLAKE2B 8fa915670346e554f6a881a44bfac42a5ca565acc3426b35901952eae9ea36780181e7569c2db52688a28d680de6fd02764d93219fdf93e7adbba8b8de3b0e6a SHA512 34bcb93ec7a313a28ac20cd853e37419c4607f4035a367015826bd797401a2ada20ee99ae9028b6115c9db8aa1d4f74b74fb08ed09ab528d5946bc26c754b182 -DIST rust-1.36.0-mips-unknown-linux-gnu.tar.xz 134020892 BLAKE2B 0579a8f6ae590780a1bf8a79c6ece290262fedce30721dc4ce405f774d9ed4cda99680da0aed22050147478d2ad3fe391f028a6d1e05b47b509a33d6f1569090 SHA512 8163136f8621ff8b562e50123eef5903de3bf888a230fa83fcc6aa0fad9ea61e1a1cc2248479e6e0f82f0c25014207c7b7186177067a21721156c795d59e8188 -DIST rust-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz 140200900 BLAKE2B e0e9d428d0af610d4dcf4ff38bafdb24001e6644dcad62af6b1782362520358411767b10740587e37dc1ffb85f4036495cdfdb15d68d387988df2512e9a78d05 SHA512 d3dcfef22fc2e130150c64aaeb13a96696c48353300049aca3ba42411548922945192847ba12834d21619d9db26a6628cea8417e3678e52f2742438b862f5d7a -DIST rust-1.36.0-mipsel-unknown-linux-gnu.tar.xz 136390260 BLAKE2B 63e26f3a9563a065d086daa223b732ab0ab89b424cf3e764d93b56c9efe9d611c6565cf89b649819a71af2195f19c278824ee71e2985b20fe55f20e75b8b6be8 SHA512 c8f6538b677ab8b7154b7a7e07ead85a84ff08bc27d2150189e7597e1f9f30ac418d72684916dc85ae8ff95718ec17e289e1f813303e97cec59e63a7f5c1367b -DIST rust-1.36.0-powerpc-unknown-linux-gnu.tar.xz 134270632 BLAKE2B 5466f797d778e2112a0aa53a05f6853d9baf261b1c9a53fd05ac4925b7eb85b7b0a3df02a8509f98b800e42ef2a5ec09cb176e0a5893fc5ee57d0805bcba621f SHA512 a02afacc01a92b5575e3526b3b9bfa149f86ec03b3601b269fe4cb05d8f4dfa24b62625737f8ffe67bfababbe791af1584f45979ef012004b7de7771f29a9edf -DIST rust-1.36.0-powerpc64-unknown-linux-gnu.tar.xz 145880928 BLAKE2B 4922df3a7d7f2d77a3f3380ec4ae9a1e4062cc81abe16ccc978543e4c24c4415bc34db0831b73c078f1ebebb57cea81c600d4e320cb10a4c508a252169d6999b SHA512 20bdd2b427549c866343962abefc4ffc356a1cb6965c754f28f19b05c234cb9c0abccbce036013deba1dc7699c2889ec954fff2b944953385624be54ee7a733e -DIST rust-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz 149721676 BLAKE2B e00bcc60a89354f6d4b5c89feffe5fe6dd7bf25d8dd2db2878e7c12ffc484e9258f37d80bda2b12f3965d96c73f1a03b6adbd8c20176c383e04f1a229d47d000 SHA512 02f32b544b0a55ba6f6fc4852f18766107bc0ce2c50488db11605e8a10e5965dd44e8332905c00080b08576370f2f0297ecbe12ba9fe01b4c24cdb9fd03ad64f -DIST rust-1.36.0-s390x-unknown-linux-gnu.tar.xz 159518028 BLAKE2B c5876ea15c9fa56a92b4c0bf2aab472b83381a7a31fbb207e4165fdc49fea2150dddd53cc771dbcb81b01fe43a3175df146d8645d04c556af3556822fc59bf25 SHA512 c637b8f50cbce3333280f43ce4b97d3f75ddae429ee34461837c3c3869e20aed8c5e76f7a58998f617dc0ffc2e6afd00908e5de05f4c7ed9a8c34d5dbc7ce916 -DIST rust-1.36.0-x86_64-unknown-linux-gnu.tar.xz 169600936 BLAKE2B 8bf075f2b5624e4716e3058512b85b70e72ec6f0c8ce8fc38857612b02aa5702a1bb447f13f882a1b96b1f32330d0a8f7f1f1db81827b51cb7429195e070a5a3 SHA512 3f14dda1e09ef8c8168600f4d70ba60cb2a1086ad9edb5eed708d0ffc16fdb9c582ce350a93afcd64b78f87737e37d4f099703835a1ec9837a5721c2335e17c7 DIST rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz 124322996 BLAKE2B 732dc36933682a18bcd5694b1715af5c442452df8232e2affda8185b9aaf0daf297cf7c4a64fc7d35898e1b3829ba9e8fbe33e8c8f7bc6183b3149f983208ba8 SHA512 c70054f589aa2aecfbd6a89f567306e0cf5d3eb56e5a544ced0a5d212f14033dab10559d22dd6b07945e45a25d8de14fc7897c9d24c0d8149548a06b404ca9d2 DIST rust-1.37.0-arm-unknown-linux-gnueabi.tar.xz 124741032 BLAKE2B 88e38ea9152546c8a04bd6f93fa8d97d3e58255568a522d2774a2656a4c6dd7bad74633a10b424f6c5f6ca07ea07e473e620ab24dfdbe5c27bb5141ab0f5bba8 SHA512 bd28b8bb60b8e4373693ad9d41bfe62eb12a7272a5d7978691b0c7e1892a2df8d6ff8cf5c25dab805fab1d03dd17c76c1014d395b042118cb24603739c6dbb32 DIST rust-1.37.0-arm-unknown-linux-gnueabihf.tar.xz 124971492 BLAKE2B 07614242bc500c9ca81a87ed81cc0bada9b467049b7bc2afbe6245b742ac2bec9030feb08f0ef8a2402bf2c2a19722b8b06dacd0ef56edb0522bf41e29080a01 SHA512 e380e2bf862a157cb5e06d27fa8e306474e708ce7e0ffd087531a4fa5729bef104131c256625c05515f6e7dfd43f639ce1fd5e05a2da42ad7f437d578b4acd8a @@ -76,10 +37,21 @@ DIST rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz 242170220 BLAKE2B 3a5ec3b57c DIST rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz 247026740 BLAKE2B 90269aa78eded26c7d54c2e38a08af5f2a5cc3bfb86c268a12050315ba48f232f324b1fcc8e4abae49489cfd9df83edf6d04424ba14fb77f15daea1f6b5c242e SHA512 e15585150370514e580e171faa749218aeef04ce0493f5ad3928a0cb6cd0bddbf7c75ba8ed0783a2c954bbd7166e0445b4c33be4ab48479b0104f032b3d4b0af DIST rust-1.39.0-s390x-unknown-linux-gnu.tar.xz 298119784 BLAKE2B 82f64163929c129e2aaee8909401c4f302496f63f8d9d366d6f7460b4546d7657ea38bcd864ecd0f58a5995e47f7f5890e4523dcbcbc51e3bf4085536b07de5f SHA512 d2b588f802d4fbe153dbd88cb745d34d1f5434cb3134cc9e091ebfb336a48b4c886cd80311cf92b5e1c6a16374302853a67e8a0576b02a89dbcf61d27919a045 DIST rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz 284967620 BLAKE2B c5d2c2a11c4f66105ece51e7ca45ca6a9e0d70215f94ce52f6e61b20995ceb611e45bad1e5e9f33fd444bb0a58a2edb691f1a65a1caf36ad892c034e00104383 SHA512 02ca6c821877379d8bd0bcc38281a87e6f86bdbae1270da19e41336cc3a812d9c11c1e976655c192c39153f92cda90ddbd7b4b0bcb4f6787d6d354d2be827a8a -EBUILD rust-bin-1.34.2.ebuild 5612 BLAKE2B 773c5c632c9752ea2395852539380c77e8c94efda82529484e63bedbfd8830f68ac0dbebae74680af76fad3ebef70088b09d96e8fec75d16fe756f900115b8bc SHA512 4adeba33d77bb9c1e048a8565b035fb29100d21ab81cb068b93d969b27cb20ac631a12a1a9ba632cebc8dfe7ee4ce6684f0717e87573f9b90d74d410b239022a -EBUILD rust-bin-1.35.0.ebuild 5228 BLAKE2B 4b252f3a7b14b078e88ffc6e7502353809f5725e09ca87499726ccd4844ebfef00296ad3353b047b9259c84f701b7a7937e266a45cc7981f22abc640ed5aeffa SHA512 fe14cef8eb6564201d1784618b436ebf27f23d445a39146d1aa0ebcd6d958c5ae97ee5954cbbb8d59b91bd8d4f9d9ccda26cf6db121e8c05e620173a54ba95a9 -EBUILD rust-bin-1.36.0.ebuild 5100 BLAKE2B dc636c7c3db969f5836bef453260e4535ac61b5156c1eba62c2051ca33b098fc7b19316ae95a9983e0f4b95170d1e309eabce393a2d7a19654694d0a2d336b80 SHA512 03ed9dd0a85b9dfb7574b3b02051406e4716cf142a8bc6fca19f84b9758a138b388078070d8a83aec1fb0a484fde9ef9e1b86d69b4d055913ba9dfa486e1e1a1 -EBUILD rust-bin-1.37.0.ebuild 5096 BLAKE2B b47962073b9391002e37bd73595221218a7c45f5cfe9648f01272f2da206cf1c2b3987044a2dce4498d7f3f506d2f6f92ba761b2dfce063bd6571f68018cede9 SHA512 f5d182e548a78ac4b48fb0b4cfe10d691c390a6c6d055f1e4197ccc5159f142ebe9b8ad618853f2b419fd057f25d2944471a72252db25285c1ef25d0374a044e -EBUILD rust-bin-1.38.0.ebuild 5100 BLAKE2B dc636c7c3db969f5836bef453260e4535ac61b5156c1eba62c2051ca33b098fc7b19316ae95a9983e0f4b95170d1e309eabce393a2d7a19654694d0a2d336b80 SHA512 03ed9dd0a85b9dfb7574b3b02051406e4716cf142a8bc6fca19f84b9758a138b388078070d8a83aec1fb0a484fde9ef9e1b86d69b4d055913ba9dfa486e1e1a1 -EBUILD rust-bin-1.39.0.ebuild 5100 BLAKE2B dc636c7c3db969f5836bef453260e4535ac61b5156c1eba62c2051ca33b098fc7b19316ae95a9983e0f4b95170d1e309eabce393a2d7a19654694d0a2d336b80 SHA512 03ed9dd0a85b9dfb7574b3b02051406e4716cf142a8bc6fca19f84b9758a138b388078070d8a83aec1fb0a484fde9ef9e1b86d69b4d055913ba9dfa486e1e1a1 +DIST rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz 80285104 BLAKE2B 857a3148337833a216912b732c017827d0ee2869af41d114f3a743fbc8bd0ad851c4c42dca63cbcb8f15c816a8c45bd60049fb60ea80a85faec23000140acab6 SHA512 f601e4251e08a6d66edb0489b6ab840b57622b506547e81036e6dfe08eb71005a22a2777a0b8b2d07a6f88286d58f513482b863116311a6f43c7284769af6e7f +DIST rust-1.40.0-arm-unknown-linux-gnueabi.tar.xz 82051152 BLAKE2B 33c62780b3f228298217f7a16e00348cf3c29c504f59de414a0e8a3c506c801d87f460a7bf6107bb7856249c5a5b8fad94499f7f059602b99252ef85dc5b973c SHA512 2098ff12393dd99004ce94f49d445dad03184a108ea8249b70e51abd44bd510f8a4ee43eba3b32967b1a543951e8eec5b06c85692312821b5c855c1d5f034e94 +DIST rust-1.40.0-arm-unknown-linux-gnueabihf.tar.xz 82518972 BLAKE2B 2861693efa9bbd54e09bd693886941ec13b09f1901d384f24534b2852f9cb3b59fa0eaac1ec16bc6df49437cf08a09eff6c649729b0b8c2b4d8def6d7111d229 SHA512 994a91704e65e126bf3d53aa5ccbf9f92f05495a68db1917754f8bf078f16b0255797c884b4f2c70033ae0c94d5f41ad73e1af2e963580ebf56c90a6bf76630a +DIST rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz 84254100 BLAKE2B 5ec75764435f5b906ed5ac84c6454a8fade0d71a9f9d2b3c799525ebf1e1a6e208e85dffe125e3de163d94a62693241a6ed59651955942edc8cdfad5c354a23d SHA512 d3345946c5a3d5cb3d7fca4d3200710704d64547ebfa4ab11c45ea1a18ca3c49b429783d499845f31dcb150abe2f6836fe203fd9d7aa53e0475b940da5549492 +DIST rust-1.40.0-i686-unknown-linux-gnu.tar.xz 122168896 BLAKE2B c89278bd7af7d167251c122297b4a8045da94951aaba5288a3a47b7d4f7af2af2e5ae672388f5c6192382e800151ad54cb2fc9a4fd66fde3acb8acb877aaa27b SHA512 d727149afbbc3b2709360dd6080ff301e781aaa94459c1348d3e35382bc9c7ad65c4d70f9bfc7b44ac92ddaf89e3aab92b75b9d184eba86916da25bd629592b6 +DIST rust-1.40.0-mips-unknown-linux-gnu.tar.xz 74305992 BLAKE2B cf51e3d843a32a3025232d1bc4374c55d3931d8b8634aed83f3f5e890081d7ed2a09d0aa3f026936d5e2f91fd26b56be704cf2975678db5fa23cf57c34277a89 SHA512 995b875dcbbd8472e3109504e695bf15eca812ea252e5ff1a615fb1c5dd3b66fe637fa4c30618b1584af4b641d4b4d5a4d7e1b6a09cb0ca4ff8fdd8a3488a255 +DIST rust-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz 80925812 BLAKE2B a77123767639e93531fdf30af711a8dafd91c4143e7774edf88a9f513fd6fc928f3c96656ce4d0ede54677077c8eb383d5c37bee6881fd0796fe47257a16d753 SHA512 ebbb01c033c16dd9fe93ce0a532afa39b1459b056896c906f9e561285977e7c569e770c7e624e485cd8014008c9d496dae893921bbc1342c3e2b6520c9b84440 +DIST rust-1.40.0-mipsel-unknown-linux-gnu.tar.xz 76145484 BLAKE2B e06cfc8ac8d6124c4eb7c004c9e792c6ba21de5621d21456a7e47f1cd67f584d480708ddb098d882005953db818da27e396c9409c1e089d7db42844608ba1fe8 SHA512 4d4b52397574cfcbf8e79d71cbf783119b0096ed6d8b1f1a4c191336ac0e616b682342077f3451db477e0271a5ac453ee418314c071e8f922e790eb0e32ae768 +DIST rust-1.40.0-powerpc-unknown-linux-gnu.tar.xz 82846452 BLAKE2B e82e117b0592278b491399f27de4c26b518bf8f7cbb60125fc3ae36ddb033113324222ac7433ac9b02026efe4be477ec9967c55648121869a36ce833c3600afd SHA512 4d71bbf1b29f9ea649f444bafbaa8d6447026d992c264736b50365736c9e2129d28f23e09260aa21be10562727a5f6b298ddaf8f7598b4bad53d65cdd2f9e9f0 +DIST rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz 85231436 BLAKE2B b307d794e9e849d40a98116851950f76576b5ea6bb159c71830bb4210c40d5b6cc37d67d316d1b289735f83a29393699a49dd0c11cafe8191a64de6384ed69af SHA512 eae2e0ba3a6a9ba07945112c17962ca3c77737fa187759e674e78f626777da85a5ee6107168fe2866b5beb1ecf2e655652cb7d9b51867b247d76e174dfb103ce +DIST rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz 87972788 BLAKE2B ad1e460dbd7ee5dbe90bf84a68fbcdd89f3d7a1a898ccd94827327bbb2bfeafeb66d5c50651183e0d429f8d14a41e4e26b8f7cae2ff61b055eddcb2c0fa6aecd SHA512 8b82f3bacc503aa23cfa7a6cd6232e34b734becffbbe02df9f766878d526d24d7409d8c104f39fa791c0f7a8b3fa61f6b8a528e89e8ab94d6a131b2d0ac11f0f +DIST rust-1.40.0-s390x-unknown-linux-gnu.tar.xz 95398844 BLAKE2B e897ac3e1f46a63c7ad14e0e5229b7028ac325256e084439bcad0ced631eb26d50ca72710c46e59accb0e3d0574d08a9c15455be59a8d78173387d35ddd3bed7 SHA512 e71d3a1d85975653b6d972a4854c9e53be7f2d093a601145261c97f7917f869399fbc6322a04f63b782a5a28b91c3be40041a8c77367d19dec8d0e857cbbef14 +DIST rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz 110186516 BLAKE2B ad89d8cecbd565b23c98ec095bad218de971cb4bb89924bbcb012df6c9ecf0db2b50d624abdf6b050fe1f5067aea9311dc01852950a5ca5e993e99f913fc5dbc SHA512 11a2ad1d8b9e91cbe9ee6a1954d46ac75eeaa83f0c2425a8ad70d191727b02e86ead33d6464222effca6f5134c31a165801a854aa57bdb5f12944d605de3c1d1 +EBUILD rust-bin-1.37.0.ebuild 5059 BLAKE2B be2cd8601cf91bebd1f27eaa3a86d0f82ea23e5fb0327c472c813f8a30d0a87c061a03a284276db65a2613f19ee3965f97a9ad8eb5e9e23fd2a17070948e1acc SHA512 959f028fd8150f91c924ee8218ff44a2b01e83fa310db4712442a131e3933c6d53cb78a231caabed08bb5897f026397ed999d37e9e49fa38eb6e86e935d45c07 +EBUILD rust-bin-1.38.0.ebuild 5068 BLAKE2B 3439926963e53cfd3387c358194a0e39116e6d0a6cd370c29766f0dd9840259e20ed3f775c1d4868669f34aab7a493484c0539dd29a01bb35e498f8fb0033d09 SHA512 9f89a45e66d3c041c06a5b471547ba76ed907177b49dd913e8ab33cee6013e3b85cb85d0f39f27893c67aa797052703ca8edece01b505aa18bf30ced39cfa0ad +EBUILD rust-bin-1.39.0.ebuild 5063 BLAKE2B a2647b8dcdcd8274ed68ffb05f3f7086d88b9f448cf6ad21cf70673ab4330f956c6d3d3144bba2f46a47cafa4a0f4778d24ad3d181d4c4006a82ec482cce3a69 SHA512 85e1a89222776c0e8fe36d1a821c1d717215dc98b7bc43c3b51304df0a460c5ac1a48e17c004baeb3b905d871bee5e356eb6711b43714b56dbc63a4dbd043b9e +EBUILD rust-bin-1.40.0.ebuild 5068 BLAKE2B 3439926963e53cfd3387c358194a0e39116e6d0a6cd370c29766f0dd9840259e20ed3f775c1d4868669f34aab7a493484c0539dd29a01bb35e498f8fb0033d09 SHA512 9f89a45e66d3c041c06a5b471547ba76ed907177b49dd913e8ab33cee6013e3b85cb85d0f39f27893c67aa797052703ca8edece01b505aa18bf30ced39cfa0ad MISC metadata.xml 381 BLAKE2B 2a378d099ea6bb4ebe56493d1e7196c3207c54212e3c9ef8c0d020a360240cd3a5867b30e1fd3ac0a4da10de11ea6010677cbe63632e97a03ba480496a968cfe SHA512 573b793a11a2f3b7fee167fadc0c4135d16b9452642655fe3e217d6196b4f046afac281542ae361749d1d84c67a4cdd6b4944e364045d9e46e39d69b81fbc92c diff --git a/dev-lang/rust-bin/rust-bin-1.34.2.ebuild b/dev-lang/rust-bin/rust-bin-1.34.2.ebuild deleted file mode 100644 index f7d54470c20f..000000000000 --- a/dev-lang/rust-bin/rust-bin-1.34.2.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils bash-completion-r1 rust-toolchain toolchain-funcs - -MY_P="rust-${PV}" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="https://www.rust-lang.org/" -SRC_URI="$(rust_all_arch_uris ${MY_P})" - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" -SLOT="stable" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" - -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-20190311 - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libssh2 - net-misc/curl[ssl] - !dev-lang/rust:0 - !dev-util/cargo - rustfmt? ( !dev-util/rustfmt )" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" - -QA_PREBUILT=" - opt/${P}/bin/*-${PV} - opt/${P}/lib/*.so - opt/${P}/lib/rustlib/*/bin/* - opt/${P}/lib/rustlib/*/lib/*.so - opt/${P}/lib/rustlib/*/lib/*.rlib* -" - -pkg_pretend () { - if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then - die "${CHOST} is not supported by upstream Rust. You must use a hard float version." - fi -} - -src_unpack() { - default - mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die -} - -src_install() { - local std=$(grep 'std' ./components) - local components="rustc,cargo,${std}" - use doc && components="${components},rust-docs" - use clippy && components="${components},clippy-preview" - use rustfmt && components="${components},rustfmt-preview" - ./install.sh \ - --components="${components}" \ - --disable-verify \ - --prefix="${ED}/opt/${P}" \ - --mandir="${ED}/usr/share/${P}/man" \ - --disable-ldconfig \ - || die - - local rustc=rustc-bin-${PV} - local rustdoc=rustdoc-bin-${PV} - local rustgdb=rust-gdb-bin-${PV} - local rustgdbgui=rust-gdbgui-bin-${PV} - local rustlldb=rust-lldb-bin-${PV} - - mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die - mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die - mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die - mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die - mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die - - dosym "${rustc}" "/opt/${P}/bin/rustc" - dosym "${rustdoc}" "/opt/${P}/bin/rustdoc" - dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb" - dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui" - dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb" - - dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}" - dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}" - dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}" - dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}" - dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" - - local cargo=cargo-bin-${PV} - # ugly hack for https://bugs.gentoo.org/679806 - if use ppc64; then - mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}".bin || die - sed -i 's/getentropy/gEtEnTrOpY/g' "${ED}/opt/${P}/bin/${cargo}".bin || die - cat <<- 'EOF' > "${ED}/opt/${P}/bin/${cargo}" - #!/bin/sh - OPENSSL_ppccap=0 $(realpath $0).bin "${@}" - EOF - fperms +x "/opt/${P}/bin/${cargo}" - else - mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die - fi - dosym "${cargo}" "/opt/${P}/bin/cargo" - dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" - if use clippy; then - local clippy_driver=clippy-driver-bin-${PV} - local cargo_clippy=cargo-clippy-bin-${PV} - mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die - mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die - dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver" - dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy" - dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" - dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}" - fi - if use rustfmt; then - local rustfmt=rustfmt-bin-${PV} - local cargo_fmt=cargo-fmt-bin-${PV} - mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die - mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die - dosym "${rustfmt}" "/opt/${P}/bin/rustfmt" - dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt" - dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}" - dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}" - fi - - cat <<-EOF > "${T}"/50${P} - LDPATH="/opt/${P}/lib" - MANPATH="/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - # note: eselect-rust adds EROOT to all paths below - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-gdbgui - /usr/bin/rust-lldb - EOF - echo /usr/bin/cargo >> "${T}/provider-${P}" - if use clippy; then - echo /usr/bin/clippy-driver >> "${T}/provider-${P}" - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" - fi - if use rustfmt; then - echo /usr/bin/rustfmt >> "${T}/provider-${P}" - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" - fi - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi - - if has_version 'app-shells/zsh'; then - elog "install app-shells/rust-zshcomp to get zsh completion for rust." - fi -} - -pkg_postrm() { - eselect rust unset --if-invalid -} diff --git a/dev-lang/rust-bin/rust-bin-1.35.0.ebuild b/dev-lang/rust-bin/rust-bin-1.35.0.ebuild deleted file mode 100644 index a8b9a6d4b6cc..000000000000 --- a/dev-lang/rust-bin/rust-bin-1.35.0.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 rust-toolchain toolchain-funcs - -MY_P="rust-${PV}" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="https://www.rust-lang.org/" -SRC_URI="$(rust_all_arch_uris ${MY_P})" - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" -SLOT="stable" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" - -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-20190311 - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libssh2 - net-misc/curl[ssl] - !dev-lang/rust:0 - !dev-util/cargo - rustfmt? ( !dev-util/rustfmt )" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" - -QA_PREBUILT=" - opt/${P}/bin/*-${PV} - opt/${P}/lib/*.so - opt/${P}/lib/rustlib/*/bin/* - opt/${P}/lib/rustlib/*/lib/*.so - opt/${P}/lib/rustlib/*/lib/*.rlib* -" - -pkg_pretend () { - if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then - die "${CHOST} is not supported by upstream Rust. You must use a hard float version." - fi -} - -src_unpack() { - default - mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die -} - -src_install() { - local std=$(grep 'std' ./components) - local components="rustc,cargo,${std}" - use doc && components="${components},rust-docs" - use clippy && components="${components},clippy-preview" - use rustfmt && components="${components},rustfmt-preview" - ./install.sh \ - --components="${components}" \ - --disable-verify \ - --prefix="${ED}/opt/${P}" \ - --mandir="${ED}/usr/share/${P}/man" \ - --disable-ldconfig \ - || die - - local rustc=rustc-bin-${PV} - local rustdoc=rustdoc-bin-${PV} - local rustgdb=rust-gdb-bin-${PV} - local rustgdbgui=rust-gdbgui-bin-${PV} - local rustlldb=rust-lldb-bin-${PV} - - mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die - mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die - mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die - mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die - mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die - - dosym "${rustc}" "/opt/${P}/bin/rustc" - dosym "${rustdoc}" "/opt/${P}/bin/rustdoc" - dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb" - dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui" - dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb" - - dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}" - dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}" - dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}" - dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}" - dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" - - local cargo=cargo-bin-${PV} - mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die - dosym "${cargo}" "/opt/${P}/bin/cargo" - dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" - - if use clippy; then - local clippy_driver=clippy-driver-bin-${PV} - local cargo_clippy=cargo-clippy-bin-${PV} - mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die - mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die - dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver" - dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy" - dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" - dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}" - fi - if use rustfmt; then - local rustfmt=rustfmt-bin-${PV} - local cargo_fmt=cargo-fmt-bin-${PV} - mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die - mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die - dosym "${rustfmt}" "/opt/${P}/bin/rustfmt" - dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt" - dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}" - dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}" - fi - - cat <<-EOF > "${T}"/50${P} - LDPATH="/opt/${P}/lib" - MANPATH="/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - # note: eselect-rust adds EROOT to all paths below - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-gdbgui - /usr/bin/rust-lldb - EOF - echo /usr/bin/cargo >> "${T}/provider-${P}" - if use clippy; then - echo /usr/bin/clippy-driver >> "${T}/provider-${P}" - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" - fi - if use rustfmt; then - echo /usr/bin/rustfmt >> "${T}/provider-${P}" - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" - fi - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi - - if has_version 'app-shells/zsh'; then - elog "install app-shells/rust-zshcomp to get zsh completion for rust." - fi -} - -pkg_postrm() { - eselect rust unset --if-invalid -} diff --git a/dev-lang/rust-bin/rust-bin-1.36.0.ebuild b/dev-lang/rust-bin/rust-bin-1.36.0.ebuild deleted file mode 100644 index 180b335fff90..000000000000 --- a/dev-lang/rust-bin/rust-bin-1.36.0.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 rust-toolchain toolchain-funcs - -MY_P="rust-${PV}" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="https://www.rust-lang.org/" -SRC_URI="$(rust_all_arch_uris ${MY_P})" - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" -SLOT="stable" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" - -DEPEND="" -RDEPEND=">=app-eselect/eselect-rust-20190311 - sys-libs/zlib - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-libs/libssh2 - net-misc/curl[ssl] - !dev-lang/rust:0 - !dev-util/cargo - rustfmt? ( !dev-util/rustfmt )" -REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" - -QA_PREBUILT=" - opt/${P}/bin/*-${PV} - opt/${P}/lib/*.so - opt/${P}/lib/rustlib/*/bin/* - opt/${P}/lib/rustlib/*/lib/*.so - opt/${P}/lib/rustlib/*/lib/*.rlib* -" - -pkg_pretend () { - if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then - die "${CHOST} is not supported by upstream Rust. You must use a hard float version." - fi -} - -src_unpack() { - default - mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die -} - -src_install() { - local std=$(grep 'std' ./components) - local components="rustc,cargo,${std}" - use doc && components="${components},rust-docs" - use clippy && components="${components},clippy-preview" - use rustfmt && components="${components},rustfmt-preview" - ./install.sh \ - --components="${components}" \ - --disable-verify \ - --prefix="${ED}/opt/${P}" \ - --mandir="${ED}/usr/share/${P}/man" \ - --disable-ldconfig \ - || die - - local rustc=rustc-bin-${PV} - local rustdoc=rustdoc-bin-${PV} - local rustgdb=rust-gdb-bin-${PV} - local rustgdbgui=rust-gdbgui-bin-${PV} - local rustlldb=rust-lldb-bin-${PV} - - mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die - mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die - mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die - mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die - mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die - - dosym "${rustc}" "/opt/${P}/bin/rustc" - dosym "${rustdoc}" "/opt/${P}/bin/rustdoc" - dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb" - dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui" - dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb" - - dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}" - dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}" - dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}" - dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}" - dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" - - local cargo=cargo-bin-${PV} - mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die - dosym "${cargo}" "/opt/${P}/bin/cargo" - dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" - - if use clippy; then - local clippy_driver=clippy-driver-bin-${PV} - local cargo_clippy=cargo-clippy-bin-${PV} - mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die - mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die - dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver" - dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy" - dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" - dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}" - fi - if use rustfmt; then - local rustfmt=rustfmt-bin-${PV} - local cargo_fmt=cargo-fmt-bin-${PV} - mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die - mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die - dosym "${rustfmt}" "/opt/${P}/bin/rustfmt" - dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt" - dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}" - dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}" - fi - - cat <<-EOF > "${T}"/50${P} - LDPATH="/opt/${P}/lib" - MANPATH="/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - # note: eselect-rust adds EROOT to all paths below - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-gdbgui - /usr/bin/rust-lldb - EOF - echo /usr/bin/cargo >> "${T}/provider-${P}" - if use clippy; then - echo /usr/bin/clippy-driver >> "${T}/provider-${P}" - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" - fi - if use rustfmt; then - echo /usr/bin/rustfmt >> "${T}/provider-${P}" - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" - fi - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi -} - -pkg_postrm() { - eselect rust cleanup -} diff --git a/dev-lang/rust-bin/rust-bin-1.37.0.ebuild b/dev-lang/rust-bin/rust-bin-1.37.0.ebuild index 60afa54a0547..960639b6f749 100644 --- a/dev-lang/rust-bin/rust-bin-1.37.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.37.0.ebuild @@ -144,7 +144,7 @@ pkg_postinst() { elog "Rust installs a helper script for calling GDB now," elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then + if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." fi diff --git a/dev-lang/rust-bin/rust-bin-1.38.0.ebuild b/dev-lang/rust-bin/rust-bin-1.38.0.ebuild index 180b335fff90..4c4e24a97377 100644 --- a/dev-lang/rust-bin/rust-bin-1.38.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.38.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})" LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" SLOT="stable" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" DEPEND="" @@ -144,7 +144,7 @@ pkg_postinst() { elog "Rust installs a helper script for calling GDB now," elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then + if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." fi diff --git a/dev-lang/rust-bin/rust-bin-1.39.0.ebuild b/dev-lang/rust-bin/rust-bin-1.39.0.ebuild index 180b335fff90..692430f4eae8 100644 --- a/dev-lang/rust-bin/rust-bin-1.39.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.39.0.ebuild @@ -144,7 +144,7 @@ pkg_postinst() { elog "Rust installs a helper script for calling GDB now," elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then + if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." fi diff --git a/dev-lang/rust-bin/rust-bin-1.40.0.ebuild b/dev-lang/rust-bin/rust-bin-1.40.0.ebuild new file mode 100644 index 000000000000..4c4e24a97377 --- /dev/null +++ b/dev-lang/rust-bin/rust-bin-1.40.0.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 rust-toolchain toolchain-funcs + +MY_P="rust-${PV}" + +DESCRIPTION="Systems programming language from Mozilla" +HOMEPAGE="https://www.rust-lang.org/" +SRC_URI="$(rust_all_arch_uris ${MY_P})" + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" +SLOT="stable" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="clippy cpu_flags_x86_sse2 doc libressl rustfmt" + +DEPEND="" +RDEPEND=">=app-eselect/eselect-rust-20190311 + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-misc/curl[ssl] + !dev-lang/rust:0 + !dev-util/cargo + rustfmt? ( !dev-util/rustfmt )" +REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )" + +QA_PREBUILT=" + opt/${P}/bin/*-${PV} + opt/${P}/lib/*.so + opt/${P}/lib/rustlib/*/bin/* + opt/${P}/lib/rustlib/*/lib/*.so + opt/${P}/lib/rustlib/*/lib/*.rlib* +" + +pkg_pretend () { + if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then + die "${CHOST} is not supported by upstream Rust. You must use a hard float version." + fi +} + +src_unpack() { + default + mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die +} + +src_install() { + local std=$(grep 'std' ./components) + local components="rustc,cargo,${std}" + use doc && components="${components},rust-docs" + use clippy && components="${components},clippy-preview" + use rustfmt && components="${components},rustfmt-preview" + ./install.sh \ + --components="${components}" \ + --disable-verify \ + --prefix="${ED}/opt/${P}" \ + --mandir="${ED}/usr/share/${P}/man" \ + --disable-ldconfig \ + || die + + local rustc=rustc-bin-${PV} + local rustdoc=rustdoc-bin-${PV} + local rustgdb=rust-gdb-bin-${PV} + local rustgdbgui=rust-gdbgui-bin-${PV} + local rustlldb=rust-lldb-bin-${PV} + + mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die + mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die + mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die + mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die + mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die + + dosym "${rustc}" "/opt/${P}/bin/rustc" + dosym "${rustdoc}" "/opt/${P}/bin/rustdoc" + dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb" + dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui" + dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb" + + dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}" + dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}" + dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}" + dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}" + dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}" + + local cargo=cargo-bin-${PV} + mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die + dosym "${cargo}" "/opt/${P}/bin/cargo" + dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}" + + if use clippy; then + local clippy_driver=clippy-driver-bin-${PV} + local cargo_clippy=cargo-clippy-bin-${PV} + mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die + mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die + dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver" + dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy" + dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}" + dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}" + fi + if use rustfmt; then + local rustfmt=rustfmt-bin-${PV} + local cargo_fmt=cargo-fmt-bin-${PV} + mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die + mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die + dosym "${rustfmt}" "/opt/${P}/bin/rustfmt" + dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt" + dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}" + dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}" + fi + + cat <<-EOF > "${T}"/50${P} + LDPATH="/opt/${P}/lib" + MANPATH="/usr/share/${P}/man" + EOF + doenvd "${T}"/50${P} + + # note: eselect-rust adds EROOT to all paths below + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-gdbgui + /usr/bin/rust-lldb + EOF + echo /usr/bin/cargo >> "${T}/provider-${P}" + if use clippy; then + echo /usr/bin/clippy-driver >> "${T}/provider-${P}" + echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" + fi + if use rustfmt; then + echo /usr/bin/rustfmt >> "${T}/provider-${P}" + echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" + fi + dodir /etc/env.d/rust + insinto /etc/env.d/rust + doins "${T}/provider-${P}" +} + +pkg_postinst() { + eselect rust update --if-unset + + elog "Rust installs a helper script for calling GDB now," + elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}," + + if has_version app-editors/emacs; then + elog "install app-emacs/rust-mode to get emacs support for rust." + fi + + if has_version app-editors/gvim || has_version app-editors/vim; then + elog "install app-vim/rust-vim to get vim support for rust." + fi +} + +pkg_postrm() { + eselect rust cleanup +} diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 2000dfb1d7bc..a53e273f2ad6 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -1,50 +1,10 @@ AUX 0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch 1493 BLAKE2B 7776443fff61cb2265194946e362fddee9b9a6a121b4f02acafeba2873e997d71e2cea0487d0421ccef6fb60b602986b7e7101fa71ca0839755d3ad0b9757faa SHA512 555df431e915bae6dfd7377303ad3a0e2fd7205b71671d74c4917d5dd88e817389e3ead8b9ebe4686d8c45111335ec94e9bd46a0400e01fe593eb0736f0256fb -AUX 1.34.0-doc-build-fix.patch 17719 BLAKE2B 9fa2ce19c51c5fd6fdbf113f22f16db741ef97323d2d0807ffd66d5ffe52e1af1c8fe663fb3f24797b427f6689bbb624c2b4ea7840f17ad50924b21c84e06176 SHA512 5b5098b4c2110c9f5272015dfc04756ee9a9fb1c52763ccc2b3c1349146ebf2e0cbe5ef7fc5d30860024eb626a645409e78da26b9d88c25d8fabc5846905e786 -AUX 1.34.0-libressl.patch 7747 BLAKE2B 6c977bf710049a14333ae2e05ac051b117cccbc6b2e42f041ec9538ae523d2014255e95c997a01de60861e136ee465bdc4c113c395df12e0022bb340070633f1 SHA512 6a6405faadec3f7a483adc6f61fe312f5779e66620fe307fc27414aa1721ca6cdfc57ab153cd2d00ba0e37bc4aad8b6cf3ac29f43190a8367b9fd22204c40344 AUX 1.34.2-fix-custom-libdir.patch 1683 BLAKE2B 3c6c0f3266c0b3246e37b394fb7877e69b2c6b847e54b7dcb8dfd564b8dd505ff4f9e0c7ff1eda32f6745fc2ba84a0bec95f3ab2386977711a43f84cb0e58288 SHA512 d5859315789dac323ee8aa514b1c8cca20d7542bf015e173aec3a9560c8fce2865464cf877dc622aca255843153acf40e5e46b394e63b3144112e3540c4f6ecd AUX 1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch 4921 BLAKE2B 58cb6e6bf7dac8cbd4fb8cb60de61235ad9fbb105172a830a8dcd26661f5a36b50f386a858b319a014e17841349c186a6f760c5776a7848a96af08c39de0e370 SHA512 7d253aff433807453f3d02b3791ac68cbca36937de0e09ca03b429ccdaf9bf8f89578435e2d2901320c371491c08826b29ed665085ca70bff3ae904ed19cd999 AUX 1.36.0-libressl.patch 10109 BLAKE2B b4e40f307bf8309f494a4d1c9ab19f0218fe13a7940cb740edbd0b946f239e58f7046a1c84733f9a7f072be52276861186b2dc9f44d65acc1afbecf7f2c48c11 SHA512 a48fe6a5b407f11b8ecab1121756a1fe563559fea28364ecb4aac243c7432440f28333571e82e8e114ac4f65eb1bce13703f9cd0dc4a573c6d910e9b5c95201c AUX 1.38.0-fix-custom-libdir.patch 4011 BLAKE2B 53020c315a3e98c9a0da8e37842ae8827e3e4823eaf99310ef1908ec3938ca4336aa263600a9906726f9ca8aebc098ca419d35bae1df8e24e18ca84053e3b1da SHA512 b9c6a7b946a4fccf693d69327a961d332eafc2abefb2c91f2220d6660e54bda70a1901c3b5a6807d28fde1e3d07ee76a0bfa32df3264cc262db0174b83ca52f0 AUX 1.38.0-fix-multiple-llvm-rebuilds.patch 3027 BLAKE2B e1a7d42d5aee18c377fe15b44241818f2486d6dcf50fe273b946dc8db6c5e2d1f60a843eb66e40f738e531bc580affce391e04e2014a4ce5b3cf6c0be6bdc19d SHA512 7d8ea21a6b5d1de8ec0cb9d47ee3311b889e03485d30266f5b04031ae073ff697981590b1ce9bfa9d15938e9fcca605b77353992a8a29dc41a98acd32f4da08b -DIST rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz 121877852 BLAKE2B accab68c374afe3eafa38e7ad33c32c427db8d0caab722461075c679af2406d991453a8e529a013b99a5841ef9a5e047cdc9ca88dbebab0c904f4afd99c2b851 SHA512 51f6ca909411fd3b3c05baedc38be8a29923966e7cd6960a10152886687132d4ef9750140c5121b9486d6f6ee1ed7ff35f8105c9f0731fe98ce750d0ea9c528f -DIST rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz 122944304 BLAKE2B c9c29d9409d5829029ffc444c890c0bba0ea213c0a4eb169e65447b6183b0693ab26d48db2fb0be5a325f6ebb7588f90e18b8377f46276d519fcdf5a637ddae7 SHA512 7911dd32cb415d69c05041f450540312d6a78efea36646b4d409a01a0809d94c2eb6a20bfc27772f50cfa0cfed076c3cf5ce62509820819111226f6974f05844 -DIST rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz 123280648 BLAKE2B be19b75623995c0f986d56318887685e70b682caa735adeac259a3f4b67f56537dc43a2a5d696db66547cb523227498c9fcc4213b28df12e5d26999f3caaa7ee SHA512 a0850de543cd11efab4d67bde498e5897f66bbffa1671c4bb6d31fc709dc0869e322e18982dffd199ad6ff7cee282475b04a563fd11a4c7df86f872b02fcce93 -DIST rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz 125019964 BLAKE2B d5d25099719e4ba9bedeb1de89ec3ecb53cbf9d5540de83f723250f5c0130d0a8a7e7a1956cf1581fd709a806b7d42a55dcc94cf9d5e164cd0638a84f65f2f37 SHA512 25a16c576d826115fdac5a55b89bf3372dfb39c563f2ce7d39b0a7a3c9bdc43eaf10974dfa42e26c5aa04aee169ced3e797fa46fa82bd9f4ceddeddaf6687659 -DIST rust-1.33.0-i686-unknown-linux-gnu.tar.xz 168000488 BLAKE2B 62ee1355ddcc09723bd604faba92a602da68768ab741820905b473ff590e1bc7a2bd755db129d04efe9820326bfeb1b5ff54de37188e6b58ef45ec4144c05ada SHA512 f61f97c529232fd6d7587bbf34c41dd9cc334272b1d523464d7b964aba5a102edaff8d387445e3fdb2b9587c1cdd870e97b9572c9421e79ee047479443f1896d -DIST rust-1.33.0-mips-unknown-linux-gnu.tar.xz 115251736 BLAKE2B 6785896dd969c52c49edb265d2883d48debb0bed77aecbec0a913ec0d7751d747d9a3d5db2b8fdbdec9a9f598bf13a2870987740f79a75042a030d549cb1d7a0 SHA512 17c76e83a6be9813b842909177dbab89abc2ffa4b97c32a45d8e9c0cb69311570d3797932d49b8c26522c812cb9fc86d00a3787a9a413d57140349d75dfd266a -DIST rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz 123408336 BLAKE2B f45ed3ab2c899bbdfbdbd3f50f3db1aaeb0fab32f1693cd432132d6e5713cbea63876d7e506eba8c25f5f28a946b524438837c9342f7b7cdf446910698136a34 SHA512 40998fe7ea3f40bb39d7a6d2dc16043aaaf0cbd2cda912b6deeb42fe02da480d4a218810610fc6e31686ab89db1da0cddb6b2599e98c3ba6856fef7c0d64bae7 -DIST rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz 117489676 BLAKE2B b35648ede3694707cea887c0856e016ac98c53c8099202c30e819805564fcfa3d43410980980b8b9c977b4cbf97e185a4049311cda67e0dd5443136c6fe43ae0 SHA512 957a16738b3fc37b916593cb2e5a2d503da08bfe9517f3537483fa48781073e9f54eb14f8f9afc3d2e85fcd45ee0eb3fce1dc2680b5667e67520af363eeeb134 -DIST rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz 117067768 BLAKE2B a968d0eaa52edaa3b5f99d11b34b9f24930a1639277a92d5d68cf80007b8f026daabd07c5379fd18a82c904939172a677be6a0baa9c73785b1ee19d7d04fa66a SHA512 8129b248ea55e427d29d8a637081d1744c08368178ca55c5367c485959984d41d093044ced29825194287a5bda3d491148f36c4c16d6efac797bb8c3af9800e7 -DIST rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz 126030216 BLAKE2B b1d1b996b833ebf8e8fb29d1395192a4354cac4d5381a3ac4f7b8338a19b3b49e5bd318268ee6cd075fa7b69d539e8d2dc021eddfda794791cb1a154b7d2b7e8 SHA512 7d53501d20119ba8d9723650800cdbde17e4ed1719f6258c48c25113082e0400d9ac74ca1bfca54722dbb2049f7b5d34177bb613031c1611daa2545e1706c745 -DIST rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz 130922680 BLAKE2B db63d859631703e845efac57074e0f33f80a3b52b2e9dc8707b81892eee8fc922fa5a7d4b7b1f45fb5f19ea4d7f6fde9212f1c6e99e7e4c30dbc02aa87b0df7e SHA512 393c808e93792cf2b126d6111834932a55cbf18339942ac0d20fc4a3692b0ac08c21a3c8fd393795f7aafecac5a2c5d7c9415c18017a7453f759f746045f5144 -DIST rust-1.33.0-s390x-unknown-linux-gnu.tar.xz 134441220 BLAKE2B e6f0a6e54e4e1fde10f54f66615d44442b7cb5eb5bda43d55ee791328c7ecd61505b3d84719df82b7c5c7ae473b7041512f2cf346281518d7d78d0e22112fa05 SHA512 755a0203e2c143386cb3729faada4d2c38b254dfa7e6eeb722ec9847d6319a1d3d289c7b77a2bc478d79dbbabfcd826d8b015acd29fbdf5acb591feae1876205 -DIST rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz 155298128 BLAKE2B af5bc628bc054bd354d5af78e53cd2ffbfbdf2c2d3a3e58eeb593f148c54024fa5905aa53a69c514d6d41e48688697e1ce8adb866817c77cdf541399f6e7956f SHA512 b7f3087f34e99517cd729f5ff1f8cce3f3254cb36c734d5b90d878293e4406934c2f597bf7e2941e9257046f62c9274eb4769a64dabfbc5f0bbf2a1703f7fef8 -DIST rust-1.34.2-aarch64-unknown-linux-gnu.tar.xz 120868188 BLAKE2B d843cce81338b2b3765c973f06dca83161fefed129efefe94efad663b5ddef54aa092bf5977ba7bca74519b008796e60486cf8b193ec2a2dead3add66295d41f SHA512 7103362b8840d094661a16053d8f07eba413c369bf3a2b686313875aa97c30b35697fceefbfc90dffd5cfd4de946e7f848f2b791736443639b30bb75709b7122 -DIST rust-1.34.2-arm-unknown-linux-gnueabi.tar.xz 122563056 BLAKE2B 05e73de7d58723affef3f272e646245a97b17373cc960d5e1be0365919ad3879e08bd9012126e41235b97a758bb57fa4e67fcd11e2f29322af9ab039fc3e2dfd SHA512 d6c055e8ba0fd494797a55d2a6df1eec2a6361c0b081e4b7cb06e42a03a644e4de49c7b17dc8cb6484f3271517f2bd50935bc72ead486531b5b370a1c576b12a -DIST rust-1.34.2-arm-unknown-linux-gnueabihf.tar.xz 122858592 BLAKE2B aebe65fb64044c342f525749eb5d67217f459712aa72d49497062af461901a6e92d21b00e05439bd0753228b876f521198a8b005b116b5121ec3dd812df4bec8 SHA512 5cc2612988182b68d9b220d6d7620fc0b064a9d347825d4677959b7e43820647ff25651427db3a5c72401ab8d0c14e2976921d71ddbe0a5b540cf045241cd727 -DIST rust-1.34.2-armv7-unknown-linux-gnueabihf.tar.xz 124601212 BLAKE2B 7ab258783070d3ba1e27431faf36a8c75d0afae935bc4ba08bf1e6b7f080d56cb3a9ac3de8b91ff9885e2df2ccebdf29de80b99548c610ea30c157103b920434 SHA512 fe5be9a345d10ee2b3a47986977be91cd2dd94f2076571f810ac21cea36f79f073eb16915c090861cf46c6835f86db64c2ed1ef036f911b3be829d7927ecb747 -DIST rust-1.34.2-i686-unknown-linux-gnu.tar.xz 169581332 BLAKE2B 75f1fc4c52e81cb9c7f95d18d9aff2439bfc698444321d92f09d5a47e493d693f2cae3d8ee56ccff59ca967a0a2a53828559eefce1398a2450fe39c95397e3e2 SHA512 056243d226cd9a36dfcd266f2aba88adde58dbcfa87f20613183c5dcc514bb413e25f6d6963494dc141f4e91649b17b1db91e6a9d313af7ef7b1893b64337c33 -DIST rust-1.34.2-mips-unknown-linux-gnu.tar.xz 113493608 BLAKE2B 10df3e2eb9fd9200bab1ca94eafd80f680c94bd21589f72fd660e9d819a6615cc83e47ac70df87712e252946f58df30824be992f16ca707b72451898e1884e99 SHA512 ec100071fbd8373baf41f0f517497b9923a77ebea8257d2fdcc9a4488d7ec6d59c0b517f4d922a0f7f699d701510d32d49c1e699c69a94f571f73ba46fe795f3 -DIST rust-1.34.2-mips64-unknown-linux-gnuabi64.tar.xz 119118112 BLAKE2B 8ba04a90e82bf7d830c750350570dde8cfa0646f1ea10c583927cc6c7ceeb935fb4035248d8a3ac4a477a858a32d3753811e2893220b8b3919e882213dd63373 SHA512 bb3c5e8ce24895a07984059fca53f4737777a78d350312292877b8e1c21a7a84320f1fee4d64c9d684d14be5fe500494d38ef3f5ab4e4f0e84cbd3f3d30a8586 -DIST rust-1.34.2-mipsel-unknown-linux-gnu.tar.xz 115776696 BLAKE2B dfe09e60be47c6cbe183e4f4bb358cd6d1fe0872114d6a663ee95cd063155f99688bdf23b5c7230b626351654da8f38c7b763099b8d6c2707e185449267c137c SHA512 91348409dfdb63b82e6b6a3097d181485f05f0dfb6cd3bd80785da2eea23f493a90a4e07e660dbc14e9c887ff7e27bc0d13203c78feece5aca219e439a9c18cf -DIST rust-1.34.2-powerpc-unknown-linux-gnu.tar.xz 116817940 BLAKE2B bd7fcc7e0e8844d23e73bb8bc07f7454d234d4fc96d6549399c399845af147debbfbcdea2c53d1ad5a28126d6c9cc20178634290fb837f0537947f64d688df75 SHA512 b8009e9ab2e9167cce8e1911ec0bebc9959a89bafcb645637f2a55af15a2f4f5d4fa20d6b38b7ae572480f3d3817392b8c6386b6ed589b34dd0a02529da2a459 -DIST rust-1.34.2-powerpc64-unknown-linux-gnu.tar.xz 125735384 BLAKE2B c25d43fa630e9b95692bcb493064f592a12ecee700538671192f04cfdf443a5d046493662c88d91f62cc1eba94e80ec9b6bed9949af9a8bc83788521832336d4 SHA512 d1ab37d68c0b52e3780ea133f8ba4d5b823c7f874bbf15f97f304c21405b1fdbde3d28e83381f08095fca8e2ea615f46accad725ee854ad9db168ab4629e30a3 -DIST rust-1.34.2-powerpc64le-unknown-linux-gnu.tar.xz 129619832 BLAKE2B df76b7c08941ae2cb512ba656b09a7b87e1e656badbadf58d64ab5f9133e7248a63873675ac44f16207107a0f68da6089706b46af94154c0bd51aed655f8b578 SHA512 3c881e7bcf622237f279855ebaeb544f4df9bfe5bc1f74578093d67befed8f027692ea56dc773c653bef8a124e9ebac2544d0c197a0e3a1ec8da63ef9d434412 -DIST rust-1.34.2-s390x-unknown-linux-gnu.tar.xz 134376720 BLAKE2B 3eb1452bc0f5d6cbe5547f18ad039c54d4fee44e8c24e35f3399272755cd293df008db2c7dded32c7853944e43de7a4d337b7408835445a4916dbf55d14a7b3e SHA512 181f58b00cdccb205be853f5d00fc0a0c939b7e4dc801717b21ece0f714a8f3b501f1196eb2e3f3081932a0417a6218763c3d095cdd036e9f202cc41291876a1 -DIST rust-1.34.2-x86_64-unknown-linux-gnu.tar.xz 157279864 BLAKE2B c25fcb6168e16a4deb19a8ca9b3d91966194f4c8d2e60933226fab015b64a819f6e56a6b51b6e9457ce80efaf5bf71f2eed2f3e6e39bef5856524e33d0a5637b SHA512 64d6b7da08ffd877c10d819605a37b0bc178c4ab80e2f7449f3d5ac9254a438e148da3729408b4c9429ed499d7f142c9d2926f5c916e0a32bebaaefe4b0a09a6 -DIST rust-1.35.0-aarch64-unknown-linux-gnu.tar.xz 132705960 BLAKE2B 134e71195a69f891d7b60bd2ad24468beb0796480d2a48707058b085a6f9255bc092578015be89dd29cebbf1b5f49221735dcedd0cb79a1975220531e5f4d364 SHA512 9231e4acf26dc19a31c6c9623c939eafd0fdefc18debb8569baae36d3ad3410e21097ae2306b5adc48bc5e219da1dc1df38569e1d0ae9b0178d5a2e815c20db8 -DIST rust-1.35.0-arm-unknown-linux-gnueabi.tar.xz 134286432 BLAKE2B 3cc7e664e4d59f0a7ec5153b67c95ccd78c40b2d32a30f2082d8c8370d9e41a47d9e60b0b1182a4e4f8d0e81fb276a16092e4c7911da4479ef0998b0d36ac273 SHA512 e16a4484e1788b4b2cd14482c7717fbc3cfc0b38cf0a483ad4d1bba174ba8b9e631cb6a04fd442e05ee6c9c8291dc344c64b0ced10e342bf75c9ad6b63480723 -DIST rust-1.35.0-arm-unknown-linux-gnueabihf.tar.xz 134633256 BLAKE2B 0487f81ea9635c037a601cce5a55dc4f54eb14adef5056e3e2e83086fa0a4384e92179cbe3ae476d0b9a7e0860a718265fa0261f6dd762444812e3263037e18e SHA512 229d206f30387109649a434c23a8b9af14c2942691cba3a22ca3d76ca76942bd0ad44e0660dd72bdd9a00214a9fa6c140691bd5dd879af35cf2abf9f4a7cbac8 -DIST rust-1.35.0-armv7-unknown-linux-gnueabihf.tar.xz 136384068 BLAKE2B db8ba39772e150d829cb9c86f20c89c09b1c6a2c996fe5300e265704a0557e8cd879690ede2f03e4ba03d5201a368c65b53a471d581e7ae95646b50992fd4fa8 SHA512 4d80fdc7483566999d8c38b6772c1f1c6cf0f537f68bff9dd9ed68931afab569e02fc9d5ed2999fb1d3478113527840676d903630f93c3d79c30fdba0b98a2bb -DIST rust-1.35.0-i686-unknown-linux-gnu.tar.xz 173765732 BLAKE2B f55ffa1742bc68c733d8392cafe592a937f0a07e3dd50b63aa7479839c0f18d1eecabe897d962635f5dca669053a7a28b5dc2c7d736f581dad9d7ed508bf5ddc SHA512 33a603f638ced850c4572cc81041b1ab47d95a062c66ea24695e449cca7ac6353757c794a85af4a15e43e0ce091c7cc47dbd01fd30e23e1bae6ced194a08a667 -DIST rust-1.35.0-mips-unknown-linux-gnu.tar.xz 126071936 BLAKE2B d0c34edac3e3a36e096efc51116b5073dc7bbbceee6373c2c9720150fe64a6d1e19450590f63b89111f7e93b72af3cc838215a153fbd069d6a66236ce65265f9 SHA512 a70490da14da69c7700c446925875babd8bf6ba0f81c4bf3b838676439a88be1d7cc49290b265f56fad84c8d31fc95c90a46164feeed5b7853751eb71678ad5c -DIST rust-1.35.0-mips64-unknown-linux-gnuabi64.tar.xz 135622404 BLAKE2B 63c4334c08a774a47712ff5781ebebb0ecef828ad26542f22e96a74ae31ca2ac946b02f835403596bb00ba3d6d4bd7b736a34626e97d43aef631b936bdc0d467 SHA512 cd5525846129eaa09ebf8c91ff5ec098241ba3c75539d09d415b09945c18d60cafacce6263def1c3c647cceb28750fac7f2210366a8a8f3e8b30c4e4dd79f96f -DIST rust-1.35.0-mipsel-unknown-linux-gnu.tar.xz 128447920 BLAKE2B 896586031be5be6cf8f2b1d9729a594f99b42c8af72ab1e91c45b2716dd70279c6126290209262175e26ba12a9644fc7007f640155aebc226c568684256113c7 SHA512 42a3828eb1124fde0026be35885034dbcafedaa0ccc02202778f488e89dc4c3f5085341f5892f46f74f4dd2c541c579470ca25ba7315c2316bff7e7a293f2340 -DIST rust-1.35.0-powerpc-unknown-linux-gnu.tar.xz 128414412 BLAKE2B 4bedb0d572c615d763a0d2c21aea60b59b985193cd43c4d649b8c945728d65606ba3f40f4a0a2fd0524bbe8a4895787efabc6fe4517b070e321f2a2588b06740 SHA512 ea9b908f3ddc1b659b1dcdfa937bda410a2778f2133c797258eac46b73b7f44a0ab12d99a02549f8dd4de243bf3ddbe4279f132a8cb66389ed30af3cf7692652 -DIST rust-1.35.0-powerpc64-unknown-linux-gnu.tar.xz 139462276 BLAKE2B b99ee8f5f0f372f975e1f690a9e2dea67840220a3f893189672e004045332cecf1823fba3d155348a70c200649a8ff7891bf08fe2f726e69003a71165ea8dfa5 SHA512 a89094b58ffdb4940e51c4c2e5f5efa094d7d6c1a2b2382397dbfb05eeaf99e9329a8e7c51da602a6b8935ebb4f6df475a1873748139d9f9a97b8bd40c49849b -DIST rust-1.35.0-powerpc64le-unknown-linux-gnu.tar.xz 143826544 BLAKE2B ff5f814515034b382faf40dc0d95623ec57c4f063ded1bb89364594736269744f5409c978de24fa29f6a061d1489179456a90847f5ce8de1f684df22fda68b75 SHA512 3b63dac50a92693d13066aa6e96de05fceb2da6c07834adfab8c12e6a78f59051dfa008062b1d2ad410a009e2164fc716d689231e552379e419161d1620d0066 -DIST rust-1.35.0-s390x-unknown-linux-gnu.tar.xz 152808372 BLAKE2B 96a1e2b96b6a1faf5a3125494b17c4d5f95ea618a5ff8f7ddb7506ebef4fd6cf7f9a2ae961657b7b969a5f3cbc870c805c6634163e7f5fc71e058ea4528e19a0 SHA512 11539eb25e474bbaa8e57f21c3f64506859bc86baec74df24bb4aaf5361745840b82ff715fc54fbd6ba654a8f7fd4f064af0538b983dd489cd69498bd70d1bf7 -DIST rust-1.35.0-x86_64-unknown-linux-gnu.tar.xz 161491264 BLAKE2B ed336829cfe4199750798352e4e338f307033ea0eb5db9ab68f9cf7465d86edbd1218d3e929c775822fd5db3d73a5d75c6e9b5ca45ed6b474bffe403f39f71a0 SHA512 49976ac2fbac5b1709c4a7f3785eb99ab827464ec4d99ee7190df16c3be23e98de606566b57df2231a15097c7fe984e0d19496ce7478ccc1f0f2c7aeb32ecb04 +AUX 1.40.0-add-soname.patch 1690 BLAKE2B 87708762c1870789462cbcff2d66aae1321c4a7a2a3442536b497c824132082c260d59a47c74242bd954f6ef174784d73352188077899927b62fa71707cb7aec SHA512 d835699769f5f68d5f92507c03460a6aa84d0c93b03f71b0a5fdf9efbc4cf4761d1e10135ae8240b91f97fa158424fdb5c30b7aea96672c754f1091e80511902 DIST rust-1.36.0-aarch64-unknown-linux-gnu.tar.xz 139261576 BLAKE2B f8f0ac14c397253298bb321fef83e78fb839e647fa8a9ff891f16e3a1723e1ee69e59686357751b3b4c1a1d1e28632c2047be8795f8a27733ee4bbe8ff71e105 SHA512 77ffd9aa0dfdbb886a51c8d17e3e348c777226e859a48374dad8be20b9a3c7130c7f46d9173753e4ac4a264b45610767ba2625df4192773913892a13a255d3d6 DIST rust-1.36.0-arm-unknown-linux-gnueabi.tar.xz 140294440 BLAKE2B 25d0ea284d20f93bc82618c61abcd4281835e914426e3e9998ff80d233af4cbb938c05bd3dc9422c3f212f24a08f6bea3f67691860acd8cce60d9f7015556381 SHA512 e1dd8200ade615bcedcc1372d4833c037435a47311ca8a20ebbf914d80add818bf70adadf2b6d33d5a4f04eb4994722978b6b3f83dc6a7cc3c98aea52f244405 DIST rust-1.36.0-arm-unknown-linux-gnueabihf.tar.xz 140715096 BLAKE2B effed4996df93d2defa843b3356d80abb9a3a69990f5d6c7d6c38f18ad39d2b46618d64007014be931762ab31c2c46a747cc2705b3cd0ec66e7fa888ecfaf81a SHA512 dfabb476a1f31755eea4a0b976991ea083682463e4538f2b7f34dcfa4b6220b82d81fdf4c677294899d5cd740a8a3e012d1b0bb424ae529c05ce92802cf18959 @@ -84,16 +44,26 @@ DIST rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz 240082008 BLAKE2B d15d508397 DIST rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz 244407488 BLAKE2B 79ca67230dc4d16518421f08554bbc0093f2423469426d1f6f0a925a7bd01b059875ce1a1af29a516dd1cff745524702a8f37e8cb9b43398a32eb78a55e0c3ca SHA512 5f3e1dd233ef17d8a296dcb55738fa119e40c32b154a7575f149bf1475b64e34f7e805f206b9862dc6499be470f179290d8abb7ad8d2b5cb355cef03d95ae374 DIST rust-1.38.0-s390x-unknown-linux-gnu.tar.xz 291685528 BLAKE2B 1d7678b68c5296fed276eb10a07ffd906cfe569b93b6872872c8aae10fa6f30f0ef4023e55256ee8d2e9f6935fc3391421f0f7758aaad60a0dac15b34074fcbc SHA512 7af64849236e0173d2aea723f3462682fde7d2e1e04d61c28d215163415e1b15cfb8cac57010ce55bdd928ea74076506ef50376d7550999e0fb00f9d20c4f5ff DIST rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz 279859784 BLAKE2B 40dab0ac1e800d7c095052800505220019154d40741d7c8872932948d5df62863fe9d1e43596a43411e959c2ddc4fb8d9b4e74525aa1a35352efec781054fc37 SHA512 0b25c3049a7a213e9151c898979ec9b5b45e46a9072f9853d8f048cf401ef7ac343526d6919e68607a490e3e7bd0375b12ed9fb253caed26bb60f46473d3699b -DIST rustc-1.34.2-src.tar.xz 95048792 BLAKE2B e81e4bfda87ddfb09ab8a74792346970aa440c678d2bb1279c329db4929282f761ada6fea9d81ceeecfd513613025c8e636487626fc36bd0b33559e045bb1b15 SHA512 f1bd2b226d90aae8a4657e6117b9a8451d4ce8129f79cc0fce0da7613a3b7800e690bc0ede8fec20a2f5f32c13fa8e22ac97d3838e0d36936793535a75d9c381 -DIST rustc-1.35.0-src.tar.xz 96543548 BLAKE2B 0291152f2b7aa8b50b22d74afbd9c7654bab8ae7dcb76224dbff43bc39a3b918ff86bfd20f408a9a16da8b20b08d9f0289bb63620f093d25d9fa008de57f52c3 SHA512 477c10b780bd54776be7ecbda0ab970416253e4a87c3e701825a7d07bcbcd91601b8e61129c5d04d4259e89c2e81e87cdbdee853375a8de5c9cf8372be2c9129 -DIST rustc-1.36.0-src.tar.xz 98707920 BLAKE2B caff82482589941ab63be51eeffdf2a0419c1b624485240a0547b4bebc9f64f6c65a4babb960d1b23b3cde76550390d6d4813e1e9a9c43bf325998c87832fb94 SHA512 1adbb3b67d599f926dc19258e2596cb3b990e152e75e71645637098526207aa5632d7915fd5b67c7a045f63860cc7be3d28be014ad6141a342adc16b2fe8a879 +DIST rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz 238165960 BLAKE2B c3e14a7b57d904d0882cb224e2390087cca5a3b4a6246e52e6d064c554721efe7b5542e694a3b6d2115f9914214a94200e0ff31008a5c8df1448b667b0fdb34e SHA512 ad37a8454acb8985a5c2b42d7f8bc4212651a16fb5af6b4314dd97faa47de79893f2f74b516af89cd7e77ef3db64247c4764585eb0a17ac328c9cba5e5b9c407 +DIST rust-1.39.0-arm-unknown-linux-gnueabi.tar.xz 244091604 BLAKE2B 9d09dbd18cfdad062705ee3c1726cee7d4c25dd9a739be451e1bcbd7e6d36316a113f93c0f8309bec3a825435d6245d195fd5da7b35fb51f2cf61f6f638c415d SHA512 1d51d47650cf11bf16b21df0b759de9ae23d96d4b14b5107f062bd240d02d5793542efbf0feaa09403cd35ca38af3e85f1abbd5083b645d40cdb1189d02a8099 +DIST rust-1.39.0-arm-unknown-linux-gnueabihf.tar.xz 244501036 BLAKE2B a6ea74a0249e9c7509e21d20b9c04e59af93f78dde92557b6d449fb51776fb6e31d5baa19419547d9baf10768423642a0489c828c5919c055981876ef2282603 SHA512 291d9963f67708b5b14f1f27bb9e7d374fcd7a5d24d932db02203aaf89d06db8178305eb18e4dcd56cce81dc5eb80d2fb019ca94a99c06b548f0588ae560b7ac +DIST rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz 246114456 BLAKE2B e412273d164fae3f7c1702601a4f518b15acdd8f75746de7fa0af63a67a7873ce27b7e5bdf9d1354508ca0b0d20705dfd26659c6355a12c6a2cc59ad8d2a2a2a SHA512 db2b001a5587e2d5c8cdcb53c974f2332e76f58e362cba55fc971d7244754f1fa0b7e708ad7e73e7250652b442f06929dc1e8981536d7d76850b45ade275d406 +DIST rust-1.39.0-i686-unknown-linux-gnu.tar.xz 297665804 BLAKE2B 0024993e80174c0dd71c5f781ea466690fb18e3b760b11382613cad10e6112122d90c54b2a7451c049711c13e0f3da979bf8e8d2e79723e7a484352303bf0337 SHA512 930546e79c0b1105eb0604ae33ccdbd8b00b56e56d069f19f0d802093a052fd3f940eaf1390cdecd79833b0c70457ebfee2ce3b9674fff72df1367076584394a +DIST rust-1.39.0-mips-unknown-linux-gnu.tar.xz 242857808 BLAKE2B a2484913ce31ebae0be04f13dd24972a34206b00d5e141f3c5f8e43ab852547b149bc1002053276557d3dd18d231c2772d5817137fd7f615f155c742f0379af8 SHA512 ab9862a55fe0550c4d19c8fe4fa912661594b56f5f05b21c3ee660734a2d119b5b2dc70b9606af2ba91bd2911fe84c847480a828fb3f0a9d30132a70514d26d7 +DIST rust-1.39.0-mips64-unknown-linux-gnuabi64.tar.xz 238468588 BLAKE2B bb48de21d7a45ebb2464159b09974530572e08cf7adfee4d90b5280ed49867a591f9d3e21069868fecc14242649a9d68041baf07d9fb6c40ef8b3780ed8ab70f SHA512 93531394a9a8ed5edf3853f0d5c8faa795982e9c6a5a0a92832c2809c8baade736eafb8c0626ba6e543b05f693753c256b1d6290d5c41162d6129168ef1b5702 +DIST rust-1.39.0-mipsel-unknown-linux-gnu.tar.xz 246030532 BLAKE2B bfece8ee21b8bf0df389331ebbde98dc81810e4fb4c82e21c7fe2a85dcc27465f9a49e599bfdedf99a15cf479ff6c5baf27cc36e77afc90f281ac535ac0a92e0 SHA512 74536b1a1ce15f27ab8a1be7c9a7edb0638edf862c8f1464c98942287da1e7d64abec83be21634ddba2e88c0f9cf1456c000adc4360712aeab214ad87a44c9a7 +DIST rust-1.39.0-powerpc-unknown-linux-gnu.tar.xz 240597272 BLAKE2B a338ed495504d7aa290cfff3af37acc846b066921d0b84ae552ac4c127d24c645290098a711d3f2d17bf2a20f24356f24d67ece5aea7582dcc8a74cb6533209c SHA512 fa4ee683655d96c7ee1df12a39d50b1486c1e34cf4f10c09c6eecfb33b6f67b526dbcd02e1846d3e16db7103c04ee7f388a419ccfdf68ccc908b511b1fb8b7bd +DIST rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz 242170220 BLAKE2B 3a5ec3b57c3611efb97f4f849cea3519f0bf4f0dd92d135b82603b10d0f1fe3b2832194ee989e38134c75a9c98a1402fc14382d4976d4f34680fbbba8de279cf SHA512 ff99ad6b120631346af8afac092f8b620e50fb8e118ef1e0ff5668103c01f4b9f082fae72e31a767be35d0647fd9fecc7e6b7b215bb1906e06b20bf3e2685619 +DIST rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz 247026740 BLAKE2B 90269aa78eded26c7d54c2e38a08af5f2a5cc3bfb86c268a12050315ba48f232f324b1fcc8e4abae49489cfd9df83edf6d04424ba14fb77f15daea1f6b5c242e SHA512 e15585150370514e580e171faa749218aeef04ce0493f5ad3928a0cb6cd0bddbf7c75ba8ed0783a2c954bbd7166e0445b4c33be4ab48479b0104f032b3d4b0af +DIST rust-1.39.0-s390x-unknown-linux-gnu.tar.xz 298119784 BLAKE2B 82f64163929c129e2aaee8909401c4f302496f63f8d9d366d6f7460b4546d7657ea38bcd864ecd0f58a5995e47f7f5890e4523dcbcbc51e3bf4085536b07de5f SHA512 d2b588f802d4fbe153dbd88cb745d34d1f5434cb3134cc9e091ebfb336a48b4c886cd80311cf92b5e1c6a16374302853a67e8a0576b02a89dbcf61d27919a045 +DIST rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz 284967620 BLAKE2B c5d2c2a11c4f66105ece51e7ca45ca6a9e0d70215f94ce52f6e61b20995ceb611e45bad1e5e9f33fd444bb0a58a2edb691f1a65a1caf36ad892c034e00104383 SHA512 02ca6c821877379d8bd0bcc38281a87e6f86bdbae1270da19e41336cc3a812d9c11c1e976655c192c39153f92cda90ddbd7b4b0bcb4f6787d6d354d2be827a8a DIST rustc-1.37.0-src.tar.xz 98654252 BLAKE2B ddee92c7959a0e1ee11ffe5ded6017703cfac7bbf2a00dc46c37ed28f1cd1d31e1d5b62cc1a5ae2d55d64f8705d0cb282f4968deddf36c3152e5e0cfdfbea67d SHA512 bfee43f578e6d44ead950b870b9fd31087e1bd3f917611f5dce7ad56504b83185edf43e297e8d1304e9e97b9a580d1e6adf6608ab8ed6dee0dc8c5153cdbc5d4 DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec209bbeb349816b5f7937e58c165db8befae33c5667732e5aaaa677c5a6c1e0229d9969ab8967fda9b8d7a593e6c5eb6 SHA512 b756d29a7a222bc7b5c7f42ff397346ab840f78e559f93e6e36b65e76eea525cf429899fe4de9fb8966623a2225b552feef9fa831bee50f9e25c976fa2af8c0a DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0 -EBUILD rust-1.34.2.ebuild 9619 BLAKE2B a6507b9f69ba43063616cb36647d752b13b39ee11b3b522b5df211760d9f6e467c1ddeb38623b6c366d8158e6e9bd24f8280cc16267d7035c3e13b19c519a6dd SHA512 460328d7e6d228e24f849f44e705db6fba483a0038026a71e55c3c4ba1a54bb1f9b41a2571faa54696d9c6758f12a22cdbbd5b2e2ccd7ccb0c46780249bd79f3 -EBUILD rust-1.35.0.ebuild 9867 BLAKE2B 58de6eb2d6178caf33dd494ce9bb9e51a4c69407aa5bd555e7dbdd50ff5f4703f163646d8f73195dfd03983dd469ea16cb640aa81bf8c30df7f9ec2ebb77e65a SHA512 24810fb45f8615a1cb19db451cc02dae3187448a339d13a511497658efb162355a812b6781304f594f823516ccc6ee857307ee6ad63011e060e6c73fcc082aed -EBUILD rust-1.36.0.ebuild 8933 BLAKE2B 30f4c5bef8337244f6452245cddff17c9472d108f4ca022603c0f410597639543e4316aea7921e5d3f054b4b526c55bc044959bcd5e792936a69aba211c33dca SHA512 4f941b3722fbb4debacf2095577eff60a3b7b40a9affa74939e1f78c8cf53abc232435ea47acda8adcf6943ed223900b26dea90c84f6f1c81f8c24cac0e3a6d5 -EBUILD rust-1.37.0.ebuild 8925 BLAKE2B b2ea8d88b2514bb141af417589b073b44c8cebf4aa4522c3f6d0983ea32983214882f019fe4080af34e345302c4b3ca700cd8b0524328123bb8f59443d7367dd SHA512 595484513ce5aeb6dd98d01acd2ec3f40f63ec557fff0cb70258d604d158fe0b03fdef8fd087ac810a39cea2d09146813e7c70a93055abd580a9fc18f799c6e2 -EBUILD rust-1.38.0.ebuild 8878 BLAKE2B 1f21e03b7bbf616021c9d9512558e29ca76efeeada69c5b780807f46eba6f608faf4acea054704368218e486e2a503ebe203a33ba00cbfba5acada45cb18b1bd SHA512 2e05a65745acdd15469d13d79899522a31907b0f4936234479dff2e0ea0b2d32fc5a3fe3ff18d4b809e15b048b2da71a8ae3fe03c34ead461733e4d7487201d5 -EBUILD rust-1.39.0.ebuild 9031 BLAKE2B a83cdacf595174ac165c545ac18e02a6465680abb1a2f4626579182967a7c7c666388a813a297c25d73e6755261529c03c6a2a9259621964a2990eccc4c52286 SHA512 23856cd4b6c285f5ce88477206f8cc6768b29ae33816a71e7bd918599d58c15e0d101f600b80352e3080130d6363f9055e4935e6b737eca5ccbed592a781ef03 -MISC metadata.xml 560 BLAKE2B c2d499593b39271f1185356988667d0d04845debf6d963adde0874c0e22a4e6958d987da7983d8294b74f6ab1807c9f74b9a79d82f00e6d77f294107d0e30b67 SHA512 621ecee45168efc07d8e6584977c9a0ec3bf870a1e4af79512ef21c34c1ddc4563979cd0c47f3d198b27952741f8246e38893d0c137e72c57a2793901d9f82fe +DIST rustc-1.40.0-src.tar.xz 92306352 BLAKE2B 762b9592414e5c816540f6fd37d07b3b0ffe97a151968cc8ae77be2fda03a6d66905192985edc65055cc7811dbd90faa2b2c056481f72161c6f7ccbcce13671a SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f +EBUILD rust-1.37.0.ebuild 8881 BLAKE2B 90974442e9a17314286176455529fbf5e8ee67c88ab2edd0a099fe2a83550d6a4155459b3295935ae0bf74e01ef645c84db4847110dae8391b724a15d5370937 SHA512 1473b6fca5f436716dc5cb32afca7d24accd24ff53a38f701a73490c65260e9741cd279768009f7e733ff58ae7d2526ea718816eacbaf44f67873073d829379c +EBUILD rust-1.38.0.ebuild 8839 BLAKE2B 3c820863777382a169fa7b22e3003b3ef7ac0e8671356c2f73ab670674fce8f778e0b11110703f8d266e4e0653d758ba99d3d3029ca2699028b4fba967d6b275 SHA512 45f54b1d7f153383aed4972d81e9e1e32b7584163599c39fc2dfa57d12156e7cf08645f2fc5a580e69e1fe5575e711a5abd26066b7150af73401a71faefea7f1 +EBUILD rust-1.39.0.ebuild 8987 BLAKE2B 6cd397f4fbba13b161bb8e0733ee5e2aa66231b5aa7c2890c20a0b7ce72676db4ab3a7aa13cc508aed3e552b339fd072653f729311a783a786747d3737c141ba SHA512 b1f7e0cfbb0ca75df422c91edae2bfe1ee989e7f7dc82160c21d08b62f8f77c759ee1a9502f25ca3f48c47f193fca23db4c507034e8c36467027214c1a448994 +EBUILD rust-1.40.0-r1.ebuild 9262 BLAKE2B 5a00a1185d651682725ee2516f6552f56a0ea4e3cdf176772da8ca44131338bc5d8cd709e2974d9ce8d40773df9e1585406183b917eec8571510b3a1813b9ed9 SHA512 8e574647b588f52d78d7a964a4b0d164652e730c3d66e1c739b81613e201ca5ad7b5aad919b8fe91d8bf94cd6de3bfaa1d6cd8dc1b73dcad2c51b997cf01f15d +EBUILD rust-1.40.0.ebuild 8973 BLAKE2B 98357f067e04a73b104b3acbabe52c7e352fdeb30caed104abadd3f976c001d1fffbe7693cef4ce4a1721e6c2b5856c1a4dbacdc854af012743b58be1f2283ab SHA512 93d5bbfc899c7dd6f95ec8fa88af749866fbaf5f3e5a755b33b95654f38fa6c06a6ca87d3cb2a57412ad2d9072f7043b90fbdce8174830d64c48acc29db6dd5c +MISC metadata.xml 885 BLAKE2B 0c22dd218172717e47fba5c3294746470a9adcba729a3585937748ef8e4b8ea118e036753c332eace3dbc6ce82406c15f35948d1857485abe7761c7e4f299c1b SHA512 56f1535f91d2d0126ee70d42ef0ac3ac0e491ce1c539a159db6c429104881227676f6e29412f090631e728093b0902d330c00a8d4d8027c1a07e3632c8e36435 diff --git a/dev-lang/rust/files/1.34.0-doc-build-fix.patch b/dev-lang/rust/files/1.34.0-doc-build-fix.patch deleted file mode 100644 index 52b8d6ea7f73..000000000000 --- a/dev-lang/rust/files/1.34.0-doc-build-fix.patch +++ /dev/null @@ -1,442 +0,0 @@ -From 9efc93c96dd6746460cef916d307b72ba21a7fd0 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Sun, 3 Mar 2019 09:29:59 -0700 -Subject: [PATCH 1/2] Tools built by the bootstrap compiler must be built by it - -This avoids building compilers that we don't need -- most tools will work -just fine with the downloaded compiler. ---- - src/bootstrap/doc.rs | 6 ++- - src/bootstrap/test.rs | 10 ++-- - src/bootstrap/tool.rs | 104 +++++++++++++++++++++++++++--------------- - 3 files changed, 78 insertions(+), 42 deletions(-) - -diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs -index e0ad0422a6ce..621e3a95473e 100644 ---- a/src/bootstrap/doc.rs -+++ b/src/bootstrap/doc.rs -@@ -883,7 +883,11 @@ impl Step for ErrorIndex { - builder.info(&format!("Documenting error index ({})", target)); - let out = builder.doc_out(target); - t!(fs::create_dir_all(&out)); -- let mut index = builder.tool_cmd(Tool::ErrorIndex); -+ let compiler = builder.compiler(2, builder.config.build); -+ let mut index = tool::ErrorIndex::command( -+ builder, -+ compiler, -+ ); - index.arg("html"); - index.arg(out.join("error-index.html")); - -diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index 51412f79c3d0..5abf9d699784 100644 ---- a/src/bootstrap/test.rs -+++ b/src/bootstrap/test.rs -@@ -414,7 +414,6 @@ impl Step for Miri { - - #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] - pub struct CompiletestTest { -- stage: u32, - host: Interned, - } - -@@ -427,16 +426,14 @@ impl Step for CompiletestTest { - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure(CompiletestTest { -- stage: run.builder.top_stage, - host: run.target, - }); - } - - /// Runs `cargo test` for compiletest. - fn run(self, builder: &Builder<'_>) { -- let stage = self.stage; - let host = self.host; -- let compiler = builder.compiler(stage, host); -+ let compiler = builder.compiler(0, host); - - let mut cargo = tool::prepare_tool_cargo(builder, - compiler, -@@ -1426,7 +1423,10 @@ impl Step for ErrorIndex { - t!(fs::create_dir_all(&dir)); - let output = dir.join("error-index.md"); - -- let mut tool = builder.tool_cmd(Tool::ErrorIndex); -+ let mut tool = tool::ErrorIndex::command( -+ builder, -+ builder.compiler(compiler.stage, builder.config.build), -+ ); - tool.arg("markdown") - .arg(&output) - .env("CFG_BUILD", &builder.config.build) -diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index fc1a17d54667..4f2aa0b795dc 100644 ---- a/src/bootstrap/tool.rs -+++ b/src/bootstrap/tool.rs -@@ -250,9 +250,9 @@ pub fn prepare_tool_cargo( - cargo - } - --macro_rules! tool { -+macro_rules! bootstrap_tool { - ($( -- $name:ident, $path:expr, $tool_name:expr, $mode:expr -+ $name:ident, $path:expr, $tool_name:expr - $(,llvm_tools = $llvm:expr)* - $(,is_external_tool = $external:expr)* - ; -@@ -266,10 +266,7 @@ macro_rules! tool { - - impl Tool { - pub fn get_mode(&self) -> Mode { -- let mode = match self { -- $(Tool::$name => $mode,)+ -- }; -- mode -+ Mode::ToolBootstrap - } - - /// Whether this tool requires LLVM to run -@@ -282,27 +279,15 @@ macro_rules! tool { - - impl<'a> Builder<'a> { - pub fn tool_exe(&self, tool: Tool) -> PathBuf { -- let stage = self.tool_default_stage(tool); - match tool { - $(Tool::$name => - self.ensure($name { -- compiler: self.compiler(stage, self.config.build), -+ compiler: self.compiler(0, self.config.build), - target: self.config.build, - }), - )+ - } - } -- -- pub fn tool_default_stage(&self, tool: Tool) -> u32 { -- // Compile the error-index in the same stage as rustdoc to avoid -- // recompiling rustdoc twice if we can. Otherwise compile -- // everything else in stage0 as there's no need to rebootstrap -- // everything. -- match tool { -- Tool::ErrorIndex if self.top_stage >= 2 => self.top_stage, -- _ => 0, -- } -- } - } - - $( -@@ -321,7 +306,8 @@ macro_rules! tool { - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure($name { -- compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), -+ // snapshot compiler -+ compiler: run.builder.compiler(0, run.builder.config.build), - target: run.target, - }); - } -@@ -331,7 +317,7 @@ macro_rules! tool { - compiler: self.compiler, - target: self.target, - tool: $tool_name, -- mode: $mode, -+ mode: Mode::ToolBootstrap, - path: $path, - is_optional_tool: false, - source_type: if false $(|| $external)* { -@@ -347,21 +333,67 @@ macro_rules! tool { - } - } - --tool!( -- Rustbook, "src/tools/rustbook", "rustbook", Mode::ToolBootstrap; -- ErrorIndex, "src/tools/error_index_generator", "error_index_generator", Mode::ToolRustc; -- UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen", Mode::ToolBootstrap; -- Tidy, "src/tools/tidy", "tidy", Mode::ToolBootstrap; -- Linkchecker, "src/tools/linkchecker", "linkchecker", Mode::ToolBootstrap; -- CargoTest, "src/tools/cargotest", "cargotest", Mode::ToolBootstrap; -- Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap, llvm_tools = true; -- BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::ToolBootstrap; -- RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::ToolBootstrap; -- RustInstaller, "src/tools/rust-installer", "fabricate", Mode::ToolBootstrap, -- is_external_tool = true; -- RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes", Mode::ToolBootstrap; -+bootstrap_tool!( -+ Rustbook, "src/tools/rustbook", "rustbook"; -+ UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen"; -+ Tidy, "src/tools/tidy", "tidy"; -+ Linkchecker, "src/tools/linkchecker", "linkchecker"; -+ CargoTest, "src/tools/cargotest", "cargotest"; -+ Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true; -+ BuildManifest, "src/tools/build-manifest", "build-manifest"; -+ RemoteTestClient, "src/tools/remote-test-client", "remote-test-client"; -+ RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true; -+ RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes"; - ); - -+#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] -+pub struct ErrorIndex { -+ pub compiler: Compiler, -+} -+ -+impl ErrorIndex { -+ pub fn command(builder: &Builder<'_>, compiler: Compiler) -> Command { -+ let mut cmd = Command::new(builder.ensure(ErrorIndex { -+ compiler -+ })); -+ add_lib_path( -+ vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))], -+ &mut cmd, -+ ); -+ cmd -+ } -+} -+ -+impl Step for ErrorIndex { -+ type Output = PathBuf; -+ -+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { -+ run.path("src/tools/error_index_generator") -+ } -+ -+ fn make_run(run: RunConfig<'_>) { -+ // Compile the error-index in the same stage as rustdoc to avoid -+ // recompiling rustdoc twice if we can. -+ let stage = if run.builder.top_stage >= 2 { run.builder.top_stage } else { 0 }; -+ run.builder.ensure(ErrorIndex { -+ compiler: run.builder.compiler(stage, run.builder.config.build), -+ }); -+ } -+ -+ fn run(self, builder: &Builder<'_>) -> PathBuf { -+ builder.ensure(ToolBuild { -+ compiler: self.compiler, -+ target: self.compiler.host, -+ tool: "error_index_generator", -+ mode: Mode::ToolRustc, -+ path: "src/tools/error_index_generator", -+ is_optional_tool: false, -+ source_type: SourceType::InTree, -+ extra_features: Vec::new(), -+ }).expect("expected to build -- essential tool") -+ } -+} -+ - #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] - pub struct RemoteTestServer { - pub compiler: Compiler, -@@ -625,7 +657,7 @@ impl<'a> Builder<'a> { - /// `host`. - pub fn tool_cmd(&self, tool: Tool) -> Command { - let mut cmd = Command::new(self.tool_exe(tool)); -- let compiler = self.compiler(self.tool_default_stage(tool), self.config.build); -+ let compiler = self.compiler(0, self.config.build); - self.prepare_tool_cmd(compiler, tool, &mut cmd); - cmd - } -@@ -637,7 +669,7 @@ impl<'a> Builder<'a> { - fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) { - let host = &compiler.host; - let mut lib_paths: Vec = vec![ -- if compiler.stage == 0 && tool != Tool::ErrorIndex { -+ if compiler.stage == 0 { - self.build.rustc_snapshot_libdir() - } else { - PathBuf::from(&self.sysroot_libdir(compiler, compiler.host)) - -From 03718ed67a7b8fd57fc27316ec57ac3bc0f13d06 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Sun, 3 Mar 2019 09:50:56 -0700 -Subject: [PATCH 2/2] Permit getting stage 0 rustdoc - -This allows us to e.g. test compiletest, including doctests, in stage 0 -without building a fresh compiler and rustdoc. ---- - src/bootstrap/builder.rs | 15 +++++++-------- - src/bootstrap/dist.rs | 2 +- - src/bootstrap/doc.rs | 8 ++++---- - src/bootstrap/test.rs | 8 ++++---- - src/bootstrap/tool.rs | 8 +++++--- - 5 files changed, 21 insertions(+), 20 deletions(-) - -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 7e6c0a9f52aa..f8b7f25a7543 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -668,20 +668,19 @@ impl<'a> Builder<'a> { - .map(|entry| entry.path()) - } - -- pub fn rustdoc(&self, host: Interned) -> PathBuf { -- self.ensure(tool::Rustdoc { host }) -+ pub fn rustdoc(&self, compiler: Compiler) -> PathBuf { -+ self.ensure(tool::Rustdoc { compiler }) - } - -- pub fn rustdoc_cmd(&self, host: Interned) -> Command { -+ pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command { - let mut cmd = Command::new(&self.out.join("bootstrap/debug/rustdoc")); -- let compiler = self.compiler(self.top_stage, host); - cmd.env("RUSTC_STAGE", compiler.stage.to_string()) - .env("RUSTC_SYSROOT", self.sysroot(compiler)) - // Note that this is *not* the sysroot_libdir because rustdoc must be linked - // equivalently to rustc. - .env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler)) - .env("CFG_RELEASE_CHANNEL", &self.config.channel) -- .env("RUSTDOC_REAL", self.rustdoc(host)) -+ .env("RUSTDOC_REAL", self.rustdoc(compiler)) - .env("RUSTDOC_CRATE_VERSION", self.rust_version()) - .env("RUSTC_BOOTSTRAP", "1"); - -@@ -689,7 +688,7 @@ impl<'a> Builder<'a> { - cmd.env_remove("MAKEFLAGS"); - cmd.env_remove("MFLAGS"); - -- if let Some(linker) = self.linker(host) { -+ if let Some(linker) = self.linker(compiler.host) { - cmd.env("RUSTC_TARGET_LINKER", linker); - } - cmd -@@ -751,7 +750,7 @@ impl<'a> Builder<'a> { - // This is the intended out directory for compiler documentation. - my_out = self.compiler_doc_out(target); - } -- let rustdoc = self.rustdoc(compiler.host); -+ let rustdoc = self.rustdoc(compiler); - self.clear_if_dirty(&my_out, &rustdoc); - } else if cmd != "test" { - match mode { -@@ -897,7 +896,7 @@ impl<'a> Builder<'a> { - .env( - "RUSTDOC_REAL", - if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) { -- self.rustdoc(compiler.host) -+ self.rustdoc(compiler) - } else { - PathBuf::from("/path/to/nowhere/rustdoc/not/required") - }, -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 2dae3f9135d8..3045cda125ee 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -479,7 +479,7 @@ impl Step for Rustc { - t!(fs::create_dir_all(image.join("bin"))); - builder.cp_r(&src.join("bin"), &image.join("bin")); - -- builder.install(&builder.rustdoc(compiler.host), &image.join("bin"), 0o755); -+ builder.install(&builder.rustdoc(compiler), &image.join("bin"), 0o755); - - // Copy runtime DLLs needed by the compiler - if libdir != "bin" { -diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs -index 621e3a95473e..ae329286486d 100644 ---- a/src/bootstrap/doc.rs -+++ b/src/bootstrap/doc.rs -@@ -335,7 +335,7 @@ fn invoke_rustdoc( - let footer = builder.src.join("src/doc/footer.inc"); - let version_info = out.join("version_info.html"); - -- let mut cmd = builder.rustdoc_cmd(compiler.host); -+ let mut cmd = builder.rustdoc_cmd(compiler); - - let out = out.join("book"); - -@@ -415,7 +415,7 @@ impl Step for Standalone { - } - - let html = out.join(filename).with_extension("html"); -- let rustdoc = builder.rustdoc(compiler.host); -+ let rustdoc = builder.rustdoc(compiler); - if up_to_date(&path, &html) && - up_to_date(&footer, &html) && - up_to_date(&favicon, &html) && -@@ -425,7 +425,7 @@ impl Step for Standalone { - continue - } - -- let mut cmd = builder.rustdoc_cmd(compiler.host); -+ let mut cmd = builder.rustdoc_cmd(compiler); - cmd.arg("--html-after-content").arg(&footer) - .arg("--html-before-content").arg(&version_info) - .arg("--html-in-header").arg(&favicon) -@@ -824,7 +824,7 @@ impl Step for Rustdoc { - builder.ensure(Rustc { stage, target }); - - // Build rustdoc. -- builder.ensure(tool::Rustdoc { host: compiler.host }); -+ builder.ensure(tool::Rustdoc { compiler: compiler }); - - // Symlink compiler docs to the output directory of rustdoc documentation. - let out_dir = builder.stage_out(compiler, Mode::ToolRustc) -diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index 5abf9d699784..6b9960c355c5 100644 ---- a/src/bootstrap/test.rs -+++ b/src/bootstrap/test.rs -@@ -177,7 +177,7 @@ impl Step for Cargotest { - cmd.arg(&builder.initial_cargo) - .arg(&out_dir) - .env("RUSTC", builder.rustc(compiler)) -- .env("RUSTDOC", builder.rustdoc(compiler.host)), -+ .env("RUSTDOC", builder.rustdoc(compiler)), - ); - } - } -@@ -560,7 +560,7 @@ impl Step for RustdocTheme { - builder.sysroot_libdir(self.compiler, self.compiler.host), - ) - .env("CFG_RELEASE_CHANNEL", &builder.config.channel) -- .env("RUSTDOC_REAL", builder.rustdoc(self.compiler.host)) -+ .env("RUSTDOC_REAL", builder.rustdoc(self.compiler)) - .env("RUSTDOC_CRATE_VERSION", builder.rust_version()) - .env("RUSTC_BOOTSTRAP", "1"); - if let Some(linker) = builder.linker(self.compiler.host) { -@@ -995,7 +995,7 @@ impl Step for Compiletest { - || (mode == "ui" && is_rustdoc_ui) - { - cmd.arg("--rustdoc-path") -- .arg(builder.rustdoc(compiler.host)); -+ .arg(builder.rustdoc(compiler)); - } - - cmd.arg("--src-base") -@@ -1451,7 +1451,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) -> - } - - builder.info(&format!("doc tests for: {}", markdown.display())); -- let mut cmd = builder.rustdoc_cmd(compiler.host); -+ let mut cmd = builder.rustdoc_cmd(compiler); - builder.add_rust_test_threads(&mut cmd); - cmd.arg("--test"); - cmd.arg(markdown); -diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs -index 4f2aa0b795dc..5fb83caac06c 100644 ---- a/src/bootstrap/tool.rs -+++ b/src/bootstrap/tool.rs -@@ -430,7 +430,9 @@ impl Step for RemoteTestServer { - - #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)] - pub struct Rustdoc { -- pub host: Interned, -+ /// This should only ever be 0 or 2. -+ /// We sometimes want to reference the "bootstrap" rustdoc, which is why this option is here. -+ pub compiler: Compiler, - } - - impl Step for Rustdoc { -@@ -444,12 +446,12 @@ impl Step for Rustdoc { - - fn make_run(run: RunConfig<'_>) { - run.builder.ensure(Rustdoc { -- host: run.host, -+ compiler: run.builder.compiler(run.builder.top_stage, run.host), - }); - } - - fn run(self, builder: &Builder<'_>) -> PathBuf { -- let target_compiler = builder.compiler(builder.top_stage, self.host); -+ let target_compiler = self.compiler; - if target_compiler.stage == 0 { - if !target_compiler.is_snapshot(builder) { - panic!("rustdoc in stage 0 must be snapshot rustdoc"); diff --git a/dev-lang/rust/files/1.34.0-libressl.patch b/dev-lang/rust/files/1.34.0-libressl.patch deleted file mode 100644 index d5705f88af52..000000000000 --- a/dev-lang/rust/files/1.34.0-libressl.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/vendor/openssl-sys/.cargo-checksum.json b/vendor/openssl-sys/.cargo-checksum.json -index b5c539431..9428e81b1 100644 ---- a/vendor/openssl-sys/.cargo-checksum.json -+++ b/vendor/openssl-sys/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"b09af0445220130b1b1c45791a316435f7400cf2fab3abe9c419f4f8028cfb9c","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"fae5176c2b149d190c9611b58c5882312b5c0e483d1a404cfdf850473314a58f","build/main.rs":"c8bc352b94d05afeaeb96300341a695c70c3b62c46793a5c035aaf42e22b69d1","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"4f12d2f4c2a493888db669d1ecfd55df40861a78cae65957f801ed91dc2cae30","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"29aa053b67b47515fd15812aa0a90ff35dd9fa347da2beeba96d6deafeb9d945","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"520b282b92fa372a75bc16696dc3ee7a9a5752e517a18862182a3e9f5a976d28","src/dsa.rs":"3c294c5c45235497396ac803b723b3a0cb5bd3609f5dec18338b5b014c2adeb9","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"b22d27b01a70652384866b3d0d01d2f7a0421b2ba2db9268ed379fef4b1ac034","src/err.rs":"81230711e081277e0b6dae4ff21266052d075688c758c2b0720001849ef9192d","src/evp.rs":"13a8a71154545d7c478e156edb21beb219824937aba6b29c6bc6ef895c735a3d","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"17b5a1faa0fe3ab777c8cb0039a3dffd8922b211bf1330c2cd0c3e02f624353c","src/macros.rs":"a7c95174fd4cfeb42f730c7c0744194009520249888dbf43968571219fd6dfa1","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"619177f939328597e4bcf9c41fdf4d0aa9207d779c6e0dafddbe2eab9b1a6a98","src/pem.rs":"3ae1c53dbc126a04c188575294111cc04c215c2f3e031192d5cc05952f011ddf","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"a0bf64f1f8ff9f6e5dbed6c38d8fa2d3d1c5dfcfe6dd3ff79f7737b072ce4681","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"e69d3b9b8f2f8ae1ed3905a4dbe064ad1b7c1eaf21d7eabb86ecdb5b41e2120a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"fd85a1683064def0a9e07d803b90102229adc1d58fa19cf4e56976f0dd7425b9","src/x509.rs":"839be2feb74755ab7df66a024ad27dfa70ce4f7889229d9152ba999f3a54b914","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"66fd646ea4caf5ce81e3c881e88d85462519c4e97a7f82e82ca8ac52ea830ad2"},"package":"1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"} -\ No newline at end of file -+{"files":{"Cargo.toml":"b09af0445220130b1b1c45791a316435f7400cf2fab3abe9c419f4f8028cfb9c","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"fae5176c2b149d190c9611b58c5882312b5c0e483d1a404cfdf850473314a58f","build/main.rs":"45da6667bd8b1a35354ee1636df0b55f9d13d4ae45dd1fef5cf17c615c372bfd","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"4f12d2f4c2a493888db669d1ecfd55df40861a78cae65957f801ed91dc2cae30","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"29aa053b67b47515fd15812aa0a90ff35dd9fa347da2beeba96d6deafeb9d945","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"520b282b92fa372a75bc16696dc3ee7a9a5752e517a18862182a3e9f5a976d28","src/dsa.rs":"3c294c5c45235497396ac803b723b3a0cb5bd3609f5dec18338b5b014c2adeb9","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"b22d27b01a70652384866b3d0d01d2f7a0421b2ba2db9268ed379fef4b1ac034","src/err.rs":"81230711e081277e0b6dae4ff21266052d075688c758c2b0720001849ef9192d","src/evp.rs":"13a8a71154545d7c478e156edb21beb219824937aba6b29c6bc6ef895c735a3d","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"17b5a1faa0fe3ab777c8cb0039a3dffd8922b211bf1330c2cd0c3e02f624353c","src/macros.rs":"a7c95174fd4cfeb42f730c7c0744194009520249888dbf43968571219fd6dfa1","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"619177f939328597e4bcf9c41fdf4d0aa9207d779c6e0dafddbe2eab9b1a6a98","src/pem.rs":"3ae1c53dbc126a04c188575294111cc04c215c2f3e031192d5cc05952f011ddf","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"469601b4fbb56d4dbf5cf5d7bb8483e3bde411edea18601e7d1ed6ef27180fd3","src/rsa.rs":"a0bf64f1f8ff9f6e5dbed6c38d8fa2d3d1c5dfcfe6dd3ff79f7737b072ce4681","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"e69d3b9b8f2f8ae1ed3905a4dbe064ad1b7c1eaf21d7eabb86ecdb5b41e2120a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"fd85a1683064def0a9e07d803b90102229adc1d58fa19cf4e56976f0dd7425b9","src/x509.rs":"839be2feb74755ab7df66a024ad27dfa70ce4f7889229d9152ba999f3a54b914","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"66fd646ea4caf5ce81e3c881e88d85462519c4e97a7f82e82ca8ac52ea830ad2"},"package":"1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"} -diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs -index 69def400e..08cc96eb9 100644 ---- a/vendor/openssl-sys/build/main.rs -+++ b/vendor/openssl-sys/build/main.rs -@@ -505,6 +505,7 @@ See rust-openssl README for more information: - (8, 1) => ('8', '1'), - (8, _) => ('8', 'x'), - (9, 0) => ('9', '0'), -+ (9, _) => ('9', 'x'), - _ => version_error(), - }; - -@@ -545,7 +546,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 --through 2.9.0, but a different version of OpenSSL was found. The build is now aborting -+through 2.9.x, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " diff --git a/dev-lang/rust/files/1.40.0-add-soname.patch b/dev-lang/rust/files/1.40.0-add-soname.patch new file mode 100644 index 000000000000..7a5c0189c68c --- /dev/null +++ b/dev-lang/rust/files/1.40.0-add-soname.patch @@ -0,0 +1,36 @@ +Description: Set DT_SONAME when building dylibs + In Rust, library filenames include a version-specific hash to help + the run-time linker find the correct version. Unlike in C/C++, the + compiler looks for all libraries matching a glob that ignores the + hash and reads embedded metadata to work out versions, etc. + . + The upshot is that there is no need for the usual "libfoo.so -> + libfoo-1.2.3.so" symlink common with C/C++ when building with Rust, + and no need to communicate an alternate filename to use at run-time + vs compile time. If linking to a Rust dylib from C/C++ however, a + "libfoo.so -> libfoo-$hash.so" symlink may well be useful and in + this case DT_SONAME=libfoo-$hash.so would be required. More + mundanely, various tools (eg: dpkg-shlibdeps) complain if they don't + find DT_SONAME on shared libraries in public directories. + . + This patch passes -Wl,-soname=$outfile when building dylibs (and + using a GNU linker). +Author: Angus Lees +Forwarded: no + +--- a/src/librustc_codegen_ssa/back/link.rs ++++ b/src/librustc_codegen_ssa/back/link.rs +@@ -1034,6 +1034,13 @@ + cmd.args(&rpath::get_rpath_flags(&mut rpath_config)); + } + ++ if (crate_type == config::CrateType::Dylib || crate_type == config::CrateType::Cdylib) ++ && t.options.linker_is_gnu { ++ let filename = String::from(out_filename.file_name().unwrap().to_str().unwrap()); ++ let soname = [String::from("-Wl,-soname=") + &filename]; ++ cmd.args(&soname); ++ } ++ + // Finally add all the linker arguments provided on the command line along + // with any #[link_args] attributes found inside the crate + if let Some(ref args) = sess.opts.cg.link_args { diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml index 7a1b62bcd0fc..70279a4bbfdf 100644 --- a/dev-lang/rust/metadata.xml +++ b/dev-lang/rust/metadata.xml @@ -1,6 +1,10 @@ + + gyakovlev@gentoo.org + Georgy Yakovlev + rust@gentoo.org Rust Project @@ -8,8 +12,11 @@ Install clippy component Use the system LLVM install + Enable nightly (UNSTABLE) features + Build a multi-threaded rustc Install rls component Install rustfmt component + Bootstrap using installed rust compiler Build support for the wasm32-unknown-unknown target diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild deleted file mode 100644 index 8973490b5aa2..000000000000 --- a/dev-lang/rust/rust-1.34.2.ebuild +++ /dev/null @@ -1,342 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) - -inherit check-reqs eapi7-ver estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs - -if [[ ${PV} = *beta* ]]; then - betaver=${PV//*beta} - BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" - MY_P="rustc-beta" - SLOT="beta/${PV}" - SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" -else - ABI_VER="$(ver_cut 1-2)" - SLOT="stable/${ABI_VER}" - MY_P="rustc-${PV}" - SRC="${MY_P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" -fi - -RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="https://www.rust-lang.org/" - -SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz - $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})" - -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" - -IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. - -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 9. -# 3. Specify LLVM_MAX_SLOT, e.g. 8. -LLVM_DEPEND=" - || ( - sys-devel/llvm:8[llvm_targets_WebAssembly?] - ) - "${S}"/config.toml - [llvm] - optimize = $(toml_usex !debug) - release-debuginfo = $(toml_usex debug) - assertions = $(toml_usex debug) - targets = "${LLVM_TARGETS// /;}" - experimental-targets = "" - link-shared = $(toml_usex system-llvm) - [build] - build = "${rust_target}" - host = ["${rust_target}"] - target = [${rust_targets}] - cargo = "${rust_stage0_root}/bin/cargo" - rustc = "${rust_stage0_root}/bin/rustc" - docs = $(toml_usex doc) - submodules = false - python = "${EPYTHON}" - locked-deps = true - vendor = true - extended = ${extended} - tools = [${tools}] - [install] - prefix = "${EPREFIX}/usr" - libdir = "$(get_libdir)/${P}" - docdir = "share/doc/${P}" - mandir = "share/${P}/man" - [rust] - optimize = $(toml_usex !debug) - debuginfo = $(toml_usex debug) - debug-assertions = $(toml_usex debug) - default-linker = "$(tc-getCC)" - channel = "stable" - rpath = false - lld = $(toml_usex wasm) - EOF - - for v in $(multilib_get_enabled_abi_pairs); do - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - arch_cflags="$(get_abi_CFLAGS ${v##*.})" - - cat <<- EOF >> "${S}"/config.env - CFLAGS_${rust_target}=${arch_cflags} - EOF - - cat <<- EOF >> "${S}"/config.toml - [target.${rust_target}] - cc = "$(tc-getBUILD_CC)" - cxx = "$(tc-getBUILD_CXX)" - linker = "$(tc-getCC)" - ar = "$(tc-getAR)" - EOF - if use system-llvm; then - cat <<- EOF >> "${S}"/config.toml - llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" - EOF - fi - done - - if use wasm; then - cat <<- EOF >> "${S}"/config.toml - [target.wasm32-unknown-unknown] - linker = "rust-lld" - EOF - fi -} - -src_compile() { - env $(cat "${S}"/config.env)\ - "${EPYTHON}" ./x.py build -v --config="${S}"/config.toml -j$(makeopts_jobs) \ - --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 -} - -src_install() { - local rust_target abi_libdir - - env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || die - - mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die - mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die - mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die - mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die - mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die - mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die - if use clippy; then - mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die - mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die - fi - if use rls; then - mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die - fi - if use rustfmt; then - mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die - mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die - fi - - # Copy shared library versions of standard libraries for all targets - # into the system's abi-dependent lib directories because the rust - # installer only does so for the native ABI. - for v in $(multilib_get_enabled_abi_pairs); do - if [ ${v##*.} = ${DEFAULT_ABI} ]; then - continue - fi - abi_libdir=$(get_abi_LIBDIR ${v##*.}) - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - mkdir -p "${ED}/usr/${abi_libdir}" - cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ - "${ED}/usr/${abi_libdir}" || die - done - - # temp fix for https://bugs.gentoo.org/672816 - # FIXME: this should handle libdir=lib, not exact arches - if { use x86 || use arm; }; then - local rust_target wrongdir rightdir - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends" - rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends" - if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then - einfo "fixing bug #672816" - mv "${wrongdir}" "${rightdir}" || die - rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die - fi - fi # end temp fix - - dodoc COPYRIGHT - - # FIXME: - # Really not sure if that env is needed, specailly LDPATH - cat <<-EOF > "${T}"/50${P} - LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}" - MANPATH="${EPREFIX}/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - # note: eselect-rust adds EROOT to all paths below - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-gdbgui - /usr/bin/rust-lldb - EOF - echo /usr/bin/cargo >> "${T}/provider-${P}" - if use clippy; then - echo /usr/bin/clippy-driver >> "${T}/provider-${P}" - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" - fi - if use rls; then - echo /usr/bin/rls >> "${T}/provider-${P}" - fi - if use rustfmt; then - echo /usr/bin/rustfmt >> "${T}/provider-${P}" - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" - fi - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB and LLDB," - elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." - - ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." - ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" - ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi - - if has_version 'app-shells/zsh'; then - elog "install app-shells/rust-zshcomp to get zsh completion for rust." - fi -} - -pkg_postrm() { - eselect rust unset --if-invalid -} diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild deleted file mode 100644 index 64f0e0d63448..000000000000 --- a/dev-lang/rust/rust-1.35.0.ebuild +++ /dev/null @@ -1,350 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) - -inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs - -if [[ ${PV} = *beta* ]]; then - betaver=${PV//*beta} - BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" - MY_P="rustc-beta" - SLOT="beta/${PV}" - SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" -else - ABI_VER="$(ver_cut 1-2)" - SLOT="stable/${ABI_VER}" - MY_P="rustc-${PV}" - SRC="${MY_P}-src.tar.xz" - KEYWORDS="~amd64 arm64 ~ppc64 ~x86" -fi - -RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).2" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="https://www.rust-lang.org/" - -SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz - $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})" - -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" - -IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. - -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 9. -# 3. Specify LLVM_MAX_SLOT, e.g. 8. -LLVM_DEPEND=" - || ( - sys-devel/llvm:8[llvm_targets_WebAssembly?] - wasm? ( =sys-devel/lld-8* ) - ) - "${S}"/config.toml - [llvm] - optimize = $(toml_usex !debug) - release-debuginfo = $(toml_usex debug) - assertions = $(toml_usex debug) - targets = "${LLVM_TARGETS// /;}" - experimental-targets = "" - link-shared = $(toml_usex system-llvm) - [build] - build = "${rust_target}" - host = ["${rust_target}"] - target = [${rust_targets}] - cargo = "${rust_stage0_root}/bin/cargo" - rustc = "${rust_stage0_root}/bin/rustc" - docs = $(toml_usex doc) - submodules = false - python = "${EPYTHON}" - locked-deps = true - vendor = true - extended = ${extended} - tools = [${tools}] - verbose = 2 - [install] - prefix = "${EPREFIX}/usr" - libdir = "$(get_libdir)/${P}" - docdir = "share/doc/${P}" - mandir = "share/${P}/man" - [rust] - optimize = $(toml_usex !debug) - debuginfo = $(toml_usex debug) - debug-assertions = $(toml_usex debug) - default-linker = "$(tc-getCC)" - channel = "stable" - rpath = false - lld = $(usex system-llvm false $(toml_usex wasm)) - EOF - - for v in $(multilib_get_enabled_abi_pairs); do - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - arch_cflags="$(get_abi_CFLAGS ${v##*.})" - - cat <<- EOF >> "${S}"/config.env - CFLAGS_${rust_target}=${arch_cflags} - EOF - - cat <<- EOF >> "${S}"/config.toml - [target.${rust_target}] - cc = "$(tc-getBUILD_CC)" - cxx = "$(tc-getBUILD_CXX)" - linker = "$(tc-getCC)" - ar = "$(tc-getAR)" - EOF - if use system-llvm; then - cat <<- EOF >> "${S}"/config.toml - llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" - EOF - fi - done - - if use wasm; then - cat <<- EOF >> "${S}"/config.toml - [target.wasm32-unknown-unknown] - linker = "$(usex system-llvm lld rust-lld)" - EOF - fi -} - -src_compile() { - env $(cat "${S}"/config.env)\ - "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ - --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 -} - -src_install() { - local rust_target abi_libdir - - env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ - --exclude src/tools/miri || die - - mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die - mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die - mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die - mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die - mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die - mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die - if use clippy; then - mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die - mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die - fi - if use rls; then - mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die - fi - if use rustfmt; then - mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die - mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die - fi - - # Copy shared library versions of standard libraries for all targets - # into the system's abi-dependent lib directories because the rust - # installer only does so for the native ABI. - for v in $(multilib_get_enabled_abi_pairs); do - if [ ${v##*.} = ${DEFAULT_ABI} ]; then - continue - fi - abi_libdir=$(get_abi_LIBDIR ${v##*.}) - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - mkdir -p "${ED}/usr/${abi_libdir}" - cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ - "${ED}/usr/${abi_libdir}" || die - done - - # temp fix for https://bugs.gentoo.org/672816 - # FIXME: this should handle libdir=lib, not exact arches - if { use x86 || use arm; }; then - local rust_target wrongdir rightdir - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends" - rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends" - if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then - einfo "fixing bug #672816" - mv "${wrongdir}" "${rightdir}" || die - rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die - fi - fi # end temp fix - - dodoc COPYRIGHT - - # FIXME: - # Really not sure if that env is needed, specailly LDPATH - cat <<-EOF > "${T}"/50${P} - LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}" - MANPATH="${EPREFIX}/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - # note: eselect-rust adds EROOT to all paths below - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-gdbgui - /usr/bin/rust-lldb - EOF - echo /usr/bin/cargo >> "${T}/provider-${P}" - if use clippy; then - echo /usr/bin/clippy-driver >> "${T}/provider-${P}" - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" - fi - if use rls; then - echo /usr/bin/rls >> "${T}/provider-${P}" - fi - if use rustfmt; then - echo /usr/bin/rustfmt >> "${T}/provider-${P}" - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" - fi - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB and LLDB," - elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." - - ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." - ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" - ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi - - if has_version 'app-shells/zsh'; then - elog "install app-shells/rust-zshcomp to get zsh completion for rust." - fi -} - -pkg_postrm() { - eselect rust unset --if-invalid -} diff --git a/dev-lang/rust/rust-1.36.0.ebuild b/dev-lang/rust/rust-1.36.0.ebuild deleted file mode 100644 index 82dfe0bbb425..000000000000 --- a/dev-lang/rust/rust-1.36.0.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) - -inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs - -if [[ ${PV} = *beta* ]]; then - betaver=${PV//*beta} - BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" - MY_P="rustc-beta" - SLOT="beta/${PV}" - SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" -else - ABI_VER="$(ver_cut 1-2)" - SLOT="stable/${ABI_VER}" - MY_P="rustc-${PV}" - SRC="${MY_P}-src.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -fi - -RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" - -DESCRIPTION="Systems programming language from Mozilla" -HOMEPAGE="https://www.rust-lang.org/" - -SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz - $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})" - -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" - -IUSE="clippy cpu_flags_x86_sse2 debug doc libressl rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. - -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 9. -# 3. Specify LLVM_MAX_SLOT, e.g. 8. -LLVM_DEPEND=" - || ( - sys-devel/llvm:8[llvm_targets_WebAssembly?] - wasm? ( =sys-devel/lld-8* ) - ) - "${S}"/config.toml - [llvm] - optimize = $(toml_usex !debug) - release-debuginfo = $(toml_usex debug) - assertions = $(toml_usex debug) - targets = "${LLVM_TARGETS// /;}" - experimental-targets = "" - link-shared = $(toml_usex system-llvm) - [build] - build = "${rust_target}" - host = ["${rust_target}"] - target = [${rust_targets}] - cargo = "${rust_stage0_root}/bin/cargo" - rustc = "${rust_stage0_root}/bin/rustc" - docs = $(toml_usex doc) - submodules = false - python = "${EPYTHON}" - locked-deps = true - vendor = true - extended = ${extended} - tools = [${tools}] - verbose = 2 - [install] - prefix = "${EPREFIX}/usr" - libdir = "$(get_libdir)/${P}" - docdir = "share/doc/${P}" - mandir = "share/${P}/man" - [rust] - optimize = $(toml_usex !debug) - debuginfo = $(toml_usex debug) - debug-assertions = $(toml_usex debug) - default-linker = "$(tc-getCC)" - channel = "stable" - rpath = false - lld = $(usex system-llvm false $(toml_usex wasm)) - EOF - - for v in $(multilib_get_enabled_abi_pairs); do - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - arch_cflags="$(get_abi_CFLAGS ${v##*.})" - - cat <<- EOF >> "${S}"/config.env - CFLAGS_${rust_target}=${arch_cflags} - EOF - - cat <<- EOF >> "${S}"/config.toml - [target.${rust_target}] - cc = "$(tc-getBUILD_CC)" - cxx = "$(tc-getBUILD_CXX)" - linker = "$(tc-getCC)" - ar = "$(tc-getAR)" - EOF - if use system-llvm; then - cat <<- EOF >> "${S}"/config.toml - llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" - EOF - fi - done - - if use wasm; then - cat <<- EOF >> "${S}"/config.toml - [target.wasm32-unknown-unknown] - linker = "$(usex system-llvm lld rust-lld)" - EOF - fi -} - -src_compile() { - env $(cat "${S}"/config.env)\ - "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ - --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 -} - -src_install() { - local rust_target abi_libdir - - env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ - --exclude src/tools/miri || die - - mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die - mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die - mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die - mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die - mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die - mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die - if use clippy; then - mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die - mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die - fi - if use rls; then - mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die - fi - if use rustfmt; then - mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die - mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die - fi - - # Copy shared library versions of standard libraries for all targets - # into the system's abi-dependent lib directories because the rust - # installer only does so for the native ABI. - for v in $(multilib_get_enabled_abi_pairs); do - if [ ${v##*.} = ${DEFAULT_ABI} ]; then - continue - fi - abi_libdir=$(get_abi_LIBDIR ${v##*.}) - rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) - mkdir -p "${ED}/usr/${abi_libdir}/${P}" - cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ - "${ED}/usr/${abi_libdir}/${P}" || die - done - - dodoc COPYRIGHT - - # FIXME: - # Really not sure if that env is needed, specailly LDPATH - cat <<-EOF > "${T}"/50${P} - LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}" - MANPATH="${EPREFIX}/usr/share/${P}/man" - EOF - doenvd "${T}"/50${P} - - # note: eselect-rust adds EROOT to all paths below - cat <<-EOF > "${T}/provider-${P}" - /usr/bin/rustdoc - /usr/bin/rust-gdb - /usr/bin/rust-gdbgui - /usr/bin/rust-lldb - EOF - echo /usr/bin/cargo >> "${T}/provider-${P}" - if use clippy; then - echo /usr/bin/clippy-driver >> "${T}/provider-${P}" - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" - fi - if use rls; then - echo /usr/bin/rls >> "${T}/provider-${P}" - fi - if use rustfmt; then - echo /usr/bin/rustfmt >> "${T}/provider-${P}" - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" - fi - dodir /etc/env.d/rust - insinto /etc/env.d/rust - doins "${T}/provider-${P}" -} - -pkg_postinst() { - eselect rust update --if-unset - - elog "Rust installs a helper script for calling GDB and LLDB," - elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." - - ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." - ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" - ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." - - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then - elog "install app-emacs/rust-mode to get emacs support for rust." - fi - - if has_version app-editors/gvim || has_version app-editors/vim; then - elog "install app-vim/rust-vim to get vim support for rust." - fi -} - -pkg_postrm() { - eselect rust cleanup -} diff --git a/dev-lang/rust/rust-1.37.0.ebuild b/dev-lang/rust/rust-1.37.0.ebuild index 5ef4c15bfdba..31a203e3dd3b 100644 --- a/dev-lang/rust/rust-1.37.0.ebuild +++ b/dev-lang/rust/rust-1.37.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs @@ -312,7 +312,7 @@ pkg_postinst() { ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then + if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." fi diff --git a/dev-lang/rust/rust-1.38.0.ebuild b/dev-lang/rust/rust-1.38.0.ebuild index 306dede9d39f..a2cbb5dcb9cd 100644 --- a/dev-lang/rust/rust-1.38.0.ebuild +++ b/dev-lang/rust/rust-1.38.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) inherit check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs @@ -18,7 +18,7 @@ else SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" @@ -312,7 +312,7 @@ pkg_postinst() { ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then + if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." fi diff --git a/dev-lang/rust/rust-1.39.0.ebuild b/dev-lang/rust/rust-1.39.0.ebuild index 6f66984bd72b..b221916b0b34 100644 --- a/dev-lang/rust/rust-1.39.0.ebuild +++ b/dev-lang/rust/rust-1.39.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +PYTHON_COMPAT=( python2_7 python3_{6,7} ) inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs @@ -317,7 +317,7 @@ pkg_postinst() { ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then + if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." fi diff --git a/dev-lang/rust/rust-1.40.0-r1.ebuild b/dev-lang/rust/rust-1.40.0-r1.ebuild new file mode 100644 index 000000000000..e204b4c08023 --- /dev/null +++ b/dev-lang/rust/rust-1.40.0-r1.ebuild @@ -0,0 +1,342 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6,7} ) + +inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs + +if [[ ${PV} = *beta* ]]; then + betaver=${PV//*beta} + BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" + MY_P="rustc-beta" + SLOT="beta/${PV}" + SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" +else + ABI_VER="$(ver_cut 1-2)" + SLOT="stable/${ABI_VER}" + MY_P="rustc-${PV}" + SRC="${MY_P}-src.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" + +DESCRIPTION="Systems programming language from Mozilla" +HOMEPAGE="https://www.rust-lang.org/" + +SRC_URI=" + https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz + !system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) ) +" + +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" + +IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm ${ALL_LLVM_TARGETS[*]}" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling more than one slot +# simultaneously. + +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_DEPEND=" + || ( + sys-devel/llvm:9[llvm_targets_WebAssembly?] + wasm? ( =sys-devel/lld-9* ) + ) + =virtual/rust-1.$(($(ver_cut 2) - 1))', but we can't do it yet +# as the first gentoo-built rust that can bootstap new compiler is 1.40.0-r1 +BOOTSTRAP_DEPEND="|| ( =dev-lang/rust-${PVR} =dev-lang/rust-bin-${PV}* )" + +COMMON_DEPEND=" + sys-libs/zlib + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + net-libs/libssh2 + net-libs/http-parser:= + net-misc/curl[ssl] + system-llvm? ( + ${LLVM_DEPEND} + ) +" + +DEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} + || ( + >=sys-devel/gcc-4.7 + >=sys-devel/clang-3.5 + ) + system-bootstrap? ( ${BOOTSTRAP_DEPEND} ) + system-llvm? ( + dev-util/cmake + dev-util/ninja + ) +" + +RDEPEND="${COMMON_DEPEND} + >=app-eselect/eselect-rust-20190311 +" + +REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) + parallel-compiler? ( nightly ) + wasm? ( llvm_targets_WebAssembly ) + x86? ( cpu_flags_x86_sse2 ) +" + +QA_FLAGS_IGNORED=" + usr/bin/*-${PV} + usr/lib*/lib*.so + usr/lib/rustlib/*/codegen-backends/librustc_codegen_llvm-llvm.so + usr/lib/rustlib/*/lib/lib*.so +" + +QA_SONAME="usr/lib.*/librustc_macros.*.so" + +PATCHES=( + "${FILESDIR}"/1.36.0-libressl.patch + "${FILESDIR}"/1.40.0-add-soname.patch +) + +S="${WORKDIR}/${MY_P}-src" + +toml_usex() { + usex "$1" true false +} + +pre_build_checks() { + CHECKREQS_DISK_BUILD="9G" + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + CHECKREQS_DISK_BUILD="14G" + fi + eshopts_pop + check-reqs_pkg_setup +} + +pkg_pretend() { + pre_build_checks +} + +pkg_setup() { + pre_build_checks + python-any-r1_pkg_setup + use system-llvm && llvm_pkg_setup +} + +src_prepare() { + if ! use system-bootstrap; then + local rust_stage0_root="${WORKDIR}"/rust-stage0 + local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)" + + "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \ + --destdir="${rust_stage0_root}" --prefix=/ || die + fi + + default +} + +src_configure() { + local rust_target="" rust_targets="" arch_cflags + + # Collect rust target names to compile standard libs for all ABIs. + for v in $(multilib_get_enabled_abi_pairs); do + rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\"" + done + if use wasm; then + rust_targets="${rust_targets},\"wasm32-unknown-unknown\"" + fi + rust_targets="${rust_targets#,}" + + local extended="true" tools="\"cargo\"," + if use clippy; then + tools="\"clippy\",$tools" + fi + if use rls; then + tools="\"rls\",\"analysis\",\"src\",$tools" + fi + if use rustfmt; then + tools="\"rustfmt\",$tools" + fi + + local rust_stage0_root + if use system-bootstrap; then + rust_stage0_root="$(rustc --print sysroot)" + else + rust_stage0_root="${WORKDIR}"/rust-stage0 + fi + + rust_target="$(rust_abi)" + + cat <<- EOF > "${S}"/config.toml + [llvm] + optimize = $(toml_usex !debug) + release-debuginfo = $(toml_usex debug) + assertions = $(toml_usex debug) + targets = "${LLVM_TARGETS// /;}" + experimental-targets = "" + link-shared = $(toml_usex system-llvm) + [build] + build = "${rust_target}" + host = ["${rust_target}"] + target = [${rust_targets}] + cargo = "${rust_stage0_root}/bin/cargo" + rustc = "${rust_stage0_root}/bin/rustc" + docs = $(toml_usex doc) + compiler-docs = $(toml_usex doc) + submodules = false + python = "${EPYTHON}" + locked-deps = true + vendor = true + extended = ${extended} + tools = [${tools}] + verbose = 2 + [install] + prefix = "${EPREFIX}/usr" + libdir = "lib" + docdir = "share/doc/${PF}" + mandir = "share/man" + [rust] + optimize = $(toml_usex !debug) + debug = $(toml_usex debug) + debug-assertions = $(toml_usex debug) + default-linker = "$(tc-getCC)" + parallel-compiler = $(toml_usex parallel-compiler) + channel = "$(usex nightly nightly stable)" + rpath = false + lld = $(usex system-llvm false $(toml_usex wasm)) + [dist] + src-tarball = false + EOF + + for v in $(multilib_get_enabled_abi_pairs); do + rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) + arch_cflags="$(get_abi_CFLAGS ${v##*.})" + + cat <<- EOF >> "${S}"/config.env + CFLAGS_${rust_target}=${arch_cflags} + EOF + + cat <<- EOF >> "${S}"/config.toml + [target.${rust_target}] + cc = "$(tc-getBUILD_CC)" + cxx = "$(tc-getBUILD_CXX)" + linker = "$(tc-getCC)" + ar = "$(tc-getAR)" + EOF + if use system-llvm; then + cat <<- EOF >> "${S}"/config.toml + llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" + EOF + fi + done + + if use wasm; then + cat <<- EOF >> "${S}"/config.toml + [target.wasm32-unknown-unknown] + linker = "$(usex system-llvm lld rust-lld)" + EOF + fi +} + +src_compile() { + env $(cat "${S}"/config.env)\ + "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ + --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 +} + +src_install() { + env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ + --exclude src/tools/miri || die + + # bug #689562, #689160 + rm "${D}/etc/bash_completion.d/cargo" || die + rmdir "${D}"/etc{/bash_completion.d,} || die + dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo + + mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die + mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die + mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die + mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die + mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die + mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die + if use clippy; then + mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die + mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die + fi + if use rls; then + mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die + fi + if use rustfmt; then + mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die + mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die + fi + + # Move public shared libs to abi specific libdir + # Private and target specific libs MUST stay in /usr/lib/rustlib/${rust_target}/lib + if [[ $(get_libdir) != lib ]]; then + dodir /usr/$(get_libdir) + mv "${ED}/usr/lib"/*.so "${ED}/usr/$(get_libdir)/" || die + fi + + dodoc COPYRIGHT + + # note: eselect-rust adds EROOT to all paths below + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-gdbgui + /usr/bin/rust-lldb + EOF + echo /usr/bin/cargo >> "${T}/provider-${P}" + if use clippy; then + echo /usr/bin/clippy-driver >> "${T}/provider-${P}" + echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" + fi + if use rls; then + echo /usr/bin/rls >> "${T}/provider-${P}" + fi + if use rustfmt; then + echo /usr/bin/rustfmt >> "${T}/provider-${P}" + echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" + fi + dodir /etc/env.d/rust + insinto /etc/env.d/rust + doins "${T}/provider-${P}" +} + +pkg_postinst() { + eselect rust update --if-unset + + elog "Rust installs a helper script for calling GDB and LLDB," + elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." + + ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." + ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" + ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." + + if has_version app-editors/emacs; then + elog "install app-emacs/rust-mode to get emacs support for rust." + fi + + if has_version app-editors/gvim || has_version app-editors/vim; then + elog "install app-vim/rust-vim to get vim support for rust." + fi +} + +pkg_postrm() { + eselect rust cleanup +} diff --git a/dev-lang/rust/rust-1.40.0.ebuild b/dev-lang/rust/rust-1.40.0.ebuild new file mode 100644 index 000000000000..9f1b9c45eddb --- /dev/null +++ b/dev-lang/rust/rust-1.40.0.ebuild @@ -0,0 +1,329 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{6,7} ) + +inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs + +if [[ ${PV} = *beta* ]]; then + betaver=${PV//*beta} + BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}" + MY_P="rustc-beta" + SLOT="beta/${PV}" + SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz" +else + ABI_VER="$(ver_cut 1-2)" + SLOT="stable/${ABI_VER}" + MY_P="rustc-${PV}" + SRC="${MY_P}-src.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi + +RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" + +DESCRIPTION="Systems programming language from Mozilla" +HOMEPAGE="https://www.rust-lang.org/" + +SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz + $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION})" + +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} + +LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" + +IUSE="clippy cpu_flags_x86_sse2 debug doc libressl nightly rls rustfmt system-llvm wasm ${ALL_LLVM_TARGETS[*]}" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling more than one slot +# simultaneously. + +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 9. +# 3. Specify LLVM_MAX_SLOT, e.g. 8. +LLVM_DEPEND=" + || ( + sys-devel/llvm:9[llvm_targets_WebAssembly?] + wasm? ( =sys-devel/lld-9* ) + ) + "${S}"/config.toml + [llvm] + optimize = $(toml_usex !debug) + release-debuginfo = $(toml_usex debug) + assertions = $(toml_usex debug) + targets = "${LLVM_TARGETS// /;}" + experimental-targets = "" + link-shared = $(toml_usex system-llvm) + [build] + build = "${rust_target}" + host = ["${rust_target}"] + target = [${rust_targets}] + cargo = "${rust_stage0_root}/bin/cargo" + rustc = "${rust_stage0_root}/bin/rustc" + docs = $(toml_usex doc) + submodules = false + python = "${EPYTHON}" + locked-deps = true + vendor = true + extended = ${extended} + tools = [${tools}] + verbose = 2 + [install] + prefix = "${EPREFIX}/usr" + libdir = "$(get_libdir)/${P}" + docdir = "share/doc/${P}" + mandir = "share/${P}/man" + [rust] + optimize = $(toml_usex !debug) + debug = $(toml_usex debug) + debug-assertions = $(toml_usex debug) + default-linker = "$(tc-getCC)" + channel = "$(usex nightly nightly stable)" + rpath = false + lld = $(usex system-llvm false $(toml_usex wasm)) + EOF + + for v in $(multilib_get_enabled_abi_pairs); do + rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) + arch_cflags="$(get_abi_CFLAGS ${v##*.})" + + cat <<- EOF >> "${S}"/config.env + CFLAGS_${rust_target}=${arch_cflags} + EOF + + cat <<- EOF >> "${S}"/config.toml + [target.${rust_target}] + cc = "$(tc-getBUILD_CC)" + cxx = "$(tc-getBUILD_CXX)" + linker = "$(tc-getCC)" + ar = "$(tc-getAR)" + EOF + if use system-llvm; then + cat <<- EOF >> "${S}"/config.toml + llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" + EOF + fi + done + + if use wasm; then + cat <<- EOF >> "${S}"/config.toml + [target.wasm32-unknown-unknown] + linker = "$(usex system-llvm lld rust-lld)" + EOF + fi +} + +src_compile() { + env $(cat "${S}"/config.env)\ + "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) \ + --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305 +} + +src_install() { + local rust_target abi_libdir + + env DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml \ + --exclude src/tools/miri || die + + # bug #689562, #689160 + rm "${D}/etc/bash_completion.d/cargo" || die + rmdir "${D}"/etc{/bash_completion.d,} || die + dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo + + mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die + mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die + mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die + mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die + mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die + mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die + if use clippy; then + mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die + mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die + fi + if use rls; then + mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die + fi + if use rustfmt; then + mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die + mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die + fi + + # Copy shared library versions of standard libraries for all targets + # into the system's abi-dependent lib directories because the rust + # installer only does so for the native ABI. + for v in $(multilib_get_enabled_abi_pairs); do + if [ ${v##*.} = ${DEFAULT_ABI} ]; then + continue + fi + abi_libdir=$(get_abi_LIBDIR ${v##*.}) + rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) + mkdir -p "${ED}/usr/${abi_libdir}/${P}" + cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \ + "${ED}/usr/${abi_libdir}/${P}" || die + done + + dodoc COPYRIGHT + + # FIXME: + # Really not sure if that env is needed, specailly LDPATH + cat <<-EOF > "${T}"/50${P} + LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}" + MANPATH="${EPREFIX}/usr/share/${P}/man" + EOF + doenvd "${T}"/50${P} + + # note: eselect-rust adds EROOT to all paths below + cat <<-EOF > "${T}/provider-${P}" + /usr/bin/rustdoc + /usr/bin/rust-gdb + /usr/bin/rust-gdbgui + /usr/bin/rust-lldb + EOF + echo /usr/bin/cargo >> "${T}/provider-${P}" + if use clippy; then + echo /usr/bin/clippy-driver >> "${T}/provider-${P}" + echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" + fi + if use rls; then + echo /usr/bin/rls >> "${T}/provider-${P}" + fi + if use rustfmt; then + echo /usr/bin/rustfmt >> "${T}/provider-${P}" + echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" + fi + dodir /etc/env.d/rust + insinto /etc/env.d/rust + doins "${T}/provider-${P}" +} + +pkg_postinst() { + eselect rust update --if-unset + + elog "Rust installs a helper script for calling GDB and LLDB," + elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}." + + ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo." + ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some" + ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'." + + if has_version app-editors/emacs; then + elog "install app-emacs/rust-mode to get emacs support for rust." + fi + + if has_version app-editors/gvim || has_version app-editors/vim; then + elog "install app-vim/rust-vim to get vim support for rust." + fi +} + +pkg_postrm() { + eselect rust cleanup +} diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest index 9e20ba1c0533..15ffa864ed73 100644 --- a/dev-lang/scala/Manifest +++ b/dev-lang/scala/Manifest @@ -1,4 +1,9 @@ +AUX scala-2.12.10-no-git.patch 1556 BLAKE2B c3c4e0dc416aceb7b0a90425d719e6de716364a7f2cfc91e863e37b902ece95f903098d98ea37c1b662423e84700561aa8510ed7e191973f86b5544f356ba89c SHA512 565cf1b242b374803211c5fea7e71e8ccb654462b043810b28f7b15ad3641a20bd57fb5005de09a6b9d63ca113e8f578992c650ea286879dd32888762bb4b9b0 AUX scala-2.12.4-no-git.patch 1453 BLAKE2B 6d77493326398d00c103e6342ff4765f9a2f3b270a819d651ca4435ed473416b3882f6a98707c181131ea539d7a034a862bd1768cff1eab44d12a23899f5ef67 SHA512 48e12f3a6cc6ee65f9ea7afbd403d67e7bc642e242677d38f4a87f74f90b3feb5efe8fd6798bc36d0f209b27f323e854173cfa104dd149e24dd1809f64f61475 +DIST scala-2.12.10-gentoo-binary.tar.xz 79479656 BLAKE2B 2d75552ba960a1f1cda5f678f1ba6ca01d5a41b813c098ceacdea93f8a3ea3f7c45d18a94f7be891f22d01fc9fc9a14b0c077723056e859ade327f973c545572 SHA512 f9eee5667bd31e1d90da2a95ffde9f894bef557dcebd6db9e882baed9b9ba6a9d290cdb34688307467578fdc8e20993911d64bd5d442e0a7198e4889edb80a2b +DIST scala-2.12.10-ivy2-deps.tar.xz 76800392 BLAKE2B 4290f8f3a2f0122620e5c459e23fece319168c1c7807c93ec731b99d89ec2ffb19591c3e01d2827e984f46214895dac7c68456f92241afb165a0cb6088ac33d6 SHA512 71870332e8488de99d0e8dc11c8afe009152b83feef1912c91c7ca6201de67c96b9760ee039ce0449d5893da0c2086e5c9f7819ad8008e899ab49508a1de1e99 +DIST scala-2.12.10-sbt-deps.tar.xz 34944260 BLAKE2B a42a320340f180c60ae2f5e908eb5fabd3cd4d4e9218c724ec74a79f288b4145445de7ccf91cc2dea3ab1bb128beffbbaeedfb1ed4e44f9c0ad66b16fba4741b SHA512 08bb9eea27ac3603bf4772d29235bf076bf7bb5433fc13d2faf85d7362b4a80176651457851c4eefb41a0169ce1204e634f44e22e5d6ac83777c11c90d9a8aae +DIST scala-2.12.10.tar.gz 6725873 BLAKE2B 5534baed3c51d8234b67cec79d8f6859bde403e79e557a0d50019d834c9f448398b507ad90aca522437f870a2f4cbdf56a2b7c5bee67a95c1e96b237bebcefc6 SHA512 30079ee83e89c189e84e94068f261aafe1fd7fe0cb4177e2802ac85372c4c2272c5af2b57424ab90e5236cbaca2f30936635f8f3bb4bfb2c748483e9c52ae96e DIST scala-2.12.4-annotations.jar 2242 BLAKE2B 0c731c25eaa407bdfb51d749f688062a33bd7f2815e8303ba5c56532027350f58d5ab364f2428547c2a99e2032ba0d0d20d4d50cc27dc5c42946e7842111547d SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd DIST scala-2.12.4-ant-contrib.jar 224277 BLAKE2B f43bfe3da05decbcf4ec9d2f48bface141907abfbe5b17532e970dbb660e0e1ffae9807c12da38cd6dc8e57c2605c6ec86ad11a99331e73edd3e4418656ab27e SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83 DIST scala-2.12.4-ant-dotnet-1.0.jar 57795 BLAKE2B 1f04f20739a231816a6d9c81ac0ba23f155ebdb467f466640b18ba2b4f125a6171bcf420c42f71fcfa2c13293a5241e200d0d908bd460ca3ae0342b13747aaad SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867 @@ -17,5 +22,6 @@ DIST scala-2.12.4-nest.jar 2920 BLAKE2B 3c48a2ea7501be03ede0fd9c1f907508491299cd DIST scala-2.12.4-sbt-deps.tar.xz 34841672 BLAKE2B 0f1577bba65eb5863013014b16627c28934f13e84a6ed0a52748e2007417ae074bcb4b68650993d870f4ada872248d489f84ea02ee19521dd9ce8faae963e221 SHA512 74455451e77f0d935c8027e67b898e5eec9e984158292a37a4362072f4922eb53dfe9ddd5d52da8066fb8949c6469bff70405df8581633a49a37c8b900c6885e DIST scala-2.12.4-vizant.jar 15910 BLAKE2B 393ddd38ff2528b9c54fbb2b79111858a2dfeab66e4b10daf4e23d113963edb3002db8c9415fe47557736a63ecef4b198bd90b87a54240a9a43823fdab0f3082 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390 DIST scala-2.12.4.tar.gz 5999529 BLAKE2B 5dfeadb9ac9562dd825f6a41f9cabdd353f669a58dc3aaec714d6155e9e598296c1e31dcc8956a24a97103e3449fb8f8c3a9ebe5e52dd405572d59ccae89c5e6 SHA512 cad6d54777a3ad4d26df5b4d5cecbbdb4a91ecb17cbf791fe259735221d33f9dd17a14e86f5e3520464078ad9ef68581e722e3c0d7494436bf356c79a9d31697 -EBUILD scala-2.12.4.ebuild 7275 BLAKE2B 0d0fd9b3598c5e02d6d23180ed2eb3f5297c1f11f6afed71d9248495cbc0fccbfbb16ed06865718e0897bd4003d3c77e741fbbd34a7d647584d43c2aed762eec SHA512 c7d313adc7580a6aed48b1b04ecdc15a1a0698c9568b4dca1039660921c6b47781d54b52cae588c63d1bf6a8598c884094276d61978c2aa77fc43d963d23a139 +EBUILD scala-2.12.10.ebuild 5524 BLAKE2B da37cb31d4815dfda02b33753b94a8c808e36a9408d370e1a6b9f81386c3996ec5927ddcb3cce349de843dc50ffd41267777988384f9d1d4ac0352746ee24c4d SHA512 a173d7f6b8960ecf47d0b559f16f64d749b50d25bba30d80e3a76534dc566811e1eb7b70780a7a92054911dd0a0abe39c94cc321c0d3ed08e89a485d8ba6a3d3 +EBUILD scala-2.12.4.ebuild 7268 BLAKE2B 45ba9473c293af55b4ac2ecc7d6742757fc433e7a95a8058345f1b27fb2f2a95fd905366572c2e5280f4baeb16df86783f44ee74d65e74896435346f66f446c9 SHA512 e7dde2e35cb5df8b015383cca8bdf1d0e094ab6b3c86a270c5ea3f759da54680a6bfb64f39b9ee64ed4dc1ac7bfe1d21172da8002408842401b760dc684eef0f MISC metadata.xml 478 BLAKE2B d23bdb99144c333f9ae563a08a78c2ccabdefc22e88207f89c0492c444b574677eeec648a38f105fa8e114a8a8a373dc9487cc36e1eb825cdf814bc1d76d402a SHA512 cca0d7d9cb94bfaad3f93382456248626e83ed8358798ff4b11c600cadee3b88b28b89e914fe5d42c16e170969ded1b35efd1af61953476347f620b9a973d718 diff --git a/dev-lang/scala/files/scala-2.12.10-no-git.patch b/dev-lang/scala/files/scala-2.12.10-no-git.patch new file mode 100644 index 000000000000..017cb983b59b --- /dev/null +++ b/dev-lang/scala/files/scala-2.12.10-no-git.patch @@ -0,0 +1,37 @@ +--- scala-2.12.10-orig/project/VersionUtil.scala 2019-09-05 01:01:59.000000000 +1000 ++++ scala-2.12.10/project/VersionUtil.scala 2019-09-12 11:00:05.525154568 +1000 +@@ -2,7 +2,7 @@ + + import sbt.{stringToProcess => _, _} + import Keys._ +-import java.util.{Date, Locale, Properties, TimeZone} ++import java.util.{Calendar, Date, Locale, Properties, TimeZone} + import java.io.{File, FileInputStream} + import java.text.SimpleDateFormat + +@@ -65,18 +65,13 @@ + val log = sLog.value + val (dateObj, sha) = { + try { +- // Use JGit to get the commit date and SHA +- import org.eclipse.jgit.storage.file.FileRepositoryBuilder +- import org.eclipse.jgit.revwalk.RevWalk +- val db = new FileRepositoryBuilder().findGitDir.build +- val head = db.resolve("HEAD") +- if (head eq null) { +- log.info("No git HEAD commit found -- Using current date and 'unknown' SHA") +- (new Date, "unknown") +- } else { +- val commit = new RevWalk(db).parseCommit(head) +- (new Date(commit.getCommitTime.toLong * 1000L), commit.getName.substring(0, 7)) +- } ++ val commit = "61701c22900f14676fa181500722b64330eb2605" ++ val cal = Calendar.getInstance(); ++ cal.set(Calendar.YEAR, 2019); ++ cal.set(Calendar.MONTH, Calendar.SEPTEMBER); ++ cal.set(Calendar.DAY_OF_MONTH, 5); ++ val date = cal.getTime(); ++ (date, commit.substring(0, 7)) + } catch { + case ex: Exception => + log.error("Could not determine commit date + SHA: " + ex) diff --git a/dev-lang/scala/scala-2.12.10.ebuild b/dev-lang/scala/scala-2.12.10.ebuild new file mode 100644 index 000000000000..43d41a07a6f6 --- /dev/null +++ b/dev-lang/scala/scala-2.12.10.ebuild @@ -0,0 +1,198 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +JAVA_PKG_IUSE="doc source" + +inherit eutils check-reqs java-pkg-2 + +SV="$(ver_cut 1-2)" +SBTV="0.13.18" + +# Note: to bump scala, some things to try are: +# 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.gz +# and https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.gz from +# SRC_URI +# 2. try emerge scala, with network-sandbox disabled: +# FEATURES="noclean -network-sandbox" emerge dev-lang/scala +# Check if it downloads more stuff in src_compile to +# ${WORKDIR}/.ivy2 or ${WORKDIR}/.sbt or /root/.ivy2 or /root/.sbt +# 3. tar up all the .ivy2 and .sbt junk into ${P}-ivy2-deps.tar.xz and +# ${P}-sbt-deps.tar.xz and add them to SRC_URI, in ${WORKDIR}: +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-ivy2-deps.tar.xz .ivy2/cache +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-sbt-deps.tar.xz .sbt +# 4. Add these tar files to SRC_URI (undo step 1). +# 5. Try emerging it again, with network-sandbox, and create the bianry +# tar archive: +# FEATURES="noclean network-sandbox -test" USE="doc source" emerge dev-lang/scala +# cd $WORDKIR +# XZ_OPT=-9 tar --owner=portage --group=portage \ +# -cJf /usr/portage/distfiles/${P}-gentoo-binary.tar.xz .ivy2/local \ +# ${P}/build/pack/bin ${P}/build/quick/classes/scala-dist/man/man1 \ +# ${P}/src/library ${P}/src/library-aux ${P}/src/reflect ${P}/doc/README \ +# ${P}/build/scaladoc + +DESCRIPTION="The Scala Programming Language" +HOMEPAGE="http://www.scala-lang.org/" +SRC_URI=" + !binary? ( + https://github.com/scala/scala/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz + https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz + ) + binary? ( + https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz + )" +LICENSE="BSD" +SLOT="${SV}/${PV}" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" + +IUSE="binary emacs" + +COMMON_DEP="dev-java/ant-core:0 + dev-java/jline:2" + +DEPEND="${COMMON_DEP} + !binary? ( + >=virtual/jdk-1.8:* + >=dev-java/sbt-${SBTV}:0 + media-gfx/graphviz + ) + binary? ( + >=virtual/jdk-1.8:* + ) + app-arch/xz-utils:0" + +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8:* + app-eselect/eselect-scala + !dev-lang/scala-bin:0" + +PDEPEND="emacs? ( app-emacs/scala-mode:0 )" + +CHECKREQS_MEMORY="1536M" + +pkg_setup() { + java-pkg-2_pkg_setup + + if ! use binary; then + debug-print "Checking for sufficient physical RAM" + + ewarn "This package can fail to build with memory allocation errors in some cases." + ewarn "If you are unable to build from sources, please try USE=binary" + ewarn "for this package. See bug #181390 for more information." + + check-reqs_pkg_setup + fi +} + +pkg_pretend() { + if ! use binary; then + check-reqs_pkg_pretend + fi +} + +src_unpack() { + # Unpack tar files only. + for f in ${A} ; do + [[ ${f} == *".tar."* ]] && unpack ${f} + done +} + +src_prepare() { + java-pkg_getjars ant-core,jline-2,sbt + + if ! use binary; then + local a + for a in "${JURI[@]}" + do + echo "${a}" + local g="${a/* -> /}" + echo "${g}" + local j="${a/ -> */}" + echo "${j}" + cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die + done + + # gentoo patch (by gienah) to stop it calling git log in the build + eapply "${FILESDIR}/${PN}-2.12.10-no-git.patch" + + local SBT_PVR="$(java-config --query=PVR --package=sbt)" + sed -e "s@sbt.version=${SBTV}@sbt.version=${SBT_PVR}@" \ + -i "${S}/project/build.properties" \ + || die "Could not set sbt.version=${SBT_PVR} in project/build.properties" + + cat <<- EOF > "${S}/sbt" + #!/bin/bash + gjl_package=sbt + gjl_jar="sbt-launch.jar" + gjl_java_args="-Dsbt.version=${SBT_PVR} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" + source /usr/share/java-config-2/launcher/launcher.bash + EOF + chmod u+x "${S}/sbt" || die + + sed -e 's@-Xmx1024M@-Xmx1536M@' \ + -i "${S}/build.sbt" \ + || die "Could not change increase memory size in ${S}/build.sbt" + fi + + default +} + +src_compile() { + if ! use binary; then + export PATH="${EROOT}/usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}" + export LANG="en_US.UTF-8" + einfo "=== scala compile ..." + "${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed" + einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..." + "${S}"/sbt -Dsbt.log.noformat=true publishLocal \ + || die "sbt publishLocal failed" + else + einfo "Skipping compilation, USE=binary is set." + fi +} + +src_test() { + if ! use binary; then + "${S}"/sbt -Dsbt.log.noformat=true test || die "sbt test failed" + else + einfo "Skipping tests, USE=binary is set." + fi +} + +src_install() { + pushd build/pack || die + local SCALADIR="/usr/share/${PN}-${SV}" + exeinto "${SCALADIR}/bin" + doexe $(find bin/ -type f ! -iname '*.bat') + dodir /usr/bin + for b in $(find bin/ -type f ! -iname '*.bat'); do + local _name=$(basename "${b}") + dosym "${SCALADIR}/bin/${_name}" "/usr/bin/${_name}-${SV}" + done + popd || die + java-pkg_dojar $(find "${WORKDIR}"/.ivy2/local -name \*.jar -print) + + pushd build/quick/classes/scala-dist/man/man1 || die + for i in *.1; do + newman "${i}" "${i/./-${SV}.}" + done + popd || die + + #sources are .scala so no use for java-pkg_dosrc + pushd src || die + if use source; then + dodir "${SCALADIR}/src" + insinto "${SCALADIR}/src" + doins -r library library-aux reflect + fi + popd || die + + local DOCS=( "doc/README" ) + local HTML_DOCS=( "build/scaladoc" ) + use doc && einstalldocs +} diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild index b36402420d49..1adbeeb8b465 100644 --- a/dev-lang/scala/scala-2.12.4.ebuild +++ b/dev-lang/scala/scala-2.12.4.ebuild @@ -145,7 +145,7 @@ src_prepare() { #!/bin/bash gjl_package=sbt gjl_jar="sbt-launch.jar" - gjl_java_args="-Dsbt.version=0.13.13 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" + gjl_java_args="-Dsbt.version=0.13.13 -Dfile.encoding=UTF8 -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled -Duser.home="${WORKDIR}"" source /usr/share/java-config-2/launcher/launcher.bash EOF chmod u+x "${S}/sbt" || die @@ -161,7 +161,6 @@ src_prepare() { src_compile() { if ! use binary; then export PATH="${EROOT}usr/share/scala-${SV}/bin:${WORKDIR}/${L_P}:${PATH}" - export LANG="en_US.UTF-8" einfo "=== scala compile ..." "${S}"/sbt -Dsbt.log.noformat=true compile || die "sbt compile failed" einfo "=== sbt publishLocal with jdk $(java-pkg_get-vm-version) ..." diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index e6c91f91ced6..75777582de5b 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -1,9 +1,11 @@ DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd3e2144fc4c186c9f5395fb7356593766dcaff3ff424f19f917c8a4b56da31b019bd2206a7f794ece549043b76 SHA512 e3a0788befb5499be6f70524ef398dc3282a38891f20519dd23ec92f216fc1919a76656e4b648c3dc9d94e578dc2663439ff976eb52ca0dba5a6594f8d4d3037 -DIST swipl-8.1.14.tar.gz 10772544 BLAKE2B d272b6cd5a096d6422a2afc7fe27354c3c0e45462580e05c85916b604b28566d6f454fff1cf72c4194194fdea2577c0c73c9c9e556322eee4d904e079e5a5bd7 SHA512 360c18af7e53c85f33bfa1afbe19f99c6afbe72e8f86436dfc034485f92dd60d1fa1320826438532bd84f842ccba730826efefecdc4fdbae0d2f71bc590c4ae5 -DIST swipl-8.1.15.tar.gz 10786301 BLAKE2B e79795f92e269dfc9b8150d63cfac946285a4a433ae2d4445b381ac37fe5bfb9df2f9d1fe48b3531c430a792d74414fdb0219b2ec14b75a974639246402e67fa SHA512 97d2873acb5c5a9806e6c8a99633a093a62cb3f6c693b42265a97d9c3bb0d44b286627a2a962ba031c99be6a19f5a63eada831b625deb8e22dc9423136788f2e -DIST swipl-8.1.16.tar.gz 10793960 BLAKE2B 4c353fe4b839e50e47c2e063ed38913fb4271fb51974bf88f745769fa8f39e2c731bf687d3f3b8531d0dc31fe7f50e82d24f2f27e7a68cfcbbdb5a6b68f9c347 SHA512 f62b8e3fdead3273e3cb6a58a3087c012dca6c8cc7ede239ad833a59641ded4c275e2b8820b719c6f335b2730bab75ac70df09fba743e8d7d20567dc6b79ac60 +DIST swipl-8.1.17.tar.gz 10858037 BLAKE2B 69d6528e250dfd780c17bd87c2d79f2923a4ed413d44a5b1f77ca28c2077d8000dc991058fe47a7aaaa6310cf015049980463005d53294a71ba610e43b67b0dd SHA512 42a5a529e1ed935501e87cab28ab5b6d3a18283027bb801a7e3d66d41342fe6ee74de70fe9e8a341f360ab145d0a2e49d8937cb661cfec52f9105c4cf06dc735 +DIST swipl-8.1.18.tar.gz 10865862 BLAKE2B 9728593b9ce890fdb8b4bda8667dbfa9323707d86e0491e62ca82098c62d797da3cdc0180aba0509393532f2b095d1626a0b465955036de80b4fff4dbb62cba6 SHA512 c6b29b57e42e464f03e328fcc272c04db7772b45e62a26fec14f7fe2b9d3c494eeb4c090237b942e38f666dea6fc92e1d00dacba83f6ea74d6dd53923fd23816 +DIST swipl-8.1.19.tar.gz 10865698 BLAKE2B 08da8b7d93a313f621f9bb6abcc509ab6997b673f89483356f6a90f80fd7053acfac611bfaaa2925b3c0d51d7216ea7a1fcbd52dc202961e5a157eb7d0cf0907 SHA512 6094ef47e6c30b5d15f01c8f8c52b125cd04153b9949b6c0a19f4b2e57cd2604377b6b905dec6fa34fd6c6baec1d74d0463c24dfe407fb25643e7e89515b3296 +DIST swipl-8.1.20.tar.gz 10866943 BLAKE2B 57efd2dcd7a60589a5f8073703c121c0bcdc988e5da1a638ec542c18b342d51ef6a26ddc2cadc4fd5d79de37134492b9cf447cb0229faf4366f190169c689592 SHA512 c05b57977d9204916dc18cfcc387971f0dcef74d4b5b0cdfd1d134d57faefd81255b668a97d1d09952ea2d0dcadee0997e84305d49d0252549f6f4d57bf84d4e EBUILD swi-prolog-8.0.3.ebuild 2490 BLAKE2B edc287a8138d4d5e1c1638e316a860aded0a514a76b3b4e66d03977ba277ed280523544a2c6b8187ffb8f3f67035a475e2de80e0bce333dddcab385b06797eb4 SHA512 1c689254578253eb4f138f0ee2f498690c280148c6b544f3995827ed4a11bc61b63e95e1bf85bd83e7ccd0939267964679cf102f7bffb072b122a521d6521a96 -EBUILD swi-prolog-8.1.14.ebuild 2492 BLAKE2B 912f4ffa308202e1f9387108adacbd8cda71ce3a98e801c5d6424183eb0c67ec5737666c2b78e2caecb45269394d206ca08f741da9d1b95581fab7977f1d4b32 SHA512 d04e8e92c62dcbd38e5a128b5f233f81073fec776690202234f5793a44a5b3f0e646c3b914d91b622e1d055c3173ed39aee2386ea252d2716121bfd6d23a8dcf -EBUILD swi-prolog-8.1.15.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b -EBUILD swi-prolog-8.1.16.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b +EBUILD swi-prolog-8.1.17.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b +EBUILD swi-prolog-8.1.18.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b +EBUILD swi-prolog-8.1.19.ebuild 2594 BLAKE2B f3501afc82f537b8729a49cab6a883fe30aeca2613d963483ae27e97f611629e18d6dd4e4de64d80da627d0d86df9014f0d9ddfade1fe69aac8a54e7b01eb936 SHA512 f2c97e516918257b85af4b3fea975c2deb5879cce17233734659faaffa46072cfa4de6b6b32bed7ae9ccc36e625212b7bdd572f6c00deb4a099bcea8bbc6248b +EBUILD swi-prolog-8.1.20.ebuild 2594 BLAKE2B d5840bb83530ae6e0b1a00520bec268be97f7695af60f3771849cde506372e7c3ed2181509ff61431354fff79ddb10efcf032b017444cec9afefdfcb078958d5 SHA512 238f4c5eac973338e87cda5426251a43852d0abab3fa084ec09e6b31a754d51c14f8ba05550245bb9225e517345ce7ea6f6df7dab45e384ac56393225b741354 MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3 diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.14.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.14.ebuild deleted file mode 100644 index 6f028803afe7..000000000000 --- a/dev-lang/swi-prolog/swi-prolog-8.1.14.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils flag-o-matic multilib - -PATCHSET_VER="0" - -DESCRIPTION="versatile implementation of the Prolog programming language" -HOMEPAGE="http://www.swi-prolog.org/" -SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" -RESTRICT="!test? ( test )" - -RDEPEND="sys-libs/ncurses:= - sys-libs/zlib - archive? ( app-arch/libarchive ) - berkdb? ( >=sys-libs/db-4:= ) - odbc? ( dev-db/unixODBC ) - pcre? ( dev-libs/libpcre ) - readline? ( sys-libs/readline:= ) - libedit? ( dev-libs/libedit ) - gmp? ( dev-libs/gmp:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - java? ( >=virtual/jdk-1.7:= ) - uuid? ( dev-libs/ossp-uuid ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - ) - X? ( - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXpm - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM ) - yaml? ( dev-libs/libyaml )" - -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - java? ( test? ( =dev-java/junit-3.8* ) )" - -S="${WORKDIR}/swipl-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" - -src_prepare() { - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV} ]] ; then - epatch "${WORKDIR}"/${PV} - fi - - sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die - - eapply_user - - cmake-utils_src_prepare -} - -src_configure() { - append-flags -fno-strict-aliasing - use debug && append-flags -DO_DEBUG - - mycmakeargs=( - -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl - -DUSE_GMP=$(usex gmp) - -DINSTALL_DOCUMENTATION=$(use doc && usex archive) - -DSWIPL_PACKAGES_BASIC=$(usex !minimal) - -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) - -DSWIPL_PACKAGES_ODBC=$(usex odbc) - -DSWIPL_PACKAGES_BDB=$(usex berkdb) - -DSWIPL_PACKAGES_PCRE=$(usex pcre) - -DSWIPL_PACKAGES_YAML=$(usex yaml) - -DSWIPL_PACKAGES_SSL=$(usex ssl) - -DSWIPL_PACKAGES_JAVA=$(usex java) - -DSWIPL_PACKAGES_QT=$(usex qt5) - -DSWIPL_PACKAGES_X=$(usex X) - -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) - ) - - cmake-utils_src_configure -} - -src_test() { - USE_PUBLIC_NETWORK_TESTS=false \ - USE_ODBC_TESTS=false \ - cmake-utils_src_test -V -} diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.15.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.15.ebuild deleted file mode 100644 index 8b822e794107..000000000000 --- a/dev-lang/swi-prolog/swi-prolog-8.1.15.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils flag-o-matic multilib - -PATCHSET_VER="0" - -DESCRIPTION="versatile implementation of the Prolog programming language" -HOMEPAGE="http://www.swi-prolog.org/" -SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" -RESTRICT="!test? ( test )" - -RDEPEND="sys-libs/ncurses:= - sys-libs/zlib - archive? ( app-arch/libarchive ) - berkdb? ( >=sys-libs/db-4:= ) - odbc? ( dev-db/unixODBC ) - pcre? ( dev-libs/libpcre ) - readline? ( sys-libs/readline:= ) - libedit? ( dev-libs/libedit ) - gmp? ( dev-libs/gmp:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - java? ( >=virtual/jdk-1.7:= ) - uuid? ( dev-libs/ossp-uuid ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - ) - X? ( - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXpm - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM ) - yaml? ( dev-libs/libyaml )" - -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - java? ( test? ( =dev-java/junit-3.8* ) )" - -S="${WORKDIR}/swipl-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" - -src_prepare() { - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV} ]] ; then - epatch "${WORKDIR}"/${PV} - fi - - sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die - - eapply_user - - cmake-utils_src_prepare -} - -src_configure() { - append-flags -fno-strict-aliasing - use debug && append-flags -DO_DEBUG - - mycmakeargs=( - -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl - -DUSE_GMP=$(usex gmp) - -DINSTALL_DOCUMENTATION=$(use doc && usex archive) - -DSWIPL_PACKAGES_BASIC=$(usex !minimal) - -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) - -DSWIPL_PACKAGES_ODBC=$(usex odbc) - -DSWIPL_PACKAGES_BDB=$(usex berkdb) - -DSWIPL_PACKAGES_PCRE=$(usex pcre) - -DSWIPL_PACKAGES_YAML=$(usex yaml) - -DSWIPL_PACKAGES_SSL=$(usex ssl) - -DSWIPL_PACKAGES_JAVA=$(usex java) - -DSWIPL_PACKAGES_QT=$(usex qt5) - -DSWIPL_PACKAGES_X=$(usex X) - -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile \ - XDG_CONFIG_DIRS="${HOME}" \ - XDG_DATA_DIRS="${HOME}" -} - -src_test() { - USE_PUBLIC_NETWORK_TESTS=false \ - USE_ODBC_TESTS=false \ - cmake-utils_src_test -V -} diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.16.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.16.ebuild deleted file mode 100644 index 8b822e794107..000000000000 --- a/dev-lang/swi-prolog/swi-prolog-8.1.16.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils eutils flag-o-matic multilib - -PATCHSET_VER="0" - -DESCRIPTION="versatile implementation of the Prolog programming language" -HOMEPAGE="http://www.swi-prolog.org/" -SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" -RESTRICT="!test? ( test )" - -RDEPEND="sys-libs/ncurses:= - sys-libs/zlib - archive? ( app-arch/libarchive ) - berkdb? ( >=sys-libs/db-4:= ) - odbc? ( dev-db/unixODBC ) - pcre? ( dev-libs/libpcre ) - readline? ( sys-libs/readline:= ) - libedit? ( dev-libs/libedit ) - gmp? ( dev-libs/gmp:0 ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - java? ( >=virtual/jdk-1.7:= ) - uuid? ( dev-libs/ossp-uuid ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - ) - X? ( - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXpm - x11-libs/libXt - x11-libs/libICE - x11-libs/libSM ) - yaml? ( dev-libs/libyaml )" - -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) - java? ( test? ( =dev-java/junit-3.8* ) )" - -S="${WORKDIR}/swipl-${PV}" -BUILD_DIR="${S}/build" -CMAKE_USE_DIR="${S}" - -src_prepare() { - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV} ]] ; then - epatch "${WORKDIR}"/${PV} - fi - - sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die - - eapply_user - - cmake-utils_src_prepare -} - -src_configure() { - append-flags -fno-strict-aliasing - use debug && append-flags -DO_DEBUG - - mycmakeargs=( - -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl - -DUSE_GMP=$(usex gmp) - -DINSTALL_DOCUMENTATION=$(use doc && usex archive) - -DSWIPL_PACKAGES_BASIC=$(usex !minimal) - -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) - -DSWIPL_PACKAGES_ODBC=$(usex odbc) - -DSWIPL_PACKAGES_BDB=$(usex berkdb) - -DSWIPL_PACKAGES_PCRE=$(usex pcre) - -DSWIPL_PACKAGES_YAML=$(usex yaml) - -DSWIPL_PACKAGES_SSL=$(usex ssl) - -DSWIPL_PACKAGES_JAVA=$(usex java) - -DSWIPL_PACKAGES_QT=$(usex qt5) - -DSWIPL_PACKAGES_X=$(usex X) - -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile \ - XDG_CONFIG_DIRS="${HOME}" \ - XDG_DATA_DIRS="${HOME}" -} - -src_test() { - USE_PUBLIC_NETWORK_TESTS=false \ - USE_ODBC_TESTS=false \ - cmake-utils_src_test -V -} diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild new file mode 100644 index 000000000000..8b822e794107 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-8.1.17.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic multilib + +PATCHSET_VER="0" + +DESCRIPTION="versatile implementation of the Prolog programming language" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/ncurses:= + sys-libs/zlib + archive? ( app-arch/libarchive ) + berkdb? ( >=sys-libs/db-4:= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + readline? ( sys-libs/readline:= ) + libedit? ( dev-libs/libedit ) + gmp? ( dev-libs/gmp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + java? ( >=virtual/jdk-1.7:= ) + uuid? ( dev-libs/ossp-uuid ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + X? ( + virtual/jpeg:0 + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + yaml? ( dev-libs/libyaml )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/swipl-${PV}" +BUILD_DIR="${S}/build" +CMAKE_USE_DIR="${S}" + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + if [[ -d "${WORKDIR}"/${PV} ]] ; then + epatch "${WORKDIR}"/${PV} + fi + + sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die + + eapply_user + + cmake-utils_src_prepare +} + +src_configure() { + append-flags -fno-strict-aliasing + use debug && append-flags -DO_DEBUG + + mycmakeargs=( + -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl + -DUSE_GMP=$(usex gmp) + -DINSTALL_DOCUMENTATION=$(use doc && usex archive) + -DSWIPL_PACKAGES_BASIC=$(usex !minimal) + -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) + -DSWIPL_PACKAGES_ODBC=$(usex odbc) + -DSWIPL_PACKAGES_BDB=$(usex berkdb) + -DSWIPL_PACKAGES_PCRE=$(usex pcre) + -DSWIPL_PACKAGES_YAML=$(usex yaml) + -DSWIPL_PACKAGES_SSL=$(usex ssl) + -DSWIPL_PACKAGES_JAVA=$(usex java) + -DSWIPL_PACKAGES_QT=$(usex qt5) + -DSWIPL_PACKAGES_X=$(usex X) + -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile \ + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" +} + +src_test() { + USE_PUBLIC_NETWORK_TESTS=false \ + USE_ODBC_TESTS=false \ + cmake-utils_src_test -V +} diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.18.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.18.ebuild new file mode 100644 index 000000000000..8b822e794107 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-8.1.18.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic multilib + +PATCHSET_VER="0" + +DESCRIPTION="versatile implementation of the Prolog programming language" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/ncurses:= + sys-libs/zlib + archive? ( app-arch/libarchive ) + berkdb? ( >=sys-libs/db-4:= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + readline? ( sys-libs/readline:= ) + libedit? ( dev-libs/libedit ) + gmp? ( dev-libs/gmp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + java? ( >=virtual/jdk-1.7:= ) + uuid? ( dev-libs/ossp-uuid ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + X? ( + virtual/jpeg:0 + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + yaml? ( dev-libs/libyaml )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/swipl-${PV}" +BUILD_DIR="${S}/build" +CMAKE_USE_DIR="${S}" + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + if [[ -d "${WORKDIR}"/${PV} ]] ; then + epatch "${WORKDIR}"/${PV} + fi + + sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die + + eapply_user + + cmake-utils_src_prepare +} + +src_configure() { + append-flags -fno-strict-aliasing + use debug && append-flags -DO_DEBUG + + mycmakeargs=( + -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl + -DUSE_GMP=$(usex gmp) + -DINSTALL_DOCUMENTATION=$(use doc && usex archive) + -DSWIPL_PACKAGES_BASIC=$(usex !minimal) + -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) + -DSWIPL_PACKAGES_ODBC=$(usex odbc) + -DSWIPL_PACKAGES_BDB=$(usex berkdb) + -DSWIPL_PACKAGES_PCRE=$(usex pcre) + -DSWIPL_PACKAGES_YAML=$(usex yaml) + -DSWIPL_PACKAGES_SSL=$(usex ssl) + -DSWIPL_PACKAGES_JAVA=$(usex java) + -DSWIPL_PACKAGES_QT=$(usex qt5) + -DSWIPL_PACKAGES_X=$(usex X) + -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile \ + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" +} + +src_test() { + USE_PUBLIC_NETWORK_TESTS=false \ + USE_ODBC_TESTS=false \ + cmake-utils_src_test -V +} diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.19.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.19.ebuild new file mode 100644 index 000000000000..8b822e794107 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-8.1.19.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic multilib + +PATCHSET_VER="0" + +DESCRIPTION="versatile implementation of the Prolog programming language" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/ncurses:= + sys-libs/zlib + archive? ( app-arch/libarchive ) + berkdb? ( >=sys-libs/db-4:= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + readline? ( sys-libs/readline:= ) + libedit? ( dev-libs/libedit ) + gmp? ( dev-libs/gmp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + java? ( >=virtual/jdk-1.7:= ) + uuid? ( dev-libs/ossp-uuid ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + X? ( + virtual/jpeg:0 + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + yaml? ( dev-libs/libyaml )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/swipl-${PV}" +BUILD_DIR="${S}/build" +CMAKE_USE_DIR="${S}" + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + if [[ -d "${WORKDIR}"/${PV} ]] ; then + epatch "${WORKDIR}"/${PV} + fi + + sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die + + eapply_user + + cmake-utils_src_prepare +} + +src_configure() { + append-flags -fno-strict-aliasing + use debug && append-flags -DO_DEBUG + + mycmakeargs=( + -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl + -DUSE_GMP=$(usex gmp) + -DINSTALL_DOCUMENTATION=$(use doc && usex archive) + -DSWIPL_PACKAGES_BASIC=$(usex !minimal) + -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) + -DSWIPL_PACKAGES_ODBC=$(usex odbc) + -DSWIPL_PACKAGES_BDB=$(usex berkdb) + -DSWIPL_PACKAGES_PCRE=$(usex pcre) + -DSWIPL_PACKAGES_YAML=$(usex yaml) + -DSWIPL_PACKAGES_SSL=$(usex ssl) + -DSWIPL_PACKAGES_JAVA=$(usex java) + -DSWIPL_PACKAGES_QT=$(usex qt5) + -DSWIPL_PACKAGES_X=$(usex X) + -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile \ + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" +} + +src_test() { + USE_PUBLIC_NETWORK_TESTS=false \ + USE_ODBC_TESTS=false \ + cmake-utils_src_test -V +} diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.20.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.20.ebuild new file mode 100644 index 000000000000..67d5ec674d94 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-8.1.20.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic multilib + +PATCHSET_VER="0" + +DESCRIPTION="versatile implementation of the Prolog programming language" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/ncurses:= + sys-libs/zlib + archive? ( app-arch/libarchive ) + berkdb? ( >=sys-libs/db-4:= ) + odbc? ( dev-db/unixODBC ) + pcre? ( dev-libs/libpcre ) + readline? ( sys-libs/readline:= ) + libedit? ( dev-libs/libedit ) + gmp? ( dev-libs/gmp:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + java? ( >=virtual/jdk-1.7:= ) + uuid? ( dev-libs/ossp-uuid ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtgui:5 + ) + X? ( + virtual/jpeg:0 + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM ) + yaml? ( dev-libs/libyaml )" + +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/swipl-${PV}" +BUILD_DIR="${S}/build" +CMAKE_USE_DIR="${S}" + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + if [[ -d "${WORKDIR}"/${PV} ]] ; then + epatch "${WORKDIR}"/${PV} + fi + + sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die + + eapply_user + + cmake-utils_src_prepare +} + +src_configure() { + append-flags -fno-strict-aliasing + use debug && append-flags -DO_DEBUG + + mycmakeargs=( + -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl + -DUSE_GMP=$(usex gmp) + -DINSTALL_DOCUMENTATION=$(use doc && usex archive) + -DSWIPL_PACKAGES_BASIC=$(usex !minimal) + -DSWIPL_PACKAGES_ARCHIVE=$(usex archive) + -DSWIPL_PACKAGES_ODBC=$(usex odbc) + -DSWIPL_PACKAGES_BDB=$(usex berkdb) + -DSWIPL_PACKAGES_PCRE=$(usex pcre) + -DSWIPL_PACKAGES_YAML=$(usex yaml) + -DSWIPL_PACKAGES_SSL=$(usex ssl) + -DSWIPL_PACKAGES_JAVA=$(usex java) + -DSWIPL_PACKAGES_QT=$(usex qt5) + -DSWIPL_PACKAGES_X=$(usex X) + -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile \ + XDG_CONFIG_DIRS="${HOME}" \ + XDG_DATA_DIRS="${HOME}" +} + +src_test() { + USE_PUBLIC_NETWORK_TESTS=false \ + USE_ODBC_TESTS=false \ + cmake-utils_src_test -V +} diff --git a/dev-lang/teyjus/Manifest b/dev-lang/teyjus/Manifest index 678229e840d0..e48623d54b68 100644 --- a/dev-lang/teyjus/Manifest +++ b/dev-lang/teyjus/Manifest @@ -4,6 +4,6 @@ AUX teyjus-2.1-p001-Fixes-arity-for-pervasive-modulo-operation.patch 1144 BLAKE2 AUX teyjus-2.1-p002-Add-string-literals-from-proper-character-groups.patch 2083 BLAKE2B 4480c4cc607988fe4b55e5d0405298d37ca3f7364a694b750dd2a544a5cee71d27f84745a5559b33ed67ec215b389b349e9a73fa3d65ce6f69e949b6bc19e205 SHA512 9bca80da36bcb300fca23553205e1ce459e7b52e6d2b3a8b27e9e330413cd8b49ca928bd92d47fe16546854f945d05e2280143ff75cc45aa93d7850c2da8a916 AUX teyjus-2.1-p003-Removing-deprecated-function-String.set.patch 1599 BLAKE2B e264e64eda3b877e1042fbef4173d4483697fab19e33ceb51176c65a57df651cc0566df486ab551cc50cbf43a47bf60cdfdbd72cc42a2156b195b4f711c06fc3 SHA512 627dd8328a33fa3489ba3da59b4e8c43202b327c27ddecbef2beeddaeecff9f749522d7d9e3e105781b1e60cd633a87aedff39a7e6aa0ec8e1f76556e58ff1f3 DIST teyjus-2.1.tar.gz 723763 BLAKE2B ab6a98c2d2291620b586ab0b419a214b0f7c0b27aad444324e5a417c1a0b27382e2d5c622f798ea88cab77853bca3305ec37904c50a7304ace20237afb993b91 SHA512 1f71d19502f4f4da00f635d2c3d4e141403182d65f039e0d43660edf84c5fcd900e7225ac92dc5bdbe0c8379c4e2ce6e27879af504fcfafddf2695a0c8a13379 -EBUILD teyjus-2.1-r1.ebuild 2938 BLAKE2B c713ad568af551adc3f9ecd1e8e71e44d4956e4377de75fa8cefbe156ee2fcd0e55516f2b5a30f899e981ccd129a7ca6f723f2b6ece9140858731fe7f45e832a SHA512 c2dff73bc04710a4b92432d3334ab6cefd1c2d422fbc525bc7adcb4c8d5e5de6b6d32e3f1cba7702da4cefd88b826cf47dc5ca31e5cd1ffdcb6dfce89f991e22 -EBUILD teyjus-2.1.ebuild 2897 BLAKE2B de6b991a07ded4592fa66307d461e36cc3a8f23a40c7e62987a18c2a7576c79c1b0bc02e09703e2165448a258a66b42dd14e465ee52c2072ecbf26b1dd822d67 SHA512 8f33c998b725169d57808b0a69578a20ffd8f54192a55d8f25761b6a38ea18b9ba96c1d7775447ba17ee245a5f1376476474dbf4e5ac5afd493c530e81f19ea7 +EBUILD teyjus-2.1-r1.ebuild 2951 BLAKE2B 2b5ad60a50908053416b7633eae435da838621ea15ee09cfab961710db1e7d4b7ac8f35e70a3819fd4658ed8b110902d6abf37b6f525ab7e3cf606fcf823d6aa SHA512 5502e778ddfbe97973949e638af3c73631efa9d9b2af53fd1435e1eb47f7e68df8a4e49411ee20748e17535c786c2c04a5bde4d913ef70fc2bffd933ad9de4d7 +EBUILD teyjus-2.1.ebuild 2907 BLAKE2B ea6e92b665791e776f737885a883fe4f04bc05dec026cfbf0e9b3da84ec9cb6d54aeb5c9f124ce958a27eadc624eefec651b3f69e35c0a4e7175241e9887d764 SHA512 809cbdce2b3ffd69e7fb1281feaad43220e688539be1ce63fc99febe3ac2adf57da12ed2f8f4b5ffe86df13dec3f08557afe6c7321da75f1b631b54f2488ecd1 MISC metadata.xml 1653 BLAKE2B a9c2315795d7eb61708ff4b163a0588900bcaea661b052a24f83834acbded91f3dabaa0a14525e1ff729175d7c17ac393946c21ae801b60efd591448b07b7c1c SHA512 5b82a25d9ef5e24c4c9bbd633b7de98f92ce79ae041c3056df6dd0471824c98884d1ef608352431c34aecdaa79736c7f163762206adb9207eeebca2886f5aa1b diff --git a/dev-lang/teyjus/teyjus-2.1-r1.ebuild b/dev-lang/teyjus/teyjus-2.1-r1.ebuild index 4a0f0073b3ed..b95680891d7d 100644 --- a/dev-lang/teyjus/teyjus-2.1-r1.ebuild +++ b/dev-lang/teyjus/teyjus-2.1-r1.ebuild @@ -17,7 +17,7 @@ IUSE="emacs examples +ocamlopt" RDEPEND=">=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] - emacs? ( virtual/emacs )" + emacs? ( >=app-editors/emacs-23.1:* )" DEPEND="${RDEPEND} app-text/dos2unix dev-util/omake" diff --git a/dev-lang/teyjus/teyjus-2.1.ebuild b/dev-lang/teyjus/teyjus-2.1.ebuild index 051d659806b0..a571b19301d1 100644 --- a/dev-lang/teyjus/teyjus-2.1.ebuild +++ b/dev-lang/teyjus/teyjus-2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -17,7 +17,7 @@ IUSE="emacs examples +ocamlopt" RDEPEND=">=sys-devel/binutils-2.17:* >=sys-devel/gcc-2.95.3:* >=dev-lang/ocaml-3.10[ocamlopt?] - emacs? ( virtual/emacs )" + emacs? ( >=app-editors/emacs-23.1:* )" DEPEND="${RDEPEND} dev-util/omake" diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest index 8bc391316076..71d970b1a8f6 100644 --- a/dev-lang/vala/Manifest +++ b/dev-lang/vala/Manifest @@ -1,18 +1,16 @@ AUX 0.40-Allow-disabling-the-build-of-valadoc.patch 4585 BLAKE2B 4f0ee3cb4a47f4479ba29b3acfa173fcf045bedafa677544147969d63b05734de31fe6ce135bfa529f28583318cf8a8e76cd32f372d3513a859ebcbb560ebae1 SHA512 de1c71ac885ca88c7276c2e0b8e92ab63587b662f927cae423775908cec4bfd4bbfdf14f069c541a599e001e7e66712f04b9f45bc88882cc7ee5b0f582bd8229 AUX 0.40-valadoc-doclets-data-parallel-installable.patch 6105 BLAKE2B 24f3a2c44125da3dfc93c6c7426d85de59ef79baa3e96b898b0c01f8e46b8939e6f5ec1ab3ef1f84052ccef6a3bb61d3c86329aba228f3356b879ee6d867f045 SHA512 87d810c135844ebdbc011bccb66ac58ad77b773ed0513d96cd465b3a34103e308c9fc134c9701ec0df56d49644ecfe73ceafd2fde02699347253bbaabffbbb0f AUX 0.44-valadoc-doclets-data-parallel-installable.patch 6063 BLAKE2B d27b69ab82a789f73e9ba02ef10d3865452a5d5532215e44533012be29d36d40496346a0557ee90831fbe2cf1da9e77e56b30c3f1e988c051b97142d12952931 SHA512 d5174b6dbc887f25f90e400ae569152a998da3df3e9ca4ea5f450240b1982b7a118ddbce7814b98e966e384b956c02389b34200b6a1ecbf4e634fdc07421809a -DIST vala-0.36.18.tar.xz 2905668 BLAKE2B ed7f8a38e99fd75945071cf54190631b0ccddbb682da9790bb07b4d334063679bfb002bcf6e5c6c1807ca2b1c4e80659441779c113a7b05f9b4ff291f5ada201 SHA512 69d76fddee8e52e54dc8a3dbe1c0ffc5aeaede096f52614c3a7e18d28ec7a6a31aa617719a4d27a7a15867cd740888f5b381cd612d8fc010f1ea9fd9389d0655 DIST vala-0.36.20.tar.xz 2918672 BLAKE2B 9c2c46992444fafd173f767a4a10ac185b0c49db0ede3cb52dec10da08ab3370adb4445087b24c91c9126e8586418a149ac783b3de92cac6c4badd488f3dc56f SHA512 21ca0573a2f9d945a362f7f15da7db25532fd7b19a0aa0442243b95df0568b7a88ae94d0659af44f6f57e364f4370de361102e7e46a070487985e7cb5d81277c -DIST vala-0.40.14.tar.xz 3398668 BLAKE2B 6df1e47439000e1a49dda4d58651b7039737a2648563fc4e09d679bf63d968d9dafcc9ab5e371ca450bab70163f9fb1fb30ffa75451940f9a1518d7fb3a5ebf1 SHA512 0387bbcf35055f2b4a8f790370847bcc12a92d7969d9ed583b0630be8b637a9e28895508da9cdfab8baf97ad5fdc9249bf82e31e6c1ee19d0026f5061c027db8 DIST vala-0.40.16.tar.xz 3412776 BLAKE2B 0cfe072ce3dfd8b95e804582899ff002869bc005b93ad1ba68e9b085e12444a3ef967c6282d65bab7f8302018edc075077ae8de65182b9123f8f74a91ea062bf SHA512 e37c8573fe6104c0ad6f29748cd28564638d62ebe499ce084481c74d2601a19334c431575904fbbed490b44ea117246516580a5d658dfba30c63de7e7c3fa3e0 -DIST vala-0.42.7.tar.xz 3362192 BLAKE2B 59f76d43f4bf80f75681c386cb30c4686bf93444bcd371900b134e0338ab865cf61d4cfd35facfff47c78075c384028cbcbd318eb927444f15862f7a28bccaa1 SHA512 d9044b126c91f3b1835a7182a054464339e4e2e52e63df90f43d2d5d9cba06fd6bb7eed5f6aa4d502f43f0a1232610d39d244952cfca54f63eb019e764899eca +DIST vala-0.40.18.tar.xz 3429060 BLAKE2B 113cebedfefec3a510085e6562012cefedcc6879f4a21eed835e779d850c39ea0c5d9ce5e5e036fa5d849c28f803fd80f1b4e55d4eb3db0fb0fa8f2706824823 SHA512 a58afc4ecf5a7c5c35d3f32d06947ed656f66672fd496d4963b5267d8be9ffecbbc0415af8ef15d35c92f986cb7861dc09d2ec35c2b6f77f3decc4adba24ced2 +DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540 DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f -DIST vala-0.46.3.tar.xz 3367124 BLAKE2B 795e1615c91ac0324df2f5304951204caf9c024ca9e0d1ba768d0613f6e21393648bc3654c8cc9d386a8bef2009b4c842b1b924b1fd079e2689e6c64a7e7749b SHA512 f932fbcd42e6c82c4543efcc507abdb1e1d1af9c0eac125981c55cb052357e7723cb2a08a5aa56c02ac5228d0125c9906a133ce66f8b59fca84c773060174d0c -EBUILD vala-0.36.18.ebuild 803 BLAKE2B b2aa274e02549db51339539806933decbc69fe5342df5f8efe1de90399bd39e493b108e84a02fbde45ed86f0e596b92ca4cee4363590292faa59ec5e403200c9 SHA512 d9a34652a8abed5d7d2433984ac77b41cc8e83d3e6266894d0825cd82d300035a06a031f6c0958ace9ae61f35165ab5361a7df88f0cd8d1d67c43af352757f78 -EBUILD vala-0.36.20.ebuild 804 BLAKE2B 01c9d9ebec0f8a1a75132740b246321e5d2f45dbc0fa31d788069d4afb8d2e88789e6c97d7e6cc76e37d305726dd2457b4aad8b2c5e12e1f3c125605d9504531 SHA512 dc015086a13750567df817701167e90cb84a46894235fc04582bfee3ce6af9dedd5f5bd5adf5927e44efde2135dcc46057c29be0f6eb1ad7305a65430bef1e30 -EBUILD vala-0.40.14.ebuild 1190 BLAKE2B c100cef080ec6ed08fa7cdb179ac879a754fbf7a5cfe53756f4c4d409257871bf0ed7d2296b45a8a3513710e492b8ccfd8d0f25d6ae31f27d25adbb401c94904 SHA512 58b88ddd9900a70b7e81ccad0a2fc46bb583712bf7af4bb43ef2e0e0a31165eabc1cc5ec51a411460a736bf6b8fc104e6628a7c3895911add736a40924a06deb -EBUILD vala-0.40.16.ebuild 1191 BLAKE2B 3058f778360b882d121bebf0ed8c12e145260271a3df0fa3282b8fb7f5818a51aee688439fa7cedf7db6fa8bd6aae67a134c35b6b888c1a888340034f0f37476 SHA512 a748d5a4313300d538347e9a00e163c150f7d0cd6ae047a9279ee608a1cd735d608fceedda8e36f1615f178ae573990544f357c02976b9094803b77969c7a66c -EBUILD vala-0.42.7.ebuild 1190 BLAKE2B 8559f875569e8e30af57255947ebcdfbffaa1a319d5fd251c4d07bf11f5ebea37803d539a32004600a239a59d71888b9aac0d5ed8dfe228e72b99371ae08b286 SHA512 533db662e00df920f514373e52290bca0b9fcf507a1ab7638154333e370b86cb8def1f631c613d4711e19429cc0d1f2f9ce1c7b47eef8b8afdf063e7a42a57df -EBUILD vala-0.44.9.ebuild 1115 BLAKE2B 2f040ed425009d760fa3afebaa96f186273c27b7fe0084224b20a1e2856bd1c594fac1a40daa0f778186450b3faf50dcc0a87fe3748bd7a25c5c97ab6dc0d152 SHA512 d8c6dd4f4d729517d110f53acbf6edd927dc129d3fb472364fb5a5f8dc9428e13f0edbec4c85657795d425a213b65775608013a3f26c5e852012dc091627873c -EBUILD vala-0.46.3.ebuild 1316 BLAKE2B a95eccfac99a4e00d44e6208acfbdcb38a5b5db8564dfb37e033fb9d9e759f60ee67e21cdcc57576557d6593b65add6b4fcb9cdcdb4a691f9bace86e8767848a SHA512 36bab891f6580e43f0b1954245a944e95ec85b2066ee87b7e96481d2ad7d89f110187101395525389453b2eea4d20e45879d9a31d5a52ba307d74c6c3e2e2ce6 +DIST vala-0.46.5.tar.xz 3375148 BLAKE2B 22bf169159d4f4e23398789e46c39d98a7727cd02e6539104963d34bfe569bad25338b3455ffd32413a36f5cd6061a29bdbbdb275f225f1408d6b34967b64a6c SHA512 eb1763d9c4bfe74441640f7228d44ff7cfd9a379b24b8aa906bc59be4514b319598ffee616d3de1db101134bb163715f33dd1d7a0a10ec03246c7ccf62a4778b +EBUILD vala-0.36.20.ebuild 803 BLAKE2B 6f734547fd057b40fd39d7a93a5a72df69bf476ac0c31f0c9eb175cbc4aa2af7cf51bc3d6cbfc4804926fc4857f37c089cbafe4bc0b39d58372db51b7e976ac1 SHA512 c089ecf979d5e1ab590d59a81a1b98456abd6c05aad2803bebf3ab9e4f26c6ad1e89687a82a407aad245ce6b7665d68cbe3a3113dfbf2d98b25d1856e0282059 +EBUILD vala-0.40.16.ebuild 1190 BLAKE2B 62644e9a2533e5a61c8c98e975d84a8ab573ed739a36e3f403c6ce8d3c4b8f59ebe76d17f7fcf84db2bd5cd7765692feb7f14ef0eea1f8205477a9534fb19ba2 SHA512 52d6f7f10dbf3f90974a57ff25fa3f82984b9cc02ad62df70911016cc4462d660226206e0979e99cbb44ac0f55b7f7029f1dd32be055072a5d1e62b5049cb02e +EBUILD vala-0.40.18.ebuild 1200 BLAKE2B 1a0203c999be5ffb366bb817fe88bc67b51f39999b758ea9e00e70d8367cd807d4a6d38115a056ff7c2a12728798d8a847ad54f229739ac4aff69ce27e948fff SHA512 97323b9de55335a0e1dbcfeddd1b9906d1b4a5a55a6ae99c41e3115cb55f83736baabc6a659e119a760bfe8dee0441b0b72b6c7058c76fdad9593235d46c7ee1 +EBUILD vala-0.44.11.ebuild 1123 BLAKE2B b56d80467b3fa986044bcaa5454dad3884063a8d21916a03750d152245c830ab2f806030230095abd585d0966c15e877976ea561cc57b9857bdaa55bb8a0dfa3 SHA512 9e6976cbdccba886f1bc92e00a0a4a726d44c466c400a8693db525dd76cdefee45778f28449a58194b12e9016eb34956d7192a03780bd2b78b99093480feb955 +EBUILD vala-0.44.9.ebuild 1112 BLAKE2B 694649036808bce02c35314873f95be80ed49d1c547e7707a600f9fcab55c808c702f21a7042fcdd556e77242623cf1432971a68c41e3cef1af7e1083d0ebeba SHA512 94eda383a97057491db7660eda8f864ed8a447e01e9332238bb421e493db48d0ad9d32fafabce174740db6ebb223d0afb912c6b4e5fa4fc9939cef72fdbbe8c3 +EBUILD vala-0.46.5.ebuild 1316 BLAKE2B a95eccfac99a4e00d44e6208acfbdcb38a5b5db8564dfb37e033fb9d9e759f60ee67e21cdcc57576557d6593b65add6b4fcb9cdcdb4a691f9bace86e8767848a SHA512 36bab891f6580e43f0b1954245a944e95ec85b2066ee87b7e96481d2ad7d89f110187101395525389453b2eea4d20e45879d9a31d5a52ba307d74c6c3e2e2ce6 MISC metadata.xml 345 BLAKE2B de3110ae281a87f8cb8f6c10d93705f56f0cfed972cd893a063e66c2629150d491498a29b35b4efe19fa5b6baa740f1d989bad440924befc60ef56423096f108 SHA512 163aa55430a075974d504a5bbb71ad9a249cb215de12a82b3141de18bb05f1e0c2078c02c617cf7d98a97c7f8dd407077183754d8c82c77e80dd0d7b2ec38283 diff --git a/dev-lang/vala/vala-0.36.18.ebuild b/dev-lang/vala/vala-0.36.18.ebuild deleted file mode 100644 index 9a7ac30ecf3a..000000000000 --- a/dev-lang/vala/vala-0.36.18.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://wiki.gnome.org/Projects/Vala" - -LICENSE="LGPL-2.1" -SLOT="0.36" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.32:2 - >=dev-libs/vala-common-${PV} -" -DEPEND="${RDEPEND} - !${CATEGORY}/${PN}:0 - dev-libs/libxslt - sys-devel/flex - virtual/pkgconfig - virtual/yacc - test? ( - dev-libs/dbus-glib - >=dev-libs/glib-2.26:2 - dev-libs/gobject-introspection ) -" - -src_configure() { - # weasyprint enables generation of PDF from HTML - gnome2_src_configure \ - --disable-unversioned \ - VALAC=: \ - WEASYPRINT=: -} diff --git a/dev-lang/vala/vala-0.36.20.ebuild b/dev-lang/vala/vala-0.36.20.ebuild index 5a401a62733d..188f01782455 100644 --- a/dev-lang/vala/vala-0.36.20.ebuild +++ b/dev-lang/vala/vala-0.36.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala" LICENSE="LGPL-2.1" SLOT="0.36" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-lang/vala/vala-0.40.14.ebuild b/dev-lang/vala/vala-0.40.14.ebuild deleted file mode 100644 index e433ec9bf106..000000000000 --- a/dev-lang/vala/vala-0.40.14.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://wiki.gnome.org/Projects/Vala" - -LICENSE="LGPL-2.1" -SLOT="0.40" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" -IUSE="test valadoc" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.40.0:2 - >=dev-libs/vala-common-${PV} - valadoc? ( >=media-gfx/graphviz-2.16 ) -" -DEPEND="${RDEPEND} - !${CATEGORY}/${PN}:0 - dev-libs/libxslt - sys-devel/flex - virtual/pkgconfig - virtual/yacc - test? ( - dev-libs/dbus-glib - >=dev-libs/glib-2.26:2 - dev-libs/gobject-introspection ) -" - -PATCHES=( - # From master - "${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch - # Add missing bits to make valadoc parallel installable - "${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch -) - -src_configure() { - # weasyprint enables generation of PDF from HTML - gnome2_src_configure \ - --disable-unversioned \ - $(use_enable valadoc) \ - VALAC=: \ - WEASYPRINT=: -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/dev-lang/vala/vala-0.40.16.ebuild b/dev-lang/vala/vala-0.40.16.ebuild index 14649dc7f4fe..7f747a367a42 100644 --- a/dev-lang/vala/vala-0.40.16.ebuild +++ b/dev-lang/vala/vala-0.40.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala" LICENSE="LGPL-2.1" SLOT="0.40" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" IUSE="test valadoc" RESTRICT="!test? ( test )" diff --git a/dev-lang/vala/vala-0.40.18.ebuild b/dev-lang/vala/vala-0.40.18.ebuild new file mode 100644 index 000000000000..f8a7cfa9827a --- /dev/null +++ b/dev-lang/vala/vala-0.40.18.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 + +DESCRIPTION="Compiler for the GObject type system" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1" +SLOT="0.40" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" +IUSE="test valadoc" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.40.0:2 + >=dev-libs/vala-common-${PV} + valadoc? ( >=media-gfx/graphviz-2.16 ) +" +DEPEND="${RDEPEND} + !${CATEGORY}/${PN}:0 + dev-libs/libxslt + sys-devel/flex + virtual/pkgconfig + virtual/yacc + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 + dev-libs/gobject-introspection ) +" + +PATCHES=( + # From master + "${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch + # Add missing bits to make valadoc parallel installable + "${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch +) + +src_configure() { + # weasyprint enables generation of PDF from HTML + gnome2_src_configure \ + --disable-unversioned \ + $(use_enable valadoc) \ + VALAC=: \ + WEASYPRINT=: +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +} diff --git a/dev-lang/vala/vala-0.42.7.ebuild b/dev-lang/vala/vala-0.42.7.ebuild deleted file mode 100644 index 1a4265b067e3..000000000000 --- a/dev-lang/vala/vala-0.42.7.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 - -DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://wiki.gnome.org/Projects/Vala" - -LICENSE="LGPL-2.1" -SLOT="0.42" -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" -IUSE="test valadoc" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.40.0:2 - >=dev-libs/vala-common-${PV} - valadoc? ( >=media-gfx/graphviz-2.16 ) -" -DEPEND="${RDEPEND} - !${CATEGORY}/${PN}:0 - dev-libs/libxslt - sys-devel/flex - virtual/pkgconfig - virtual/yacc - test? ( - dev-libs/dbus-glib - >=dev-libs/glib-2.26:2 - dev-libs/gobject-introspection ) -" - -PATCHES=( - # From master - "${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch - # Add missing bits to make valadoc parallel installable - "${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch -) - -src_configure() { - # weasyprint enables generation of PDF from HTML - gnome2_src_configure \ - --disable-unversioned \ - $(use_enable valadoc) \ - VALAC=: \ - WEASYPRINT=: -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/dev-lang/vala/vala-0.44.11.ebuild b/dev-lang/vala/vala-0.44.11.ebuild new file mode 100644 index 000000000000..f88d43a47fb5 --- /dev/null +++ b/dev-lang/vala/vala-0.44.11.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 + +DESCRIPTION="Compiler for the GObject type system" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1+" +SLOT="0.44" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" +IUSE="test valadoc" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.40.0:2 + >=dev-libs/vala-common-${PV} + valadoc? ( >=media-gfx/graphviz-2.16 ) +" +DEPEND="${RDEPEND} + !${CATEGORY}/${PN}:0 + dev-libs/libxslt + sys-devel/flex + virtual/pkgconfig + virtual/yacc + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 + dev-libs/gobject-introspection ) +" + +PATCHES=( + # Add missing bits to make valadoc parallel installable + "${FILESDIR}"/0.44-valadoc-doclets-data-parallel-installable.patch +) + +src_configure() { + # weasyprint enables generation of PDF from HTML + gnome2_src_configure \ + --disable-unversioned \ + $(use_enable valadoc) \ + VALAC=: \ + WEASYPRINT=: +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +} diff --git a/dev-lang/vala/vala-0.44.9.ebuild b/dev-lang/vala/vala-0.44.9.ebuild index 4696a3f4ba89..646a35e6311f 100644 --- a/dev-lang/vala/vala-0.44.9.ebuild +++ b/dev-lang/vala/vala-0.44.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala" LICENSE="LGPL-2.1+" SLOT="0.44" -KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-linux" IUSE="test valadoc" RESTRICT="!test? ( test )" diff --git a/dev-lang/vala/vala-0.46.3.ebuild b/dev-lang/vala/vala-0.46.3.ebuild deleted file mode 100644 index 365332156e80..000000000000 --- a/dev-lang/vala/vala-0.46.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome2 - -DESCRIPTION="Compiler for the GObject type system" -HOMEPAGE="https://wiki.gnome.org/Projects/Vala" - -LICENSE="LGPL-2.1+" -SLOT="0.46" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="test valadoc" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.48.0:2 - >=dev-libs/vala-common-${PV} - valadoc? ( >=media-gfx/graphviz-2.16 ) - != it, which would be bad -# as the newer is not required with older vala when those are picked instead of 0.46. -# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92 -DEPEND="${RDEPEND} - dev-libs/libxslt - sys-devel/flex - virtual/pkgconfig - virtual/yacc - test? ( - dev-libs/dbus-glib - >=dev-libs/glib-2.26:2 - dev-libs/gobject-introspection ) -" - -src_configure() { - # weasyprint enables generation of PDF from HTML - gnome2_src_configure \ - --disable-unversioned \ - $(use_enable valadoc) \ - VALAC=: \ - WEASYPRINT=: -} - -src_install() { - default - find "${D}" -name "*.la" -delete || die -} diff --git a/dev-lang/vala/vala-0.46.5.ebuild b/dev-lang/vala/vala-0.46.5.ebuild new file mode 100644 index 000000000000..365332156e80 --- /dev/null +++ b/dev-lang/vala/vala-0.46.5.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2 + +DESCRIPTION="Compiler for the GObject type system" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1+" +SLOT="0.46" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" +IUSE="test valadoc" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.48.0:2 + >=dev-libs/vala-common-${PV} + valadoc? ( >=media-gfx/graphviz-2.16 ) + != it, which would be bad +# as the newer is not required with older vala when those are picked instead of 0.46. +# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92 +DEPEND="${RDEPEND} + dev-libs/libxslt + sys-devel/flex + virtual/pkgconfig + virtual/yacc + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 + dev-libs/gobject-introspection ) +" + +src_configure() { + # weasyprint enables generation of PDF from HTML + gnome2_src_configure \ + --disable-unversioned \ + $(use_enable valadoc) \ + VALAC=: \ + WEASYPRINT=: +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +} diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest index 45002400443d..9a2d25ad222f 100644 --- a/dev-lang/zig/Manifest +++ b/dev-lang/zig/Manifest @@ -3,6 +3,6 @@ AUX zig-0.4.0-r1-suppress-warnings.patch 1106 BLAKE2B 3e4cac7325789a3ef954f35814 DIST zig-0.4.0.tar.gz 8924757 BLAKE2B 5ca3377f205694ff02360900b49eee7347cdf1cdaef90f1be071eff2610425ed453dfb35928fbe65b25f151b7153ab838c887d362ed3cd746f07833ae42510fd SHA512 423915730bc4ae9a67db3731a96471467826d16e59b87b3541f3e8ed2436f941939f22ccbebdb9a958a195b05360eb65f5be1658b32a01cc8db55c6e581eb039 DIST zig-0.5.0.tar.gz 15743912 BLAKE2B 1a28dffebc24200cf51e1d94ff7203c8de5641e1a299eff58e808a5a8f3257fc8ff771699a0f90733702b90e5536990adc5bf41b973b4ea642081ef788f7a83d SHA512 9fc2ef827421e54e8db98ce3474ba3bbe9119b0b9aa30b4edd78d73277d2384067b5c78f4ebbca350a97ac230131e7f71e6d54c1e75fc74e1833ce6c51c402df EBUILD zig-0.4.0-r1.ebuild 1250 BLAKE2B 43219ec7395eb7bb27a1d039c97773e76bb0d3b19656b692b804ad5bd991200b89bfd0af7c4b9bdc56f93886533243f3d0cbc411b2d5ce34f63906712a498665 SHA512 d61ca59a5205c8bdcf113ee0f317763808073b9e1480c551b1a71b34fa4e0bc3dc191e8961fdeb0b1ebe283b6f504c9403ca2c138f8afabbbf9200a7729e56f1 -EBUILD zig-0.5.0.ebuild 1536 BLAKE2B 89afabb6ce9f5fe6b28a748c026389a710241767fb0ac612cc9cd1da263a9f09d2459db19bd896aab7279c0da63cf24e6203c9b531188ca2696a510ce727e9a6 SHA512 48fc52a5f78ae16e7354979287b7f7a768d8ded1b6d9289c5dfe18948ef952acf2a44df48e01522c40ff3b16572b8f1a20f5dc8e5f89d5d87f272f588c035e8a -EBUILD zig-9999.ebuild 1536 BLAKE2B 89afabb6ce9f5fe6b28a748c026389a710241767fb0ac612cc9cd1da263a9f09d2459db19bd896aab7279c0da63cf24e6203c9b531188ca2696a510ce727e9a6 SHA512 48fc52a5f78ae16e7354979287b7f7a768d8ded1b6d9289c5dfe18948ef952acf2a44df48e01522c40ff3b16572b8f1a20f5dc8e5f89d5d87f272f588c035e8a +EBUILD zig-0.5.0.ebuild 1523 BLAKE2B 1e2d2d2aad86816165f85afb8f1bec72f3cd496506990fc6465959edb4181ebe817f677c31d2aeb192656a0f5bdd388d939757cd2f394e516927e799a134dec8 SHA512 0475818ef4c104fff9a57e197c96bf8423bc4f91d2d08ca80c0af7de0872793c2c07fab57f9d4338a328ab67ef2fe9366fdd7179acf7c44ee5d918fa46b47d42 +EBUILD zig-9999.ebuild 1523 BLAKE2B 1e2d2d2aad86816165f85afb8f1bec72f3cd496506990fc6465959edb4181ebe817f677c31d2aeb192656a0f5bdd388d939757cd2f394e516927e799a134dec8 SHA512 0475818ef4c104fff9a57e197c96bf8423bc4f91d2d08ca80c0af7de0872793c2c07fab57f9d4338a328ab67ef2fe9366fdd7179acf7c44ee5d918fa46b47d42 MISC metadata.xml 549 BLAKE2B 1f79da87db9888bc7a1c12163f7ee36dcb37645f5bdeb61034144f76b03b7e464c05f62a8753b0b85fd0ed4fd33ea1066da552d29d28bdd2502918697b3d94a0 SHA512 5867cda8d47f181e93b4aa4763efa5e12d7a6bbf1001e496cd82cc892a43b144a2d8a0a4d26466ac171622acf3590866d9d75a16c8337ae06734d5d4f8b2e908 diff --git a/dev-lang/zig/zig-0.5.0.ebuild b/dev-lang/zig/zig-0.5.0.ebuild index 7189e4ddc62f..223f162cfd9c 100644 --- a/dev-lang/zig/zig-0.5.0.ebuild +++ b/dev-lang/zig/zig-0.5.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils llvm +inherit cmake llvm DESCRIPTION="A robust, optimal, and maintainable programming language" HOMEPAGE="https://ziglang.org/" @@ -48,7 +48,7 @@ src_prepare() { sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \ die "unable to fix install path" - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -57,5 +57,5 @@ src_configure() { -DCLANG_LIBDIRS="$(llvm-config --libdir)" ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/dev-lang/zig/zig-9999.ebuild b/dev-lang/zig/zig-9999.ebuild index 7189e4ddc62f..223f162cfd9c 100644 --- a/dev-lang/zig/zig-9999.ebuild +++ b/dev-lang/zig/zig-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils llvm +inherit cmake llvm DESCRIPTION="A robust, optimal, and maintainable programming language" HOMEPAGE="https://ziglang.org/" @@ -48,7 +48,7 @@ src_prepare() { sed -i 's/--prefix "${CMAKE_INSTALL_PREFIX}"/--prefix ".\/${CMAKE_INSTALL_PREFIX}"/' CMakeLists.txt || \ die "unable to fix install path" - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -57,5 +57,5 @@ src_configure() { -DCLANG_LIBDIRS="$(llvm-config --libdir)" ) - cmake-utils_src_configure + cmake_src_configure } -- cgit v1.2.3