gentoo resync : 21.06.2020

5 files changed, 31 insertions, 48 deletions

diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 6476ee9a221d..f5c2e94bbae0 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -1,9 +1,9 @@
 AUX elixir-1.10.2-test-regex-fix.patch 1092 BLAKE2B 132d75468b1128dc20a51d39cd7ea53640a89e037c10781aa368e965a303d4411ab176e92ff57c5109d28ae02f0e51f621f3816eaef9a65be6f93eb7c0e43bfb SHA512 98e0a19f5e911cfd930c15615c6a651b8510bdd01bd34994f3edaa475665fe4e1d284368ad685fe6acf461dd7ff4648c140fa949b93bcb62d645920c642d75d1
+AUX elixir-1.10.3-epmd-daemon.patch 512 BLAKE2B c767cf4336214396d953efe568f0302d6852ec5332575202c167f38553deb9878b69d0744ed8a4062bbcb996df840f759f390ddc0c5e467aeab99250dee5a72e SHA512 dfe12ca0b47529a29d87871c9b31728099f816a0bd416512dd2409686fe6ceeb0e80e9da322ff38df27600da3235d174b365c80b8cae0e55eaee328b1260bc0d
+AUX elixir-1.10.3-no-Q.patch 355 BLAKE2B 903e5a7149f6e7f7030a533ae437b0e40b97c82c6baa7f90c1dff37fedf96c2e821e98529007e2300a92b8b3e9284428d91d6ee45888da7d79b18d35dfd89e58 SHA512 21d28b63fee2877337c0df095cfa200ae11ec2f0c76556e971957bb92e2b8e9d811c939b1efa458c633b61d3525f47a8b04d1b6f23df04e50ffb3ed5225f7c18
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
-DIST elixir-1.10.2.tar.gz 2323450 BLAKE2B 2d0897af98864966dabc8760d3551caeae39baddc892239c398f3aecf6b72db0ee9d3c8e03fbc8b7a7da0b0dcb08f200fa145d704b8306190eb47a9ccb862bb4 SHA512 a1d1c7847fc8135865d063c6e014bee970066ba07f979f308bec456a732f5366a9343631239965d1caeeaea5cdb644f35185fdfb23f18fcc8c6735a7e3256c0f
 DIST elixir-1.10.3.tar.gz 2329031 BLAKE2B 0e8d84c71f4bb260aef875370acb89b6a8daf5187aec5fe28d13054b6a16e91925aec46a312a31e607b469657a0f4cb34d29735e9633ddc7cd69417402f1b8b1 SHA512 66b18b983e5374afbd4d94c43a880c5e46a9aa150fa6f38be74ff7f58a19eaaee00248b202d9ae3f6b78e2495fc8d5cec755de644256a731be367766c3812855
 DIST elixir-1.9.4.tar.gz 2250611 BLAKE2B adc363627dc3997684482ac022927aaa4d315afdb8fbc8981e1b88371eb13be80e01084b67288fc88fc51f0015085743d11289e932093d5608e5ac4dfa0823a8 SHA512 c97b93c7438efd7215408525a3b9f2935a1591cce3da3eb31717282d06aff94e8e3d22c405bac40c671bcfe8e73f3dd1ada315f53dee73ceef0bfe2a7c27e86d
-EBUILD elixir-1.10.2.ebuild 881 BLAKE2B d49f7d705ccc444e4a9b7ed1821f4184c640115d20a0e0670d9daf40a56085106e256b877c4212571970675b38989967c21bd4ec872dba0fb46cc8a544cc302d SHA512 d159ef309974512e113bac24381a70827b55008c4ea4f9350a461e8d7d983b7f8792bd42c9e5797c649ab555ada6584311fbf861f54ceb42190f66230bef0f9c
-EBUILD elixir-1.10.3.ebuild 832 BLAKE2B a6b773168780e531aba87ca5924a8d4c60c1d5174985f00b4d04d302ef45c7e62558bd0ca53724895a2dee1c8f696a0ed4e28d84c501115614a3c888bfafad51 SHA512 2219b506b85987d503b9f6c076478e3f5000ceb5ac39cb3a1a586824dcb703c3fe7732dbc25778c76fa2a6b8bda4a02c4a7ea16e765b5525ccf278ab09ae8cbf
+EBUILD elixir-1.10.3.ebuild 883 BLAKE2B c8945f6c84ce2ba4ef99b42f5f0f3c262cfb6d743cd418f66113cab8a9a90caf1ddc71441d96b3755e9025974688909d8306b63ded24d871733d263c54df1d56 SHA512 a3581664d0fe5c49bd7c4ed2b6f2fba7c4b402944daf7c79e79acbd7ffbb463c17e559d961f7abd3c54c5ca5e6d23520e379a5712d7d232439b5c878291cb3d7
 EBUILD elixir-1.9.4.ebuild 756 BLAKE2B 45337b098daa503ea61e9f8f5d8e4ccb6bbd09babb2457dc85a8e96cb79f76ec31d1ef393d015d8fb878b6c4e0d9c4380f39252d8e67b6da5b5e99dc79b77c5b SHA512 97ee97a4b7aece89c3308aa9efc050562e688e491fc313afd31a6400048c1551f734e5222963b187cc7ae4006d112ace23bee093645acfa96d88839136437e8b
 MISC metadata.xml 790 BLAKE2B 33e4a37225c8f5bd142c5cbbe097ad3330f6c5b1115f834c1c20613281bdc0afa0927734ec3b0a2b1da595980abeec2fcf2bb20e725f5701590d1c3629972910 SHA512 5489797d3771c405edb4c9883082f780279470d7821dbdd1a4790bcdc74c0e31327c8f15286dc421bfe426d7371d6be2819e707389f425101e2d0d0577475586
