gentoo resync : 04.01.2022

4 files changed, 180 insertions, 4 deletions

diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index e9f178e4cb2c..847588b6391b 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -2,9 +2,11 @@ AUX scotch-6.0.4-as-needed.patch 6168 BLAKE2B 5b008f9035379d91cd8ffde6d64a22b021
 AUX scotch-6.0.4-flex-2.6.3-fix.patch 1623 BLAKE2B 9d86299eb543147ce7e736779b05c3b8113c12b54fbaf46a2b99a6cef2b670fc1b448d059858f954f37acf72c7c268acf1793de89f193d02f8b61d3f5d4ca1e5 SHA512 1a2a5a363e1dd59e1cced76928da15132cd1c8af57d6d0ad0eec04e02d029c6ae275e202e8c87bc65ff0188f41e379865829b5b61e4f1e44a885d48c4462b09e
 DIST scotch-v6.1.0.tar.gz 6292006 BLAKE2B 5b76b01c0fa752468a36830a15c190cd78efc851c3b6831eb2d16b7cf34a71d55463b266ffdee4c6addd4e66ca7caf75e63825051e600ee8a32494e5033cabbd SHA512 e6d217a23e39635f8749811a3fc64c8da14d0396a71b4042a4f8f3ce32ff1f0b4ed033ebae90f3785443dae9b35ded68ea512ed1e3e7f9ea9a471a499ae26b89
 DIST scotch-v6.1.1.tar.gz 6363384 BLAKE2B 337c81608fd245dde5b19bb6c79924e0ee80181ce3c935ae37e6248be2511a2f4d70bdda5b9217e5e1ed79fc00269de15755c3b6829579aa190ca6da9c3c2dac SHA512 daa62463f25416764250fe0452ae84bc6a2e485ee62a387418b4686c2ab93a2ca2d5a12cba922857c99a1c9ec67fc82951b0f9563ab97f5f3a6b86bb9da22b0c
+DIST scotch-v6.1.2.tar.gz 6395320 BLAKE2B 07aa4f56c097cf364d7d63613f3c5d5d3f2a8419ce27da95a4a20d5ea48fcf2f036acaa62ab1f591b5d1dc672151562bc0721a66f203c60d5ee26a501cf90352 SHA512 dcf63c65bf8155590a70483f80ad21b4a303debf50d47a3c154983935dc056f3df93a61c3d88304f3d1a4517ab3a355e176d72b3835382cd65c1556fbbd21702
 DIST scotch_6.0.4_esmumps.tar.gz 4804966 BLAKE2B 63c058fac9206e70975463b1748eb5ce7cd2ba01d9fcbb28eba8f5914ac49a71fcf87941fafd6047712fa519f3b5523ce199bdf5228a8b094bbb465dd64a1083 SHA512 0fcf639ab1a09451256444005f1a4a739403159e3ab22c34fbcedc481be387cd4c86be6fb029b4b5816220564f64f662434bf7f1d3921ed18be081ae2a7a9ee2
 EBUILD scotch-6.0.4-r2.ebuild 5042 BLAKE2B 3482237b7fcfaa11a4c1b0845d780059823ad509c823d41f052991b6a8977d6cea0ba1e96e5270a6d983a313300a6cb6e41ce7a94d7bb8316d3c38be521f1e9f SHA512 c376bc48a33a468921001462b116a2de43717d33b18e018e45f04efffcce034ea3c64b1eedae31f5a92e744d41bcff39cfc50ef0ca0f76f1062f814d40eeef46
