diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
| commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
| tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-lang | |
| parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) | |
gentoo resync : 22.01.2021
Diffstat (limited to 'dev-lang')
76 files changed, 2334 insertions, 2831 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex b40f33ed8ccb..71015926c783 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/cilk/Manifest b/dev-lang/cilk/Manifest deleted file mode 100644 index 4c7d60718740..000000000000 --- a/dev-lang/cilk/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX cilk-5.4.6-autotools.patch 3379 BLAKE2B 50f3a0c7b36fc2f944d0e952e4ebd5b96e978d0f339fb3ae9b3205e7ea2f76a1fd04a262752ac68af22f57620173d372b7f0963911afa012d3258d6631ae7b15 SHA512 a69181b04c8ebd5010164d8796e615cd63837be45409438d20d009eb69492cfe5750f1a21754cdadb15cf9ca4645edc65db46092741e6227df4f41fef5110943 -DIST cilk-5.4.6.tar.gz 1270768 BLAKE2B e340901034a082af0ad431e33cd68c3ba9b97fa06ad5efe44b1f7e9eb6159f0408048d6ba76315dfc54670faf548d45f282fdd0ae5300ae2a5d741a92639beec SHA512 1ad082c5e1f42a4f15130673d1d43a0b5dedd80ca0e3182765065be8dccce72b26087243ca3405460dcc90332a84c3c5b1decf5a4650505fb738e7e085998e0e -EBUILD cilk-5.4.6-r1.ebuild 873 BLAKE2B 019e29f097c69c317805411eaa7ae51c3fb279a14f7e19d0c7f125baf5f4f969ae194fcdd1c8b16b75ab5d4e5542f8b89525bac9acbc3dacbc6f36dfaca9f770 SHA512 9c5414928164016e8f7b2cd3f87513313de62ac2c8d3988b52571bdded22b63bfaec8d18ab46d39cbf5c3ea0226bc35eab2da7b7525f0007ca081c07dc95993c -EBUILD cilk-5.4.6-r2.ebuild 970 BLAKE2B 15b132cbd2709027b5321391c111327a75b775df78a46b95bd161be321862b8cfeb45712feff77cade5e89a68876bdff9fadc9e70dde7531aa39a768733c05e9 SHA512 853142dc8f3e07718e059d618b7b87b112220d3c47f7536c257ae958f9717cef79b7c9a5818684434d358c56b9a7e82df38ae5604c727a9dd08276cbb4b2fc60 -MISC metadata.xml 874 BLAKE2B 719290eb8bee04e03209a96d8b2a04c04fa35f1143e96078dfd7fddb538be34f4f1b4be4b7b21527799e76d66a4d0016fd8af46210ca57a98b09e03761f33481 SHA512 b2044c69cb6dc0ee0a9a0e35abdd52fc52e46e532ca212f075bebb80b078d174ab6e9897b2cbec8f742274fc0aac37f1a8dea7b23d66d718871ef1cd3566cf96 diff --git a/dev-lang/cilk/cilk-5.4.6-r1.ebuild b/dev-lang/cilk/cilk-5.4.6-r1.ebuild deleted file mode 100644 index 80297e33e8b2..000000000000 --- a/dev-lang/cilk/cilk-5.4.6-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic autotools eutils - -DESCRIPTION="Language for multithreaded parallel programming based on ANSI C" -HOMEPAGE="http://supertech.csail.mit.edu/cilk" -SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples static-libs" - -src_prepare() { - epatch "${FILESDIR}"/${P}-autotools.patch - eautoreconf -} - -src_configure() { - append-cppflags -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200809L - replace-flags -O[2-9] -O1 - econf --with-perfctr=no $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc NEWS README THANKS - use doc && dodoc doc/manual.pdf - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-lang/cilk/cilk-5.4.6-r2.ebuild b/dev-lang/cilk/cilk-5.4.6-r2.ebuild deleted file mode 100644 index d0d1a60b22df..000000000000 --- a/dev-lang/cilk/cilk-5.4.6-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools flag-o-matic - -DESCRIPTION="Language for multithreaded parallel programming based on ANSI C" -HOMEPAGE="http://supertech.csail.mit.edu/cilk" -SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples static-libs" - -PATCHES=( - "${FILESDIR}/${P}-autotools.patch" -) - -src_prepare() { - # fix #571060 by restoring pre-GCC5 inline semantics - append-cflags -std=gnu89 - append-cppflags -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200809L - replace-flags -O[2-9] -O1 - - default - eautoreconf -} - -src_configure() { - econf \ - --with-perfctr=no \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc NEWS README THANKS - use doc && dodoc doc/manual.pdf - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-lang/cilk/files/cilk-5.4.6-autotools.patch b/dev-lang/cilk/files/cilk-5.4.6-autotools.patch deleted file mode 100644 index 9f2d62b90410..000000000000 --- a/dev-lang/cilk/files/cilk-5.4.6-autotools.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Nur cilk-5.4.6.orig/cilk2c/Makefile.am cilk-5.4.6/cilk2c/Makefile.am ---- cilk-5.4.6.orig/cilk2c/Makefile.am 2012-11-12 21:18:50.374020109 -0800 -+++ cilk-5.4.6/cilk2c/Makefile.am 2012-11-12 21:19:09.667111443 -0800 -@@ -1,4 +1,6 @@ --pkglib_PROGRAMS = cilk2c -+pkglibexec_PROGRAMS = cilk2c -+ -+BUILT_SOURCES = ANSI-C.c ANSI-C.h - - cilk2c_SOURCES = analyze.c ast.c complex-types.c constexpr.c \ - container.c conversions.c dataflow.c elide.c initializer.c list.c \ -diff -Nur cilk-5.4.6.orig/configure.ac cilk-5.4.6/configure.ac ---- cilk-5.4.6.orig/configure.ac 2012-11-12 21:18:50.371020111 -0800 -+++ cilk-5.4.6/configure.ac 2012-11-12 21:19:09.668111459 -0800 -@@ -1,8 +1,8 @@ - dnl Process this file with autoconf to produce a configure script. - AC_INIT - AC_CONFIG_SRCDIR([config.h.in]) --AM_CONFIG_HEADER([config.h runtime/cilk-sysdep.h]) --AC_PREREQ(2.53) -+AC_CONFIG_HEADERS([config.h runtime/cilk-sysdep.h]) -+AC_PREREQ(2.68) - AM_INIT_AUTOMAKE(cilk, 5.4.6) - AC_CANONICAL_HOST - -@@ -20,7 +20,7 @@ - - dnl Checks for required programs. - if test "$GCC" != "yes"; then -- AC_ERROR("I cannot find gcc. gcc is required for Cilk to work.") -+ AC_MSG_ERROR("I cannot find gcc. gcc is required for Cilk to work.") - fi - - dnl Checks for libraries. -diff -Nur cilk-5.4.6.orig/examples/Makefile.am cilk-5.4.6/examples/Makefile.am ---- cilk-5.4.6.orig/examples/Makefile.am 2012-11-12 21:18:50.370020112 -0800 -+++ cilk-5.4.6/examples/Makefile.am 2012-11-12 21:20:06.347380163 -0800 -@@ -5,13 +5,13 @@ - NPROC = 4 - PROGFLAGS = --nproc $(NPROC) --yield - --CILKFLAGS=@CFLAGS@ -+CILKFLAGS=-O2 - CILKCOMPILE = $(CILK) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CILKFLAGS) $(CILKFLAGS) - CILKLD = $(CILK) - CILKLINK = $(CILKLD) $(AM_CILKFLAGS) $(CILKFLAGS) $(PERFCTR_LIBS) $(LDFLAGS) -o $@ - LINK=$(CILKLINK) - --noinst_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens \ -+check_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens \ - cilksort fft test-locks bucket cholesky game nfib kalah matmul lu plu \ - heat test-errno strassen rectmul spacemul \ - test-void-func \ -@@ -58,7 +58,7 @@ - EXTRA_DIST = knapsack-example1.input knapsack-example2.input \ - knapsack-example3.input - --check: hello testall fft fib lu matmul cilksort heat test-locks test-errno -+check-local: hello testall fft fib lu matmul cilksort heat test-locks test-errno - @echo "Runnig Cilk tests. This will take a while." - ./hello $(PROGFLAGS) - ./test-void-func $(PROGFLAGS) -diff -Nur cilk-5.4.6.orig/runtime/Makefile.am cilk-5.4.6/runtime/Makefile.am ---- cilk-5.4.6.orig/runtime/Makefile.am 2012-11-12 21:18:50.375020110 -0800 -+++ cilk-5.4.6/runtime/Makefile.am 2012-11-12 21:19:09.668111459 -0800 -@@ -1,5 +1,5 @@ - lib_LTLIBRARIES = libcilk.la libcilk.g.la libcilk.p.la libcilk.g.p.la --pkglib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a -+lib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a - - CILK_HFILES = cilk-cilk2c.h cilk.h cilk-lib.h cilk-lib.cilkh \ - gcc-builtin.h cilk-cilk2c-pre.h -@@ -8,7 +8,7 @@ - cmdline.c internal-malloc.c timing.c invoke-main.c malloc.c debug.c \ - workers.c mutex.c - --pkginclude_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h -+include_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h - - CILK_SRC = cilk-internal.h $(CILK_CFILES) $(CILK_HFILES) - COMMON_LINK_FLAGS = -version-info 1:3:0 @PTHREAD_LIBS@ diff --git a/dev-lang/cilk/metadata.xml b/dev-lang/cilk/metadata.xml deleted file mode 100644 index c8b5e5c42150..000000000000 --- a/dev-lang/cilk/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - Cilk is a language for multithreaded parallel programming based on - ANSI C. Cilk is especially effective for exploiting dynamic, highly - asynchronous parallelism, which can be difficult to write in data-parallel or - message-passing style. Cilk provides an effective platform for - programming dense and sparse numerical algorithms, such as matrix - factorization and N-body simulations. Cilk is algorithmic, in that - the runtime system employs a scheduler that allows the performance - of programs to be estimated accurately based on abstract complexity - measures. - </longdescription> -</pkgmetadata> diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 31e127fedc40..3dc7718c93b9 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -8,10 +8,10 @@ AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24 AUX erlang-23.1.2-ac2.70.patch 2596 BLAKE2B 740d4e2f30f5a1426fc4511512ae73337150c11d1e5c702b519cca456d7a796b890d7e17a9854a196fa45287a00e3c654556bdc2d8b99c35b9e494a1dc73592a SHA512 16c7d71cd4a075c5e470f54c82817c9b1dc8e83ddb9f9e4af544090b3d9ea418de5c9d47f0372706bc2c9c097a7f347a40a951d339f8895cf0ef862325940e44 DIST erlang-23.0.4.tar.gz 56394805 BLAKE2B 10a4e9e3084ad2d1bb10fa736d86eb03fa6b249f83b9d06bfef4c37f99ad86dd1415c2fbaa1524cddaf57dd228d25f388fa9fe9f5b4a03ba7477080e11020fb1 SHA512 53d4b7a5e76113bb3a9695a266e58dbebb57887b1eea4e8acb56bb85d194295231d739719d526dfc6d1f0bf745d7f059fdf5ec9dc79859f5b16a75c4d0a6b348 -DIST erlang-23.1.1.tar.gz 56498218 BLAKE2B cd513a2d45aecc12503df8765e0f4170001373c0e6b35b4c01d7471906408558a3b6bbf9c189858fce3cb8fd7020270813550e2099f04c8094afc49dcd070016 SHA512 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9 DIST erlang-23.1.4.tar.gz 56503340 BLAKE2B f4b26aa5882bb3d2218897706734798a80cbb5113008be70b2a0c793a5cc1eb01eb1ace17ae525e19f176e47ffc85b108240b7fec71cf8eedb4d67860ecaa98b SHA512 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367 DIST erlang-23.1.5.tar.gz 56508089 BLAKE2B 7784cbed8df68d449cbace6d84b37208b739a3b12fbed1117f05c765883d348e877001f5eba15ffdec5acc47725bf69d06a7f02b48766efa5496a8326fb8eb8c SHA512 dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955 DIST erlang-23.2.1.tar.gz 56580525 BLAKE2B 4b5d4be9d0501dd2eb5d44357ccc9a169dc3b5742380264a7929e6aebf1d003327b2c109aa7dc4ad668f1576376e54022ff240f41df7af9010184d643eae2371 SHA512 444c19fac295a979321ccde1f516156a25faa79d66437ddf7bc0a197f3fb8d2ddd6c056d565f9b6bc47e8444b8feda790c4844dbe95ec0b300428fb22c4e0531 +DIST erlang-23.2.2.tar.gz 56594755 BLAKE2B 3f5c552d3cd070b36bc7a1112b9541f358001ee4ad49a62ccce3462b02b642d4abc0bf8844e5441168be850f5588cf4ecdbf545fcff60e7746cec637898f2c7e SHA512 26743a7a4b2e31e63c0940ed6fdad64427c22e0f08fc063e1b8639bea6fa89c6b24e9c87ca572475d3ce39a18857ef6143676653cdf97b374656ae49f5892633 DIST erlang-23.2.tar.gz 56581092 BLAKE2B f3191b99465ab18eaf13c6d15f79ae150fb04337450b3ff145532aab0da229c44c082bb138a79c84860f09107a363c34e2b2505ce38c6c8dea1ede5fbe3ce044 SHA512 3bdb464992387c5a352c11bf9dc49c6a982dac10865d2b668d8db6fb45db15f4d79d38976d04fbbd51568ee9efb8b5295bb06b6fee37b81fde6fa43c51dcc313 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927 DIST erlang_doc_html_23.1.tar.gz 36285075 BLAKE2B e2e24ac4cecfc9c10853fd3718e8e332579a91bf25eaaf9e0fc2044d89bcd6d03fd251d6a8ab64a86439f1244e275ef398701b47933a741d4e64016838db48aa SHA512 c8fecb08344c9c7a4c7b911ac4f73e2d8c0c3778d665098c3377e055346a7ecfcc378bca28dff768c36dc7bf7447308f4fb58273875c22f2d6cd896fd6232656 @@ -20,9 +20,9 @@ DIST erlang_doc_man_23.0.tar.gz 1383486 BLAKE2B 63a9989c26797fe07fbd0ccca0d8425d DIST erlang_doc_man_23.1.tar.gz 1384042 BLAKE2B 914f64d9317e45e22dc0a3025306d36f12eb998734bd15cd29b540f9a848f11c1cf6897f9cd7aea2d2c95ed6ef3e544ee674a9a97a87e0340e4b65e09b0cee6e SHA512 90f026618f45a2a78590f093378e4883c5f442816367eb1691ea4fe7c36694f4a47325e738e6b585195678993bcdefdf4f8180894b16721277d02b2b79aef285 DIST erlang_doc_man_23.2.tar.gz 1386417 BLAKE2B 91fb2646461330c2f3793e7819e4c77ba9259366098b710fd102ffbcbcf38fa84ad720613313e3c59c1d419aaddd5a1a85d26c5d41a71d6692d428a494f57012 SHA512 464fa2c3608a6c096a241e5fc2cee710ef51394b169e3b3ce3ab5f69d847437c54780d4afc1a799d13f88ea88ac64056b19bff4d927e1e6bbe54a773b0ccd89d EBUILD erlang-23.0.4.ebuild 4563 BLAKE2B d144bc5d0c8f802d720fd36a53663692f8e335f766ced3c9bfab0c9dc5086c875df2b6cb42fb840304a659f203c70ec150fffea072d9e04dc5e151a55325c067 SHA512 a16aa96dafb7729c137e06c5d4c654965437a80becd9a5913d33ced734063e0947d61c2a2672e1ef6fff8dbec14b9a736e8d4b94a839a7da4e8add656645269e -EBUILD erlang-23.1.1.ebuild 4563 BLAKE2B d144bc5d0c8f802d720fd36a53663692f8e335f766ced3c9bfab0c9dc5086c875df2b6cb42fb840304a659f203c70ec150fffea072d9e04dc5e151a55325c067 SHA512 a16aa96dafb7729c137e06c5d4c654965437a80becd9a5913d33ced734063e0947d61c2a2672e1ef6fff8dbec14b9a736e8d4b94a839a7da4e8add656645269e EBUILD erlang-23.1.4.ebuild 4604 BLAKE2B 94eb0cd161622bdaf13b9c4cd9d4f2ccca1a76afae3e162a035520f0bcc0dce5f8feeb3c13823b069c89bc8219c7c12c443d8e375b744598ee771135966f8856 SHA512 d3b6f3043a10e12b52cbab260f90852940bc83b1101f65d0216a23e5edd04edc09bcacc04341c272bfb251ac1303de0e14932fca48018db443a977817645158b -EBUILD erlang-23.1.5.ebuild 4609 BLAKE2B b8ddf3bcd86dfb396a99e3209280b77e2ed8e1c5af99ddba34be0adf9b40bd58053bd254e1b52b4df6fe26e01e5ccb24c999ca4b4ddd4858488c78d79a06d684 SHA512 42d3fd1039bf50fe419a53aaa05d6c0602506e67b125049592881f732493851b07671b174e41cceb97334b2afa35bfd3ff89c70eb4e832bd8c2bdaba3f053fe6 +EBUILD erlang-23.1.5.ebuild 4604 BLAKE2B 94eb0cd161622bdaf13b9c4cd9d4f2ccca1a76afae3e162a035520f0bcc0dce5f8feeb3c13823b069c89bc8219c7c12c443d8e375b744598ee771135966f8856 SHA512 d3b6f3043a10e12b52cbab260f90852940bc83b1101f65d0216a23e5edd04edc09bcacc04341c272bfb251ac1303de0e14932fca48018db443a977817645158b EBUILD erlang-23.2.1.ebuild 4609 BLAKE2B b8ddf3bcd86dfb396a99e3209280b77e2ed8e1c5af99ddba34be0adf9b40bd58053bd254e1b52b4df6fe26e01e5ccb24c999ca4b4ddd4858488c78d79a06d684 SHA512 42d3fd1039bf50fe419a53aaa05d6c0602506e67b125049592881f732493851b07671b174e41cceb97334b2afa35bfd3ff89c70eb4e832bd8c2bdaba3f053fe6 -EBUILD erlang-23.2.ebuild 4609 BLAKE2B b8ddf3bcd86dfb396a99e3209280b77e2ed8e1c5af99ddba34be0adf9b40bd58053bd254e1b52b4df6fe26e01e5ccb24c999ca4b4ddd4858488c78d79a06d684 SHA512 42d3fd1039bf50fe419a53aaa05d6c0602506e67b125049592881f732493851b07671b174e41cceb97334b2afa35bfd3ff89c70eb4e832bd8c2bdaba3f053fe6 +EBUILD erlang-23.2.2.ebuild 4568 BLAKE2B afa013bfe43d1c6c8a9853f4ffaa3ce26095d5eba4dba1383f56ac0378fe1f3d73f2cfbfdb17df4c689764eaedcb349d65ea2b99aac67ff452f14a3d2d17be44 SHA512 7e8a5cb7c184d4e0ae500593764f6fbd9866e0ffc22c33359d0b2911b0b98a546da0998fb0aba17534e97ddb7ebc981f2e470c542378b0def45897383d26bd8a +EBUILD erlang-23.2.ebuild 4606 BLAKE2B a5cea3852b65c49661148be2b6096c25cc1a1f3c638ddd14d131abf9f11b0883a92cbea258a6490c1044a13770d4140e0534bf8e9d418ecbc7fe6c49bf334980 SHA512 fa81f994489cf22305a7624a8f582487c8bfa450c802acf3c78e650bbd640624c1f775e32613d99d5c844db425803393a64f8709561121307f4439045b1e52f6 MISC metadata.xml 834 BLAKE2B 1f394278eed4a3ac5e1c04f4ffced7042cc910d9e84ed4ad955cf91240446410f0ffbf1c138cc76cfa55d40c0eb0f110da98cd49c59df2b12ae70c13afd45a06 SHA512 7c067d233ffae83e4b1b55ba9e8adffe125d27f5f81401a4e4262d9b713b08bdaa4dd927570b2d32591092ca387372ee206e25e0b939ca721c96317fcd3d2be2 diff --git a/dev-lang/erlang/erlang-23.1.5.ebuild b/dev-lang/erlang/erlang-23.1.5.ebuild index e266bd5246c6..27ebfc6b45ee 100644 --- a/dev-lang/erlang/erlang-23.1.5.ebuild +++ b/dev-lang/erlang/erlang-23.1.5.ebuild @@ -22,7 +22,7 @@ LICENSE="Apache-2.0" # 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 ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" RDEPEND=" diff --git a/dev-lang/erlang/erlang-23.1.1.ebuild b/dev-lang/erlang/erlang-23.2.2.ebuild index 15f8ee9a7d15..e78f4f36b069 100644 --- a/dev-lang/erlang/erlang-23.1.1.ebuild +++ b/dev-lang/erlang/erlang-23.2.2.ebuild @@ -22,7 +22,7 @@ LICENSE="Apache-2.0" # 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 ~x64-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" RDEPEND=" @@ -48,8 +48,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/otp-OTP-${PV}" PATCHES=( - "${FILESDIR}/18.2.1-wx3.0.patch" - "${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch" + "${FILESDIR}"/18.2.1-wx3.0.patch + "${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch ) SITEFILE=50"${PN}"-gentoo.el diff --git a/dev-lang/erlang/erlang-23.2.ebuild b/dev-lang/erlang/erlang-23.2.ebuild index e266bd5246c6..3c1427ccf895 100644 --- a/dev-lang/erlang/erlang-23.2.ebuild +++ b/dev-lang/erlang/erlang-23.2.ebuild @@ -22,7 +22,7 @@ LICENSE="Apache-2.0" # 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 ~x64-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets" RDEPEND=" diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index ba9d7e8efa32..0b03eecae913 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -1,11 +1,11 @@ AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315 -DIST go1.14.12.src.tar.gz 22553834 BLAKE2B f2b3f750cc451c00376846962a5337c8e57aa9f4f737c7a8ab826772547ca0677bb3c6e52d004259f7e53d49efb013f645ce5223241fd29b35121149dc09a76c SHA512 cba26b97878d5bd57d75bd1541932786779ddb7e9fa0bfb7bf003c7ae9e7bee8318c0d2108ce918453b863892b8f562e481bd0ed6cfc44e43d901522603adff2 DIST go1.14.13.src.tar.gz 22553900 BLAKE2B 35aed1c43a59e06c1d5feaa91a6c4120c586958257cb3e4f83ab4e767159e20ae953d70bc0debabd80722bca0965d1b129531a2bd89f558df0a8700cadc09edc SHA512 b54a0bc3b85809a78d4704fe2e97ad7417a2027608ec0f90c2784e2ddb28b505df3cda862dc6f1b99af2d136363cbb9b120e2fd6ed985cb300c43f8e539a5e28 -DIST go1.15.5.src.tar.gz 23019303 BLAKE2B 549f0e9c4e22432db7a1c6e06724d6ada0ac90c09c0886d3053296390d85686df89bcaff86c703e8a2789119f670ffb2c6c11f4bf7e186c14a75896e8e6b8c6e SHA512 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4 +DIST go1.14.14.src.tar.gz 22557733 BLAKE2B aa3638c7a20f89e90bf17e9da1b12323cc8c0f52fb0a92ca6a850f7b2c94e406ea50a57fc28cc34b951bf7ecee0a9bb1ce884ad86dfc23241d7b62cd9435f881 SHA512 76213b19eeec66ca6c6b5bdef875bea0b64c3877c70eec64dd65f7869ceb8db016ff19193f01771f8944fd5f0ae3b54c68185e158f2622d1db5552fec1f37976 DIST go1.15.6.src.tar.gz 23019337 BLAKE2B d328401af9843f4a099dee7d82433ad2a0b349add0f2ecb609635814cca610e17a6fc50215e9928b8cb0d8ea8dd6ae9d84ffca125e1362dfb18ba08783bb4264 SHA512 f20e495204f32170d6554e8f4b64763dae8302a7859005020f650d1d53a5b15de3afbaff28e0b6418287396166c67bdc4c6bee7a0fd7ba8a87bb79b6c1d38326 -EBUILD go-1.14.12.ebuild 4816 BLAKE2B fdef3a598cfb56afcea723bf4be7fe2e2603273631ffc3add513902f6e171f090a7154870ef7e0e9c937e96c6a17bba03b2c26fc7aafb715468f13f65b6c64d5 SHA512 558e7511ab18d58cf026dd841f5ce37b4fcc6a99a6eb4dadd0a0d32eda9eb00d5404de9f5bbba321763cd5ee2abb027137fe74e39ce6a874f3c4036b86621c08 -EBUILD go-1.14.13-r1.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759 -EBUILD go-1.15.5.ebuild 4816 BLAKE2B fdef3a598cfb56afcea723bf4be7fe2e2603273631ffc3add513902f6e171f090a7154870ef7e0e9c937e96c6a17bba03b2c26fc7aafb715468f13f65b6c64d5 SHA512 558e7511ab18d58cf026dd841f5ce37b4fcc6a99a6eb4dadd0a0d32eda9eb00d5404de9f5bbba321763cd5ee2abb027137fe74e39ce6a874f3c4036b86621c08 -EBUILD go-1.15.6-r1.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759 -EBUILD go-9999.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759 +DIST go1.15.7.src.tar.gz 23017978 BLAKE2B 15b0827fb56b8e9208c65e8f7f11c7f67820efce1627b4123e937301bb437c597e87adfff9a2eee9aaf53ba0f22eb2f10746bafb7247b4250566f20181b7a2a0 SHA512 7b3e8bcd2fc95baad41f8b5f0456c009e01896d160e65c2670d51c23d8cfcf7a6801e831e6f9a8877fe58c8f54ac8f75bf6e7935b38ba7aaa51dc8e46cf76ddb +EBUILD go-1.14.13-r1.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122 +EBUILD go-1.14.14.ebuild 4577 BLAKE2B 50b6f9f44810ba3473936dbded7727569b76adb0c0827529cf96ec248108f9083fc2d118cb8f9316e361cbc2a5f7cc8e95121fe208982b21922136d382a81bad SHA512 9e08f5d30a0d901017c2b23c12a5f20260bddf3b053ddc339a1532571e0e2b2a4e51de89f7d591404fdd59ac2b917b187b05d740a3f5c36d20fb0c3095e962ab +EBUILD go-1.15.6-r1.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122 +EBUILD go-1.15.7.ebuild 4577 BLAKE2B 50b6f9f44810ba3473936dbded7727569b76adb0c0827529cf96ec248108f9083fc2d118cb8f9316e361cbc2a5f7cc8e95121fe208982b21922136d382a81bad SHA512 9e08f5d30a0d901017c2b23c12a5f20260bddf3b053ddc339a1532571e0e2b2a4e51de89f7d591404fdd59ac2b917b187b05d740a3f5c36d20fb0c3095e962ab +EBUILD go-9999.ebuild 4579 BLAKE2B c19b3d07e84df70393c8242eb825444436b97d591b214bf1fbd6d265ac0e276fd147d1cfa96e61b1e33468d56eb355cdeda807af7beaa0b3fdcb2f1d1f989374 SHA512 768d17b68de2925267e8274f9e216cd5f79c13be54cb986d0126ab85beaaaa4e46d8ca18422786ee09813b4707aafc6695df815e234fa330dc0211c2ebd398d3 MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba diff --git a/dev-lang/go/go-1.14.13-r1.ebuild b/dev-lang/go/go-1.14.13-r1.ebuild index 6bb792691ce1..55fd0c4f6bf1 100644 --- a/dev-lang/go/go-1.14.13-r1.ebuild +++ b/dev-lang/go/go-1.14.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac @@ -181,14 +181,6 @@ src_install() # install the @golang-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/go-sets.conf go.conf - - # fix install_name for test object (binutils_test) on Darwin, it - # is never used in real circumstances - if [[ ${CHOST} == *-darwin* ]] ; then - local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ - libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 - install_name_tool -id "${libmac64}" "${D}${libmac64}" - fi } pkg_postinst() { diff --git a/dev-lang/go/go-1.14.12.ebuild b/dev-lang/go/go-1.14.14.ebuild index 7c0569dd4b05..59b37bd3e992 100644 --- a/dev-lang/go/go-1.14.12.ebuild +++ b/dev-lang/go/go-1.14.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac @@ -154,43 +154,37 @@ src_test() src_install() { - local bin_path f x - - dodir /usr/lib/go - # There is a known issue which requires the source tree to be installed [1]. # Once this is fixed, we can consider using the doc use flag to control # installing the doc and src directories. + # The use of cp is deliberate in order to retain permissions # [1] https://golang.org/issue/2775 - # - # deliberately use cp to retain permissions + dodir /usr/lib/go cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go + einstalldocs + # testdata directories are not needed on the installed system rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print) + + local bin_path if go_cross_compile; then bin_path="bin/$(go_tuple)" else bin_path=bin fi + local f x for x in ${bin_path}/*; do f=${x##*/} dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} done - einstalldocs - if [[ ${CHOST} == *-darwin* ]] ; then - # fix install_name for test object (binutils_test) on Darwin, it - # is never used in real circumstances - local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ - libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 - install_name_tool -id "${libmac64}" "${D}${libmac64}" - fi + # install the @golang-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/go-sets.conf go.conf } pkg_postinst() { [[ -z ${REPLACING_VERSIONS} ]] && return - has_version "<sys-apps/portage-3.0.9" && return - einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild" einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}" einfo "due to the static linking nature of go." diff --git a/dev-lang/go/go-1.15.6-r1.ebuild b/dev-lang/go/go-1.15.6-r1.ebuild index 6bb792691ce1..55fd0c4f6bf1 100644 --- a/dev-lang/go/go-1.15.6-r1.ebuild +++ b/dev-lang/go/go-1.15.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac @@ -181,14 +181,6 @@ src_install() # install the @golang-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/go-sets.conf go.conf - - # fix install_name for test object (binutils_test) on Darwin, it - # is never used in real circumstances - if [[ ${CHOST} == *-darwin* ]] ; then - local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ - libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 - install_name_tool -id "${libmac64}" "${D}${libmac64}" - fi } pkg_postinst() { diff --git a/dev-lang/go/go-1.15.5.ebuild b/dev-lang/go/go-1.15.7.ebuild index 7c0569dd4b05..59b37bd3e992 100644 --- a/dev-lang/go/go-1.15.5.ebuild +++ b/dev-lang/go/go-1.15.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ case ${PV} in case ${PV} in *_beta*|*_rc*) ;; *) - KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" ;; esac esac @@ -154,43 +154,37 @@ src_test() src_install() { - local bin_path f x - - dodir /usr/lib/go - # There is a known issue which requires the source tree to be installed [1]. # Once this is fixed, we can consider using the doc use flag to control # installing the doc and src directories. + # The use of cp is deliberate in order to retain permissions # [1] https://golang.org/issue/2775 - # - # deliberately use cp to retain permissions + dodir /usr/lib/go cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go + einstalldocs + # testdata directories are not needed on the installed system rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print) + + local bin_path if go_cross_compile; then bin_path="bin/$(go_tuple)" else bin_path=bin fi + local f x for x in ${bin_path}/*; do f=${x##*/} dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} done - einstalldocs - if [[ ${CHOST} == *-darwin* ]] ; then - # fix install_name for test object (binutils_test) on Darwin, it - # is never used in real circumstances - local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ - libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 - install_name_tool -id "${libmac64}" "${D}${libmac64}" - fi + # install the @golang-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/go-sets.conf go.conf } pkg_postinst() { [[ -z ${REPLACING_VERSIONS} ]] && return - has_version "<sys-apps/portage-3.0.9" && return - einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild" einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}" einfo "due to the static linking nature of go." diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 6bb792691ce1..39d69abc7b52 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -181,14 +181,6 @@ src_install() # install the @golang-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/go-sets.conf go.conf - - # fix install_name for test object (binutils_test) on Darwin, it - # is never used in real circumstances - if [[ ${CHOST} == *-darwin* ]] ; then - local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ - libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 - install_name_tool -id "${libmac64}" "${D}${libmac64}" - fi } pkg_postinst() { diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index 3c57f0fad27e..ef332fce2e54 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -1,16 +1,4 @@ -DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7 -DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852 -DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea -DIST mercury-extras-20.01.2-gentoo-patchset-1.tar.gz 922 BLAKE2B 3713bb18147328acfda4e605ca241a000b19c787f15998ba79b9198bf0bd2e5597df3198837efc24679655d923c56391973085c59498d5441626cab4bbce6226 SHA512 70fa7bb240ccee87557eaf84dba712f162543c0caca4e80ec2ab47ed9f5a81cc8f1ad47a85671cfe3f917c4757a653a6602e1c6461307887656683f638db225d DIST mercury-extras-20.06-gentoo-patchset-0.tar.gz 1093 BLAKE2B cd0087a7a878c303a610e0007b352deec2e54b8223af1fbdcdd5e1fec0a7d6b4533895ba4ec01d4f90734349535a4c16c69f4ec60495f5a7888f99e4580e3ce3 SHA512 abd74dee931a01085a75f45d2793109737662345bdc68f4cf25dd874b59726da6a5ec8acd84cc8f0957052eeb9e5a9e3502090a0688fbea817d05c6948728ecb -DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c -DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90 -DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d -DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4 -EBUILD mercury-extras-14.01.1.ebuild 4543 BLAKE2B e97e6d88006db060b8d3df4ef37e5816d9047388e9deb79ca231d5209f4f79a31e1923d9f98a210ef739f6292bd3c1a432297ccf6bbc0f2c83321a0ff3844332 SHA512 5b6faadbe8fd1c7abc3fb6b28ac1fbc1d4d1a5683afd36d46aee7c6ea07ba07fcba1fb020b65ea9f570220d29ab06abc2a2171716cf94495ec9adc5d234beb24 -EBUILD mercury-extras-20.01.1.ebuild 8085 BLAKE2B 2c5d2ace45872369bd2375995a28475c5f4e69b47c77d3af24e92f3a650a8d64d61e4c69e1a3503da8ac7a855a5576c9f9bda772c2b7248582b2c8c0fd5c4212 SHA512 861b3ad5d55116023a91f95d18c2b7bb992416d9c9283341a6fbf03656c9aea0d4259feeecf38971fbfe2b75ea502cbfc664f83115d5c0bcee93f09b3f8ae0f9 -EBUILD mercury-extras-20.01.2.ebuild 8176 BLAKE2B a64709a822a405c7ede506192b05ca669ff9be6b64a75b56c57ea78f021ebab36e63f2dde8bed4a64f5f786f42afc7af64fad70c44c4658fae3989fe2979ccde SHA512 a172aaff9c7b84f7169f73f61606588a219d9bb990112459d9469c6d610af5b1292cbe745bcdd476fd42900ebb27a7abfc6b380e3050dc3846d6b50090e80274 -EBUILD mercury-extras-20.01.ebuild 8127 BLAKE2B 50bdc7b9de3d58bc3ac19e6a3aadccd94f0e2a344ad43795e4ad630f9982202930577be28d24c7d6f08b908795ebfbe4237d069692afa4bf5491cdbb94213334 SHA512 274b4d9e715b0b88b5a445e13bda0495305999820d1866083101071367871442c4ffe9dd5ca68e7a4a1facf1308ce77db27ada715ba30af00b26322a2c963822 EBUILD mercury-extras-20.06.ebuild 7369 BLAKE2B c84cd6de5e6be4654d78fabe06ff81e105bbd5be0f3506ca43c949efacc9f816e5499cecfde8e004f646f27e20a9b8e57cd34a1b367094db4dd7b0045139f12c SHA512 4de30d7696b137063b3f4b891d2f703e6c86ea1e9163f9233f310ca0ed7bc65e0b94f0ea2782c7b5dce4febe86ada14dc0dc2379558750f0d581a849618e4d13 MISC metadata.xml 318 BLAKE2B 8094d1a2d85b6c13ff05e9d81938e498ec514304b338f27cdbb5d92a62090fcace46b95cb21f56db75b6bdf087916a8d2c89960646e1b8828ccf31bbbb73ae6d SHA512 a49e9c19e322bb1b5d8c09c9db8c364b78fb97e62546991dc8bfe86bb2e478fec85e2acbbcdfff52b3b11ec627ba089d1a23e876bf4c1a0633829a739fff50fc diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild deleted file mode 100644 index 6298fa9e072f..000000000000 --- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib vcs-clean - -PATCHSET_VER="4" -MY_P=mercury-srcdist-${PV} - -DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="X cairo examples glut iodbc ncurses odbc opengl ssl tcl tk xml" - -RDEPEND="~dev-lang/mercury-${PV} - cairo? ( >=x11-libs/cairo-1.10.0 ) - glut? ( media-libs/freeglut ) - odbc? ( dev-db/unixODBC ) - iodbc? ( !odbc? ( dev-db/libiodbc ) ) - ncurses? ( sys-libs/ncurses:= ) - opengl? ( - virtual/opengl - virtual/glu - ) - tcl? ( tk? ( - dev-lang/tcl:0 - dev-lang/tk:0 - x11-libs/libX11 - x11-libs/libXmu - ) - )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P}/extras - -mercury_pkgs() -{ - echo "base64 - cgi - complex_numbers - dynamic_linking - error - fixed - lex - moose - posix - solver_types/library - $(use ncurses && echo curs curses) - $(use glut && echo graphics/mercury_glut) - $(use opengl && echo graphics/mercury_opengl) - $(use tcl && use tk && echo graphics/mercury_tcltk) - $(use odbc && echo odbc || (use iodbc && echo odbc) ) - $(has_version dev-lang/mercury[trail] && echo references) - $(usev xml)" -} - -src_prepare() { - cd "${WORKDIR}" - - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV} ]] ; then - epatch "${WORKDIR}"/${PV} - fi - - cd "${S}" - if use odbc; then - cp odbc/Mmakefile.odbc odbc/Mmakefile - elif use iodbc; then - cp odbc/Mmakefile.iodbc odbc/Mmakefile - fi -} - -src_compile() { - local MERCURY_PKGS="$(mercury_pkgs)" - - # Mercury dependency generation must be run single-threaded - mmake -j1 \ - SUBDIRS="${MERCURY_PKGS}" \ - depend || die "mmake depend failed" - - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - SUBDIRS="${MERCURY_PKGS}" \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ - || die "mmake failed" - - if use cairo; then - cd "${S}"/graphics/mercury_cairo - mmc --make libmercury_cairo \ - || die "mmc --make libmercury_cairo failed" - fi -} - -src_install() { - local MERCURY_PKGS="$(mercury_pkgs)" - - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - SUBDIRS="${MERCURY_PKGS}" \ - EXTRA_MLFLAGS=--no-strip \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - INSTALL_PREFIX="${D}"/usr \ - install || die "mmake install failed" - - if use cairo; then - cd "${S}"/graphics/mercury_cairo - INSTALL_PREFIX="${D}"/usr \ - mmc --make libmercury_cairo.install \ - || die "mmc --make libmercury_cairo.install failed" - fi - - find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm - - cd "${S}" - if use examples; then - insinto /usr/share/doc/${PF}/samples/base64 - doins base64/*.m - - insinto /usr/share/doc/${PF}/samples/complex_numbers - doins complex_numbers/samples/* - - insinto /usr/share/doc/${PF}/samples/dynamic_linking - doins dynamic_linking/hello.m - - insinto /usr/share/doc/${PF}/samples/error - doins error/* - - insinto /usr/share/doc/${PF}/samples/fixed - doins fixed/*.m - - insinto /usr/share/doc/${PF}/samples/gator - doins -r gator/* - - insinto /usr/share/doc/${PF}/samples/lex - doins lex/samples/* - - insinto /usr/share/doc/${PF}/samples/log4m - doins log4m/*.m - - insinto /usr/share/doc/${PF}/samples/monte - doins monte/*.m - - insinto /usr/share/doc/${PF}/samples/moose - doins moose/samples/* - - insinto /usr/share/doc/${PF}/samples/net - doins net/*.m - - if use ncurses; then - insinto /usr/share/doc/${PF}/samples/curs - doins curs/samples/* - - insinto /usr/share/doc/${PF}/samples/curses - doins curses/sample/* - fi - - if use X; then - insinto /usr/share/doc/${PF}/samples/graphics - doins graphics/easyx/samples/*.m - fi - - if use glut && use opengl; then - insinto /usr/share/doc/${PF}/samples/graphics - doins graphics/samples/calc/* - doins graphics/samples/gears/* - doins graphics/samples/maze/* - doins graphics/samples/pent/* - fi - - if use opengl && use tcl && use tk; then - insinto /usr/share/doc/${PF}/samples/graphics - doins graphics/samples/pent/*.m - fi - - if use ssl; then - insinto /usr/share/doc/${PF}/samples/mopenssl - doins mopenssl/*.m - fi - - ecvs_clean - fi - - dodoc README -} diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild deleted file mode 100644 index 7595eae754b7..000000000000 --- a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild +++ /dev/null @@ -1,317 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils multilib vcs-clean - -PATCHSET_VER="0" -MY_P=mercury-srcdist-${PV} - -DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml" -REQUIRED_USE="?? ( odbc iodbc )" - -RDEPEND=" - ~dev-lang/mercury-${PV} - cairo? ( >=x11-libs/cairo-1.10.0 ) - gmp? ( dev-libs/gmp:0 ) - glut? ( media-libs/freeglut ) - odbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) - tommath? ( dev-libs/libtommath ) - ncurses? ( sys-libs/ncurses:= ) - opengl? ( - virtual/opengl - virtual/glu - ) - tk? ( - dev-lang/tcl:0 - dev-lang/tk:0 - ) - X? ( x11-libs/libX11 )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P}/extras - -mercury_pkgs() { - echo " - align_right/align_right:bin: - base64/mercury_base64:lib: - cgi/mercury_www:lib: - complex_numbers/complex_numbers:lib: - $(use ncurses && echo \ - curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses) - dynamic_linking/dl:lib: - error/error:bin: - fixed/fixed:lib: - $(use gmp && echo gmp_int/gmp_int:lib:) - $(use tommath && echo mp_int/mp_int:lib:libtommath) - $(use X && echo graphics/easyx/easyx:lib:x11) - $(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo) - $(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut) - $(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu) - $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk) - lex/lex:lib: - lex/regex:lib: - moose/moose:bin: - net/net:lib: - net/echo:bin: - $(use ssl && echo mopenssl/mopenssl:lib:openssl) - $(use odbc && echo odbc/odbc:lib:) - $(use iodbc && echo odbc/odbc:lib:libiodbc) - posix/posix:lib: - $(has_version dev-lang/mercury[trail] && echo \ - references/global:lib: trailed_update/trailed_update:lib:) - show_ops/show_ops:bin: - solver_types/library/any:lib: - $(use xml && echo xml/xml:lib:)" -} - -mercury_pkg_setup() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%%:*} - mercury_pkg_deps=${mercury_pkg_atts#*:} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Preparing Mercury package: ${mercury_pkg}" - - if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then - echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \ - > "${S}"/${mercury_pkg_dir}/gentoo.params - echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile - fi - - if test -n "$mercury_pkg_deps"; then - echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - fi - - if test ${mercury_pkg_name} = dl; then - echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = gmp_int; then - echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = mercury_tcltk; then - echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = mopenssl; then - local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)" - echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo " cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = odbc && use odbc; then - echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \ - >> "${S}"/${mercury_pkg_dir}/Mmakefile - echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = odbc && use iodbc; then - echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - fi -} - -mercury_pkg_compile() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%:*} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Compiling Mercury package: ${mercury_pkg}" - - if test "${mercury_pkg_type}" = "bin"; then - mercury_mmc_target=${mercury_pkg_name} - else - mercury_mmc_target=lib${mercury_pkg_name} - fi - - # Mercury dependency generation must be run single-threaded - mmc -f *.m || die "mmc -f .m failed" - mmake -j1 \ - ${mercury_pkg_name}.depend \ - || die "mmake ${mercury_pkg} depend failed" - - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - MLFLAGS=--no-strip \ - CFLAGS="${CFLAGS}" \ - LD_LIBFLAGS="${LDFLAGS}" \ - ${mercury_mmc_target} || die "mmake ${mercury_pkg} failed" - -} - -mercury_pkg_install() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%:*} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Installing Mercury package: ${mercury_pkg}" - - if test "${mercury_pkg_type}" = "bin"; then - into /usr/$(get_libdir)/mercury/extras - dobin ${mercury_pkg_name} - else - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - MLFLAGS=--no-strip \ - CFLAGS="${CFLAGS}" \ - LD_LIBFLAGS="${LDFLAGS}" \ - INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \ - lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed" - fi -} - -src_prepare() { - cd "${WORKDIR}"/${MY_P} - if [[ -d "${WORKDIR}"/${PV} ]] ; then - eapply "${WORKDIR}"/${PV} - fi - eapply_user - - cd "${S}" - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_setup ${mercury_pkg} - done -} - -src_compile() { - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_compile ${mercury_pkg} - done -} - -src_install() { - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_install ${mercury_pkg} - done - - cd "${S}" - dodoc README - - if use examples; then - docinto samples/cgi - dodoc cgi/form_test.m - - docinto samples/complex_numbers - dodoc complex_numbers/samples/*.m - - if use ncurses; then - docinto samples/curs - dodoc curs/samples/*.m - - docinto samples/curses - dodoc curses/sample/*.m - fi - - docinto samples/dynamic_linking - dodoc dynamic_linking/{hello,dl_test}.m - - docinto samples/gator - dodoc -r gator/* - - if use gmp; then - docinto samples/gmp_int - dodoc gmp_int/gmp_int_test.m - fi - - if use tommath; then - docinto samples/mp_int - dodoc mp_int/mp_int_test.m - fi - - if use X; then - docinto samples/graphics - dodoc graphics/easyx/samples/*.m - fi - - if use glut && use opengl; then - docinto samples/graphics - dodoc graphics/samples/gears/*.m - dodoc graphics/samples/maze/*.m - fi - - if use tk; then - docinto samples/graphics - dodoc graphics/samples/calc/*.m - fi - - if use opengl && use tk; then - docinto samples/graphics - dodoc graphics/samples/pent/*.m - fi - - docinto samples/lex - dodoc lex/samples/*.m - - docinto samples/log4m - dodoc log4m/*.m - - docinto samples/monte - dodoc monte/*.m - - docinto samples/moose - dodoc moose/samples/* - - docinto samples/net - dodoc net/test_lookups.m - - if use odbc || use iodbc; then - docinto samples/odbc - dodoc odbc/odbc_test.m - fi - - docinto samples/posix - dodoc posix/samples/*.m - - docinto samples/random - dodoc random/*.m - - if has_version dev-lang/mercury[trail]; then - docinto samples/references - dodoc references/samples/*.m - - docinto samples/trail - dodoc trail/*.m - - docinto samples/trailed_update - dodoc trailed_update/samples/*.m - fi - - if use xml; then - docinto samples/xml - dodoc xml/tryit.m - dodoc xml/samples/* - dodoc xml_stylesheets/*.xsl - fi - - ecvs_clean - fi -} diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild deleted file mode 100644 index bce2fa7c29f2..000000000000 --- a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils multilib vcs-clean - -PATCHSET_VER="1" -MY_P=mercury-srcdist-${PV} - -DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library" -HOMEPAGE="https://www.mercurylang.org/index.html" -SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz - https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml" -REQUIRED_USE="?? ( odbc iodbc )" - -RDEPEND=" - ~dev-lang/mercury-${PV} - cairo? ( >=x11-libs/cairo-1.10.0 ) - gmp? ( dev-libs/gmp:0 ) - glut? ( media-libs/freeglut ) - odbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) - tommath? ( dev-libs/libtommath ) - ncurses? ( sys-libs/ncurses:= ) - opengl? ( - virtual/opengl - virtual/glu - ) - tk? ( - dev-lang/tcl:0 - dev-lang/tk:0 - ) - X? ( x11-libs/libX11 )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P}/extras - -mercury_pkgs() { - echo " - align_right/align_right:bin: - base64/mercury_base64:lib: - cgi/mercury_www:lib: - complex_numbers/complex_numbers:lib: - $(use ncurses && echo \ - curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses) - dynamic_linking/dl:lib: - error/error:bin: - fixed/fixed:lib: - $(use gmp && echo gmp_int/gmp_int:lib:) - $(use tommath && echo mp_int/mp_int:lib:libtommath) - $(use X && echo graphics/easyx/easyx:lib:x11) - $(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo) - $(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut) - $(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu) - $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk) - lex/lex:lib: - lex/regex:lib: - moose/moose:bin: - net/net:lib: - net/echo:bin: - $(use ssl && echo mopenssl/mopenssl:lib:openssl) - $(use odbc && echo odbc/odbc:lib:) - $(use iodbc && echo odbc/odbc:lib:libiodbc) - posix/posix:lib: - $(has_version dev-lang/mercury[trail] && echo \ - references/global:lib: trailed_update/trailed_update:lib:) - show_ops/show_ops:bin: - solver_types/library/any:lib: - $(use xml && echo xml/xml:lib:)" -} - -mercury_pkg_setup() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%%:*} - mercury_pkg_deps=${mercury_pkg_atts#*:} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Preparing Mercury package: ${mercury_pkg}" - - if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then - echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \ - > "${S}"/${mercury_pkg_dir}/gentoo.params - echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile - fi - - if test -n "$mercury_pkg_deps"; then - echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - fi - - if test ${mercury_pkg_name} = dl; then - echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = gmp_int; then - echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = mercury_tcltk; then - echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = mopenssl; then - local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)" - echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo " cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = odbc && use odbc; then - echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \ - >> "${S}"/${mercury_pkg_dir}/Mmakefile - echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = odbc && use iodbc; then - echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - fi -} - -mercury_pkg_compile() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%:*} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Compiling Mercury package: ${mercury_pkg}" - - if test "${mercury_pkg_type}" = "bin"; then - mercury_mmc_target=${mercury_pkg_name} - else - mercury_mmc_target=lib${mercury_pkg_name} - fi - - # Mercury dependency generation must be run single-threaded - mmc -f *.m || die "mmc -f .m failed" - mmake -j1 \ - ${mercury_pkg_name}.depend \ - || die "mmake ${mercury_pkg} depend failed" - - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - MLFLAGS=--no-strip \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LD_LIBFLAGS="${LDFLAGS}" \ - ${mercury_mmc_target} || die "mmake ${mercury_pkg} failed" - -} - -mercury_pkg_install() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%:*} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Installing Mercury package: ${mercury_pkg}" - - if test "${mercury_pkg_type}" = "bin"; then - into /usr/$(get_libdir)/mercury/extras - dobin ${mercury_pkg_name} - else - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - MLFLAGS=--no-strip \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LD_LIBFLAGS="${LDFLAGS}" \ - INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \ - lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed" - fi -} - -src_prepare() { - cd "${WORKDIR}"/${MY_P} - if [[ -d "${WORKDIR}"/${PV} ]] ; then - eapply "${WORKDIR}"/${PV} - fi - eapply_user - - cd "${S}" - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_setup ${mercury_pkg} - done -} - -src_compile() { - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_compile ${mercury_pkg} - done -} - -src_install() { - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_install ${mercury_pkg} - done - - cd "${S}" - dodoc README - - if use examples; then - docinto samples/cgi - dodoc cgi/form_test.m - - docinto samples/complex_numbers - dodoc complex_numbers/samples/*.m - - if use ncurses; then - docinto samples/curs - dodoc curs/samples/*.m - - docinto samples/curses - dodoc curses/sample/*.m - fi - - docinto samples/dynamic_linking - dodoc dynamic_linking/{hello,dl_test}.m - - docinto samples/gator - dodoc -r gator/* - - if use gmp; then - docinto samples/gmp_int - dodoc gmp_int/gmp_int_test.m - fi - - if use tommath; then - docinto samples/mp_int - dodoc mp_int/mp_int_test.m - fi - - if use X; then - docinto samples/graphics - dodoc graphics/easyx/samples/*.m - fi - - if use glut && use opengl; then - docinto samples/graphics - dodoc graphics/samples/gears/*.m - dodoc graphics/samples/maze/*.m - fi - - if use tk; then - docinto samples/graphics - dodoc graphics/samples/calc/*.m - fi - - if use opengl && use tk; then - docinto samples/graphics - dodoc graphics/samples/pent/*.m - fi - - docinto samples/lex - dodoc lex/samples/*.m - - docinto samples/log4m - dodoc log4m/*.m - - docinto samples/monte - dodoc monte/*.m - - docinto samples/moose - dodoc moose/samples/* - - docinto samples/net - dodoc net/test_lookups.m - - if use odbc || use iodbc; then - docinto samples/odbc - dodoc odbc/odbc_test.m - fi - - docinto samples/posix - dodoc posix/samples/*.m - - docinto samples/random - dodoc random/*.m - - if has_version dev-lang/mercury[trail]; then - docinto samples/references - dodoc references/samples/*.m - - docinto samples/trail - dodoc trail/*.m - - docinto samples/trailed_update - dodoc trailed_update/samples/*.m - fi - - if use xml; then - docinto samples/xml - dodoc xml/tryit.m - dodoc xml/samples/* - dodoc xml_stylesheets/*.xsl - fi - - ecvs_clean - fi -} diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild deleted file mode 100644 index 8a9593959aee..000000000000 --- a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild +++ /dev/null @@ -1,317 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils multilib vcs-clean - -PATCHSET_VER="0" -MY_P=mercury-srcdist-${PV} - -DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml" -REQUIRED_USE="?? ( odbc iodbc )" - -RDEPEND=" - ~dev-lang/mercury-${PV} - cairo? ( >=x11-libs/cairo-1.10.0 ) - gmp? ( dev-libs/gmp:0 ) - glut? ( media-libs/freeglut ) - odbc? ( dev-db/unixODBC ) - iodbc? ( dev-db/libiodbc ) - tommath? ( dev-libs/libtommath ) - ncurses? ( sys-libs/ncurses:= ) - opengl? ( - virtual/opengl - virtual/glu - ) - tk? ( - dev-lang/tcl:0 - dev-lang/tk:0 - ) - X? ( x11-libs/libX11 )" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P}/extras - -mercury_pkgs() { - echo " - align_right/align_right:bin: - base64/mercury_base64:lib: - cgi/mercury_www:lib: - complex_numbers/complex_numbers:lib: - $(use ncurses && echo \ - curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses) - dynamic_linking/dl:lib: - error/error:bin: - fixed/fixed:lib: - $(use gmp && echo gmp_int/gmp_int:lib:) - $(use tommath && echo mp_int/mp_int:lib:libtommath) - $(use X && echo graphics/easyx/easyx:lib:x11) - $(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo) - $(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut) - $(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu) - $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk) - lex/lex:lib: - lex/regex:lib: - moose/moose:bin: - net/net:lib: - net/echo:bin: - $(use ssl && echo mopenssl/mopenssl:lib:openssl) - $(use odbc && echo odbc/odbc:lib:) - $(use iodbc && echo odbc/odbc:lib:libiodbc) - posix/posix:lib: - $(has_version dev-lang/mercury[trail] && echo \ - references/global:lib: trailed_update/trailed_update:lib:) - show_ops/show_ops:bin: - solver_types/library/any:lib: - $(use xml && echo xml/xml:lib:)" -} - -mercury_pkg_setup() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%%:*} - mercury_pkg_deps=${mercury_pkg_atts#*:} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Preparing Mercury package: ${mercury_pkg}" - - if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then - echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \ - > "${S}"/${mercury_pkg_dir}/gentoo.params - echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile - fi - - if test -n "$mercury_pkg_deps"; then - echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - fi - - if test ${mercury_pkg_name} = dl; then - echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = gmp_int; then - echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = mercury_tcltk; then - echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = mopenssl; then - local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)" - echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params - echo " cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = odbc && use odbc; then - echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \ - >> "${S}"/${mercury_pkg_dir}/Mmakefile - echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params - elif test ${mercury_pkg_name} = odbc && use iodbc; then - echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \ - >> "${S}"/${mercury_pkg_dir}/gentoo.params - fi -} - -mercury_pkg_compile() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%:*} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Compiling Mercury package: ${mercury_pkg}" - - if test "${mercury_pkg_type}" = "bin"; then - mercury_mmc_target=${mercury_pkg_name} - else - mercury_mmc_target=lib${mercury_pkg_name} - fi - - # Mercury dependency generation must be run single-threaded - mmc -f *.m || die "mmc -f .m failed" - mmake -j1 \ - ${mercury_pkg_name}.depend \ - || die "mmake ${mercury_pkg} depend failed" - - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - MLFLAGS=--no-strip \ - CFLAGS="${CFLAGS}" \ - LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ - ${mercury_mmc_target} || die "mmake ${mercury_pkg} failed" - -} - -mercury_pkg_install() { - mercury_pkg=${1%%:*} - mercury_pkg_dir=${mercury_pkg%/*} - mercury_pkg_name=${mercury_pkg##*/} - - mercury_pkg_atts=${1#*:} - mercury_pkg_type=${mercury_pkg_atts%:*} - - cd "${S}"/${mercury_pkg_dir} || die - - echo ">> Installing Mercury package: ${mercury_pkg}" - - if test "${mercury_pkg_type}" = "bin"; then - into /usr/$(get_libdir)/mercury/extras - dobin ${mercury_pkg_name} - else - # Compiling Mercury submodules is not thread-safe - mmake -j1 \ - MLFLAGS=--no-strip \ - CFLAGS="${CFLAGS}" \ - LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ - INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \ - lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed" - fi -} - -src_prepare() { - cd "${WORKDIR}"/${MY_P} - if [[ -d "${WORKDIR}"/${PV} ]] ; then - eapply "${WORKDIR}"/${PV} - fi - eapply_user - - cd "${S}" - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_setup ${mercury_pkg} - done -} - -src_compile() { - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_compile ${mercury_pkg} - done -} - -src_install() { - for mercury_pkg in $(mercury_pkgs); do - mercury_pkg_install ${mercury_pkg} - done - - cd "${S}" - dodoc README - - if use examples; then - docinto samples/cgi - dodoc cgi/form_test.m - - docinto samples/complex_numbers - dodoc complex_numbers/samples/*.m - - if use ncurses; then - docinto samples/curs - dodoc curs/samples/*.m - - docinto samples/curses - dodoc curses/sample/*.m - fi - - docinto samples/dynamic_linking - dodoc dynamic_linking/{hello,dl_test}.m - - docinto samples/gator - dodoc -r gator/* - - if use gmp; then - docinto samples/gmp_int - dodoc gmp_int/gmp_int_test.m - fi - - if use tommath; then - docinto samples/mp_int - dodoc mp_int/mp_int_test.m - fi - - if use X; then - docinto samples/graphics - dodoc graphics/easyx/samples/*.m - fi - - if use glut && use opengl; then - docinto samples/graphics - dodoc graphics/samples/gears/*.m - dodoc graphics/samples/maze/*.m - fi - - if use tk; then - docinto samples/graphics - dodoc graphics/samples/calc/*.m - fi - - if use opengl && use tk; then - docinto samples/graphics - dodoc graphics/samples/pent/*.m - fi - - docinto samples/lex - dodoc lex/samples/*.m - - docinto samples/log4m - dodoc log4m/*.m - - docinto samples/monte - dodoc monte/*.m - - docinto samples/moose - dodoc moose/samples/* - - docinto samples/net - dodoc net/test_lookups.m - - if use odbc || use iodbc; then - docinto samples/odbc - dodoc odbc/odbc_test.m - fi - - docinto samples/posix - dodoc posix/samples/*.m - - docinto samples/random - dodoc random/*.m - - if has_version dev-lang/mercury[trail]; then - docinto samples/references - dodoc references/samples/*.m - - docinto samples/trail - dodoc trail/*.m - - docinto samples/trailed_update - dodoc trailed_update/samples/*.m - fi - - if use xml; then - docinto samples/xml - dodoc xml/tryit.m - dodoc xml/samples/* - dodoc xml_stylesheets/*.xsl - fi - - ecvs_clean - fi -} diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 9ecedf188dae..aa99f7af4f94 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -1,17 +1,5 @@ AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071 -DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d -DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e -DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367 -DIST mercury-20.01.2-gentoo-patchset-1.tar.gz 4562 BLAKE2B f1e9d040cfd5930c4f4d9722fc10e11532272f1fa0ab6bd25cc0d2ed42eb0edfbe6f9bc1d41972775fa720b80601d5fdae1681d56f677861fab15e10cc6d05cb SHA512 4f89b09e1e196a61892811167bc0dc1b3ee868ef336efdf66e417574c18ea53b557bd87d5c5300eee8194a3c4250b47e70f5991fcc25b1c58d956a4b097eaec5 DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256 -DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c -DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90 -DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d -DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4 -EBUILD mercury-14.01.1-r1.ebuild 5624 BLAKE2B 0ddb116dec074a53e316935279650cecae3990ec9cbdbfbc1e99e6c47d0fceb20bcbb685259a78e18a850fafe2e4d609072a5183a2ef9ef3a6d45ba9368dbdc7 SHA512 338dee876d50fee43085a203b6adafaeb0f921c855925bda05ba3b30f133ac8eab9dfd476793d63f99ef5f9e4cb40775c9255c835c38685dd13fa78b54b2690f -EBUILD mercury-20.01.1.ebuild 4984 BLAKE2B 55587832b1021ed04397d28a254bc17ca6172b52ac2afa89979f99a65d90107b52ea3758303d26b224ccffda5e5a2be76655d5791f0d2fa6d3fcb69caf5ae01b SHA512 fd270ddc8913049f2bb8cf472c85fc5d4724a4d979399ed2919cc34760c61492ec46fe8c9abbe2b7b9f43c0ff7fc608bfcba744bbbd05a75e0d1aa4387ba6c91 -EBUILD mercury-20.01.2.ebuild 5073 BLAKE2B 669670dc48445434e48190c7f5414dd48132ce97080bb56c47f3669d92164ef005007fd07fb3335cb53a0044dd37423cbea4d42ed960792ff18ba96c8aba8378 SHA512 fd037eecd755cef8214d48cb3a7b40c6406ea4f12c15392f898270deb88909b2edcf24892106a7d960118b282d5bbe4b7a3eb0cad81a2907b6aea0fa5afb3335 -EBUILD mercury-20.01.ebuild 5129 BLAKE2B 93b409d07e9a60705630c17100da0231b5aaa74089990b32d02dbbde77681c428242f096a39b90e2136aba6fb30310ced9e98aeaecc6d2dc553f427461dc27f5 SHA512 4355a4e2f2280c9196c4e1aedd804b94b50933da23a9337b948756a1a8c5f824320d837f5dd49a1e498e7b0d68e9786c00afcb3d5d90fba1975f5626d0787430 EBUILD mercury-20.06.ebuild 5181 BLAKE2B 0fcd5b91586cb40cc6b15b9a6e689985ca3fa80d13bea92f53f6165c389c2877d4db9f4f3b8a7f37525c2c6a0fc284c9a5d1e327f9b5c304b348b4999272233a SHA512 068408d5531d72288c35f9f01b339244f5f126de614fd9d8ede2a78514a4d4cb8691fd7a5e7afe114a3958f95817791e358c6d519b8d3879248382216743649c 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 deleted file mode 100644 index 3584581c3cea..000000000000 --- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils - -PATCHSET_VER="5" -MY_P=${PN}-srcdist-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug doc emacs erlang examples java mono profile readline threads trail" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - net-libs/libnsl:0= - readline? ( sys-libs/readline:= ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.6:= ) - mono? ( dev-lang/mono ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${DEPEND} - emacs? ( >=app-editors/emacs-23.1:* )" - -S="${WORKDIR}"/${MY_P} - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - cd "${WORKDIR}" || die - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV} ]] ; then - epatch "${WORKDIR}"/${PV} - fi - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/scripts/Mmake.vars.in \ - || die "sed libdir failed" - - cd "${S}" || die - eautoconf - - xdg_environment_reset -} - -src_configure() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - $(use_enable mono csharp-grade) \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable profile prof-grades) \ - $(use_enable threads par-grades) \ - $(use_enable trail trail-grades) \ - $(use_with readline)" - - econf ${myconf} -} - -src_compile() { - # Prepare mmake flags - echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params - echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params - echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params - - if use x86; then - echo "CFLAGS-ml_backend.ml_closure_gen = -O0" >> Mmake.params - echo "CFLAGS-ml_backend.ml_unify_gen = -O0" >> Mmake.params - echo "CFLAGS-ml_backend.rtti_to_mlds = -O0" >> Mmake.params - echo "CFLAGS-display_report = -O0" >> Mmake.params - echo "CFLAGS-mercury_ho_call = -O0" >> Mmake.params - echo "CFLAGS-mercury_trace_vars = -O0" >> Mmake.params - fi - - # Build Mercury using bootstrap grade - emake \ - PARALLEL="'${MAKEOPTS}'" \ - TEXI2DVI="" PDFTEX="" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then - epatch "${WORKDIR}"/${PV}-mmc - fi - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/make.program_target.m \ - || die "sed libdir failed" - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" - - # The default Mercury grade may not be the same as the bootstrap - # grade. Since src_test() is run before src_install() we compile - # the default grade now - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - default_grade -} - -src_test() { - TEST_GRADE=$(scripts/ml --print-grade) - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp browser/mer_browser.init "${TWS}"/browser/ - else - TWS="${S}" - fi - - cd "${S}"/tests || die - sed -e "s:@WORKSPACE@:${TWS}:" \ - < WS_FLAGS.ws \ - > WS_FLAGS \ - || die "sed WORKSPACE failed" - sed -e "s:@WORKSPACE@:${TWS}:" \ - < .mgnuc_copts.ws \ - > .mgnuc_copts \ - || die "sed WORKSPACE failed" - find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \; - find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \; - - # Mercury tests must be run in C locale since Mercury output is - # compared to hard-coded warnings/errors - LC_ALL="C" \ - PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - WORKSPACE_FLAGS=yes \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - DESTDIR="${D}" \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install - - if use java; then - keepdir /usr/$(get_libdir)/mercury/modules/java - fi - - if use mono; then - keepdir /usr/$(get_libdir)/mercury/modules/csharp - fi - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi - - if use examples; then - insinto /usr/share/doc/${PF}/samples - doins samples/{*.m,README,Mmakefile} - doins -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types - - if use java; then - doins -r samples/java_interface - fi - - ecvs_clean "${D}"/usr/share/doc/${PF}/samples - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-20.01.1.ebuild b/dev-lang/mercury/mercury-20.01.1.ebuild deleted file mode 100644 index 6770d4264de4..000000000000 --- a/dev-lang/mercury/mercury-20.01.1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils - -PATCHSET_VER="0" -MY_P=${PN}-srcdist-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug doc emacs erlang examples java mono profile readline threads trail" - -DEPEND="net-libs/libnsl:0= - readline? ( sys-libs/readline:= ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.6:= ) - mono? ( dev-lang/mono ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${DEPEND} - emacs? ( >=app-editors/emacs-23.1:* )" - -S="${WORKDIR}"/${MY_P} - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - if [[ -d "${WORKDIR}"/${PV} ]] ; then - eapply "${WORKDIR}"/${PV} - fi - eapply_user - - AT_M4DIR=m4 eautoreconf - - xdg_environment_reset -} - -src_configure() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - $(use_enable mono csharp-grade) \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable profile prof-grades) \ - $(use_enable threads par-grades) \ - $(use_enable trail trail-grades) \ - $(use_with readline)" - - econf ${myconf} -} - -src_compile() { - # Prepare mmake flags - echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params - echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params - echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params - - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params - - # Build Mercury using bootstrap grade - emake \ - PARALLEL="'${MAKEOPTS}'" \ - TEXI2DVI="" PDFTEX="" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then - eapply "${WORKDIR}"/${PV}-mmc - fi - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" - - # The default Mercury grade may not be the same as the bootstrap - # grade. Since src_test() is run before src_install() we compile - # the default grade now - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - default_grade -} - -src_test() { - TEST_GRADE=$(scripts/ml --print-grade) - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp browser/mer_browser.init "${TWS}"/browser/ - else - TWS="${S}" - fi - - cd "${S}"/tests || die - sed -e "s:@WORKSPACE@:${TWS}:" \ - < WS_FLAGS.ws \ - > WS_FLAGS \ - || die "sed WORKSPACE failed" - sed -e "s:@WORKSPACE@:${TWS}:" \ - < .mgnuc_copts.ws \ - > .mgnuc_copts \ - || die "sed WORKSPACE failed" - find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \; - find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \; - - # Mercury tests must be run in C locale since Mercury output is - # compared to hard-coded warnings/errors - LC_ALL="C" \ - PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - WORKSPACE_FLAGS=yes \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - DESTDIR="${D}" \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install - - if use java; then - keepdir /usr/$(get_libdir)/mercury/modules/java - fi - - if use mono; then - keepdir /usr/$(get_libdir)/mercury/modules/csharp - fi - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES VERSION || die - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi - - if use mono; then - dodoc README.CSharp - fi - - if use examples; then - docinto /usr/share/doc/${PF}/samples - dodoc samples/{*.m,README,Mmakefile} - dodoc -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types - - if use java; then - dodoc -r samples/java_interface - fi - - ecvs_clean "${D}"/usr/share/doc/${PF}/samples - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild deleted file mode 100644 index b0c5ecffdb0f..000000000000 --- a/dev-lang/mercury/mercury-20.01.2.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils - -PATCHSET_VER="1" -MY_P=${PN}-srcdist-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="https://www.mercurylang.org/index.html" -SRC_URI="https://dl.mercurylang.org/release-20.01/${MY_P}.tar.gz - https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug doc emacs erlang examples java mono profile readline threads trail" - -DEPEND="net-libs/libnsl:0= - readline? ( sys-libs/readline:= ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.6:= ) - mono? ( dev-lang/mono ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${DEPEND} - emacs? ( >=app-editors/emacs-23.1:* )" - -S="${WORKDIR}"/${MY_P} - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - if [[ -d "${WORKDIR}"/${PV} ]] ; then - eapply "${WORKDIR}"/${PV} - fi - eapply_user - - AT_M4DIR=m4 eautoreconf - - xdg_environment_reset -} - -src_configure() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - $(use_enable mono csharp-grade) \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable profile prof-grades) \ - $(use_enable threads par-grades) \ - $(use_enable trail trail-grades) \ - $(use_with readline)" - - econf ${myconf} -} - -src_compile() { - # Prepare mmake flags - echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params - echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params - echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params - echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params - - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params - - # Build Mercury using bootstrap grade - emake \ - PARALLEL="'${MAKEOPTS}'" \ - TEXI2DVI="" PDFTEX="" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then - eapply "${WORKDIR}"/${PV}-mmc - fi - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" - - # The default Mercury grade may not be the same as the bootstrap - # grade. Since src_test() is run before src_install() we compile - # the default grade now - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - default_grade -} - -src_test() { - TEST_GRADE=$(scripts/ml --print-grade) - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp browser/mer_browser.init "${TWS}"/browser/ - else - TWS="${S}" - fi - - cd "${S}"/tests || die - sed -e "s:@WORKSPACE@:${TWS}:" \ - < WS_FLAGS.ws \ - > WS_FLAGS \ - || die "sed WORKSPACE failed" - sed -e "s:@WORKSPACE@:${TWS}:" \ - < .mgnuc_copts.ws \ - > .mgnuc_copts \ - || die "sed WORKSPACE failed" - find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \; - find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \; - - # Mercury tests must be run in C locale since Mercury output is - # compared to hard-coded warnings/errors - LC_ALL="C" \ - PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - WORKSPACE_FLAGS=yes \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - DESTDIR="${D}" \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install - - if use java; then - keepdir /usr/$(get_libdir)/mercury/modules/java - fi - - if use mono; then - keepdir /usr/$(get_libdir)/mercury/modules/csharp - fi - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES VERSION || die - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi - - if use mono; then - dodoc README.CSharp - fi - - if use examples; then - docinto /usr/share/doc/${PF}/samples - dodoc samples/{*.m,README,Mmakefile} - dodoc -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types - - if use java; then - dodoc -r samples/java_interface - fi - - ecvs_clean "${D}"/usr/share/doc/${PF}/samples - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/mercury/mercury-20.01.ebuild b/dev-lang/mercury/mercury-20.01.ebuild deleted file mode 100644 index 4ee03178b5f5..000000000000 --- a/dev-lang/mercury/mercury-20.01.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils - -PATCHSET_VER="0" -MY_P=${PN}-srcdist-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug doc emacs erlang examples java mono profile readline threads trail" - -DEPEND="net-libs/libnsl:0= - readline? ( sys-libs/readline:= ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.6:= ) - mono? ( dev-lang/mono ) - doc? ( sys-apps/texinfo )" - -RDEPEND="${DEPEND} - emacs? ( >=app-editors/emacs-23.1:* )" - -S="${WORKDIR}"/${MY_P} - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - if [[ -d "${WORKDIR}"/${PV} ]] ; then - eapply "${WORKDIR}"/${PV} - fi - eapply_user - - AT_M4DIR=m4 eautoreconf - - xdg_environment_reset -} - -src_configure() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - $(use_enable mono csharp-grade) \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable profile prof-grades) \ - $(use_enable threads par-grades) \ - $(use_enable trail trail-grades) \ - $(use_with readline)" - - econf ${myconf} -} - -src_compile() { - # Prepare mmake flags - echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params - echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params - echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params - - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params - echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params - - # Build Mercury using bootstrap grade - emake \ - PARALLEL="'${MAKEOPTS}'" \ - TEXI2DVI="" PDFTEX="" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then - eapply "${WORKDIR}"/${PV}-mmc - fi - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/make.program_target.m \ - || die "sed libdir failed" - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" - - # The default Mercury grade may not be the same as the bootstrap - # grade. Since src_test() is run before src_install() we compile - # the default grade now - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - default_grade -} - -src_test() { - TEST_GRADE=$(scripts/ml --print-grade) - if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then - TWS="${S}"/install_grade_dir.${TEST_GRADE} - cp runtime/mer_rt.init "${TWS}"/runtime/ - cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/ - cp browser/mer_browser.init "${TWS}"/browser/ - else - TWS="${S}" - fi - - cd "${S}"/tests || die - sed -e "s:@WORKSPACE@:${TWS}:" \ - < WS_FLAGS.ws \ - > WS_FLAGS \ - || die "sed WORKSPACE failed" - sed -e "s:@WORKSPACE@:${TWS}:" \ - < .mgnuc_copts.ws \ - > .mgnuc_copts \ - || die "sed WORKSPACE failed" - find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \; - find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \; - - # Mercury tests must be run in C locale since Mercury output is - # compared to hard-coded warnings/errors - LC_ALL="C" \ - PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \ - TERM="" \ - WORKSPACE="${TWS}" \ - WORKSPACE_FLAGS=yes \ - MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \ - MMAKE_DIR="${TWS}"/scripts \ - MERCURY_SUPPRESS_STACK_TRACE=yes \ - GRADE=${TEST_GRADE} \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - TEXI2DVI="" PDFTEX="" \ - DESTDIR="${D}" \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install - - if use java; then - keepdir /usr/$(get_libdir)/mercury/modules/java - fi - - if use mono; then - keepdir /usr/$(get_libdir)/mercury/modules/csharp - fi - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" \ - || die "elisp-site-file-install failed" - fi - - dodoc \ - BUGS HISTORY LIMITATIONS NEWS README README.Linux \ - README.Linux-Alpha README.Linux-m68k README.Linux-PPC \ - RELEASE_NOTES VERSION || die - - if use erlang; then - dodoc README.Erlang - fi - - if use java; then - dodoc README.Java - fi - - if use mono; then - dodoc README.CSharp - fi - - if use examples; then - docinto /usr/share/doc/${PF}/samples - dodoc samples/{*.m,README,Mmakefile} - dodoc -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types - - if use java; then - dodoc -r samples/java_interface - fi - - ecvs_clean "${D}"/usr/share/doc/${PF}/samples - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 58baee165f57..9713ad1a3ecd 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -16,4 +16,4 @@ EBUILD ocaml-4.09.0.ebuild 2169 BLAKE2B cc7c2451281b2f10733f562023dae3b1698336af EBUILD ocaml-4.10.0.ebuild 2176 BLAKE2B 8a32ad81554250dd7ea21af73adee00e9f7aa6a60e0e6e0d7df40429b1237bea6df535f132a4fd7eeea55dd74a28f7f2becb15abb1394f8ee41b92755f77740b SHA512 16f9a5ce5d38a8af938c9a26e484606fdf51426c0e6f9763bcae5871db8a59f1d35717e88da5dc5195b0493d67705487d4cac4c4a7db4f02a09319bd29ecafa9 EBUILD ocaml-4.10.2.ebuild 2127 BLAKE2B 4711896726729f7640a132b9d37e73e56eff6599f83b3c68d9423742d72e7542d1c5576cb0e981835fa534ed83efbd138ded2049ab71b19f1a803f6ad4859681 SHA512 59c0c42268d49fc798668e2108e94356d1c5c5ba1ccbac5b66db98dfeedefe6190cd6250294ace15c625c6c69a613e2003c7def741f2ff86aed83b6410478fc1 EBUILD ocaml-4.11.1.ebuild 1998 BLAKE2B a1f5ba0117f52ae8ca923b341b025d526541e55dc4e167859341fe7d77f227d471e557820abe7acafd689e1b5992ae0f834f34817a38bd3bb3ada25184f0ca72 SHA512 19ae1bc225a977d1ad50216c9988698175688d77cec62163a6f79f48a0d6669e1918110621fe5b3a4ca2ac1c3a2f6ef09f8777b54f1794517be72527a1f40bdb -MISC metadata.xml 682 BLAKE2B b6f2326a10af3e782ff11f6f8a60a6a50cfe597a68616233def75a32996fcfa82955cae88be70ef946951d0958b4c735fbc50d7afa0c7f48b4ce9747b3afe0c7 SHA512 611d0608683b18a2c5ccde22cb982211f5d6ee9cd27d1a4674a55a8a059d549a5bff8e474b1f9d592236e64f9b32b4feb7dc29e921ccc65c49e857124df338c2 +MISC metadata.xml 775 BLAKE2B dfddcb1e262074326ede7fb648bb524404e86a302270b6bc9e502124689077cd54ebafbfca277d516d2763cd18580a09f749f45ca215c34c26c7ae1c56c2e841 SHA512 3551489dac19dddcf6490c74df4c8e2aa370565b207bcdee28a8160caab7394d8d770ed4408ce8db3d3c224b61439f29c4eae84180adf01a468e0ef515980818 diff --git a/dev-lang/ocaml/metadata.xml b/dev-lang/ocaml/metadata.xml index 1b869c8a3d97..d0ecd9cc9290 100644 --- a/dev-lang/ocaml/metadata.xml +++ b/dev-lang/ocaml/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="project"> + <email>ml@gentoo.org</email> + <name>ML</name> + </maintainer> <maintainer type="person"> <email>gienah@gentoo.org</email> <name>Mark Wright</name> diff --git a/dev-lang/pcc/Manifest b/dev-lang/pcc/Manifest index 876212bb4e81..2cd9282b9959 100644 --- a/dev-lang/pcc/Manifest +++ b/dev-lang/pcc/Manifest @@ -1,5 +1,5 @@ AUX pcc-1.1.0-multiarch.patch 377 BLAKE2B 5b5e86099aef3e173c194b535cbde726a41bb663e2754a848a920b2c967c5dab4b9041a7a879b7649fbb6eb8019eda46b7cfbd63bb8fa29067a9d2f7aa4b2466 SHA512 117f4a574f7d86a5d39b88927d56843c900aee539b07639072965f8c0b30120b5900dab3c7fa8d421c9dd6ea539fa0f5b55fd34be506652185f034d071f34195 DIST pcc-1.1.0.tgz 848427 BLAKE2B f94dd3eb3f96145e3fd2d5d89ca5a3a12c55614924c1bd2ccc219b03b4804bb34904b7041efb6237e06982b3282578d996510ffc9adc916e212f6f7d1bcb5a35 SHA512 5bd2b59fbb323016d215023ce77793ae66766e8e8192b44bf0707ee444658022e1645669c13eea8c81bc55c161eea3b0271d6b3098b8a7d51ce67eb86c7527b4 EBUILD pcc-1.1.0-r1.ebuild 784 BLAKE2B ad1916861a76104eae7da63eec8899cad0bee63e85fbd924a1cf3c417ae16817565f620d4dedd6d65d8efd9a2225fd168e55e1ddd7b0e9d255acd52d7160e00c SHA512 6691451956bd7c1ff1983174ab5fcb13c420f9e1ceadceb2b87186c6a1cd88f15e51b5f36b0e82a3dacd83384f9f6c69bbc34373fac2ce4b102f916e30212b1d -EBUILD pcc-9999.ebuild 882 BLAKE2B b6f2e19f40200f3f02009d50814311a4db2e6a09d043d1f6f63909646c9564163de8af28aacc9f0afcd333a7ac16cfdd53cd267ff6686ad39e9b587b591e0b0e SHA512 74b35fbfdfbd5b4f9d371205d9a6c1f89640f45531ed46ed70bb5afdfe6aabd31a8ca4943502bd72cb150d556b1ccd04680b5046fcd6b25f875d0d5325462578 +EBUILD pcc-9999.ebuild 881 BLAKE2B 8830fa7717dc63de274c52b4194932faed799238f7b847746a2505314d9589d90ccc664f792b0ab91f4c2307184d2a9bd990154caf6bb24bced48670de94edf3 SHA512 6f5d3cd0d965769d0a67071516aae38ec140667bb7731a71f4842668b2bda448db2a14194208741991a2f306d4c375658832205a14dcf1d64f992558ff441fc4 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 diff --git a/dev-lang/pcc/pcc-9999.ebuild b/dev-lang/pcc/pcc-9999.ebuild index df09ab6d97d7..f9f4e3801713 100644 --- a/dev-lang/pcc/pcc-9999.ebuild +++ b/dev-lang/pcc/pcc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -36,7 +36,7 @@ src_configure() { } src_compile() { - emake + emake } src_install() { diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index d70bac2eb9d9..40caeefca102 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -16,9 +16,9 @@ DIST php-8.0.1.tar.xz 10642344 BLAKE2B 38e523f316c41de61b39e2f069018fa32cd9886a1 EBUILD php-7.2.34-r1.ebuild 22862 BLAKE2B 5b0b472a80cf298ccbefe0d71a4965d8bfd3de5dd4a57f9f21642119dacb84b0f705f3d5341434fe23bee8e2cffbc2298bffb02a4c551dff8f8f097eb74f4d4d SHA512 7bcfd601092d8d766f620e53d9dba40c71da386072a4ffe9a358ba7a28ff765caf0b19cda385e02b99d552cb565f522a9daa98a1cff9857da65df3c864031bde EBUILD php-7.2.34-r2.ebuild 22872 BLAKE2B 041fd990f7c2e89ad83476bf66644321cad0c6132d6db5c88c07cbc44fc6246d012c2b0ea6553cfd886665bd8b34e300c986ed8c3de9b7e43bd4e0e0d9620525 SHA512 1b546d9911fc81bf306af751b0571efee65063388fe9d879da360bab61231bb321fb69c3c494c8bda5ccc2cc871308fd17e4a413e7654293640b00fdecb0a4ac EBUILD php-7.3.25.ebuild 22653 BLAKE2B 7754e07d6819c46459595633bb6012e397d326158ee3881024af680f3de8480647c9eccb5cc4a1f608793d616283e676a3e574a3f3257465012f85857e250530 SHA512 3de2770a6ea7c3edc4bc44e3e123848f187b1a793fe4980d2921f80587e684d2fe9407837c9460e76549a042c1a696ae5c6c86d7f9e95b18dcad8ac1db48612a -EBUILD php-7.3.26.ebuild 22663 BLAKE2B 32aa0281b56fd542aff37d3bf5347e038d4a5796b029c45e2357cd3d15a79e16353ab0e7474cb52ebcfb958ca90b051e9c57a34edf8f260dcdd6d9f95c6935eb SHA512 d4699b529998b8c3552dc763579a5edaa28489e1c7dc629e743f92349d85ad16d75297fc259fb3bce87966d3c702a57048f10904aa0c8c6871d2aa10f53c9ba1 +EBUILD php-7.3.26.ebuild 22661 BLAKE2B d8dfb0a106e71d5a0e8288d10c0c3fda2843edab5cf03d89b7f2046777b8be49830021f64125d7c57c7d613fa681ef4035def5ae03b6594f8b73fea845a1ffd2 SHA512 27bcb234347868923bec1bec10a49154eda217f981e3427316d1edb2ceddf3e74795cb0c9efa3e0df927cd5f3ee6981cb9a427ac9241412d40916d9d28d9afc7 EBUILD php-7.4.13.ebuild 21402 BLAKE2B 91ce77170ab0f4bc35581b16bbc025e86d218e4c0f72e12df89cecebedb17538b4acfc3aa890db7e59daf38ba1572e558b7b67ceb57fc39813a500ba0c7ae430 SHA512 5facbd6181da839b559c4c3d8af489588a88eec158d381a0e52224c90b3683e70a1c8500db44dcbc73eca5fed9e0d2c18dcc8360e3d821a9953f0771622a4680 -EBUILD php-7.4.14.ebuild 21372 BLAKE2B bc057cfd409169cb218f0c1e0bb42eb71b811c77f45cf5df7e9aab0bf206b16b9b9487b79bcb0f7c6c654594bde394884e552b703204d9f3bd00fda30ec9a6fa SHA512 47dedca5b9e87fab084ad1d33489268c72b1eb249d0da852c8065508d02ebfb2b86ead080e3ae9cfd30272f75f5005e94f55dc69a68e49270b430de3f10f05b0 +EBUILD php-7.4.14.ebuild 21370 BLAKE2B dbcf6abecae43015b35a457d31f007133c0223b0c3ceec7a5657a0b1bdec8d7d334824b1f562355eb302df0ef0ebb2168b9423aea69e3dbf9d2930e463ab662f SHA512 f7d1baacc5e130c3816f0deb0816f96775241e0fb9a18723cd922a4b8c8ded4726810d8bdb8d15d23a22d12d97e1882539d71946f97f0ae81f2e5cb43a24f77e EBUILD php-8.0.0.ebuild 21265 BLAKE2B 85bf83fa4d71eb9169e1e760a39a532d6fa0e267be1f5dc0cf3d33ab064dcf361f8cca96360728038fe562953a39e2712b9a6f8f51e5080b65af5eb2fc743922 SHA512 c655bb261c8d88f8dcb486c4be357b261d295aec1b4acf136621e40450d72b313ec7eaafaafaf5c2f2a06a15f64c45849bcbaf503ee28c35aa3322d4815af0d5 EBUILD php-8.0.1.ebuild 21265 BLAKE2B 85bf83fa4d71eb9169e1e760a39a532d6fa0e267be1f5dc0cf3d33ab064dcf361f8cca96360728038fe562953a39e2712b9a6f8f51e5080b65af5eb2fc743922 SHA512 c655bb261c8d88f8dcb486c4be357b261d295aec1b4acf136621e40450d72b313ec7eaafaafaf5c2f2a06a15f64c45849bcbaf503ee28c35aa3322d4815af0d5 MISC metadata.xml 3216 BLAKE2B 6118c94f2ac3a2f283eb035cbbacb12343476b4ce22594a00cb7ebf063abb106a0ed5557d311127b8c1e2a53263103ded790cd12d20c6b410ab6f7d218d95ed8 SHA512 ffb0b46b30b1add0fc166e3afe1317e70041a0fe849d4c05ceee011c1b5e130fbde3b86eaf876a4c8a2d23fbd7824f95299642b4f60e129436befb00f4b124cc diff --git a/dev-lang/php/php-7.3.26.ebuild b/dev-lang/php/php-7.3.26.ebuild index 1a73813dd910..96b985300a50 100644 --- a/dev-lang/php/php-7.3.26.ebuild +++ b/dev-lang/php/php-7.3.26.ebuild @@ -19,7 +19,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lang/php/php-7.4.14.ebuild b/dev-lang/php/php-7.4.14.ebuild index 74547bb5b1c7..81b7710205f7 100644 --- a/dev-lang/php/php-7.4.14.ebuild +++ b/dev-lang/php/php-7.4.14.ebuild @@ -21,7 +21,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" S="${WORKDIR}/${PN}-${MY_PV}" diff --git a/dev-lang/python-exec-conf/Manifest b/dev-lang/python-exec-conf/Manifest new file mode 100644 index 000000000000..c05ea706bd8f --- /dev/null +++ b/dev-lang/python-exec-conf/Manifest @@ -0,0 +1,3 @@ +DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050 +EBUILD python-exec-conf-2.4.6.ebuild 1168 BLAKE2B b2ba54c0b6f2e4f0f62c3f3e4769b378eed563831975065b69154efbeac4597f9d5b101bf1b32af427f601050bb881dd68bff48d65cbebe4b11d79e2d02c5996 SHA512 302786afebe1b7ab62d800be280976c1790be8de3157e7ec8ffae36491c9682ebdb8e9a02eadbd39cdf715e7a1c7f600b2726c540525645c93cf8c30802fcada +MISC metadata.xml 240 BLAKE2B 97c523cb7da7b4b1e2c1809fadbe80a88f0760dd98356fc1b9a1d8f7514fb8a696f1d36bc45285a3dc169994c78176d2bcf1397df51f9e3227c7b2dff5849742 SHA512 57181dfbeaab954ce3f81beb68ef3458f78d2f1fb9c9c2954e0553d19806b3455721f8845eb45beccd79a20941f682487fa0e09763339012a4b5057ed4e2a524 diff --git a/dev-lang/python-exec-conf/metadata.xml b/dev-lang/python-exec-conf/metadata.xml new file mode 100644 index 000000000000..aa2793060bf8 --- /dev/null +++ b/dev-lang/python-exec-conf/metadata.xml @@ -0,0 +1,8 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> +</pkgmetadata> diff --git a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild new file mode 100644 index 000000000000..db918e82c65e --- /dev/null +++ b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit python-utils-r1 + +MY_P=${P/-conf} +DESCRIPTION="Configuration file for dev-lang/python-exec" +HOMEPAGE="https://github.com/mgorny/python-exec/" +SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${MY_P}.tar.bz2" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Internal Python project hack. Do not copy it. Ever. +IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}" + +RDEPEND="!<dev-lang/python-exec-2.4.6-r4" + +src_configure() { + : +} + +src_install() { + local pyimpls=() i EPYTHON + for i in "${_PYTHON_ALL_IMPLS[@]}"; do + if use "python_targets_${i}"; then + _python_export "${i}" EPYTHON + pyimpls+=( "${EPYTHON}" ) + fi + done + + # Prepare and own the template + insinto /etc/python-exec + newins - python-exec.conf \ + < <(sed -n -e '/^#/p' config/python-exec.conf.example && + printf '%s\n' "${pyimpls[@]}" | tac) +} diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest index 09270a5d3517..23c4b742078e 100644 --- a/dev-lang/python-exec/Manifest +++ b/dev-lang/python-exec/Manifest @@ -1,4 +1,5 @@ DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050 EBUILD python-exec-2.4.6-r2.ebuild 4110 BLAKE2B d4116d68cebe0b02af7a1eba9491f5dd210c83fe5d1c60f439062866d1eab216b356f9e596c6a03e6be0153f45b5c84333e20a1c974263151d161f060fe1f2de SHA512 d5e952fa44d34ec4cf3cca44b1afd963ee14aac6a30c1c42664d8816a9d473c3498dcb9345d99cc7e2582b514b66bdd8cfec7ba522a522e2b87e0e30137941d5 EBUILD python-exec-2.4.6-r3.ebuild 4183 BLAKE2B eab9b871279d401bbb5e44d5eacd9286accaec1c9ca8c7f054d536d856b2199282d1de13652d22e6056651c10dad9870f966e0694b3ad2669671a2481f6cdadc SHA512 1be119f3c2d1f4ad4cb3e69e2718d3c857a64de4e7e385b7c60c8036133580369ebc8fc5d7ad8d7c3a965e5b29fda3871e98154292719f0d98c2e93bca311c77 +EBUILD python-exec-2.4.6-r4.ebuild 1714 BLAKE2B 271d84d7e17f608e30503261c2cb2daad2381a14136ac8465d127f750936d8c33f2e364c2649f47926ebd59230a987c316b2edf1415c15bc6ddbd64703d6942d SHA512 fe43e2d7ba2757c3e1a5e5a7815ba461cd0ea0fd3ee97cc44cb94c54fb80f263245c0545b28647850c26139861f4c00c06e2638171f9a368efcd3d2e6cecdc9a MISC metadata.xml 791 BLAKE2B ba836a4142e78972a7a6b603749bb4df0fe99cf0f054e286d9ede512db5cdab18f18fa484036e9ef7e19c20afcf1c94b70d0f813e7790dbd9decda996dd53713 SHA512 be18445f875537d03532d2ab30241951c2abc0929b382c351eda05003fd84cd84c545018941117bec5a2f74e2e2a1dd17b60bb2dae99eb81909826947ceabba9 diff --git a/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild new file mode 100644 index 000000000000..414d52b94501 --- /dev/null +++ b/dev-lang/python-exec/python-exec-2.4.6-r4.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit python-utils-r1 + +DESCRIPTION="Python script wrapper" +HOMEPAGE="https://github.com/mgorny/python-exec/" +SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +# Internal Python project hack. Do not copy it. Ever. +IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_} +native-symlinks" + +RDEPEND=" + dev-lang/python-exec-conf + !<=dev-lang/python-2.7.18-r3:2.7" + +src_configure() { + local pyimpls=() i EPYTHON + for i in "${_PYTHON_ALL_IMPLS[@]}"; do + if use "python_targets_${i}"; then + _python_export "${i}" EPYTHON + pyimpls+=( "${EPYTHON}" ) + fi + done + + local myconf=( + --with-fallback-path="${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin" + --with-python-impls="${pyimpls[*]}" + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + if use native-symlinks; then + local programs=( python python3 ) + local scripts=( python-config python3-config 2to3 idle pydoc pyvenv ) + + local f + for f in "${programs[@]}"; do + # symlink the C wrapper for python to avoid shebang recursion + # bug #568974 + dosym python-exec2c /usr/bin/"${f}" + done + for f in "${scripts[@]}"; do + # those are python scripts (except for new python-configs) + # so symlink them via the python wrapper + dosym ../lib/python-exec/python-exec2 /usr/bin/"${f}" + done + fi +} diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 39d3af979974..b0446a685303 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,27 +1,41 @@ AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a DIST Python-2.7.18.tar.xz 12854736 BLAKE2B 060a621c91dd8e3d321aec99d44c17aa67381998256a1a002d316b38288349884d5960de35c49352d03129ed0bae599e641ec2225898158ebce50a7a2fd74d2c SHA512 a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c +DIST Python-2.7.18.tar.xz.asc 833 BLAKE2B 1d98770e46171971fb99994508d238c01d2755281d2f94353314014d9e83e0ec5f0b3e3950ea1fdf5fce9ba6b8f55312355845c2a3fc4291c27ee56fe6215448 SHA512 c2a5f5a52f47dec52460ad3275758d4e5de6e7075c3def4353c988d74d563a39b42cae2d5eb24e2a23a6247cef69100f91620b11a49c2359fbf99b203c9cbda8 DIST Python-3.10.0a3.tar.xz 18676916 BLAKE2B 86c8e3cd5d9658a2b1027558eda42294807173cac39010737dba6a0bf75a3a7211297cb79061085ab0cea52eaaba521140ff67c3b6edeebd677429191f4435b5 SHA512 a361c04081e9bd7e740c3311d92ec1428f12c589613ab39ed2bb1ac5aa20e4d8bc6d6e76eefc20edd459ecf8be1720f3985126be38407fcfb41f5a6efcea3998 +DIST Python-3.10.0a4.tar.xz 18706760 BLAKE2B a1237b73f0890c3da042eff7b110bd8da5b58ecd8cd53e673d3f91555c602b6b5f2b771023749d01cf3adff45935a7e3fda78af55cf7e7279a451ac5f2902b68 SHA512 2bf756e581315a7f242683931bffb275edcd5d864b8242e3de42ccf07cca27208f0468ba1663ff12263c128060bab400ba2ed707e0c3bcc422a619adc3171c34 +DIST Python-3.10.0a4.tar.xz.asc 833 BLAKE2B 7cbfa39f918b9bb8dcdd46f2d5a4e6e7a24060bc39e8b81dfdea3fa2c305295da3bf09bd98b36a39cf8ec7619943fb0ca66f80d704bf3618b981cc22afdbd2d5 SHA512 6b94e27982e8344f0bd343bb0e04041a82608eff537105815a90a54f48cc6fa4804af10403e9729ada469c876352693144e3922de8fb2e48dc78151fa6520973 DIST Python-3.6.12.tar.xz 17202980 BLAKE2B c8d22e4d57bcaffe77cd902cda3a473e73adf2b74ab104c23b4d846f19632a24cc0c478af84079b16d784bd1c0956824c06c1f6134fd24f54e58aaab0fe96bb6 SHA512 1462801f3f6626a853097d34ccdca9838c4c5bd81ecc3abc751003f5f2f8d36eecdaa4130ef4218de351c5586093c11669639a34492668fbc5a2a4a241f4a070 +DIST Python-3.6.12.tar.xz.asc 833 BLAKE2B a5eb9f907732bb5afd8f56115ab830ed6b6f4545e4063cfe316fb7aa1ba8694fcb8c936919b4045d9f5923446f8ea20978ead059078ed50ad48a82a3bb5ae941 SHA512 91d9ce0c471359f6aa3d5d5dcad7316ec6ed173f895a51e72b1853dc422fda57a00411c88fdc40a8e21888d964136b0b032e15b215c3b6c62ffc82bddc580860 DIST Python-3.7.9.tar.xz 17389636 BLAKE2B 484833aa2aa4e29051a02969294f72099ff6f1a47d944b1a0dd15f8e6c22a0406d551bcbcd1048cf89defedaccf060733211e34b38e31fd8391dd823eaa35bc0 SHA512 e4217b25529b5336e43b63d17f3758a8177a58184564cf02bd92a312f58dba9e096485c9e3cb3544f966e847ea15b3ab30ed065d28a6ca52a6d7e0faddf7d9f9 +DIST Python-3.7.9.tar.xz.asc 833 BLAKE2B a95546b90ff87c13492d7f6e0d8e6d263557ffb55f72de212ec21ef5fb6b3c838e0a13c5696d577d1d7c46d0386698e8860d9819e6510e85aa88709011fe1e72 SHA512 922da6056029416e1dceefb83723911d5e2cc972d88c0bf1a08c35c8fe11279eb350c44834d2cc5ba94beb9b7655ecae28d8f5b6e3479eea7fcd09f67ec1e1c0 DIST Python-3.8.6.tar.xz 18233864 BLAKE2B c8a8ef6055e344dda30eb808804cfa62016b4f840257cffd5a495e5932f5696e50579d49b8181a487c9cd4a89bdb95656e80981039783a21d20f7980aa2c9883 SHA512 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560 DIST Python-3.8.7.tar.xz 18261096 BLAKE2B 6ac20efef41e828cb796aabcb7808400d494b9b48759950c8c15ee90762394f6763163d8e37ab407c1c79ebb9cda09189eaa969a75f96c86a96ccee962443924 SHA512 6a27d8eab3076930df46b0cf127f9b664f8d4147349b2b98132f464deb7f69d87e0167e8ee8e6c64249125ad73760d965ecbc81c252b63a1e7aac95594c62b74 +DIST Python-3.8.7.tar.xz.asc 833 BLAKE2B a629251732d1ea6054564b6b1a9a2b3b716e20c8fad1b6b69a9c64aff7fe7fca7dc6cdeef52d9889873f1e349c1cb1c4fba4483d8ded6ab2cdd279ea4abaeb70 SHA512 ddbad087a1d116e743e11f50d29ee0563241e4397312fa76691bad30ef62908d281ba77b89dbd8f348faa50f1c953399d79ad6c2ab77828e690f3a5a3b708bc8 DIST Python-3.9.0.tar.xz 18866140 BLAKE2B 8e12b64e187a65461473ac3b281dc489f0abac586e0755f6dbeceb236b34bdc008085eeac9ee1a19d76f5ec6a2fbda623985454c9d0164c4888a97b8cd940034 SHA512 b141039c9701a8cb0d15cd11a279153077524af4d0599e7d2c7279d4c18d05fda06b33ef82342d875de996c7117b7dc6eb154dc3669d38a1efa99801aeec6c5e DIST Python-3.9.1.tar.xz 18897104 BLAKE2B bcbce176510e8e7c6ba6070588bedc52121c21c5271f59b3d629dfb542c51ee62622b2ca53a6e2041f1a51b2d089368cc4de9bb749e8ebad9a2c4eb4de83538e SHA512 b90029d6825751685983e9dcf0e0ec9e46f18e6c7d37b0dd7a245a94316f8c0090308ad7c2b2b49ed2514b0b909177231dd5bcad03031bf4624e37136fcf8019 +DIST Python-3.9.1.tar.xz.asc 833 BLAKE2B dc445ed9797668c5f0777259ea83330815ee516dafc752e6a0d903bae5355e76360afa5ed318ce09bbbcfb4df6269b06b6fb6b7d9c074678b612bb1ea9e3148a SHA512 400259f499820e0499290402f095ee5454168907f539de705cad4f0e5586b1c67a0ac45b89bf099701be55146a5eed73dbc9e2cb15562fef34da2813ac82f342 DIST python-gentoo-patches-2.7.18-r4.tar.xz 21352 BLAKE2B d322f5afd63813d7c9280c75f942bde75ee19793e121d0406c4f229ead53324bf3996342eed9a6c1aa474894afe7f2dd70aec38aee8042993a5274abc288fd31 SHA512 1cb0be8e79d0c6c55fcbe3f3dabf8b760aea0e60d888ea39d3e69de03b55738c50b2cca06586c1cd2896956f5764eefd6d3f9fbf2de0d0ddfd8aab86837976b6 -DIST python-gentoo-patches-3.10.0a1.tar.xz 8592 BLAKE2B 066fe89725469649a88a0b0c9f62d7d1380feb704ed12c696871cd595e4e920f23b54a2c771e15b5d2345dcdab21694365ef9b29e93f552f74d13642ebc59200 SHA512 e86df9e08ec7306f6457b5e3490171966022964fb700046587088bceb3d8977a45fe7e944f7dd39ad473000654f69f495b8c67edebb13bc12000b32716845533 +DIST python-gentoo-patches-2.7.18-r6.tar.xz 22740 BLAKE2B 1727fcab273dfe5e5739c7ce1cd7fb3c6bd13c2bda25a2e4e0609a2e727a69318a46b7c2173ea7746f8a124e778b276408adc9968ed2025b8643e660bb3d3ea3 SHA512 975fe72c5b2f4577563e8e972c70b7eec7203790a500e6f051fab1f66c71e5ae46fcb3c571a9e6346bf3a0d1dd48594a61bf2751007e4f5e3d19f8db6146c99d +DIST python-gentoo-patches-3.10.0a3-r1.tar.xz 10068 BLAKE2B 8b305a31cf0aab4da9e27e671b4fd48be6224ff8508ed1831ad4149761bb263cd9a694e90d52335390643a537dee2d6cab4e086bd521c99217e81845b4f9bcf1 SHA512 69c52c61dd2f1ca097fafe13c27cd1979280675bef6af8e8e300f3791d7eb50368311e3d055075f4bca01ce02d9e97a94fcd2662c78f14cfb6a37d77c39a158f DIST python-gentoo-patches-3.6.12-r1.tar.xz 16540 BLAKE2B 8204b6f25e1f7c6fef024933d54bfa6085158ac624a6e5a8d51576da2047b6db791be5d071c483fdec5c033b8fa8ee3d4e176a3e442defa556b34a304de3b7f3 SHA512 ad74c73b4f963427e66ac6187e1569dbfbbe3c916c24971a1eba4ad7e2f94e39c970f80e197c0498820451f036b12f3076b46cfd73bb5d6d56183ac05453d9ad +DIST python-gentoo-patches-3.6.12-r2.tar.xz 17988 BLAKE2B c252bce5ac49b9af11174d3c974d95c24ec280230cede75a7650cb914f8acb3d41b8d575e469fe7f274c6d3bc238847b82e815bf1444c5afd7292e00248e3365 SHA512 50813fbd810c8b865c0f0f8d56780af7a9e094336ba486ddd94ba8fb0a83b5373f41274bbb10c3d732449ee5b2076b7430404c02bfac10fb9b27f92de79c25e2 DIST python-gentoo-patches-3.7.9-r1.tar.xz 15664 BLAKE2B 271b95a52f4ba83c1aee6f68385462c9af8f2ab575267ac068a793e99f7c9739eb4b98dfa7e9280510a709557d418db04f26b5b31bbfe95dfdc13c1773510d2d SHA512 38df628de2f2835f975f6f06395d32cd63051af87b9bf8b06eef2f987bde26a883923bcab333568c122554b900bb17995a8c7290b6a58f942bd942dcbc70d030 +DIST python-gentoo-patches-3.7.9-r2.tar.xz 17068 BLAKE2B 2cb838e6ab2f76b5d08df42a1187f3cdeaf3e26d845307ddb6f492eb46cfb14da26f7ceaca7ca09a5304ba717006d182cb632a0927029419064673e58a06d232 SHA512 fd9bdc0ed989ff9ca5f343d2fd04a9e7f4c078e434b03288b19797dab71006d89d601cf91d651a1dbb8cc6c66e829c977cec98e971b30c5f5cc29a751dc34d50 DIST python-gentoo-patches-3.8.6-r1.tar.xz 15880 BLAKE2B 9a08cd23af56bcc2ed0dffe4850698be6e0bcf7c44d3eafeb250e328a93833dc3e9ce084f1be89450d1e123cd72d81c6271edfe34046d1bab3d7c10a98d0d9c5 SHA512 83474915cab0928d1d2f4229832bef7c093b2943770fa900a7445bfaa633544f50791aa8b4bc4191662af56feef166814d98eb6fad2c0a0eb9db1f8f4806e689 -DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102db8f00902df59ee12e8501b6c7f549dd4b26a6289bf34ff8dba02b369ed7875fad3d18e177afe9e367db4cb06f2ee908482f9e SHA512 7afa8e54f7b7e6ab35edc16d4214384b8ad8a03068d1984656876d6477b278af931e8c797d03d1bed2f10f9d58ac387db1a43921e54fb17cf4b779f33820abc0 +DIST python-gentoo-patches-3.8.7-r1.tar.xz 12572 BLAKE2B 7658ae56993674a7f57cb2b6d9f23e9d01fa75f00edcc67dc3474bba0361373555c44d47c155cf9ffcbd8551ff2ae56bc22a25bef1bf6b3efed7314b2824d777 SHA512 76d0e4d18fbeedc28430a3dd1656cfafdfefdae28978baddd3e0102d0fce83be173b58da74203fc6a90cf50c63fa612f0b78e65bc59a41dce4739eead398d352 DIST python-gentoo-patches-3.9.0-r1.tar.xz 13728 BLAKE2B 50e85194c6bafefb8a0ddc4c9dea39227fc2c170db37ab44fa1e068340fa2fc5a59489f50431f0792024df551fc54a20de594579b57717c89fa134b3f000bb6d SHA512 a38c2800e3a0740af79f75f4120c925c7a891aa1f14a71ab56ad97fbabca3573c571140da3f34050bd9f97bd854a704453a910fa6883162196e6d1335a965b61 -DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb -EBUILD python-2.7.18-r5.ebuild 10624 BLAKE2B 23ec34462ef3d788a1e1463bf709d80b706e7f1349b21e87b70f9275d6c56b95d13ee6c044b707cb19ae4898333ffc1fbe7639afca079af4660486f19172214c SHA512 3927f34f85354cf23aa16f22e7d68f7b14f574c8a9e58a402ca06db205b79ba433861a678b3787b4384818e572b82fde8e8eba2dfa4510a83d93951df4e3acc8 -EBUILD python-3.10.0_alpha3.ebuild 9628 BLAKE2B d4db8c51c51da54f03dceecc5a818efe94924477a163fe253b9368eca52cffbda09fe2506d63b743ba53c9214a2398e28684ce680213fc7c13cbbf8dd349bcf8 SHA512 c023dca89e22c57822f8f7186e5971cc6a1cefd553f9a2148db55e514064073e9a05300ee2b765ebc4ed877edf29ba8f3a51e03239404a90c74e0824d3f640bc -EBUILD python-3.6.12-r1.ebuild 10622 BLAKE2B a6f43acb1f6398a7a52889b683113b303f79188969cc3da1c0f2b8ca5458c522886367c5940551b2e830c723870a134edefeeb1682666bc90c500fbfbda13d90 SHA512 57be0a253837e364572376053b0b73457d67fe033a419b554077700cf839550953645c546aca319422ed362ec19d9242dc383796f56fa7e86410356956ceffa9 -EBUILD python-3.7.9-r1.ebuild 10157 BLAKE2B 8801f5d1e932056ed58f5d51592f7d454244d73c748a12fa7da414912f4bbfc285208aad5b8eaa6d5b220da8759171345ebc5eb069b1cec895ece81a18371884 SHA512 cd063e7fccffabf0cc5a0da356daf1af7438168919603a551eb86c1d97f864f6362769b74e00e1a8db9b815d1b2d80e7adc04a99ac31e1e2c176bf85a01ec8f2 -EBUILD python-3.8.6-r1.ebuild 10258 BLAKE2B af5c72f654957dec4201f930e0ff9d6e9b09ba2db94e8da180ef06078a80934089d633167d9f7c6b2bd8bb1f9bc5bc7dcb932930e161f04d7aa6ec92e3dde583 SHA512 db97439e95a42d9f61c0b0f5ca51ecd490acd35f27ec83652d36e09c7432273baf53716a76bc61053c3c3ac6cbec393241d793a822d90ccfa18fdd42a8e2f173 -EBUILD python-3.8.7.ebuild 10264 BLAKE2B 539ee3af4b4820dd7677e351f16e50d706d6de8d45b7b48374653a024fa948f1945e97339bb7f961653c2d2ef52b5ba9216c86ef39cee9af16317535c298c515 SHA512 36e79faa5468446b33322c7a4bb1c4142307f51525690c3cdb99cfbefad362535c637635027af904215130c0ad6095cef27b600b9894cc4fc846bc93ee4603f2 -EBUILD python-3.9.0-r1.ebuild 9533 BLAKE2B 2cc0fb7af1c1c51ca3270fe06c640c8d09a2733410a1a9a96c5bb2740e5b9abe1116de81ee4df60646fc76027ae44c27626b47ead3856cdfa211a91539d256da SHA512 cbf06578450b0401b4bb8ece6e1a5f451a499286bdc2a2b2d8aea1d8b847e921ce09ef07ee54475d4b9588e72ee666ad62407f5be01c36d8809fcc7de147fcf9 -EBUILD python-3.9.1.ebuild 9542 BLAKE2B 7534f920099c3cfe5293ba093496a5858e4107f8e9e7f885c62a8d70e2c7ae4a0185b28d3753d07809b8bc99dc71ee7c4aef94880989ff43fc43fd77cbcae076 SHA512 f4fbf2530ea2c7c64d2aedaaa05890977d45709b5d6bfea2e8bf417996e59f6f8be41ac59b8811fc105b7c6f13ecb8b514fa7c4643a6871286f974190897db09 +DIST python-gentoo-patches-3.9.1-r1.tar.xz 10464 BLAKE2B d69ce207020b7a34eb45c149ce88001167704763fbc373a8d5aff48a1d6337774dfb6c75d477442516b8dceb87b116e6d8cf3231334ced9b03aa970aa0d2e8e1 SHA512 72b1e37b1ceac9a0e95aa63a7dd404c69f60ae7a8aac472b8c17100c873a4d28d3291231643862c9d1cfaf990040f8e780590274314047adee199c159d745369 +EBUILD python-2.7.18-r5.ebuild 10188 BLAKE2B 42dc7445a0579a3841091487402dff21f20a381113c721ffad04abb956fb5df76a5dac23a1a04278e1e70f16780c5df89ae6c78d9eca030a435d66625d3afa34 SHA512 4e72cf3e65ea8d1e3130a0bd7299de4ff5579514b8d9a0c7fcb904801c2f43ebfc59cdeef0fabd93934a10410b10cd9f9b1ec27aa94522380a609a38134b3a1a +EBUILD python-2.7.18-r6.ebuild 10537 BLAKE2B aef3b1571bdc86297f043b3432bc15fcba64e34197d5c6fbc67eced999f2ce1a083ad4f537e5b348ff2cede0068939ad2115010724482705a3de7e09bf1436ba SHA512 c159c8644c97323174bbd43a6e83b216dcfcb8d29268577eff020ec918ac85d3aefe4e113f0ceb716385dac68ca4a409f102d920266670997761b3a77080490f +EBUILD python-3.10.0_alpha3-r1.ebuild 9617 BLAKE2B 692262ea7574f4b1b5c54e50ae5d32cd1462a234810c1ae2b85eb24e141930f65abb51149e17436e18667152c2df8c5ae2eaa4a4051a45f3c13797e4a2fb772c SHA512 9b0ebca20c6ff10669bc2a3c30fabb249dbff58c56c5ec06fda7fbb463d76748950390c1afa74ae1b55878f40985ae58230874e93d40ec4be83b31e8a99706ac +EBUILD python-3.10.0_alpha4.ebuild 9945 BLAKE2B 3c111e986f5556d29ebce70d55e2d06b49685b5814fbb9fda465c7c441fd23d35c7a3fd12b5192ec2c6ff75fb6629e93b293b50e3147420a6869aa33cf35de4c SHA512 be722ed6a152a1f52eb331c8634afc3ec05c943dbf20086401d95a42af627e2825ceba8fc701a428ee2325d53527e8a70b162a53ab11eb68f4be13e06d4a59bf +EBUILD python-3.6.12-r1.ebuild 9738 BLAKE2B c5b923a85a870d0c24a4ec96651609afa234c055719fc25cb6c3322172526c898428ca5058e62970ae1c1d0be06ea2a1df148fe9c703de9d0bea26f8195b2ad1 SHA512 e137da3b1ad136f8a6831b709d7ce326d434c4ff44b1b3685eed05c4269d194d20883c3b84a5f3b8624cbf0b85c4d37586bf6cc2c5deac9a2526c2d2ca10c8fe +EBUILD python-3.6.12-r2.ebuild 10085 BLAKE2B a61739f785e8bd12dae3926240adb090c97d25bbb0df204a17ed8559ca8f493b85b9b09ec4df8e821b9e5f16e5db0c507c498a9ed3a6508a84fc4ce944c31672 SHA512 2541637b170781bb566e6b59e33472141cf4cd0be91e584d0d7ab6e074d63947f211776f77f70e76a34bd49dabea6c452708bb16fcaa95ea5b33c5534c8da3ad +EBUILD python-3.7.9-r1.ebuild 9273 BLAKE2B bb987ca9554fdc66d47693cea2a51c13bfcf1470f343d873831c2285855a4d6b58f70c3c9e1fa221172a8f7dcdaca9725ab7634503a99a87dd00ee586af25b6a SHA512 0005121d2e311cfb8ddc153efe18330ca9f7d31aa3eada439696b25192a9b99869b1c46d85b8e5d47ad659efb0d476f829eb9f08840e2266864c15851b3102ed +EBUILD python-3.7.9-r2.ebuild 9619 BLAKE2B f76c628fc328b685d2ef865e86e90cbffeaa33c4b99701d3e99c65561c0930af58bf988ad3a0d8b3ea3320d0657f5ea468f039ca5a5d2fa9689527b1994c02ae SHA512 85d01262fa84a8f92e6d71858a08d79c775592d2cf7ea1aed2fb21ee3ab5fa776ff61c2948faf0bc8f949fc33c965935970bfa666146b4feced8c8daf0cc4096 +EBUILD python-3.8.6-r1.ebuild 9374 BLAKE2B aa3ad15a0d88622c15d5066c691ef284ae5a862d81ebc0bb4b462f9fa4118ec0de854f2b2eb6c36e415c49e3496068e3a5a95e363d0946331d54d07a8b1ed844 SHA512 c1688391a2f1a07b61e93fead2a99537483e3f3b062b04b41c4ff4b4cd27f7e9816afe9b08f0ffea487d1ab7d11618cd5e5bd11acd33b13df9c6606466432d84 +EBUILD python-3.8.7-r1.ebuild 9720 BLAKE2B b357363d25a7015407b898a7faf70d614138e33ec90f6c8934ea0a483c8f3edc138f6d06730c5bb056c43e4c39e5cb185ebd0b7983a19993f1f1d927fe1a5ee8 SHA512 921f2af8cc56a21766927b7deae655ba462fce9e2b26c81b483ba130e466e1b5b25913d8a2593b9b489ee0578262a2d12ce9ac858d525c067a5b621b787087f2 +EBUILD python-3.9.0-r1.ebuild 9519 BLAKE2B 70df0df3732280427304871f2b20f6b1018a1e590e479d610ad2b8de055dbe1a56803a35722667af3184c7b888d8c3d64c4ba3553ca724ca4f0baa85843d18cb SHA512 515b89c3fb02e0e6a71ea7db1c51cbea2c5e42a549e19ac93f927585786292ab2d9fc3dbc6f21a9365ad2b0d4b8954f430b1a939c6903e66e29fc4723d297809 +EBUILD python-3.9.1-r1.ebuild 9866 BLAKE2B d609496cda659ae0675e8c9549943d5233e80499ad5a0f902298f8ab4213f1130fde9e9acbc755dc9c580e99d5413c2ce8d00e7066e9893da379928f76bfff19 SHA512 c30e4dba7e753f3afd41bb1573a1206d7fcd2c95425d1ed4f9239b762c4084597e7bbdc7adf5f09370b4b999ddcb0c01cdf5e8b0aae750d87b94e0ac2346a784 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18-r5.ebuild index 022e586961cc..6f8f0be89ada 100644 --- a/dev-lang/python/python-2.7.18-r5.ebuild +++ b/dev-lang/python/python-2.7.18-r5.ebuild @@ -62,10 +62,10 @@ DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" RDEPEND+=" !build? ( app-misc/mime-types ) !<=dev-lang/python-exec-2.4.6-r1" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" pkg_setup() { if use berkdb; then @@ -346,24 +346,3 @@ src_install() { dosym "python${PYVER}" "/usr/bin/python${pymajor}" dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config" } - -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.18-r6.ebuild b/dev-lang/python/python-2.7.18-r6.ebuild new file mode 100644 index 000000000000..1abbf5e7a6e9 --- /dev/null +++ b/dev-lang/python/python-2.7.18-r6.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2021 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 verify-sig + +MY_P="Python-${PV}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-2.7.18-r6" + +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 + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 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:= + dev-libs/libffi:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + 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 )" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" +RDEPEND+=" + !build? ( app-misc/mime-types ) + !<=dev-lang/python-exec-2.4.6-r1" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc + +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_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +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 + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=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" + + local -x EPYTHON=python${PYVER} + # 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 + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python + ln -s "../../../bin/python${PYVER}" \ + "${scriptdir}/python" || die + # python-config + ln -s "../../../bin/python${PYVER}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi + + # python2* is no longer wrapped, so just symlink it + local pymajor=${PYVER%.*} + dosym "python${PYVER}" "/usr/bin/python${pymajor}" + dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config" +} diff --git a/dev-lang/python/python-3.10.0_alpha3.ebuild b/dev-lang/python/python-3.10.0_alpha3-r1.ebuild index c26b80ae4526..00989b1d53fd 100644 --- a/dev-lang/python/python-3.10.0_alpha3.ebuild +++ b/dev-lang/python/python-3.10.0_alpha3-r1.ebuild @@ -9,7 +9,7 @@ inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \ MY_P="Python-${PV/_alpha/a}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-3.10.0a1" +PATCHSET="python-gentoo-patches-3.10.0a3-r1" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="https://www.python.org/" @@ -59,8 +59,8 @@ BDEPEND=" sys-devel/autoconf-archive virtual/pkgconfig !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" 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 diff --git a/dev-lang/python/python-3.10.0_alpha4.ebuild b/dev-lang/python/python-3.10.0_alpha4.ebuild new file mode 100644 index 000000000000..a07c3376effd --- /dev/null +++ b/dev-lang/python/python-3.10.0_alpha4.ebuild @@ -0,0 +1,347 @@ +# Copyright 1999-2021 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 multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +MY_P="Python-${PV/_alpha/a}" +PYVER=$(ver_cut 1-2) +PATCHSET="python-gentoo-patches-3.10.0a3-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 + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + 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(+)] )" +# autoconf-archive needed to eautoreconf +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" +RDEPEND+=" !build? ( app-misc/mime-types )" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc + +# large file tests involve a 2.5G file being copied (duplicated) +CHECKREQS_DISK_BUILD=5500M + +pkg_pretend() { + use test && check-reqs_pkg_pretend +} + +pkg_setup() { + use test && check-reqs_pkg_setup +} + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +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@@" + + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + + 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=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --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= + + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + 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" + + local -x EPYTHON=python${PYVER} + # 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 + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${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 > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/dev-lang/python/python-3.6.12-r1.ebuild b/dev-lang/python/python-3.6.12-r1.ebuild index 1695164047aa..d810a677d0fd 100644 --- a/dev-lang/python/python-3.6.12-r1.ebuild +++ b/dev-lang/python/python-3.6.12-r1.ebuild @@ -55,8 +55,8 @@ DEPEND="${RDEPEND} test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" 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. @@ -330,36 +330,3 @@ src_install() { "${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.12-r2.ebuild b/dev-lang/python/python-3.6.12-r2.ebuild new file mode 100644 index 000000000000..d1ed379be3f1 --- /dev/null +++ b/dev-lang/python/python-3.6.12-r2.ebuild @@ -0,0 +1,346 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +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 + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 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:= + dev-libs/libffi:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + 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(+)] )" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" +RDEPEND+=" !build? ( app-misc/mime-types )" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +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@@" + + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + + 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=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --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 faulthandler" + + for test in ${skipped_tests}; do + mv "${S}"/Lib/test/test_${test}.py "${T}" + done + + # bug 660358 + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + 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" + + local -x EPYTHON=python${PYVER} + # 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 + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${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 > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${scriptdir}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/dev-lang/python/python-3.7.9-r1.ebuild b/dev-lang/python/python-3.7.9-r1.ebuild index efee2dc75560..854310e45a11 100644 --- a/dev-lang/python/python-3.7.9-r1.ebuild +++ b/dev-lang/python/python-3.7.9-r1.ebuild @@ -56,8 +56,8 @@ DEPEND="${RDEPEND} test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" 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. @@ -316,36 +316,3 @@ src_install() { "${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.9-r2.ebuild b/dev-lang/python/python-3.7.9-r2.ebuild new file mode 100644 index 000000000000..7b22ccdb26a0 --- /dev/null +++ b/dev-lang/python/python-3.7.9-r2.ebuild @@ -0,0 +1,332 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +WANT_LIBTOOL="none" + +inherit autotools flag-o-matic multiprocessing pax-utils \ + python-utils-r1 toolchain-funcs verify-sig + +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 + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" +S="${WORKDIR}/${MY_P}" + +LICENSE="PSF-2" +SLOT="${PYVER}/${PYVER}m" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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:= + dev-libs/libffi:= + sys-apps/util-linux:= + >=sys-libs/zlib-1.1.3:= + virtual/libcrypt:= + 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(+)] )" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) + !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" +RDEPEND+=" !build? ( app-misc/mime-types )" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + +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@@" + + # force correct number of jobs + # https://bugs.gentoo.org/737660 + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die + + 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=( + # glibc-2.30 removes it; since we can't cleanly force-rebuild + # Python on glibc upgrade, remove it proactively to give + # a chance for users rebuilding python before glibc + ac_cv_header_stropts_h=no + + --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= + + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + + emake test EXTRATESTOPTS="-u-network -j${jobs}" \ + 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" + + local -x EPYTHON=python${PYVER} + # 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 + local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON} + fi + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + python_domodule epython.py + + # python-exec wrapping support + local pymajor=${PYVER%.*} + local scriptdir=${D}$(python_get_scriptdir) + mkdir -p "${scriptdir}" || die + # python and pythonX + ln -s "../../../bin/${abiver}" \ + "${scriptdir}/python${pymajor}" || die + ln -s "python${pymajor}" "${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 > "${scriptdir}/python${pymajor}-config" <<-EOF || die + #!/bin/sh + exec "${abiver}-config" "\${@}" + EOF + chmod +x "${scriptdir}/python${pymajor}-config" || die + ln -s "python${pymajor}-config" \ + "${scriptdir}/python-config" || die + # 2to3, pydoc, pyvenv + ln -s "../../../bin/2to3-${PYVER}" \ + "${scriptdir}/2to3" || die + ln -s "../../../bin/pydoc${PYVER}" \ + "${scriptdir}/pydoc" || die + ln -s "../../../bin/pyvenv-${PYVER}" \ + "${scriptdir}/pyvenv" || die + # idle + if use tk; then + ln -s "../../../bin/idle${PYVER}" \ + "${scriptdir}/idle" || die + fi +} diff --git a/dev-lang/python/python-3.8.6-r1.ebuild b/dev-lang/python/python-3.8.6-r1.ebuild index 3a63d125d358..0b9af8b3a705 100644 --- a/dev-lang/python/python-3.8.6-r1.ebuild +++ b/dev-lang/python/python-3.8.6-r1.ebuild @@ -56,8 +56,8 @@ DEPEND="${RDEPEND} test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" 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. @@ -320,36 +320,3 @@ src_install() { "${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.7.ebuild b/dev-lang/python/python-3.8.7-r1.ebuild index eaee9eaef9c5..becacef96767 100644 --- a/dev-lang/python/python-3.8.7.ebuild +++ b/dev-lang/python/python-3.8.7-r1.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" WANT_LIBTOOL="none" inherit autotools flag-o-matic multiprocessing pax-utils \ - python-utils-r1 toolchain-funcs + python-utils-r1 toolchain-funcs verify-sig MY_P="Python-${PV}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-3.8.6" +PATCHSET="python-gentoo-patches-3.8.7-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" + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -53,11 +56,22 @@ RDEPEND="app-arch/bzip2:= # bluetooth requires headers from bluez DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc + +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. @@ -320,36 +334,3 @@ src_install() { "${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-r1.ebuild b/dev-lang/python/python-3.9.0-r1.ebuild index 1135d77cd400..4a05618b1091 100644 --- a/dev-lang/python/python-3.9.0-r1.ebuild +++ b/dev-lang/python/python-3.9.0-r1.ebuild @@ -56,8 +56,8 @@ DEPEND="${RDEPEND} test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]" +PDEPEND="app-eselect/eselect-python" 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 diff --git a/dev-lang/python/python-3.9.1.ebuild b/dev-lang/python/python-3.9.1-r1.ebuild index 9f6b2edbb3a1..834dc6945507 100644 --- a/dev-lang/python/python-3.9.1.ebuild +++ b/dev-lang/python/python-3.9.1-r1.ebuild @@ -1,25 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 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 multiprocessing pax-utils \ - python-utils-r1 toolchain-funcs + python-utils-r1 toolchain-funcs verify-sig MY_P="Python-${PV/_/}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-3.9.0rc1" +PATCHSET="python-gentoo-patches-3.9.1-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" + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz + verify-sig? ( + https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc + )" S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml" RESTRICT="!test? ( test )" @@ -53,11 +56,15 @@ RDEPEND="app-arch/bzip2:= # bluetooth requires headers from bluez DEPEND="${RDEPEND} bluetooth? ( net-wireless/bluez ) - test? ( app-arch/xz-utils[extra-filters(+)] ) + test? ( app-arch/xz-utils[extra-filters(+)] )" +BDEPEND=" virtual/pkgconfig + verify-sig? ( app-crypt/openpgp-keys-python ) !sys-devel/gcc[libffi(-)]" RDEPEND+=" !build? ( app-misc/mime-types )" -PDEPEND=">=app-eselect/eselect-python-20140125-r1" +PDEPEND="app-eselect/eselect-python" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M @@ -70,6 +77,13 @@ pkg_setup() { use test && check-reqs_pkg_setup } +src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} + fi + default +} + src_prepare() { # Ensure that internal copies of expat, libffi and zlib are not used. rm -fr Modules/expat || die diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest index 0fd754ee2ef1..fdf00ecd1a1e 100644 --- a/dev-lang/qu-prolog/Manifest +++ b/dev-lang/qu-prolog/Manifest @@ -1,9 +1,4 @@ -AUX qu-prolog-10.5-gcc-version.patch 872 BLAKE2B 0ca594ff48e9c58c7f99d2f4774308e0e6024188157197da75846b849f11a05f3d8331f8a16a7f31c648bf6e1f60fd2f184619dd64201ec0239fd64caf098919 SHA512 b120b532101b8adf69fe1ed7ded1cf3dc8a78a59fc74fc287cf6627f593b792b33ab2bbaa4022f2ec654e0bf2e3b64cb8bca5c5f6b2c3a41c2a1a243f703e60f AUX qu-prolog-10.x-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f -DIST qp10.4.tar.gz 1671144 BLAKE2B 293cbc09a058714f762e5d371074ca1b87e8177868851a3db2606a837810b474e926c43f6715c5088c718f2b1841c46f9668795ac53edc0266a9a6d5d04386f5 SHA512 39193ba2c39dc24b234092a47f9834af5b8dff6edc34ba6e0ceb6a4bda60c2f30b951bc17ef72da1dd220ef62563c88f4106dd0115a5bf8e51045abfb96151c6 -DIST qp10.5.tar.gz 1670927 BLAKE2B 74fd47beb18f7081ade39bf215a999066a2a5e99753ee8e48751c37d7bff111d355a7713f13af43a1cffc2fa6ca5efdf89a633fba45accdef17ee265f068e57a SHA512 6a7d46f09015304ffa222c82be5d9fb28c272ce27641455113740f3a4a08887369208456c478320b30d9464d8eeea0f7fcc1c1e56e1a130134e2fe54d5446958 DIST qp10.6.tar.gz 1671349 BLAKE2B 189ddd733a0bbf939387de60ec76e8e41a430af5f4684a9a3b8cc3effa4e402cfd4471c955f4d626d2de8cf14eb93c2977540ad209d06ce9b562325a4b984fea SHA512 425b35c758ba86cc14a1faf5c19f2c091142be6c42261323dc6f551efd6c80f7223584cd2be239748539eaf25308f777d95fd5bfdc65b33ca3245377e1766299 -EBUILD qu-prolog-10.4.ebuild 1886 BLAKE2B edbc9d921adeba6e5d729b74fec6fafd6fc84be0c241f1b6109e99b21e769ccff7c94cd8dbdee767f429c76160638499a4fe42f44d1fdde49015bc42aebe832c SHA512 df532910131df9678f0500263cd05b518a49c064f86d99461e8016569dc95b5475c486f6ff703a41d701433f0c0a0f43186ab3ee7a7f51762155a5a84ab705d4 -EBUILD qu-prolog-10.5.ebuild 1962 BLAKE2B 56670281e663d1a51649fde6740370ea7f7454b094f16c514cc4daa356180d5e518ebb882bcbb576978d2875b4c8dde5bba86a3a21f7fc1774d178e5d6ccc597 SHA512 b18807094d8944eec12347d07f5624aed4d5b98d3130700e3e924ba78080832b7879c9b9791ba3c3120db978bf1a95a4bae6f5e1f9282a0a04f3b65b6390dae9 EBUILD qu-prolog-10.6.ebuild 1908 BLAKE2B fc182193b74348bd9f029fda07ffe45e1c5f6529d216817870d04181f7f641f2b6b6f3e92ed16cf6c82b6744e65eb5011ce7d96000f3628375bcf7b635e6da8a SHA512 167fe155fe6910f630a7a84386094ca4611cc28bca2188ba6c70f740075e166d2b390b6bd6614e072954154ad89ddb01204c1d85e6c66839a6df1d0699c5ef5b MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch b/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch deleted file mode 100644 index cfc7cbfd4c14..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- qp10.5.orig/configure.in 2019-12-29 00:57:44.000000000 +0100 -+++ qp10.5/configure.in 2020-06-25 08:53:32.610430095 +0200 -@@ -209,22 +209,6 @@ - uname \ - ) - --#---------------------------------------------------------------------------- --dnl Check for CPP version --AC_MSG_CHECKING([for GCC version]) --qp_cpp_ver=[`gcc --version 2>/dev/null | head -1 | sed -e 's/^[^[:digit:]]*\([[:digit:]][^[:space:]]*\).*$/\1/'`] --if test -n "$qp_cpp_ver"; then -- AC_MSG_RESULT($qp_cpp_ver) -- case "$qp_cpp_ver" in -- 2.*) -- AC_DEFINE(GCC_VERSION_2, 1, [Whether or not the GCC is gcc 2]) -- ;; -- esac --else -- AC_MSG_RESULT(not found) -- AC_MSG_ERROR(Could not determine GCC version) --fi -- - #----------------------------------------------------------------------------- - dnl Check for -fno-strict-aliasing - AC_MSG_CHECKING([for -fno-strict-aliasing]) diff --git a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild b/dev-lang/qu-prolog/qu-prolog-10.4.ebuild deleted file mode 100644 index c06392ec7013..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils multilib qmake-utils - -MY_P=qp${PV} - -DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions" -HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html" -SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2+" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug doc examples pedro qt5 readline threads" - -RDEPEND=" - !dev-util/mpatch - !dev-util/rej - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - ) - pedro? ( net-misc/pedro ) - readline? ( app-misc/rlwrap )" -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-10.x-qt5.patch - eapply_user -} - -src_configure() { - econf \ - --libdir=/usr/$(get_libdir) \ - $(use_enable debug) \ - $(use_enable threads multiple-threads) - - if use qt5; then - cd "${S}"/src/xqp || die - eqmake5 xqp.pro - fi -} - -src_compile() { - emake OPTIMISATION="${CXXFLAGS}" - - if use qt5; then - cd "${S}"/src/xqp || die - emake - fi -} - -src_install() { - sed \ - -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \ - -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die - - dobin bin/{qc,qecat,qp,kq} - - use qt5 && dobin src/xqp/xqp - - into /usr/$(get_libdir)/${PN} - dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp} - - insinto /usr/$(get_libdir)/${PN}/bin - doins bin/rl_commands - doins bin/{qc1.qup,qecat,qg,qp}.qx - - insinto /usr/$(get_libdir)/${PN}/library - doins prolog/library/*.qo - - insinto /usr/$(get_libdir)/${PN}/compiler - doins prolog/compiler/*.qo - - doman doc/man/man1/*.1 - - dodoc README - - if use doc ; then - docinto reference-manual - dodoc doc/manual/*.html - docinto user-guide - dodoc doc/user/main.pdf - fi - - if use examples ; then - docinto examples - newdoc examples/README README.examples - dodoc examples/*.ql - fi -} diff --git a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild b/dev-lang/qu-prolog/qu-prolog-10.5.ebuild deleted file mode 100644 index 36fdb457ce21..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools eutils multilib qmake-utils - -MY_P=qp${PV} - -DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions" -HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html" -SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc examples pedro qt5 readline threads" - -RDEPEND=" - !dev-util/mpatch - !dev-util/rej - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtgui:5 - ) - pedro? ( net-misc/pedro ) - readline? ( app-misc/rlwrap )" -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-10.x-qt5.patch - eapply "${FILESDIR}"/${PN}-10.5-gcc-version.patch - eapply_user - - eautoconf -} - -src_configure() { - econf \ - --libdir=/usr/$(get_libdir) \ - $(use_enable debug) \ - $(use_enable threads multiple-threads) - - if use qt5; then - cd "${S}"/src/xqp || die - eqmake5 xqp.pro - fi -} - -src_compile() { - emake OPTIMISATION="${CXXFLAGS}" - - if use qt5; then - cd "${S}"/src/xqp || die - emake - fi -} - -src_install() { - sed \ - -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \ - -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die - - dobin bin/{qc,qecat,qp,kq} - - use qt5 && dobin src/xqp/xqp - - into /usr/$(get_libdir)/${PN} - dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp} - - insinto /usr/$(get_libdir)/${PN}/bin - doins bin/rl_commands - doins bin/{qc1.qup,qecat,qg,qp}.qx - - insinto /usr/$(get_libdir)/${PN}/library - doins prolog/library/*.qo - - insinto /usr/$(get_libdir)/${PN}/compiler - doins prolog/compiler/*.qo - - doman doc/man/man1/*.1 - - dodoc README - - if use doc ; then - docinto reference-manual - dodoc doc/manual/*.html - docinto user-guide - dodoc doc/user/main.pdf - fi - - if use examples ; then - docinto examples - newdoc examples/README README.examples - dodoc examples/*.ql - fi -} diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 673298912ecf..adbd6bc59b6a 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -5,13 +5,16 @@ AUX 2.4/010-libressl_2.7.patch 638 BLAKE2B ffd6091c3d1d657d44370d4bfd84e8c40fe38 AUX 2.4/011-gcc8.patch 2470 BLAKE2B d6fe2e34e7c33ca7bccf3b934092ef43b4ba8766d8c160a0548fa4946fc61a763634037c3180479896802e6e75828af043e75839fd03cc9e4b6e126c833d2cb8 SHA512 1636dc821a822ab6ec919e576ebba9e9cba64540801df6a2b4411e650930ec5cdc3ab28aeb3c5d45d3304f73af52372c2dee91833bcd9952692f3167d21007d2 AUX 2.4/012-openssl_1.1.patch 12158 BLAKE2B b7a77180159d6e2620a148b1c8dc2b137dbad0263d4f588c2d533a0ab9775ea0e685770fc708c3d4ae7ac53c16f657b990af39032219807925e46bcf11478d6b SHA512 050eeb45f7bc8a11bcd7fea0dfabb6137a009cc8f8337aa1c62ca4cd476ff0d66723148a20764a72843a5809f3dd66fe7a607a6098e5da990c90a3d2e15a6f54 AUX 2.5/001-ia64-update-ia64-specific-code-to-use-execution-cont.patch 2501 BLAKE2B 7c166f47ce8264354272c7f74ebee5fbe038b1cf06230c6507f62d823be266959b622a0a61920845dfc38fbe7846c4ccd1cabf8e133f456e94b1da5197c49526 SHA512 72319113329c7c3c74e5bab21b67256327a65fbe01827cd32ea289de769a91b493c5d1eb35a087ed026105a9e5daf8b0bc17374c01ef1a83cb408440d6316706 +AUX 2.5/002-autoconf-2.70.patch 1916 BLAKE2B bd5d2f079aee5506b7c3d77642dad8ce465aabeea3fc0d86065e14cc5bb6d2d77e99cfc1a895674c4654d20a8322c9d21c518bca598d3be1e069bed88c8945db SHA512 8f6c7da86d618dd5f47019e1fdf1094294b46dd4d0c097ef90a62ca3ef41972ffb84bd1d40de0a3851682d9615215fc705f1b0d205724d8178ddd353d85eca75 AUX 2.5/005_no-undefined-ext.patch 486 BLAKE2B 715f952cab863847f420afb020cac6819e4ab4e8f5527bdf550dd51eef37e272e7e89cbda5b6f9f137fdac89dfc5e99d42be8ae5712c255f11a0628cf07dc84d SHA512 6bbded9fce0c091b7cfb170c9dc2b0882b0e8bbf8fe31eaf596f3620853c8c75aa64c2648d5a72a0208a6ab6d711eb080a2d6aa98352933eda3b874bdd39cee8 AUX 2.5/009_no-gems.patch 3454 BLAKE2B f2439a799776c39ba16f1503d573c90ea6d74fc2bad3b3874a961add6b605bb064c683080a4258ed1a0e83bca5cb67c02ba68bceb6acea7613ab7166e16a2f4c SHA512 bef8b2763993755b5b6ccba0b5cbe002fd721405d7c274f421ae3d95fa4d0d99cdf946f5fa9a907cac2c3696b2cc23f2f2e030b3a70eca93081e49b02f25a072 AUX 2.5/010-libressl_2.7.patch 638 BLAKE2B 53f5f5d275e2c5482a608a947a1b3c41e9dcdd1763cc57a075e3abd536567852387506ec0ce2f5f49f5eed2246ca9f860d56637a9f18cd17cd49fff6fc92d340 SHA512 986aff99fd35814c94581cdc169cfc5a5f75c87889db5556941809ecaf878b6af838afe2ee108dd7147ea70be6fe9e47f98cce3c1804af0a34f7c1aab8c13d89 AUX 2.5/011-no-gems.patch 3139 BLAKE2B ce05d6ef90001b3011167ba0827ef7852173fa508d6b4cd584f853e90a9d18325e7f2823e306fe7dd139cbdcce2a3c31cc7d2546909798489dec082dcc00d937 SHA512 758cf5ba94ab38753e8489284587254d172c308509d7542ecaca0a368cfd0834561e9d51e814c388f1b607740627ddd9cfc239c02333c24bcf7b7fb890e6909e +AUX 2.6/002-autoconf-2.70.patch 1916 BLAKE2B bd5d2f079aee5506b7c3d77642dad8ce465aabeea3fc0d86065e14cc5bb6d2d77e99cfc1a895674c4654d20a8322c9d21c518bca598d3be1e069bed88c8945db SHA512 8f6c7da86d618dd5f47019e1fdf1094294b46dd4d0c097ef90a62ca3ef41972ffb84bd1d40de0a3851682d9615215fc705f1b0d205724d8178ddd353d85eca75 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/002-autoconf-2.70.patch 964 BLAKE2B ccddabc1d6d7321a46fa0a0facb85a221b11d05fd21abbdffcd6111117449bfa78d98080f61181720cd1c784320ae1d1de2fdcf6c5996bd0d6932b4d4e029e71 SHA512 0d07e1c74dfa7d620b6eab2a0cc7c8e05211e5a5458d3deab9eed699f3e34ed80ace803f65efb71805be6d67e4aa9150fefb85f2631fbea2003b3e1a5cc44cbe AUX 2.7/010-default-gem-location.patch 688 BLAKE2B 4c2074d69b9fe5258a2fe0e38bb501a39f34ad1fa08ef338224edba1f06073138cbe3d831ecdf9910c989a7f0a1c6c6b73ced0d8ff212207a3a3df5f4d90b5de SHA512 65206a6ca42ade0413ae1467f41082f4a93b3166644d2504cff3d280d23da02fd41aea5aca69dd43f6081b436db90a5b1e98725d8fa51519ca302c02ec526ad7 AUX 3.0/001-socksocket-fix.patch 457 BLAKE2B cf3e15858481cdaa48be2cb3685bed663d9de792c743f6ef07ea5d2be214d630ee9bd70c1b6958110516d69a1889fdc4cf26676e52c55d4d530588b8274f962e SHA512 77381cb3c8d4a87a5ae06966d5dd00a38ea07148ed2feacb883e1d041d85ae0a6d64b30fd213f2ac0b1a07e3722f0e724cd0ec8414e74dc4de8844d849584b00 AUX 3.0/010-default-gem-location.patch 753 BLAKE2B 2e9c209521e113c9b5b66ef305a2f29e042bc9330cc95ca847e04aec7a9450de48904bf583265aceec5984e8384e78a37b16a65435962ffc3ef458019b5ebedf SHA512 af63cd6c2c998533fd518abc6f48d1acb0f185e3bc9c4747301f7c7f3b3780e456f32db0252a0a03306dbc19a63d24c031fcfb7c35d732190fa68763e5817dcd @@ -19,10 +22,10 @@ DIST ruby-2.5.8.tar.xz 11298404 BLAKE2B 3256c0448e72b63c0bd89f89a27fa9c09c8feed5 DIST ruby-2.6.6.tar.xz 11567284 BLAKE2B 45e910dd9b128c46bff3003834c4fdcbbc2e2e4d3e44f298ff4356a285de2c375d6b6021a3aa28d89336b32a1655fa4a7c086d07f4a0f6bcd578a11dd4a894da SHA512 86caf93dbf61d03781767ab5375a7edf4761f13ba08ccfefe16c0a7550499237e7390c2f72a95d42670d4fe76b2401b4218936187c62ec1572799e9e04c50d62 DIST ruby-2.7.2.tar.xz 12037052 BLAKE2B a4ad22295b3fed4e8064fc6e77adb8642d1fa7ae1f4ef912d7bde19c735cb25b1a3e3aefba53dad944046d844d608bcefba61c314cf1e52747f50d7d91f4c436 SHA512 7972278b096aa768c7adf2befd26003e18781a29ca317640317d30d93d6e963ded197724c8e2f1dfe1e838c5647176d414a74732a62e931fb50d6f2e0f777349 DIST ruby-3.0.0.tar.xz 14374176 BLAKE2B 9e7520e0b1ae6644285449c4ae92983d306772b3dd5366a17da709a55797c798d099424a5628c78c842b825fb336c6a769ac9c371ef276f42bf3550fd0761ebe SHA512 2a23c2894e62e24bb20cec6b2a016b66d7df05083668726b6f70af8338211cfec417aa3624290d1f5ccd130f65ee7b52b5db7d428abc4a9460459c9a5dd1a450 -EBUILD ruby-2.5.8-r1.ebuild 7069 BLAKE2B 77e1c5ba8e5c3c203293d996b176702d96af4f850fe3687cf924c20ceaed19bb807847a2b4cbdbe9454e399623fd068e602561e1f7d2f3d33e45d3f0b31b3b7e SHA512 865e728e530b4711256f29e3f9d81de1db67caf0627c24407cfebdfbf9a27e28a2dcbfb24f7d78c430d48649338d50776cd6d8bcfb567a616b3e0e7f580b94ac +EBUILD ruby-2.5.8-r1.ebuild 7073 BLAKE2B eaf5037da9841527af3e3197442c31c69eca718d25fdeb89836e61e40e5b63f6d34aa5116d50477348cd589f560fc85affd8dc04cb8d69f1c26d1aad1deeada4 SHA512 762019ac4eba249710a190579659112ba6b5152c75074fe6b2b20d2e310a2ecc860c8b7207bae371b31e9cf26820201b6aa8a514235f69eaa3af3278beafa6d5 EBUILD ruby-2.5.8.ebuild 6189 BLAKE2B aa04b9f393085468d3452bfcc55a45c721bcbe51c9602d6f44510d1f936369f1c741ade879d24c619b1722270a460ba20bc679f0714a98d310d8293bc84c3678 SHA512 156ac0da5b5e6d1240bcb42ad9a7ce455a17077a3bfd66610d5425216ff7436462e8e1362764c8614900376eef146b168e1dd4691cddd9f13ded5a4a30204c9e -EBUILD ruby-2.6.6-r2.ebuild 7477 BLAKE2B 35a9387635b0eefd90e4aa313d49e8254d96de6e1172c7a2f2a7d966859fc08ca95f9c25817bbcde9e938d5bde62687a706f2bbacf72ce3d482841c284641aaf SHA512 4acce5fef4cb07649df770a35f30a2aef5e77df569e30074f8165f00687d2cb2e7176006a9dbfb6979f0c79583ae25b457da8f76323af2ae6db4471dc8e1dffb -EBUILD ruby-2.7.2.ebuild 7648 BLAKE2B 4d7958b01427946a7b23d24cd486d54b9a0dfdc2f07549d2f2f8562eb887dc021f3fb07145818c97e1aecb4cf4ce4018b68e69ca4726e36a96142dce4eb60a63 SHA512 49c54dd909e370f676faada8a43d4fe5604183b38bb48178d418c8a91fe8cfe3c8586b0c0f08f66d586592b544d77cd0c4db56d524964f270be8fe98ce1e1502 +EBUILD ruby-2.6.6-r2.ebuild 7483 BLAKE2B 5a35f894ad96b5fd275ced79d45efc8ef3eae80a4649bf78bae35bbe97e129d9e9a7ea1a76fed0ce013f391159aa202015a805c401c13639825c138b3dad3ccb SHA512 9f248423913fffb984744387f1fd2d8b2b38cbe8a90d60fd75e5bbf25ddf9e90064a4fa24ae8cb5ab158c3201024cf2c3646706c24464e6973ecb739046e9c16 +EBUILD ruby-2.7.2.ebuild 7654 BLAKE2B 9c3a093850ad70ff63c334b2f3dfe3e3d8637e23667f4f5b0e4d969e287a3ed5ce5055f22cbd3c334ffd1ddb3b0ec09c7bafa8a8c87ecdc3d2d2d392cf5860cf SHA512 c284e72bd6847aaaca2bb2481af752e56eff49ac45007f4757edd80237bba092d21bfdc2d863d1e0fc6b9b7ccb3bdbb3898b91490261325621d8c7b395c0875b EBUILD ruby-3.0.0-r1.ebuild 7658 BLAKE2B 16d96d395cb398a2bb2f3b986996163453b44769b667545f5ca1d8527c48d4b9f17c5ba3da41769cc6fcf482f2f1e0e3e5be44a11b40bb3a0c175757ae9ceedf SHA512 0fc8907e181c259a30cbb6db82b66a99791b131bd93068b3fd924a6babb4e89729a4efe8437b143cd0e907a6ee5804a3a1c55634ec72c65a9f37d1e31f22aad1 EBUILD ruby-3.0.0.ebuild 7652 BLAKE2B 3e67942dd8dd944bd7af027d257bdc6a41769c3099f5a5f9e391fc0bbb4916e7203dae81bc4b568121bbbfe0b758b229bb66e25eebcde3cffee1766652adc036 SHA512 5b02c7620ba26e49007ecc105d946ddbcc286b848ab90210dd712130a8e05c4d7a1e258ebbbec257bab4801b5c018404b284e0eda8cc66f2d130e1cc4b73286e MISC metadata.xml 523 BLAKE2B 4ed08360a279c8d44fe87f677cdc24a76eda6d37c591186951e16321f464d4451d0d1299c4e1d996bffe15a8cca672d4c5c1bc5fb0aa6cda69b8eff90ec31df8 SHA512 f74c386a3d6314d630aff11c40314db40b7f9fb202910480b37aa65b7bac62d6e87fa7590b2a26aa1713bb65be486ed84138e1273eaf7c8b966d7414e6b55464 diff --git a/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch new file mode 100644 index 000000000000..576ed6c759bd --- /dev/null +++ b/dev-lang/ruby/files/2.5/002-autoconf-2.70.patch @@ -0,0 +1,65 @@ +From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Mon, 16 Nov 2020 08:42:15 +0000 +Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70 + +The failure initially noticed on `autoconf-2.69d` (soon to become 2.70): + +``` +$ ./configure +./configure: line 8720: syntax error near unexpected token `fi' +./configure: line 8720: `fi' +``` + +Before the change generated `./configure ` snippet looked like: + +``` + if ! $CC -E -xc - <<SRC >/dev/null +then : + + #if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 + #error premature clang + #endif +SRC + as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5 +fi +``` + +Note the newline that breaks here-document syntax. + +After the change the snippet does not use here-document. + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + configure.ac | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a5e3dc76f6..4e4a52f066 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"], + # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported) + # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn) + # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn) +- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [ +- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 +- @%:@error premature clang +- @%:@endif +-SRC +- AC_MSG_ERROR([clang version 3.0 or later is required]) +- ]) ++ AC_PREPROC_IFELSE( ++ [AC_LANG_PROGRAM([ ++ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 ++ @%:@error premature clang ++ @%:@endif ++ ])], ++ [], ++ [AC_MSG_ERROR([clang version 3.0 or later is required])]) + ]) + + AS_CASE(["$target_os"], +-- +2.29.2 + diff --git a/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch new file mode 100644 index 000000000000..576ed6c759bd --- /dev/null +++ b/dev-lang/ruby/files/2.6/002-autoconf-2.70.patch @@ -0,0 +1,65 @@ +From 6160ea5e22ee7353a0814159c94bd3cf890a52ce Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Mon, 16 Nov 2020 08:42:15 +0000 +Subject: [PATCH] configure.ac: fix for upcoming autoconf-2.70 + +The failure initially noticed on `autoconf-2.69d` (soon to become 2.70): + +``` +$ ./configure +./configure: line 8720: syntax error near unexpected token `fi' +./configure: line 8720: `fi' +``` + +Before the change generated `./configure ` snippet looked like: + +``` + if ! $CC -E -xc - <<SRC >/dev/null +then : + + #if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 + #error premature clang + #endif +SRC + as_fn_error $? "clang version 3.0 or later is required" "$LINENO" 5 +fi +``` + +Note the newline that breaks here-document syntax. + +After the change the snippet does not use here-document. + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + configure.ac | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a5e3dc76f6..4e4a52f066 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -271,13 +271,14 @@ AS_CASE(["$host_os:$build_os"], + # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported) + # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn) + # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn) +- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [ +- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 +- @%:@error premature clang +- @%:@endif +-SRC +- AC_MSG_ERROR([clang version 3.0 or later is required]) +- ]) ++ AC_PREPROC_IFELSE( ++ [AC_LANG_PROGRAM([ ++ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 ++ @%:@error premature clang ++ @%:@endif ++ ])], ++ [], ++ [AC_MSG_ERROR([clang version 3.0 or later is required])]) + ]) + + AS_CASE(["$target_os"], +-- +2.29.2 + diff --git a/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch b/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch new file mode 100644 index 000000000000..bea2bc178dc4 --- /dev/null +++ b/dev-lang/ruby/files/2.7/002-autoconf-2.70.patch @@ -0,0 +1,26 @@ +diff --git a/configure.ac b/configure.ac +index 6766df2..bc503d6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -177,13 +177,14 @@ AS_CASE(["$host_os:$build_os"], + # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported) + # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn) + # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn) +- AS_IF([! $CC -E -xc - <<SRC >/dev/null], [ +- @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 +- @%:@error premature clang +- @%:@endif +-SRC +- AC_MSG_ERROR([clang version 3.0 or later is required]) +- ])], ++ AC_PREPROC_IFELSE( ++ [AC_LANG_PROGRAM([ ++ @%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3 ++ @%:@error premature clang ++ @%:@endif ++ ])], ++ [], ++ [AC_MSG_ERROR([clang version 3.0 or later is required])])], + [openbsd*:openbsd*], [ + AC_CHECK_TOOLS(CC, [cc]) + ]) diff --git a/dev-lang/ruby/ruby-2.5.8-r1.ebuild b/dev-lang/ruby/ruby-2.5.8-r1.ebuild index 21d81b7477bc..1a4584807865 100644 --- a/dev-lang/ruby/ruby-2.5.8-r1.ebuild +++ b/dev-lang/ruby/ruby-2.5.8-r1.ebuild @@ -61,7 +61,7 @@ PDEPEND=" xemacs? ( app-xemacs/ruby-modes )" src_prepare() { - eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.patch + eapply "${FILESDIR}"/${SLOT}/{001,002,005,011}*.patch einfo "Unbundling gems..." cd "$S" diff --git a/dev-lang/ruby/ruby-2.6.6-r2.ebuild b/dev-lang/ruby/ruby-2.6.6-r2.ebuild index ee064ea4a67b..795321234d25 100644 --- a/dev-lang/ruby/ruby-2.6.6-r2.ebuild +++ b/dev-lang/ruby/ruby-2.6.6-r2.ebuild @@ -65,7 +65,7 @@ PDEPEND=" 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.6/010*.patch + eapply "${FILESDIR}"/2.6/{002,010}*.patch einfo "Unbundling gems..." cd "$S" diff --git a/dev-lang/ruby/ruby-2.7.2.ebuild b/dev-lang/ruby/ruby-2.7.2.ebuild index 473f807c1923..138024506971 100644 --- a/dev-lang/ruby/ruby-2.7.2.ebuild +++ b/dev-lang/ruby/ruby-2.7.2.ebuild @@ -65,7 +65,7 @@ PDEPEND=" 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 + eapply "${FILESDIR}"/2.7/{002,010}*.patch einfo "Unbundling gems..." cd "$S" diff --git a/dev-lang/sassc/Manifest b/dev-lang/sassc/Manifest index b66ed1902522..bb24c2aabb6f 100644 --- a/dev-lang/sassc/Manifest +++ b/dev-lang/sassc/Manifest @@ -1,3 +1,5 @@ DIST sassc-3.6.0.tar.gz 26111 BLAKE2B 91d634bd652607407c48f141aa39260739357f6eeb4bade1fff1bfdd4e4e6e0757712501395c913ef1a8944ec9174649fa5ce657af4afec6f9f0eb7f804e1ff2 SHA512 0d8de651b1587f4994a5da85ad09ec2ce6e240213dbaa567c6b9baa612fe82e337061d9a5a8a3a5588e4c366c1178b6fd04e9d699a0be3d83c68f98bac774527 +DIST sassc-3.6.1.tar.gz 26137 BLAKE2B 73aaabe4f4dab7efdaef591918da8a4bd79e98dff0105666548f00b09657f46d2e28523988d60eef7f4b1eedacbfe17638e96f5a9c98a5325ef9e56f681c0e28 SHA512 b6df8f481db0737ca08808c0849dcbd83e80799d883271d382607b7a74028153195f5f9c26768ffe1a9a92ee8c26be3c382ad7b3a5336eb6e4a0dad58132690e EBUILD sassc-3.6.0.ebuild 499 BLAKE2B 32e47680611689f022aa863cb12310bc456cf14817c871da23108872d2a7af046f73d9cf14ebb8a1ca48b5c688a15f4d6c9799268b75218a3ca5fe5a11d9313e SHA512 178d94cff7e1f973beac530b4f0f602d190c31977bfd0bc2a6e9966856fa8aa12aaa90e1995d6ec1201f0dbd5f362820d44b9fef73f6b9bfb944268bcd84574a +EBUILD sassc-3.6.1.ebuild 546 BLAKE2B b6a2bda5cdcd18a58622390d9f614d0fbcbc6e692ee06fe682b072665666707ef63a83925b1848b2a2e7f53ec3e1103578f48abc9b8aacc8a90fd5af36e7388e SHA512 41bc9e59c44eda32ca9e188422512d84dc087efe400a9c27248b1743e468630d456506697e0a6ff8d66ea725f6b08674857f7aabdecf30e32b4a6e50e44d4e45 MISC metadata.xml 481 BLAKE2B 4f5d2e0062ba66e18b394807ae98e1ebe8925d0f094f969406f4d3c3cbed7fb001adfe41f1b61246df24f89e11b142d31027dfde07cfb919c60a2fece1ed20fe SHA512 2ba528dc5a56c29561f5b7644b5a428d99383965052233f4b5b03e0796a5e0bf1d7747548f9a7edde41471cacab1269d3c1cce089bba8ab33d903b4cd48585f7 diff --git a/dev-lang/sassc/sassc-3.6.1.ebuild b/dev-lang/sassc/sassc-3.6.1.ebuild new file mode 100644 index 000000000000..82d1a97e1181 --- /dev/null +++ b/dev-lang/sassc/sassc-3.6.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +SRC_URI="https://github.com/sass/sassc/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux" + +DESCRIPTION="A libsass command line driver" +HOMEPAGE="https://github.com/sass/sassc" +LICENSE="MIT" +SLOT="0" +IUSE="" + +RDEPEND="dev-libs/libsass:=" +DEPEND="${RDEPEND}" + +DOCS=( Readme.md ) + +src_prepare() { + default + [[ -f VERSION ]] || echo "${PV}" > VERSION + eautoreconf +} diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index ff659f8b301a..034792a88776 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -3,11 +3,11 @@ DIST swi-prolog-8.2.3-gentoo-patchset-0.tar.gz 535 BLAKE2B bb7869c5166104a3a7faa DIST swipl-8.2.1.tar.gz 10969688 BLAKE2B 754678d9683999b681e62321423df01c4d28ac0aefb5b836134790112a76a2710cc3b433d381f4b11756727037cada026a2778445fe533f51a5543332ca86e82 SHA512 b49fa0832b4bad3b48256c97538172a06e7a4c50b55823dad345360f98055f0702e7a10fb2bfdb636e3fd99557bcb243cfccbaccb7546cb2afd13335f1c09db8 DIST swipl-8.2.2.tar.gz 11002077 BLAKE2B 581c3ea83d2440cbe2454ba12ea2752bec9fda926f3afef6e36de1bbf70b43b34931ad768335bb15809a3d76959c7eec7dd3ad54a0a4085ad8ba34075dd3f4d9 SHA512 fb77cfd58932dc35c3d808899c1f493ffb22a58f56fe364ce0c0b48b8cabdd204d4f920346c39f696fadd9ee8335e163a8eb8d0a770c2835d803f030c1f3f878 DIST swipl-8.2.3.tar.gz 10999577 BLAKE2B 57cfa9f6fb97f0136a35da1850c7ae8da123d1c18fe6e18597d1b2131b7304a638d42d673efad2a01eaf3f9dad7b4754e6feb64917423abda002323bfc8dec8c SHA512 cd9ffc8a963682c0d02cec4b76338352459e004e07f3e5c0f02b3c2f9b19f23fe9639e037cf52531491a41c201113138f0b6a039d401e891ad5774383b0d852f -DIST swipl-8.3.14.tar.gz 11107292 BLAKE2B b97797ed36ec80336c43b35bfee02dd144e195d03b76781c5c4dc6f8ea69b28d0876c62a38c7c66eaae2ae4cfefba409bafd3d9b93cd1d306875eb5e32d657d3 SHA512 931bb8f76836a1e4acb89070e9a8e17332ae4ed21da12a557329fc90adac052d9c5b48f553589ae9e3aa2ff5ec710ffa69e83ccbb492cf7adfb83e7cc97c61b8 -DIST swipl-8.3.15.tar.gz 11117063 BLAKE2B 17a083e76b850cb94b5a482011256c4812c4fc1d86642cd1a0f70704d5ffc9fef5cfd63bddfab2330b26d67dc6ca640012cfdd0b82c2cc90aff04b82c644f7d4 SHA512 4c2daf9c635cee30d62006b299d9f373fdd1be044fda5363995fd7343ae18ec1173d268cbd8ece52dd275ab1ca75168b386ba247f77707248c24e3ab7bcc7563 +DIST swipl-8.3.16.tar.gz 11123493 BLAKE2B 6d9566762b5d96a20a27dece39d895e2b29d3555dffe1d0495d8f8f579443ae2c37df2b0fe89c3fa6cc95743f55efdc6a4d6653e6cd1ba5ff8489181f8c7fc5a SHA512 ceaef49d29eac3a100e6d51e1bcc4e7925ce682ffda8bd2a668463b870a25e163c6d9e538c0cd46ffdc9a709c720ba9b31137a7c24a8087ea3bc0a1616304b00 +DIST swipl-8.3.17.tar.gz 11120834 BLAKE2B bc0c05a3305d30ec98f636e141b1d22e3ad06444ae98e7bb5b42a2a0e120effb68594f7c8af6da2fde915dfa679635c779a2a45144452e1b3598178b9e6095f5 SHA512 498fd807623d9ab596ce127a60430864faff6d803f63a77ef22fcbcd4e6ad02a9d6a528e0a782f68b9f92d3efd74838b95d72c1717b79000153f55ad4037b180 EBUILD swi-prolog-8.2.1.ebuild 2640 BLAKE2B 480b32c825e7402616fe049eaf53ba25ccbb2de5d3f887d44dff8403e7551a94bb621f62cfcfbcb949f5d420e6fa7c5ff207ef4af61268c9102027bc727fa1e8 SHA512 01b9006d3bb2600399277e9dd0271bc0f0ad05de80924230e1c5ddc63ac04a937c402be3bad20cb283a57c16d8e0cc710f6a087dd7ce534aa167a40f83e2c4c2 -EBUILD swi-prolog-8.2.2.ebuild 2736 BLAKE2B a7f0e99fa1a16428fb0fc954b95f83fcab341df7555799374f7e761516ee9a96dca4af5ce6f97860b29e6539e15d919d62ecae6a03fc64d328dab127462df53d SHA512 d3556938cb910b08c090df03eae1e7b5656010dbb80e7b3c4af24d3c1302b9941424a791789d45342742a9eb17b8fb05523f918c5c644c5fd93d2f3656f21b8a +EBUILD swi-prolog-8.2.2.ebuild 2735 BLAKE2B 250da4e898fcbbe166c1d0182d20977af4be2efe8e1b86129cb86ff3a4268dcf22fc88a1618c58ec6dbc30d09d798c1d3b75a842196a46d7abe64fc9874ab07b SHA512 6d461a181a79c3d0838119ea47a2847f0991194c11fe07b0d71936830fe6a2e34034adf7244e5d2f54764c8a95a06fec0f5488c4968997f7e913a80fb4a01513 EBUILD swi-prolog-8.2.3.ebuild 2738 BLAKE2B 3e4cc78b7704b324663fb604d38a91621cc1a6a351af1f030cf7a038272107d45a61cd9fbfab8cfd07d6b3986d6206d5fbedd36023e26e5e83344d21811123b1 SHA512 afcfb674f20fb3d6ef2831e47ba2578828636c6d7cff5663b392125f994a31ee77e8d873c47c583c71fb9f92bfc0cef29bc61aabd2a90763d5a1763c463e7658 -EBUILD swi-prolog-8.3.14.ebuild 2640 BLAKE2B 5e37e8648bdf73569b5ff9bd33101b8ecd000251c3de8a056ebf0938b6a4d10b672dcd4c9d57fa38a0895de23559b7be4506dca821a6fae0e220325e31c23ff7 SHA512 8653ba0a6063c64cfdfb7f298a0914c6799756ac2d1e7ae7c97e3e5329f1919751dcda2987db9b62fc5e4de8dcdbca6e3e360082a42c1293113114a1da8911fb -EBUILD swi-prolog-8.3.15.ebuild 2640 BLAKE2B 5e37e8648bdf73569b5ff9bd33101b8ecd000251c3de8a056ebf0938b6a4d10b672dcd4c9d57fa38a0895de23559b7be4506dca821a6fae0e220325e31c23ff7 SHA512 8653ba0a6063c64cfdfb7f298a0914c6799756ac2d1e7ae7c97e3e5329f1919751dcda2987db9b62fc5e4de8dcdbca6e3e360082a42c1293113114a1da8911fb +EBUILD swi-prolog-8.3.16.ebuild 2640 BLAKE2B 5e37e8648bdf73569b5ff9bd33101b8ecd000251c3de8a056ebf0938b6a4d10b672dcd4c9d57fa38a0895de23559b7be4506dca821a6fae0e220325e31c23ff7 SHA512 8653ba0a6063c64cfdfb7f298a0914c6799756ac2d1e7ae7c97e3e5329f1919751dcda2987db9b62fc5e4de8dcdbca6e3e360082a42c1293113114a1da8911fb +EBUILD swi-prolog-8.3.17.ebuild 2640 BLAKE2B 5e37e8648bdf73569b5ff9bd33101b8ecd000251c3de8a056ebf0938b6a4d10b672dcd4c9d57fa38a0895de23559b7be4506dca821a6fae0e220325e31c23ff7 SHA512 8653ba0a6063c64cfdfb7f298a0914c6799756ac2d1e7ae7c97e3e5329f1919751dcda2987db9b62fc5e4de8dcdbca6e3e360082a42c1293113114a1da8911fb MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3 diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild index a7a875814193..2b133f70327b 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.2.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz LICENSE="BSD-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml" RESTRICT="!test? ( test )" diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.14.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.16.ebuild index c9064992abbc..c9064992abbc 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.3.14.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.3.16.ebuild diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.15.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.17.ebuild index c9064992abbc..c9064992abbc 100644 --- a/dev-lang/swi-prolog/swi-prolog-8.3.15.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-8.3.17.ebuild diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest index a7f27f3c77e7..e975487cbb5c 100644 --- a/dev-lang/tcl/Manifest +++ b/dev-lang/tcl/Manifest @@ -5,11 +5,13 @@ AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebcc AUX tcl-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457 AUX tcl-8.6.9-include-spec.patch 488 BLAKE2B 06aa49163e8316b409238055d4b2ef67a3b37bdad69a190d39ce46a32dbd38320397b206036428c81e4a001ee0c01ee70f5970f584f919d0e5348000c7f93711 SHA512 ca4fc3ca2b3963d9c1b9b1c716e9c508d8c7aeaaad4b39c502472f3592c60907dbcda656369af371ec6c21f06a6dbc50fa02994a15284bedbdb22616ca9340ba DIST tcl-core8.6.10-src.tar.gz 6008840 BLAKE2B 592f708492e56da3577f190adc3da4f2979f32a570dfc29cb53fde58a83d804223dfe9527b76d094de3005a6e12dda73674573bab3af2e591b4573163b81b9c0 SHA512 de31ac8fc5226c831198af88befa05ccb1842dcfd209690e25b907f062033b3ae7a77bc12e85c4210ce85cfd7c598060e03fc81b0e624d422bfe4df655cc9068 +DIST tcl-core8.6.11-src.tar.gz 6041050 BLAKE2B 9c41d5ae5d22627b903d18c5ca607d4a2647d7af65d3029a463cf571d3fbe0bd48e15fef643e81de94296777985a36530a83718d4eb7befca4bc107ab860cc0d SHA512 fe3556c37305e3856743e9a202a320d44b1b3cbc926a1b7a4449ae5baf2f8df92214a9aa06f0a87645d032857fb71458fc864ff007fd73da60463ae5001f2d3f DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69 DIST tcl-core8.6.9-src.tar.gz 5932010 BLAKE2B ddc0cff12aeeebbf8d1c799db9e154a9ecbe2a2e2afce97c6f15c408301b7a40119bd1c861aa724c178bd9abfe0616c7bcafd9cf6714ed49cf882c9085222cf3 SHA512 306a38a27729b764bae2eae6c4cdd8cd6aee5de6bd924d6a487c8691ee874e4459abc1fa785183c2f6ff4d2d57be98093dd7460c5a668cf994e8f1c31516ae67 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 EBUILD tcl-8.5.17-r1.ebuild 3722 BLAKE2B c450876358272f48e4273201e1330237436c47f84206053982dc24a158180767433a3fc89a71b19e167a12eebb0a8a132b7b079f83b5ee2ec7aa833e5f79b596 SHA512 e0b95d26aff95ab56ecebb05d7900de30b764ad1d1dcc9bd1b71155481faf66797c3fa9e545a304cf9a0301c2bf7a455ae2b12f2297c099ac8ddd0e0db076670 EBUILD tcl-8.6.10.ebuild 4030 BLAKE2B 0d46d9c6f7292a1adef74bc4e34a6d04dbe77805da0d140f53dca504a5ed0f0b8a9335905a7f7e77e751856ef7d4d0589064f73ede6fd5ee788b420a25838d0b SHA512 e2e5ca11bfbe06db0f82e1521a77153d3e7b0ba52e90e6a9362b00f35fb04fc717246b91eff208dda720b133b0c26c8c3d8ccf1768a62e751ce8eaba76ed2c87 +EBUILD tcl-8.6.11.ebuild 4038 BLAKE2B 9baee3f2968562853d7ddf55018274daff0cb88ede893e154b7559ff6ad764e33a8eeb80aaccdaf6489ee085d44a83385c86c34a2484ab47924a5f347b0569a6 SHA512 d514672b5eef5959a5d1f8c1619c2fa6a2995897835c23a54b96ced6b640f43b92d19ca19df752e9f7ed96c2398634f7c6049eaf127ffeb846b52588f4e3c530 EBUILD tcl-8.6.8.ebuild 3942 BLAKE2B fc96d80d188d4a3073dc25eeba3023a5bd2ba6d6d26881863089427db606ccbbfa005c2576917ded8df056511d1a62e2ae5443b6fc95e11719566e9b63f714c4 SHA512 b2c641a894fa2f242d57b7668d71d8c2c9f356d0226edd6ec07bd53aa43327cb724ab6ecd3b471a2667284f42ac178cef375943c2bf2a862ee36d90d82f21387 EBUILD tcl-8.6.9-r1.ebuild 3920 BLAKE2B 0213bf6e093fc7f7418a3b4068867659cc124e6cb8e25718c951d5aa397cc1f74c25ca49ce7d20ee7d29b1d9b970d2e684223011a09097cb21ce4136dc5ae725 SHA512 e0ead8d7c5b97139eedf04baba937f048ca656508c7405fc2fc066414466fe26084d2075773df84a5968e1964dc4e67e0cfd8f8dae5842229bdfdee802053007 MISC metadata.xml 318 BLAKE2B 7ea8e51656c255c3aea3bee8849423604a164efff556974f6032de44d33e38bb0378b69c18821cc76f0284064bc84a1a56e79f522f8d7fb0adc50e2e191b5fca SHA512 61f3feb8311f1babb8a4df8c9fcddaab009ffc6d69248f18cb9e001a1659dfcf47f2699008ab83fb563b3417f6ead8113af20db7e3893f488e8d75bb2a3483cf diff --git a/dev-lang/tcl/tcl-8.6.11.ebuild b/dev-lang/tcl/tcl-8.6.11.ebuild new file mode 100644 index 000000000000..5d871ca4d7c9 --- /dev/null +++ b/dev-lang/tcl/tcl-8.6.11.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +MY_P="${PN}${PV}" + +DESCRIPTION="Tool Command Language" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" + +LICENSE="tcltk" +SLOT="0/8.6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug +threads" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +SPARENT="${WORKDIR}/${MY_P}" +S="${SPARENT}"/unix + +PATCHES=( + "${FILESDIR}"/${PN}-8.6.10-multilib.patch + "${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971 + "${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120 +) + +src_prepare() { + find \ + "${SPARENT}"/compat/* \ + "${SPARENT}"/doc/try.n \ + -delete || die + + pushd "${SPARENT}" &>/dev/null || die + default + popd &>/dev/null || die + + # httpold tests require netowk + rm ../tests/httpold.test \ + ../tests/env.test \ + ../tests/http.test \ + || die + + # workaround stack check issues, bug #280934 + use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" + + tc-export CC + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + sed \ + -e 's:-O[2s]\?::g' \ + -i tcl.m4 || die + + mv configure.{in,ac} || die + + eautoconf + + multilib_copy_sources +} + +multilib_src_configure() { + # We went ahead and deleted the whole compat/ subdir which means + # the configure tests to detect broken versions need to pass (else + # we'll fail to build). This comes up when cross-compiling, but + # might as well get a minor configure speed up normally. + export ac_cv_func_memcmp_working="yes" + export tcl_cv_str{str,toul,tod}_unbroken="ok" + export tcl_cv_strtod_buggy="no" + + econf \ + $(use_enable threads) \ + $(use_enable debug symbols) +} + +multilib_src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + # fix the tclConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ + -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ + -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ + -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then + sed \ + -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tcl${v1}/include/unix + doins *.h + insinto /usr/${mylibdir}/tcl${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die + + # install symlink for libraries + dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) + dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a + + if multilib_is_native_abi; then + dosym tclsh${v1} /usr/bin/tclsh + dodoc "${SPARENT}"/{ChangeLog*,README.md,changes} + fi +} + +pkg_postinst() { + for version in ${REPLACING_VERSIONS}; do + if ver_test 8.6 -lt ${version}; then + echo + ewarn "You're upgrading from <${P}, you must recompile the other" + ewarn "packages on your system that link with tcl after the upgrade" + ewarn "completes. To perform this action, please run revdep-rebuild" + ewarn "in package app-portage/gentoolkit." + ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" + ewarn "upgrade them before this recompilation, too," + echo + fi + done +} diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest index f2a7a304e011..2517bc51cb59 100644 --- a/dev-lang/tk/Manifest +++ b/dev-lang/tk/Manifest @@ -4,15 +4,20 @@ AUX tk-8.5.13-multilib.patch 453 BLAKE2B f7c8d90a3aa313e4ebaa6ca3b62a986637e4246 AUX tk-8.5.14-conf.patch 569 BLAKE2B 243b538978966531dcf59f76ffb3d1b82bb10c2d80fc9f31e16165c6f26db96a22ec5953840a316d430153e082e5dd6293edf8f899f0befe60d6e5b1b8ac2279 SHA512 31b53c31253df219d860fc9d067c53379bca571e799a2064e33fb1d9c3f228a001654438eeb5bad5315a6589e7b46f902d87cd54a52d4ed68c0d1d08f24ad544 AUX tk-8.6.10-multilib.patch 404 BLAKE2B 64bead51acb308eb88147797288895cda5ea0f5165ccde7a4bb87eae18eb119a81acdea776f107dd6e6c7884a01485aeab897334d07c91d5a52c10257e9fb9cc SHA512 cb62e986bd98a0b8d9f780afc9906d6ee290e3e2381919364709161d90403e95937bc83e11d1e88b7826812ea60b41b54a0c8daa10cb17f1236cdd782a152beb AUX tk-8.6.10-test.patch 18201 BLAKE2B 305f761282b489ea462eb5cfecf1612770aa9a3b293149245f66b87e440f03fc167f3fa6de991330637951ec413906beaf6430c516431a5df1512e1307b80a99 SHA512 b3e20ba67412fed07bf47b2e2642e5962e082a78b66c2b2f058a31daf1ad757b6375e65be3e9afa374db731b28809780828be95b26cbde7873899979cf1c7f80 +AUX tk-8.6.11-test.patch 2589 BLAKE2B 8917d71ef1072dfd10f35d009323f3787479104d53071fc094d762d66b260b7d72584b8bf330cc76a09fd45b471b19982edbb62603471d0c4f3ce056240b1ab1 SHA512 08648d57f3e27e574f94ff15821514fd53b85554f7e182a20685f3d6f6c5c2ef7557088c49e5689cbc88c5117e452ed512dd748b8524b5a7af60f084344ab897 AUX tk-8.6.8-libieee.patch 708 BLAKE2B ec8422ce98c68f2dd347bea807059fd8ee94fcd4540bdeb4c8d90cd7f028ff3dbe406ed26593ebd8815e611a1ae40390b4194bf8d3efd1863e8c15d04918681c SHA512 b25d2fbfc753296cef11b1943e19537aaf9f048f033078e516f36bc021107197f77b8f142fc7ace89ae6bdda037871ce7a5c45800ef0bebd04f77a5281bff457 AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5ceeecc45c98b27a5386a9b9443af7c329fc422c5249c3da6308552d5c879b5629ae47b705c0d2ddac5534 SHA512 10447a13d597c0917d15089dcfab64165927589ea0fbec7073699788f5ba003e561a6af6562b2ee3e3b40df2f9dc0719c2ca4209a927e506710a390c7a67eb70 DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f DIST tk8.6.10-src.tar.gz 4444764 BLAKE2B f56647e005778c802352aee0257c0a8f5e0014c9d21362592f08030252d83141cca385f0fb95c0e7e930016255c3b2cef49a65064e056a877214b7d7a1a01246 SHA512 d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5 +DIST tk8.6.11-src.tar.gz 4496914 BLAKE2B c3050a48d5cb3bd3095b2c439b3d33992551f953a981bf23eedbf774368b383abc77fb3156aa4bcaae658d0706495cff03536ab8258f9d824ff8f4325b36cc38 SHA512 2e11490f2f51ef7e723661dd91c95622234fb97850e80d8ecd564be8c28f7c8fb0334a97cf8267af9d68f63e4adea887a1a4eec8d2e807d6a970b5912f99d3f2 +DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4 DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686 DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 EBUILD tk-8.5.17-r1.ebuild 3560 BLAKE2B 93ed1cb14c0c19a0550bbbac0e709bc4679af057b621655d7d6e708ae2f48f78146c64e507eed8db9ae67ffcdb1f3c1ce0b0a12c1b72bd6247190bd2708ba377 SHA512 3a635f4158f718ca599d2a27b1438ae4322410b4db224ec5026b7667f1e61550df0f979451cd87fa22c6e861e251704e64e53717bbff18daa0bc334f22b3a714 EBUILD tk-8.6.10.ebuild 4156 BLAKE2B 9e1b4c777abe66af6a726cf13c083f24a3a272db6dd02b4f077412cbf0f957ad3b2e2b587ad0d730fb59c9afc2d280bb003881739dcc33c7ad3b551e89f8cfd7 SHA512 813ad0926c98367e2685ad32c0dc44d1003bcfb793dbb8869b8ccf3140eaf0c9f99f0a60e135ed8b2d92711cb67602298e42ffbf30ce4a36e3c361881009f052 +EBUILD tk-8.6.11.1.ebuild 4056 BLAKE2B 6c6d5f5f7d825e971e1fa9c31d1bd9c5ee0e2959ea1f7014bd3c10bb313eefb7a8334a60970b1f261ec17b09b23cd420fc9a1be4b608c883d93faf6fac289c63 SHA512 21cdb1f4580d76ade2fad0c6d28f46f3c9b1b00f835a1db4ebdf7eb9e5cdda7586721c5ebf236b947709dd44b5a0618e07d2a4b242eedcec474d2b544f61a3a0 +EBUILD tk-8.6.11.ebuild 4048 BLAKE2B 64f027de88ee55d7ad3b81d2bbc154913ff5525b01ca922ce32d81d5114fee12042dddfd41da878701e7bd12f9d79a3abe57333a11e48630c5ce705b6570a96c SHA512 40109fce5eb93a0501c2034a7fd38760d67d59df26c2439b395044a4bef73664f2843a62d87afa06add74772ca69ecd3c0c2e87efd80427b0d42befc9d4f2c9d EBUILD tk-8.6.8.ebuild 4109 BLAKE2B 143bb4e973d2dc0cbf2fe44d261115c17dee16936a865dd870d2f673fcf843ee9de82321087c8d4a4229185ec5e6eec96a92e2b51d3ea636e3a8ba4d88480faa SHA512 125ab4cbd73fc23d0aab1d426ebf21ac117c292de310cbd192f472db38b0249529857acfc8fdcb926b39d98584269aedd663adf2db9b85bda935eb4e215ef606 EBUILD tk-8.6.9.1.ebuild 4054 BLAKE2B c43eb1108e479d3d68d0ad12f7949a9674368228c0273460f8947c287405bad09fc2b31e65cfc738cc3ed09813fe9a18ddeaed2eca8a26e0abf57ff3c840a53b SHA512 f5b53c321f8c535b4671464e230c78b8328b74e107b313d4338a7cfe421903cb1385410cbf1775292622a1b6db208c4f10272d1077e41ea37e0e5545e526d174 EBUILD tk-8.6.9.ebuild 4020 BLAKE2B 521580f53726b28ba71830ded0e4b57d20beeb6cf73c8bbd976238b3c30d7bb01385d0da3c10fef9707bf6d03122c967a385076d63d44442985c3debf1161ad2 SHA512 8e6b0312c1a6a51f15f4322e6ab3e580fb411486337bed5129a77e3a9a7538c1730eea980c8e9e8f92496c697af3a6331445b379760143772d863b627e9b2828 diff --git a/dev-lang/tk/files/tk-8.6.11-test.patch b/dev-lang/tk/files/tk-8.6.11-test.patch new file mode 100644 index 000000000000..96cd174be884 --- /dev/null +++ b/dev-lang/tk/files/tk-8.6.11-test.patch @@ -0,0 +1,72 @@ +--- a/tests/ttk/entry.test 2020-12-26 18:46:45.262306641 +0100 ++++ b/tests/ttk/entry.test 2020-12-26 18:47:00.246040124 +0100 +@@ -111,34 +111,34 @@ + set result [.e xview] + } -result {0.0 0.5} + +-test entry-3.3 "xview" -body { ++test entry-3.3 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end abcdefghijklmnopqrstuvwxyz + .e xview end + set result [.e index @0] + } -result 7 + +-test entry-3.4 "xview" -body { ++test entry-3.4 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end abcdefghijklmnopqrstuvwxyz + .e xview moveto 1.0 + set result [.e index @0] + } -result 7 + +-test entry-3.5 "xview" -body { ++test entry-3.5 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end abcdefghijklmnopqrstuvwxyz + .e xview scroll 5 units + set result [.e index @0] + } -result 5 + +-test entry-3.6 "xview" -body { ++test entry-3.6 "xview" -constraints knownBug -body { + .e delete 0 end; + .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5] + .e xview scroll 2 pages + set result [.e index @0] + } -result 40 + + test entry-3.last "Series 3 cleanup" -body { + destroy .e + } +--- a/tests/ttk/spinbox.test 2020-12-26 18:49:19.967554727 +0100 ++++ b/tests/ttk/spinbox.test 2020-12-26 18:49:58.015877788 +0100 +@@ -136,7 +136,7 @@ + destroy .sb + } -returnCodes error -result {bad validate "bogus": must be all, key, focus, focusin, focusout, or none} + +-test spinbox-1.8.4 "-validate option: " -setup { ++test spinbox-1.8.4 "-validate option: " -constraints knownBug -setup { + set ::spinbox_test {} + ttk::spinbox .sb -from 0 -to 100 + } -body { +--- a/tests/font.test 2020-12-26 19:15:55.199228774 +0100 ++++ b/tests/font.test 2020-12-26 19:18:05.414951407 +0100 +@@ -399,7 +399,7 @@ + # (tkfont == NULL) + font measure "\{xyz" abc + } -returnCodes error -result "font \"{xyz\" doesn't exist" +-test font-9.5 {font command: measure} -body { ++test font-9.5 {font command: measure} -constraints knownBug -body { + # Tk_TextWidth() + expr {[font measure $fixed "abcdefg"] == [font measure $fixed "a"]*7 } + } -result 1 +@@ -450,7 +450,7 @@ + # (Tcl_GetIndexFromObj() != TCL_OK) + font metrics $fixed -xyz + } -returnCodes error -result {bad metric "-xyz": must be -ascent, -descent, -linespace, or -fixed} +-test font-10.9 {font command: metrics: get individual metrics} -body { ++test font-10.9 {font command: metrics: get individual metrics} -constraints knownBug -body { + font metrics $fixed -ascent + font metrics $fixed -descent + font metrics $fixed -linespace diff --git a/dev-lang/tk/tk-8.6.11.1.ebuild b/dev-lang/tk/tk-8.6.11.1.ebuild new file mode 100644 index 000000000000..f033c912f9c6 --- /dev/null +++ b/dev-lang/tk/tk-8.6.11.1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal prefix toolchain-funcs virtualx + +MY_P="${PN}${PV/_beta/b}" + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" + +LICENSE="tcltk" +SLOT="0/8.6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug +threads truetype aqua xscreensaver" +RESTRICT="!test? ( test )" + +RDEPEND=" + !aqua? ( + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) + xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) + ) + ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + !aqua? ( x11-base/xorg-proto )" + +# Not bumped to 8.6 +#RESTRICT=test + +SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})" +S="${SPARENT}"/unix + +PATCHES=( + "${FILESDIR}"/${PN}-8.6.10-multilib.patch + "${FILESDIR}"/${PN}-8.4.15-aqua.patch + "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971 + "${FILESDIR}"/${PN}-8.6.11-test.patch +) + +src_prepare() { + find \ + "${SPARENT}"/compat/* \ + -delete || die + + pushd "${SPARENT}" &>/dev/null || die + default + popd &>/dev/null || die + eprefixify Makefile.in + + # Make sure we use the right pkg-config, and link against fontconfig + # (since the code base uses Fc* functions). + sed \ + -e 's/FT_New_Face/XftFontOpen/g' \ + -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ + -e 's:xft freetype2:xft freetype2 fontconfig:' \ + -i configure.in || die + rm configure || die + + tc-export CC + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + sed \ + -e 's:-O[2s]\?::g' \ + -i tcl.m4 || die + + mv configure.{in,ac} || die + + eautoconf + + multilib_copy_sources +} + +multilib_src_configure() { + if tc-is-cross-compiler ; then + export ac_cv_func_strtod=yes + export tcl_cv_strtod_buggy=1 + fi + + local mylibdir=$(get_libdir) + + econf \ + --with-tcl="${EPREFIX}/usr/${mylibdir}" \ + $(use_enable threads) \ + $(use_enable aqua) \ + $(use_enable truetype xft) \ + $(use_enable xscreensaver xss) \ + $(use_enable debug symbols) +} + +multilib_src_test() { + CI=1 virtx emake test +} + +multilib_src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + + # normalize $S path, bug #280766 (pkgcore) + local nS="$(cd "${S}"; pwd)" + + # fix the tkConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ + -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ + -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ + -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then + sed \ + -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/*.h + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die + + # install symlink for libraries + dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + if multilib_is_native_abi; then + dosym wish${v1} /usr/bin/wish + dodoc "${SPARENT}"/{ChangeLog*,README.md,changes} + fi +} diff --git a/dev-lang/tk/tk-8.6.11.ebuild b/dev-lang/tk/tk-8.6.11.ebuild new file mode 100644 index 000000000000..741a2f709920 --- /dev/null +++ b/dev-lang/tk/tk-8.6.11.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal prefix toolchain-funcs virtualx + +MY_P="${PN}${PV/_beta/b}" + +DESCRIPTION="Tk Widget Set" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" + +LICENSE="tcltk" +SLOT="0/8.6" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug +threads truetype aqua xscreensaver" +RESTRICT="!test? ( test )" + +RDEPEND=" + !aqua? ( + >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] + truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] ) + xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) + ) + ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + !aqua? ( x11-base/xorg-proto )" + +# Not bumped to 8.6 +#RESTRICT=test + +SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})" +S="${SPARENT}"/unix + +PATCHES=( + "${FILESDIR}"/${PN}-8.6.10-multilib.patch + "${FILESDIR}"/${PN}-8.4.15-aqua.patch + "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971 + "${FILESDIR}"/${P}-test.patch +) + +src_prepare() { + find \ + "${SPARENT}"/compat/* \ + -delete || die + + pushd "${SPARENT}" &>/dev/null || die + default + popd &>/dev/null || die + eprefixify Makefile.in + + # Make sure we use the right pkg-config, and link against fontconfig + # (since the code base uses Fc* functions). + sed \ + -e 's/FT_New_Face/XftFontOpen/g' \ + -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \ + -e 's:xft freetype2:xft freetype2 fontconfig:' \ + -i configure.in || die + rm configure || die + + tc-export CC + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + sed \ + -e 's:-O[2s]\?::g' \ + -i tcl.m4 || die + + mv configure.{in,ac} || die + + eautoconf + + multilib_copy_sources +} + +multilib_src_configure() { + if tc-is-cross-compiler ; then + export ac_cv_func_strtod=yes + export tcl_cv_strtod_buggy=1 + fi + + local mylibdir=$(get_libdir) + + econf \ + --with-tcl="${EPREFIX}/usr/${mylibdir}" \ + $(use_enable threads) \ + $(use_enable aqua) \ + $(use_enable truetype xft) \ + $(use_enable xscreensaver xss) \ + $(use_enable debug symbols) +} + +multilib_src_test() { + CI=1 virtx emake test +} + +multilib_src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + + # normalize $S path, bug #280766 (pkgcore) + local nS="$(cd "${S}"; pwd)" + + # fix the tkConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \ + -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \ + -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \ + -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then + sed \ + -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tk${v1}/include/unix + doins "${S}"/*.h + insinto /usr/${mylibdir}/tk${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die + + # install symlink for libraries + dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) + dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a + + if multilib_is_native_abi; then + dosym wish${v1} /usr/bin/wish + dodoc "${SPARENT}"/{ChangeLog*,README.md,changes} + fi +} diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest index 0f10a6b35a22..18933d3f32dc 100644 --- a/dev-lang/yap/Manifest +++ b/dev-lang/yap/Manifest @@ -1,7 +1,4 @@ DIST YAP-6.3.4.tar.gz 11007893 BLAKE2B d8024fb68269bbb4f9a434e2be13b4a42aa250f7e6505ef8f6e4c76d50510e04e9a2985796ce66b1d426a877646eafeecb30774c353f5a820c32dc3cbdf20b1c SHA512 67884b98bbc564f23f88cbb1462127a47f3d0602ac347d1c8b0857e5d8ebd9d0ca28770229a6beb52493c6c3256b6cdf8dad25ed2963c64102093f70c4c20a3a -DIST yap-6.3.3-gentoo-patchset-13.tar.gz 8677 BLAKE2B ebaea8e2851a5025482422161cfca8f5c65bea65e08ed0fd8032956a909bcf8e486558705b663004aa506a614dc4d638107e3ad5fc590fc3b74a0fd203fb33d3 SHA512 b1a2b202ce05c97aebf8c869d24276f7ca12c6f1027886902d8cd7267cd623ed73c5652f49e7e58386a93b37dcfbdfc83e3b0bd1aeddb95245a5f0e8adcc852b -DIST yap-6.3.3.tar.gz 7879301 BLAKE2B 1b12a3113dd57634df64680726fd49575979b84126a7a9e1f4d1429be90e1b95599166151ffe62c9ef990ac3c32f57a1efae081b864fc22225c93d21807f412b SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80 DIST yap-6.3.4-gentoo-patchset-0.tar.gz 5165 BLAKE2B 1f6c9f91f2d2c0e9488f26e1a8079a40ed30c1c83c7171024dd0c0115874e336bbdfa449246e363d0030bd05dc0d86e9efa19cc2fdc4d04b96faeb33b9ade9d0 SHA512 a2a39869042cb647dc022b34a4dd0881a6a35ad0bf88527380d6d74e5307f9dd0ab5feea8e9e922524e3dce39132ab6c8cadd78f92735e2c368d7b277cbe6944 -EBUILD yap-6.3.3-r1.ebuild 2900 BLAKE2B c910366dce14626845c9d8e5d3b571a45dfad735228cc0b9852c0e967fb264620280d2fee5ec5ad496c0ca507e0eab499368ea545188a6e05413410365dc9234 SHA512 b2c3eee06745115093a5c63429f0838b09d43b5e273ab7a6e5edc746bdcf9b892ec0bc2c9ef830438defe1efc0ba74fea5cca9d84e2b34fb851bb0eb2145ff35 EBUILD yap-6.3.4.ebuild 3435 BLAKE2B 76a1a62f4f39fc3646e57d275608c662e98f2390dec3956d61ff6d0735cff265b3eeabf75b8fbb430511969984b633cd35b5dac3c7d38edd896dc8234de96e29 SHA512 9b38c8e553566c374fcee28d91307b0c98a36e59dd0fa54cb689828afd9c6462809d290e462e62dc88241e9db65aba8dbace42cd7f0b90c59ca17c5929498d5e MISC metadata.xml 388 BLAKE2B 6664a3afcf7d766c6167c87d139aeb008ebf1525528dbb8b6b0b9e051279a60083a3858149aaaf579563c8ddc12b3c02b9712b37d52244b659eb7d953ba946ad SHA512 cdd5e0418ac4fd525d5cbde6982591d542d9accbb48e4d7726c21257dfb114ca2c7438c2c9c914368fb407ab32ac1edd02d918689ba8a1cba4035e20135c64dd diff --git a/dev-lang/yap/yap-6.3.3-r1.ebuild b/dev-lang/yap/yap-6.3.3-r1.ebuild deleted file mode 100644 index 97ef2fda8f97..000000000000 --- a/dev-lang/yap/yap-6.3.3-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic java-pkg-opt-2 - -PATCHSET_VER="13" - -DESCRIPTION="YAP is a high-performance Prolog compiler" -HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/" -SRC_URI="http://www.dcc.fc.up.pt/~vsc/Yap/${P}.tar.gz - https://dev.gentoo.org/~keri/distfiles/yap/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="Artistic LGPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="R debug doc examples gmp java mpi mysql odbc readline static threads" - -RDEPEND="sys-libs/zlib - gmp? ( dev-libs/gmp:0 ) - java? ( >=virtual/jdk-1.4:= ) - mpi? ( virtual/mpi ) - mysql? ( dev-db/mysql-connector-c:0= ) - odbc? ( dev-db/unixODBC ) - readline? ( sys-libs/readline:= sys-libs/ncurses:= ) - R? ( dev-lang/R )" - -DEPEND="${RDEPEND} - doc? ( app-text/texi2html )" - -PATCHES=( "${WORKDIR}"/${PV} ) - -src_prepare() { - default - rm -rf "${S}"/yap || die "failed to remove yap xcode project" - - # Fix QA error on doc location - local mFile - for mFile in Makefile.in packages/Dialect.defs.in \ - $(find packages -name Makefile.in) ; do - sed -i -e "s~doc/Yap~doc/${PF}~" "${mFile}" || die - done -} - -src_configure() { - append-flags -fno-strict-aliasing - - local myddas_conf - if use mysql || use odbc; then - myddas_conf="--enable-myddas" - else - myddas_conf="--disable-myddas" - fi - if use mysql; then - myddas_conf="$myddas_conf yap_with_mysql=yes" - fi - if use odbc; then - myddas_conf="$myddas_conf yap_with_odbc=yes" - fi - - econf \ - --libdir=/usr/$(get_libdir) \ - --disable-chr \ - --disable-prism \ - --disable-gecode \ - $(use_enable !static dynamic-loading) \ - $(use_enable threads) \ - $(use_enable threads pthread-locking) \ - $(use_enable debug debug-yap) \ - $(use_enable debug low-level-tracer) \ - $(use_with gmp) \ - $(use_with readline) \ - $(use_with mpi) \ - $(use_with mpi mpe) \ - $(use_with java) \ - $(use_with R) \ - ${myddas_conf} -} - -src_compile() { - default - - if use doc ; then - emake html - fi -} - -src_test() { - # libtai package contains check.c which confuses the default - # src_test() function - true -} - -src_install() { - default - - dodoc changes*.html README - - if use doc ; then - dodoc yap.html - fi - - if use examples ; then - insinto /usr/share/doc/${PF}/examples/chr - doins packages/chr/Examples/* - insinto /usr/share/doc/${PF}/examples/clib - doins packages/clib/demo/* - insinto /usr/share/doc/${PF}/examples/http - doins -r packages/http/examples/* - insinto /usr/share/doc/${PF}/examples/plunit - doins packages/plunit/examples/* - if use java ; then - insinto /usr/share/doc/${PF}/examples/jpl/prolog - doins packages/jpl/examples/prolog/* - insinto /usr/share/doc/${PF}/examples/jpl/java - doins packages/jpl/examples/java/README - doins -r packages/jpl/examples/java/*/*.{java,pl} - fi - if use mpi ; then - insinto /usr/share/doc/${PF}/examples/mpi - doins library/mpi/examples/*.pl - fi - fi -} |