gentoo resync : 16.09.2021

5 files changed, 104 insertions, 2 deletions

diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index 47c04fcf7d14..d1f4fcd21859 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -1,5 +1,9 @@
 AUX polyml-5.6-configure.patch 390 BLAKE2B 7f20e9de1c00a429ed86ab33cd05bd2aed0a4c431d92f52e7c93c4c44f4f4611637299020d3cbf7c32b9d43f868757f4b7c534f68e5b7120c75ee0b27b5f8316 SHA512 d868d6739e88ccacf7ab5ee495ffaa54fb3ace83c57633fde2d97fb894c9e0c81e896e15192318f9b8bbcb678efb95a827549a0fd30d2ca87473b582fa09f850
 AUX polyml-5.6-ffi3.patch 584 BLAKE2B 6c7e38c077968f439f03739a4d95bad6d5f631b4cf4e1a51a58ae6273c40a1ae5dbd1fe3aa6e338215f9cedec950435e846351275be7bccb80fd313965888b78 SHA512 22bb8e13672ddb0a8f7a3ed9908fb652e238c849b553ab3ceb9b33daebc35d6502dbff3f099ab933f4e2639b5eac2294e21d45bfc96dcb1b9c6be0129c57232d
+AUX polyml-5.8.2-configure.patch 512 BLAKE2B dec4df5f79271e680d0bd1533f1dec32b6360cebb0cfeae10987e7ba5f92be961529d85471412d575bd7dddcc1a447304b5bf77d814ac54f4500913e57032f50 SHA512 c4730ee4550c0ff9eb6c8d9efbb8eb3a30d1a96a93be990a7f38f9adbc6944d51f03c449f2f8af3c8cef2c42519ce9f01df8e2b54a8a03b40f9748d09a238437
+AUX polyml-5.8.2-glibc234.patch 1259 BLAKE2B 118aa993d37e15dde23754b217fa3dd5116bec99a2ba0d9bb421dd26ec4a47428fa1d0ea0790c9d5f619f3820c78d2e8be26e100ca05fbe03b2670990972e67e SHA512 e9a86d04eca3632416981def6a7528f1761d7e2f51168a132f8be1f9f36654100a38e4d574eb8d1b9092ce9a0908f91d3794ffae7d891a6783d6f2371f724d43
+DIST polyml-5.8.2.tar.gz 8819392 BLAKE2B 28abec92f8372779ca2b431a069f43a38f0560056edc37b615d5ddc48a9d5b17f2d56c35de3e8f38a1449873d2a7cfc419f6305c790ab77590a8b785f7cfc092 SHA512 c1bac59b837762b500496eb8bf0294db76e3707b77984e5a31860b96a2fb2f406db610da5241c6ec2c00f623d76c16957e811cc808f60a3d220c15fa70440282
 DIST polyml-5.8.tar.gz 9817105 BLAKE2B 93992c8baa78017bfda6c2151d1f48805829b77c0b7ed9bec87c951fc4a4236459ed59aab1eca88ed4a1d7aa10eb9734f93324583e012b18bb7d8cce84b5a35b SHA512 50baed79b50b14bd87acc637de93fd6d0f05e61fe0f03682a12a1d2c5f382313488d48f84b49ad915b01acc5a3a5769fb05fcaa7b24499c56402ddd3ba393930
+EBUILD polyml-5.8.2.ebuild 1141 BLAKE2B 604c086ae8731d0e038243407f8e72fa4ff200d733ae28325d5b9453665941b605271d074dbf8dcfbb6a3f9a71594c5091c415fd20dfeef893239d09e6ece9c9 SHA512 b91bd08b49a42c7d9d1bf4f9817e9c271e8ebd1293b1444e41284aafdc2b2748f921c22a28f49982c4f19789fec8575a4c3a20a6e008b2688fe6974b018a2118
 EBUILD polyml-5.8.ebuild 1222 BLAKE2B 303ce107ff8f8131ea957ed8cf871a979529cd1bd51032f4b032a0dc1757535253a4085c8f4bed274a533be6f51b554525267171ea41ad5217e8aeee442ee15e SHA512 6773ac8ab453edc3a2e6dd4091881c7c8719a6806e270f64ef35027527fd362cabe52555c46f692b3d5bf0ef5364ab3c06fe01ab221c5f71fbca11f33ac2e3b0