-EBUILD scotch-6.1.0-r1.ebuild 4949 BLAKE2B f9ad61cc69a0ff7334f44148d405fff85491b71ee8e954a64eea476ef9744dc39870d994120e0b584999795227c35423a44215e399fee27574469c137a57bfd6 SHA512 9f7210c730b4f67062c8fd13643772240159c0b79b277940aaaf8f7d64783dc24361975b45cd5c95bedc3ca600841985fe32f234dcb2b81369b16729aefd055a
+EBUILD scotch-6.1.0-r1.ebuild 4948 BLAKE2B 4856a6123e7663f65de9cef8855875b45faa1dcd208e6a9833d4a255ca7cda7a82222e64a21ca3cfa9a1c9955af69e83ef13241c103ae81593fefb72be3b3187 SHA512 a469054850e7bc409d1f5e69f98d3d52337b4108f88aa0ed9fc9136c407e950be912b9c16aec452c010eee8ad77c3db3ce36035c83c0e143e9dacf79f006513c
 EBUILD scotch-6.1.0.ebuild 4942 BLAKE2B abbe129155d654ca4bf9ea5be27a703f44beb31bf2626042f763120ecdf70aad3a145e2dee2068b34038d92d634d29fe189353176eed242f37487aa62cf2f874 SHA512 4364a04ccfd41d423d439072a45be468ce844b916fd2f302e0e4dc7585217ff39ed0e52406fb96016e5b457606175b64c118f9d525629ed506bf11c700548d9e
-EBUILD scotch-6.1.1.ebuild 4956 BLAKE2B 90be76fd85e027e5649cf580e683168dc07010b1e4369a6c642d2b94aeb191b9f9944f416160d19117507dccab39dc643a3bb0db130ec691174adefef1129d33 SHA512 be8ef59bf19d25ccf85f4d5aa705f05f6d226f48e05d7d2b65d3fe52297ee6bbd944130119b781a1109fb1c47dbb2de95490c1c555c1058d9b972b06b9230463
+EBUILD scotch-6.1.1.ebuild 4957 BLAKE2B 66fe678726e0d48fa2e0d4eaa2147accd72088629b9ff7a250e7d2893a513e201032e3092a84b12b4150f6ef5005f5f6602fcd69bd57ef14e4bf56791c2db7b8 SHA512 c02acd26fa18fba7d8b04a4bb38e0b51b920abbc629c71033e2e1edfd65ad95a893c5309d96d90b660a58afa311aed898e7001a9767374452ec7d497299a2a5b
+EBUILD scotch-6.1.2.ebuild 4957 BLAKE2B 66fe678726e0d48fa2e0d4eaa2147accd72088629b9ff7a250e7d2893a513e201032e3092a84b12b4150f6ef5005f5f6602fcd69bd57ef14e4bf56791c2db7b8 SHA512 c02acd26fa18fba7d8b04a4bb38e0b51b920abbc629c71033e2e1edfd65ad95a893c5309d96d90b660a58afa311aed898e7001a9767374452ec7d497299a2a5b
 MISC metadata.xml 1169 BLAKE2B 33a4a76609e0b19a5b6f90556abc534dd36dc8b0c3baa1111197aaa0d8ff0bb29302ac52f67deb6b3f625eaad59fe18a25fb966086c67c53778202fc10d3e06c SHA512 282c23c6725a838a36b1f9a28ae3c96d2854cb988ba2563440d07f45adeb0c6dca642aa41d8ca88165a5d9e5ebeebf350e61b6466bdb785aa5669e7310d4374b
diff --git a/sci-libs/scotch/scotch-6.1.0-r1.ebuild b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
index 952cc6463c3f..d6ca0e868e39 100644
--- a/sci-libs/scotch/scotch-6.1.0-r1.ebuild
+++ b/sci-libs/scotch/scotch-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc int64 mpi static-libs test tools threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
diff --git a/sci-libs/scotch/scotch-6.1.1.ebuild b/sci-libs/scotch/scotch-6.1.1.ebuild
index 659fc047fa82..7075116f20e0 100644
--- a/sci-libs/scotch/scotch-6.1.1.ebuild
+++ b/sci-libs/scotch/scotch-6.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-v${PV}"
 LICENSE="CeCILL-2"
 SLOT="0/${SOVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64 mpi static-libs test tools threads"
+IUSE="doc int64 mpi static-libs test tools +threads"
 # bug #532620
 REQUIRED_USE="test? ( threads )"
 RESTRICT="!test? ( test )"