diff --git a/dev-lang/elixir/elixir-1.10.2.ebuild b/dev-lang/elixir/elixir-1.10.2.ebuild
deleted file mode 100644
index 6db35bebc3c2..000000000000
--- a/dev-lang/elixir/elixir-1.10.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Elixir programming language"
-HOMEPAGE="https://elixir-lang.org"
-SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 ErlPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-lang/erlang-21:0=[ssl]
-"
-# 'mix' tool collides with sci-biology/phylip, bug #537514
-RDEPEND="${DEPEND}
-	!!sci-biology/phylip
-"
-DEPEND+="
-	test? ( dev-vcs/git )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
-	"${FILESDIR}"/${P}-test-regex-fix.patch # backport
-)
-
-src_compile() {
-	emake Q=""
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
-	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
-}
diff --git a/dev-lang/elixir/elixir-1.10.3.ebuild b/dev-lang/elixir/elixir-1.10.3.ebuild
index 09b53ffa83a4..5d77e804b6ce 100644
--- a/dev-lang/elixir/elixir-1.10.3.ebuild
+++ b/dev-lang/elixir/elixir-1.10.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 ErlPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~sparc x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
@@ -27,12 +27,10 @@ DEPEND+="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
+	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
 )
 
-src_compile() {
-	emake Q=""
-}
-
 src_install() {
 	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
 	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
diff --git a/dev-lang/elixir/files/elixir-1.10.3-epmd-daemon.patch b/dev-lang/elixir/files/elixir-1.10.3-epmd-daemon.patch
new file mode 100644
index 000000000000..48cfeb752b25
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.10.3-epmd-daemon.patch
@@ -0,0 +1,13 @@
+Avoid exec/SIGCHLD race in daemon fork.
+Let's see if it fixes race seen in https://bugs.gentoo.org/727344
+--- a/Makefile
++++ b/Makefile
+@@ -280,7 +280,7 @@ test_elixir: test_stdlib test_ex_unit test_logger test_mix test_eex test_iex
+ 
+ test_stdlib: compile
+ 	@ echo "==> elixir (ex_unit)"
+-	$(Q) exec epmd & exit
++	$(Q) epmd -daemon
+ 	$(Q) if [ "$(OS)" = "Windows_NT" ]; then \
+ 		cd lib/elixir && cmd //C call ../../bin/elixir.bat -r "test/elixir/test_helper.exs" -pr "test/elixir/**/$(TEST_FILES)"; \
+ 	else \
diff --git a/dev-lang/elixir/files/elixir-1.10.3-no-Q.patch b/dev-lang/elixir/files/elixir-1.10.3-no-Q.patch
new file mode 100644
index 000000000000..3f55785839b7
--- /dev/null
+++ b/dev-lang/elixir/files/elixir-1.10.3-no-Q.patch
@@ -0,0 +1,12 @@
+Enable verbose builds by default.
+--- a/Makefile
++++ b/Makefile
+@@ -8,7 +8,7 @@ ERLC := erlc -I lib/elixir/include $(ERLC_OPTS)
+ ERL := erl -I lib/elixir/include -noshell -pa lib/elixir/ebin
+ GENERATE_APP := $(CURDIR)/lib/elixir/generate_app.escript
+ VERSION := $(strip $(shell cat VERSION))
+-Q := @
++Q :=
+ LIBDIR := lib
+ BINDIR := bin
+ INSTALL = install