-MISC metadata.xml 410 BLAKE2B 40595871124d86280ce855df1fcdfb31620828352b68b32c52feed79855bf72352e7ed3c0170683d37dfdd622e6bf2e4c69bd213f934b009a009cc3437712970 SHA512 2e1e9fffeb4895cce395005ea78661174f9959d90b7df35e25413bff30b2ca102fd189b46df080f1307d071b0c13743bf80fc5141f6e3af79f3ff1bacde32c18
+MISC metadata.xml 411 BLAKE2B ada287894c05db18789f2a5b96f8086d3fae8388281a5112f6f5356ab7f6edf818257a72f0ff9eb4e4f96b8769c24558d7ccf143e4824aca37212128804d03e8 SHA512 ec4ed37c8a94332807a58ca55f4d5c1051d5138073a33498be521d1424c841a352c36f47603bb51416257dc0219682296c96f374e97d50983ae519753dd36bf1
diff --git a/dev-lang/polyml/files/polyml-5.8.2-configure.patch b/dev-lang/polyml/files/polyml-5.8.2-configure.patch
new file mode 100644
index 000000000000..5fd1c30dac75
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.8.2-configure.patch
@@ -0,0 +1,12 @@
+diff -ruN polyml-5.8.2.orig/configure.ac polyml-5.8.2/configure.ac
+--- polyml-5.8.2.orig/configure.ac	2021-05-02 13:53:42.000000000 +0200
++++ polyml-5.8.2/configure.ac	2021-09-10 19:29:27.370699622 +0200
+@@ -198,7 +198,7 @@
+     # Solaris needs -lsocket, -lnsl and -lrt
+     AC_SEARCH_LIBS([gethostbyname], [nsl])
+     AC_SEARCH_LIBS([getsockopt], [socket])
+-    AC_SEARCH_LIBS([sem_wait], [rt])
++    AC_SEARCH_LIBS([sem_wait], [rt] [pthread])
+ 
+     # Check for X and Motif headers and libraries
+     AC_PATH_X
diff --git a/dev-lang/polyml/files/polyml-5.8.2-glibc234.patch b/dev-lang/polyml/files/polyml-5.8.2-glibc234.patch
new file mode 100644
index 000000000000..9636cc61f245
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.8.2-glibc234.patch
@@ -0,0 +1,30 @@
+From 3e27444bea771e25102430bfa632edf8d106c91c Mon Sep 17 00:00:00 2001
+From: Jerry James <loganjerry@gmail.com>
+Date: Mon, 9 Aug 2021 15:37:39 -0600
+Subject: [PATCH] Adapt to nonconstant PTHREAD_STACK_MIN in glibc 2.34+
+
+---
+ libpolyml/sighandler.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libpolyml/sighandler.cpp b/libpolyml/sighandler.cpp
+index fd6f6e3e..5d22b000 100644
+--- a/libpolyml/sighandler.cpp
++++ b/libpolyml/sighandler.cpp
+@@ -547,11 +547,11 @@ void SigHandler::Init(void)
+     pthread_attr_t attrs;
+     pthread_attr_init(&attrs);
+ #ifdef PTHREAD_STACK_MIN
+-#if (PTHREAD_STACK_MIN < 4096)
+-    pthread_attr_setstacksize(&attrs, 4096); // But not too small: FreeBSD makes it 2k
+-#else
+-    pthread_attr_setstacksize(&attrs, PTHREAD_STACK_MIN); // Only small stack.
+-#endif
++    // In glibc 2.34 and later, PTHREAD_STACK_MIN may expand to a function call
++    size_t stacksize = PTHREAD_STACK_MIN; // Only small stack.
++    if (stacksize < 4096U) // But not too small: FreeBSD makes it 2k
++        stacksize = 4096U;
++    pthread_attr_setstacksize(&attrs, stacksize);
+ #endif
+     threadRunning = pthread_create(&detectionThreadId, &attrs, SignalDetectionThread, 0) == 0;
+     pthread_attr_destroy(&attrs);
diff --git a/dev-lang/polyml/metadata.xml b/dev-lang/polyml/metadata.xml
index f190cff1cfe1..dcfdf4de127b 100644
--- a/dev-lang/polyml/metadata.xml
+++ b/dev-lang/polyml/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
diff --git a/dev-lang/polyml/polyml-5.8.2.ebuild b/dev-lang/polyml/polyml-5.8.2.ebuild
new file mode 100644
index 000000000000..2f9102e07372
--- /dev/null
+++ b/dev-lang/polyml/polyml-5.8.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools pax-utils
+
+DESCRIPTION="Poly/ML is a full implementation of Standard ML"
+HOMEPAGE="https://www.polyml.org"
+SRC_URI="https://codeload.github.com/polyml/polyml/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="X elibc_glibc +gmp portable test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="X? ( x11-libs/motif:0 )
+	gmp? ( >=dev-libs/gmp-5 )
+	dev-libs/libffi:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.8.2-configure.patch
+	"${FILESDIR}"/${PN}-5.8.2-glibc234.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		--with-pic=pic-only \
+		$(use_with X x) \
+		$(use_with gmp) \
+		$(use_enable !portable native-codegeneration)
+}
+
+src_compile() {
+	# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
+	pushd libpolyml || die "Could not cd to libpolyml"
+	emake
+	popd
+	emake polyimport
+	pax-mark m "${S}/.libs/polyimport"
+	emake
+	pax-mark m "${S}/.libs/poly"
+}
+
+src_test() {
+	emake tests
+}