diff --git a/sci-libs/scotch/scotch-6.1.2.ebuild b/sci-libs/scotch/scotch-6.1.2.ebuild
new file mode 100644
index 000000000000..7075116f20e0
--- /dev/null
+++ b/sci-libs/scotch/scotch-6.1.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+SOVER=$(ver_cut 1)
+
+DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
+HOMEPAGE="https://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/ https://gitlab.inria.fr/scotch/scotch"
+SRC_URI="https://gitlab.inria.fr/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="CeCILL-2"
+SLOT="0/${SOVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc int64 mpi static-libs test tools +threads"
+# bug #532620
+REQUIRED_USE="test? ( threads )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sys-libs/zlib
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname ${SOVER})
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		VERS_COMP=${PV//.}
+		[[ "${#VERS_COMP}" -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname ${SOVER})
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	default
+	use int64 && append-cflags -DIDXSIZE64
+	if use threads; then
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)"
+	else
+		append-cflags "-DSCOTCH_PTHREAD_NUMBER=1"
+		sed -i \
+			-e 's/ -DSCOTCH_PTHREAD//' \
+			src/Make.inc/Makefile.inc.i686_pc_linux3 || die
+	fi
+
+	# Be careful with replacing here, bug #577272
+	sed -e "s/= gcc$/= $(tc-getCC)/" \
+		-e "s/-O3/${CFLAGS} -pthread/" \
+		-e "s/= ar$/= $(tc-getAR)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "s/= ranlib$/= $(tc-getRANLIB)/" \
+		-e "/^LDFLAGS/ s/$/ ${LDFLAGS}/" \
+		src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die
+}
+
+src_compile() {
+	emake -C src CLIBFLAGS=-fPIC scotch esmumps
+	static_to_shared lib/libscotcherr.a
+	static_to_shared lib/libscotcherrexit.a
+	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr
+	static_to_shared lib/libesmumps.a -Llib -lscotch
+	static_to_shared lib/libscotchmetis.a -Llib -lscotch
+
+	if use mpi; then
+		emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps
+		export LINK=mpicc
+		static_to_shared lib/libptscotcherr.a
+		static_to_shared lib/libptscotcherrexit.a
+		static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt
+		static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch
+		static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch
+	fi
+	if use static-libs; then
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
+	fi
+}
+
+src_test() {
+	tc-export FC
+	LD_LIBRARY_PATH="${S}/lib" emake -C src check
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)*
+	use static-libs && dolib.a lib/*.a
+
+	#install metis headers into a subdir
+	#to allow usage of real metis and scotch
+	#in the same code
+	insinto /usr/include/scotch/metis
+	doins include/*metis*
+	rm include/*metis*
+	insinto /usr/include/scotch
+	doins include/*
+
+	cat <<-EOF > scotchmetis.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: scotchmetis
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
+		Private: -lm -lz -lrt
+		Cflags: -I\${includedir}/scotch/metis
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins scotchmetis.pc
+
+	# not sure it is actually a full replacement of metis
+	#alternatives_for metis scotch 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
+
+	if use mpi; then
+		cat <<-EOF > ptscotchparmetis.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ptscotchparmetis
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
+			Private: -lm -lz -lrt
+			Cflags: -I\${includedir}/scotch/metis
+			Requires: scotchmetis
+		EOF
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ptscotchparmetis.pc
+			# not sure it is actually a full replacement of parmetis
+			#alternatives_for metis-mpi ptscotch 0 \
+			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
+	fi
+
+	dodoc README.txt
+
+	if use tools; then
+		local b m
+		pushd bin > /dev/null || die
+		for b in *; do
+			newbin ${b} scotch_${b}
+		done
+		popd > /dev/null || die
+
+		pushd man/man1 > /dev/null || die
+		for m in *.1; do
+			newman ${m} scotch_${m}
+		done
+		popd > /dev/null || die
+	fi
+
+	use doc && dodoc doc/*.pdf
+}