Merge updates from master

2026-07-16 02:23:16 -04:00 · 2021-04-25 20:34:56 +00:00
parent f9e0b197f4 e658726e12
commit 23886c76ee
34 changed files with 530 additions and 177 deletions
--- a/acct-user/gogs/metadata.xml
+++ b/acct-user/gogs/metadata.xml
@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>denis7774@gmail.com</email>
-  <name>Denis Reva</name>
-  <description>RarogCmex</description>
- </maintainer>
 </pkgmetadata>
--- a/dev-libs/ftl/Manifest
+++ b/dev-libs/ftl/Manifest
@@ -0,0 +1 @@
+DIST ftl-1.0_p20210308.tar.gz 732263 BLAKE2B 2a369b809f2b0d77ffe002d2e9ffaffabcb4f12565c0bb5bcbcce5899bac030dd127427dd8f89b3595d98441b9b145daf8661ed9c46977ac6667f774bb748e91 SHA512 9a1777da96fbde00669586899658d63a64b19252e90a01ccc0440e0f79f948ddd9dc118774365e227a75b80edf4c784760164268efb2d1f69000fe68ac5eb5b9
--- a/dev-libs/ftl/ftl-1.0_p20210308.ebuild
+++ b/dev-libs/ftl/ftl-1.0_p20210308.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_STANDARD="2003"
+
+inherit fortran-2 toolchain-funcs
+
+COMMIT="97b8292e893ad147ca44e42bcd56d23e9a8259fb"
+DESCRIPTION="The Fortran Template Library (FTL) is a general purpose library for Fortran 2003"
+HOMEPAGE="https://github.com/SCM-NV/ftl/"
+SRC_URI="https://github.com/SCM-NV/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcre test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( pcre )" # Some tests fail if 'pcre' is disabled
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+RDEPEND="
+	pcre? ( dev-libs/libpcre )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Replase install PREFIX, LIBDIR, add library soname
+	sed -i -e 's:PREFIX ?= /usr/local:PREFIX ?= '"${ED}"'/usr/:' \
+		-e 's:(PREFIX)/lib:(PREFIX)/'"$(get_libdir)"':' \
+		-e 's:SOLDFLAGS = -shared:SOLDFLAGS = -shared -Wl,-soname=libftl.so.1 '"${LDFLAGS}"':' makefile || die
+}
+
+src_configure() {
+	return 0
+}
+
+src_compile() {
+	emake \
+		BUILD=release \
+		USE_PCRE=$(usex pcre true false) \
+		COMPILER="$(tc-getFC)" \
+		FLAGS="${FCFLAGS}" \
+		CXXCOMPILER="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake install
+
+	mv "${ED}/usr/$(get_libdir)"/libftl.so{,.1} || die
+	dosym libftl.so.1 /usr/$(get_libdir)/libftl.so
+}
--- a/dev-libs/ftl/metadata.xml
+++ b/dev-libs/ftl/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>torokhov-s-a@yandex.ru</email>
+		<name>Sergey Torokhov</name>
+	</maintainer>
+	<longdescription>
+		The Fortran Template Library (FTL) is a general purpose library for Fortran 2003. 
+		Its intention is to bring all these nice things we take for granted in modern languages 
+		like Python and C++ to the Fortran world: Generic containers, versatile algorithms, 
+		easy string manipulation, and more. 
+		It is heavily inspired by C++'s standard library, 
+		especially the part that is commonly referred to as the Standard Template Library (STL).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">SCM-NV/ftl</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/cloudscraper/cloudscraper-1.2.40.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.40.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
@@ -15,14 +15,15 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"

+DEPEND="
+	test? (
+		dev-python/js2py[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		net-libs/nodejs
+	)"
 RDEPEND="
 	>=dev-python/requests-2.9.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
 "

-DEPEND="test? (
-	dev-python/js2py[${PYTHON_USEDEP}]
-	dev-python/responses[${PYTHON_USEDEP}]
-)"
-
 distutils_enable_tests pytest
--- a/dev-python/cloudscraper/cloudscraper-1.2.46.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.46.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
@@ -19,6 +19,7 @@ DEPEND="
 	test? (
 		dev-python/js2py[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
+		net-libs/nodejs
 	)"
 RDEPEND="
 	>=dev-python/requests-2.9.2[${PYTHON_USEDEP}]
--- a/dev-python/cloudscraper/cloudscraper-1.2.56.ebuild
+++ b/dev-python/cloudscraper/cloudscraper-1.2.56.ebuild
@@ -19,6 +19,7 @@ DEPEND="
 	test? (
 		dev-python/js2py[${PYTHON_USEDEP}]
 		dev-python/responses[${PYTHON_USEDEP}]
+		net-libs/nodejs
 	)"
 RDEPEND="
 	>=dev-python/requests-2.9.2[${PYTHON_USEDEP}]
--- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
+++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
@@ -51,7 +51,8 @@ src_prepare(){

 	# pass compiler and CFLAGS to 'Bot' makefile
 	sed -i -e 's:gcc:'"$(tc-getCC)"':g' bot/makefile \
-		-e 's:CFLAGS=-Wall -O3 -march=native:CFLAGS='"${CFLAGS}"':'|| die
+		-e 's:CFLAGS=-Wall -O3 -march=native:CFLAGS='"${CFLAGS}"':' \
+		-e 's:\$(ARG):\$(ARG) '"${LDFLAGS}"':' || die
 }

 src_compile() {
--- a/gui-wm/cage/Manifest
+++ b/gui-wm/cage/Manifest
@@ -1 +1,2 @@
 DIST cage-0.1.2.1.tar.gz 24600 BLAKE2B 593093afd072664d1067c1df662880dcb11e00bcbcb55b46a16021e0125aff033e578d500d9aa2f9ac7e5766560c131d0a56a9245518d66caaedde572dbbaf0f SHA512 ae332d747da7b59fd8b53b50ed3033959601db0eade435aff953a2789505eb0cbf4839cb41fe537457158327685c60e4367bfb664d2d524a270a22b1f8707d5e
+DIST cage-0.1.3.tar.gz 24615 BLAKE2B 6c06cabfd2faca568c7d96095199d42c5798228f44688c285c6300a20e95ab320385513b8081f798b92a70cb7fdfa33cbd0572c4647aa8a2db75e4a50dc638be SHA512 34d2dca963810f6173343ae280e2692645a79e263aa1c01d22730db5cc14e68c0b0ec19dd947134ef27841f2ee28a28d5d71e64c396b81b6230426220517471b
--- a/gui-wm/cage/cage-0.1.3.ebuild
+++ b/gui-wm/cage/cage-0.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ "${PV}" == 9999 ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Hjdskes/cage"
+else
+	SRC_URI="https://github.com/Hjdskes/cage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A Wayland kiosk"
+HOMEPAGE="https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage"
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="-X"
+
+RDEPEND="
+	>=gui-libs/wlroots-0.13
+	x11-libs/libxkbcommon
+	X? (
+		gui-libs/wlroots[X]
+		x11-libs/libxkbcommon[X]
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	meson_src_configure $(meson_use X xwayland)
+}
--- a/gui-wm/cage/cage-9999.ebuild
+++ b/gui-wm/cage/cage-9999.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
@@ -22,7 +22,7 @@ SLOT="0"
 IUSE="-X"

 RDEPEND="
-	>=gui-libs/wlroots-0.11
+	>=gui-libs/wlroots-0.13
 	x11-libs/libxkbcommon
 	X? (
 		gui-libs/wlroots[X]
--- a/kde-apps/kclock/Manifest
+++ b/kde-apps/kclock/Manifest
@@ -0,0 +1 @@
+DIST kclock-0.4.0.tar.xz 746848 BLAKE2B 2505b763106a8f881225403c26594db8d308a9dff0d1178d39fa6607e5fde098caffb941095338e1e331caa76e25337c8b44990bb51aec9d3d1057cd69ef2843 SHA512 f8b74f4754b82ece980f7fb263519b4d372f29fab24a7444c59c9701cd75ccdd38e0c31516501675bc6c935351fb6c8b9c6c450faeaf5338539facb6e177da6b
--- a/kde-apps/kclock/kclock-0.4.0.ebuild
+++ b/kde-apps/kclock/kclock-0.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+QTMIN=5.12.0
+inherit ecm
+
+MY_PV=$(ver_cut 1-2)
+DESCRIPTION="A convergent clock application for Plasma"
+HOMEPAGE="https://apps.kde.org/kclock/"
+SRC_URI="mirror://kde/unstable/${PN}/${MY_PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	kde-frameworks/kirigami-addons:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
--- a/kde-apps/kclock/metadata.xml
+++ b/kde-apps/kclock/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">KDE/kclock</remote-id>
+		<bugs-to>https://bugs.kde.org</bugs-to>
+	</upstream>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+</pkgmetadata>
--- a/kde-frameworks/kirigami-addons/Manifest
+++ b/kde-frameworks/kirigami-addons/Manifest
@@ -0,0 +1 @@
+DIST kirigami-addons-0.1.tar.xz 58716 BLAKE2B 8b10fb75448235af4e5ae8f037efc5086376a5163ca98e8e1867ccf2b6687c9d2472e8c42b8a9d28cf9cfbf3d50ebd8c10f79f251364d2af032b0ec820ffb22f SHA512 1fda9208f00e3a607653708b390bb8b258e6d5491808d627d7457230f5f6de41ff2f6d505442914dd605791923b1ff25bd04e10a8b778d575bbc0572d427dd5a
--- a/kde-frameworks/kirigami-addons/kirigami-addons-0.1.ebuild
+++ b/kde-frameworks/kirigami-addons/kirigami-addons-0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="false"
+KFMIN=5.57.0
+QTMIN=5.15.0
+inherit ecm
+
+DESCRIPTION="Convergent visual components for Kirigami-based applications"
+HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2+ LGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
--- a/kde-frameworks/kirigami-addons/metadata.xml
+++ b/kde-frameworks/kirigami-addons/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">KDE/kirigami-addons</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+</pkgmetadata>
--- a/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
+++ b/mail-client/heirloom-mailx/heirloom-mailx-12.5.ebuild
@@ -11,6 +11,7 @@ KEYWORDS="~amd64"

 DEPEND="net-libs/liblockfile
 		dev-libs/libbsd
+		sys-libs/binutils-libs
 		virtual/mta
 		mail-client/mailx-support
 		dev-libs/openssl"
--- a/media-libs/amdvlk/metadata.xml
+++ b/media-libs/amdvlk/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer type="person">
-		<email>denis7774@gmail.com</email>
-		<name>Denis Reva</name>
-		<description>Partial maintainer</description>
-	</maintainer>
 	<longdescription lang="en">
 		The AMD Open Source Driver for Vulkan® is an open-source Vulkan driver for AMD Radeon™ graphics adapters on Linux®. It is built on top of AMD’s Platform Abstraction Library (PAL), a shared component that is designed to encapsulate certain hardware and OS-specific programming details for many of AMD’s 3D and compute drivers. Leveraging PAL can help provide a consistent experience across platforms, including support for recently released GPUs and compatibility with AMD developer tools.
 		Shaders that compose a particular VkPipeline object are compiled as a single entity using the LLVM-Based Pipeline Compiler (LLPC) library. LLPC builds on LLVM’s existing shader compilation infrastructure for AMD GPUs to generate code objects compatible with PAL’s pipeline ABI.
--- a/media-plugins/argotlunar-bin/metadata.xml
+++ b/media-plugins/argotlunar-bin/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer type="person">
-		<email>denis7774@gmail.com</email>
-		<name>Denis Reva</name>
-		<description>RarogCmex</description>
-	</maintainer>
 	<longdescription lang="en">
 	Argotlunar is a tool for creating surreal transformations of audio streams. 
 	Specifically, it is a real-time delay-line granulator. 
--- a/net-misc/purritobin/purritobin-0.5.2.ebuild
+++ b/net-misc/purritobin/purritobin-0.5.2.ebuild
@@ -30,12 +30,18 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	www-apps/uwebsockets
 "
+BDEPEND="test? ( sys-apps/coreutils )"

 src_configure() {
 	default
 	tc-export CXX
 }

+src_test() {
+	P_DD_FLAGS="iflag=fullblock" \
+	default
+}
+
 src_install() {
 	emake PREFIX="/usr" MANDIR="/usr/share/man" DESTDIR="${ED}" install
 	insinto /var/www/purritobin
--- a/net-misc/purritobin/purritobin-9999.ebuild
+++ b/net-misc/purritobin/purritobin-9999.ebuild
@@ -30,12 +30,18 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	www-apps/uwebsockets
 "
+BDEPEND="test? ( sys-apps/coreutils )"

 src_configure() {
 	default
 	tc-export CXX
 }

+src_test() {
+	P_DD_FLAGS="iflag=fullblock" \
+	default
+}
+
 src_install() {
 	emake PREFIX="/usr" MANDIR="/usr/share/man" DESTDIR="${ED}" install
 	insinto /var/www/purritobin
--- a/sys-cluster/sionlib/Manifest
+++ b/sys-cluster/sionlib/Manifest
@@ -0,0 +1 @@
+DIST sionlib-1.7.6.tar.gz 486418 BLAKE2B 885eb2012ec6da031f5ae8b093ee4f3e5bbe31c9b24a11576f2ad01b32ddd8a85051565034f0e6c756af51409fb89f9c79f80b35c8337f2dc7912cb9e54d909b SHA512 afdd8520f489bc940edc51ffa636a25cad778de07bfbb21d2bd2ab767e57b16044990d85ef44d2e6482a376196f5c6a2a6f1a71556dd987f8094dd396a971d1c
--- a/sys-cluster/sionlib/files/respect-flags.patch
+++ b/sys-cluster/sionlib/files/respect-flags.patch
@@ -0,0 +1,134 @@
+diff '--color=auto' -ru a/config/determine-cc.sh b/config/determine-cc.sh
+--- a/config/determine-cc.sh	2021-04-25 01:09:35.175990108 +0200
+++ b/config/determine-cc.sh	2021-04-25 01:10:02.876433713 +0200
+@@ -1,7 +1,6 @@
+ #!/bin/sh
+ # determine what compiler is behind "cc" (and presumably "CC" and "ftn") wrapper
+ 
+-CC=`which cc 2>/dev/null`
+ COMP=
+ if [ -z "$CC" ]; then
+   echo "No 'cc' located!"
+diff '--color=auto' -ru a/config/select-compiler.sh b/config/select-compiler.sh
+--- a/config/select-compiler.sh	2021-04-25 01:09:35.175990108 +0200
+++ b/config/select-compiler.sh	2021-04-25 01:10:26.882817842 +0200
+@@ -9,7 +9,7 @@
+ CPS=""
+ COMP=""
+ 
+-GNU=`which gcc 2> /dev/null`
+GNU="${CC}"
+ if [ -n "${GNU}" ]
+ then
+   NCPS=`expr ${NCPS} + 1`
+diff '--color=auto' -ru a/config/select-mpi.sh b/config/select-mpi.sh
+--- a/config/select-mpi.sh	2021-04-25 01:09:35.175990108 +0200
+++ b/config/select-mpi.sh	2021-04-25 01:12:41.269962840 +0200
+@@ -76,7 +76,6 @@
+   if [ -z "${MPIS}" ]; then MPIS="${MPI}"; else MPIS="${MPIS}|${MPI}"; fi
+ fi
+ 
+-MPICC=`which mpicc 2> /dev/null`
+ if [ -n "${MPICC}" ]
+ then
+   FMPI=""
+@@ -86,7 +85,7 @@
+   MPIROOTDIR1=`dirname ${MBINDIR}`
+ 
+   echo "#include <mpi.h>" > conftest.c
+-  mpicc -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
+  "${MPICC}" -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
+   MINCDIR=`cat mpiconf.txt | sed -e 's#^.* "##' -e 's#/mpi.h".*##'`
+   if [ -n "${MINCDIR}" ]
+   then
+diff '--color=auto' -ru a/mf/Makefile.defs.linux-gomp b/mf/Makefile.defs.linux-gomp
+--- a/mf/Makefile.defs.linux-gomp	2021-04-25 01:09:35.119989211 +0200
+++ b/mf/Makefile.defs.linux-gomp	2021-04-25 01:52:32.378951608 +0200
+@@ -23,24 +23,19 @@
+ #------------------------------------------------------------------------------
+ # SIONlib General Settings
+ #------------------------------------------------------------------------------
+-OPTFLAGS = -g -O0 -Wall
+CFLAGS   += -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
+ 
+-CC       = gcc
+-CFLAGS   = -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
+CXXFLAGS += $(PFLAG) $(OPTFLAGS) -fPIC
+ 
+-CXX      = g++
+-CXXFLAGS = $(PFLAG) $(OPTFLAGS) -O3
+-
+-F77      = gfortran
+-FFLAGS   = $(PFLAG) $(OPTFLAGS)
+FFLAGS   += $(PFLAG) $(OPTFLAGS) -fPIC
+ 
+ F90      = $(F77)
+-F90FLAGS = $(PFLAG) $(OPTFLAGS) -ffree-form
+F90FLAGS += $(PFLAG) $(OPTFLAGS) -ffree-form -fPIC $(FCFLAGS)
+ 
+ FPP      =
+ FDOPT    = -D
+ 
+-LDFLAGS  = $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
+LDFLAGS  += $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
+ UTILLIB  =
+ FOBASE   = pomp_fwrapper_base.o
+ 
+@@ -101,10 +96,6 @@
+ #------------------------------------------------------------------------------
+ 
+ MPIENABLE = 1
+-MPICC     = mpicc
+-MPICXX    = mpicxx
+-MPIF77    = mpif77
+-MPIF90    = mpif90
+ MPILIB    = -lmpich
+ PMPILIB   = -lpmpich
+ #PMPILIB   = # MPICH2
+@@ -139,8 +130,7 @@
+ #------------------------------------------------------------------------------
+ 
+ SZLIB          = szlib
+-SZLIB_OPTFLAGS = -O3
+-SZLIB_CFLAGS   = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED
+SZLIB_CFLAGS   = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED $(CFLAGS)
+ SZLIB_LIBPATH  = -L$(TOPDIR)/utils/szlib
+ SZLIB_LIB      = -lsc.z
+ 
+diff '--color=auto' -ru a/src/fortraninterface/Makefile b/src/fortraninterface/Makefile
+--- a/src/fortraninterface/Makefile	2021-04-25 01:09:35.141989563 +0200
+++ b/src/fortraninterface/Makefile	2021-04-25 01:23:48.055976593 +0200
+@@ -109,7 +110,7 @@
+ 	$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90.F90 > sion_f90.f90
+ sion_f90.mod : sion_f90.o
+ sion_f90.o : sion_f90.f90 sion_f77.h $(SION_HDRS)
+-	$(F90) -c sion_f90.f90
+	$(F90) $(F90FLAGS) -c sion_f90.f90
+ 
+ sion_f90_omp.o: sion_f90.o
+ sion_f90_mpi.o: sion_f90.o
+@@ -121,21 +122,21 @@
+ 	$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib sion_f90_mpi.F90 > sion_f90_mpi.f90
+ sion_f90_mpi.mod : sion_f90_mpi.o
+ sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS)
+-	$(MPIF90) -c sion_f90_mpi.f90
+	$(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_mpi.f90
+ 
+ # F90 Interface (OMP)
+ sion_f90_omp.f90: sion_f90_omp.F90
+ 	$(CPP) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_omp.F90 > sion_f90_omp.f90
+ sion_f90_omp.mod : sion_f90_omp.o 
+ sion_f90_omp.o : sion_f90_omp.f90 sion_f90.mod $(SION_HDRS)
+-	$(OMPF90) -c sion_f90_omp.f90
+	$(OMPF90) $(F90FLAGS) $(F90OMPFLAGS) -c sion_f90_omp.f90
+ 
+ # F90 Interface (OMPI)
+ sion_f90_ompi.f90: sion_f90_ompi.F90 $(SION_HDRS)
+ 	$(CPP) $(F90MPIFLAGS) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_ompi.F90 > sion_f90_ompi.f90
+ sion_f90_ompi.mod : sion_f90_ompi.o
+ sion_f90_ompi.o : sion_f90_ompi.f90 $(SION_HDRS)
+-	$(MPIF90) -c sion_f90_ompi.f90
+	$(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_ompi.f90
+ 
+ 
+ 
--- a/sys-cluster/sionlib/metadata.xml
+++ b/sys-cluster/sionlib/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription>
+SIONlib is a library for writing and reading data from several thousands of parallel tasks into/from one or a small number of physical files. Only the open and close functions are collective while file access can be performed independently.
+
+SIONlib can be used as a replacement for standard I/O APIs (e.g. POSIX) that are used to access distinct files from every parallel process. SIONlib will bundle the data into one or few files in a coordinated fashion in order to sidestep sequentialising mechanism in the file system. At the same time, the task-per-file picture is maintained for the application, every process has access to its logical file only. File access is performed using SIONlib equivalents to standard C-I/O functionality (fwrite becomes sion_write, fseek becomes sion_seek, etc.) which have similar semantics as their C counterparts.
+
+Internally, the physical files are sub-divided into sequences of blocks, which themselves contain one chunk of data belonging to every logical file. In case the amount to be written to a file is known up front, it can optionally be specified when opening the file and the sequence of blocks collapses into a single block with one chunk per task containing all of its data. If a chunk size cannot be specified ahead of time, a sensible default is chosen and reads and writes that cross chunk boundaries are handled transparently by SIONlib.
+
+SIONlib also uses information about the block size of the underlying file system, because access to the same block from different tasks often leads to contention.
+
+Both, the estimated chunk size and file system block size are used to align individual chunks with file system blocks. Ensuring contention-free access to file system blocks enables efficient parallel writing and reading.
+
+SIONlib provides two different interfaces: one for parallel access (with implementations for different parallel programming technologies such as MPI, OpenMP and hybrid MPI+OpenMP) and one for sequential access which is also used internally by the SIONlib utilities.
+	</longdescription>
+	<use>
+		<!--<flag name="cuda">enable CUDA aware interface</flag>-->
+		<flag name="cxx">Disable C++ support</flag>
+		<flag name="debug">enable SIONlib debug</flag>
+		<flag name="fortran">Enable Fortran support</flag>
+		<flag name="mpi">enable mpi</flag>
+		<flag name="python">enable python support</flag>
+		<flag name="ompi">enable hybrid openmp mpi</flag>
+		<flag name="openmp">enable openmp</flag>
+		<flag name="parutils">Enable compilation of parutils (used for benchmarking)</flag>
+		<flag name="pthreads">configure SIONlib to use pthreads for locking</flag>
+		<!--<flag name="sionfwd">enable I/O forwarding with SIONfwd</flag>-->
+	</use>
+</pkgmetadata>
--- a/sys-cluster/sionlib/sionlib-1.7.6.ebuild
+++ b/sys-cluster/sionlib/sionlib-1.7.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_NEEDED="fortran"
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
+
+DESCRIPTION="Scalable I/O library for parallel access to task-local files"
+HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html"
+SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cxx debug doc +fortran +mpi +ompi +openmp +parutils +pthreads python"
+#TODO: cuda sionfwd msa
+#--enable-sionfwd=/path/to/sionfwd
+#--msa=(hostname-regex|deep-est-sdv)]	MSA aware collective operations for the given system
+
+PATCHES=( "${FILESDIR}/respect-flags.patch" )
+
+RDEPEND="
+	${PYTHON_DEPS}
+	mpi? ( virtual/mpi )
+	ompi? (
+		sys-libs/libomp
+		virtual/mpi
+	)
+	openmp? ( sys-libs/libomp )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	FORTRAN_NEED_OPENMP=0
+	use openmp && FORTRAN_NEED_OPENMP=1
+	use ompi && FORTRAN_NEED_OPENMP=1
+
+	fortran-2_pkg_setup
+}
+
+src_configure() {
+	export AR=$(tc-getAR)
+	export CC=$(tc-getCC)
+	export CXX=$(tc-getCXX)
+	export MPICC=/usr/bin/mpicc
+	export MPICXX=/usr/bin/mpicxx
+	export MPIF77=/usr/bin/mpif77
+	export MPIF90=/usr/bin/mpif90
+	export F77=$(tc-getF77)
+	export F90=$(tc-getFC)
+	export OMPF77=$(tc-getF77)
+	export OMPF90=$(tc-getFC)
+
+	append-fflags -fallow-argument-mismatch
+
+	local myconf=(
+		--disable-mic
+		--prefix="${EPREFIX}/usr"
+	)
+
+	#custom configure?
+	use cxx || myconf+=( "--disable-cxx" )
+	use fortran || myconf+=( "--disable-fortran" )
+	use mpi || myconf+=( "--disable-mpi" )
+	use ompi || myconf+=( "--disable-ompi" )
+	use openmp || myconf+=( "--disable-omp" )
+	use parutils || myconf+=( "--disable-parutils" )
+	use pthreads || myconf+=( "--disable-pthreads" )
+
+	use debug && myconf+=( "--enable-debug" )
+	use python && myconf+=( "--enable-python=3" )
+
+	./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+	default
+	use doc && doxygen -u doxy && doxygen doxy || die
+}
+
+src_install() {
+	sed -e "s|\${PREFIX}|${D}/usr|g" -i mf/common.defs || die
+	sed -e "s|\$(PREFIX)|${D}/usr|g" -i src/utils/Makefile || die
+	sed \
+		-e "s|\$(PREFIX)|${D}/usr|g" \
+		-e "s|\${PREFIX}|${D}/usr|g" \
+		-i mf/RealMakefile || die
+
+	default
+
+	use doc && dodoc -r doc/html
+
+	mv "${ED}/usr/examples" "${ED}/usr/share/doc/${PF}/" || die
+	docompress -x "/usr/share/doc/${PF}/examples"
+	docompress -x "/usr/share/doc/${PF}/html"
+
+	#TODO: build shared libs
+	#find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
+}
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1,3 +1 @@
-DIST erofs-utils-1.1.tar.gz 46133 BLAKE2B 24a2f16059e39bd65203f4a28721b8aad70599d6201ead02c291234de631bd3def1c403fa8b50b6dce4af3eea2768b912c4f56ad20c3c26db3853ba3174775ac SHA512 f300b536f0ba91a05a7eb3dc9a9ec402c98966ad7c0e1f2f664a650caaffce6c4433722374418c6d03e69ce2e74785e55f9bcc45e6717a8bc67e5352e450806b
 DIST erofs-utils-1.2.1.tar.gz 61218 BLAKE2B 787d3c549020bf44d750ef1af8878c452683579ff545ed0a6b03a24fb5e5f559dad8dd1d00664598b7d42ec6f9d69800b087d0dcb0de147b51696b416903d712 SHA512 1b0fae6f1d7a5ee01f65e71e389c474d596be8800087beb063bfbda471c54d76f9d3f08da645cecb613b637044ff3f6b19d3c8647425261cec1646c87ad57802
-DIST erofs-utils-1.2.tar.gz 60991 BLAKE2B 08b9bea397f52d158a40f095811853315a3b553618f380d1ece012c813d708c2331b2a445bb59c4b86d81edab33c834e37aeb0aeeb9acb157b7aebed309cb591 SHA512 167311beb2d4722436051956076d670f6a54da72e1690d19d43e0c46dd972f9f61427b4792b469813a6a4ff2e3c445646cf063d37b4ee2b52f88eb14e7bf2713
--- a/sys-fs/erofs-utils/erofs-utils-1.1.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.1.ebuild
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS images"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="lz4 +uuid"
-
-RDEPEND="
-	lz4? ( >=app-arch/lz4-1.9 )
-	uuid? ( sys-apps/util-linux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable lz4) \
-		$(use_with uuid)
-}
--- a/sys-fs/erofs-utils/erofs-utils-1.2.1.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.2.1.ebuild
@@ -3,7 +3,7 @@

 EAPI=7

-inherit autotools
+inherit autotools flag-o-matic

 DESCRIPTION="Userspace tools for EROFS images"
 HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
@@ -23,12 +23,17 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"

+PATCHES=(
+	"${FILESDIR}"/erofs-utils-1.2.1-no-Werror.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
 }

 src_configure() {
+	append-flags "-Wno-error"
 	econf \
 		$(use_enable fuse) \
 		$(use_enable lz4) \
--- a/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS images"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="fuse lz4 selinux +uuid"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse:0 )
-	lz4? ( >=app-arch/lz4-1.9 )
-	selinux? ( sys-libs/libselinux )
-	uuid? ( sys-apps/util-linux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-common.patch"
-)
-
-src_prepare() {
-	default
-	use fuse && use selinux && sed -i \
-		-e 's/.*CFLAGS}.*/& ${libselinux_CFLAGS}/' \
-		-e 's/.*LIBS}.*/& ${libselinux_LIBS}/' \
-		fuse/Makefile.am
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse) \
-		$(use_enable lz4) \
-		$(use_with selinux) \
-		$(use_with uuid)
-}
--- a/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
+++ b/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
@@ -1,61 +0,0 @@
-From ac0d13efa1fe673e677343cda4795d820500da6b Mon Sep 17 00:00:00 2001
-From: Gao Xiang <hsiangkao@aol.com>
-Date: Tue, 8 Dec 2020 18:57:41 +0800
-Subject: erofs-utils: fix multiple definition of `sbi'
-
-As nl6720 reported [1], lib/inode.o (mkfs) and lib/super.o (erofsfuse)
-could be compiled together by some options. Fix it now.
-
-[1] https://lore.kernel.org/r/10789285.Na0ui7I3VY@walnut
-
-Link: https://lore.kernel.org/r/20201208105741.9614-1-hsiangkao@aol.com
-Fixes: 5e35b75ad499 ("erofs-utils: introduce fuse implementation")
-Reported-by: nl6720 <nl6720@gmail.com>
-Signed-off-by: Gao Xiang <hsiangkao@aol.com>
---
- lib/config.c | 1 +
- lib/inode.c  | 2 --
- lib/super.c  | 2 --
- 3 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/lib/config.c b/lib/config.c
-index 3155112..3ecd481 100644
--- a/lib/config.c
-+++ b/lib/config.c
-@@ -11,6 +11,7 @@
- #include "erofs/internal.h"
- 
- struct erofs_configure cfg;
-+struct erofs_sb_info sbi;
- 
- void erofs_init_configure(void)
- {
-diff --git a/lib/inode.c b/lib/inode.c
-index 3d634fc..0c4839d 100644
--- a/lib/inode.c
-+++ b/lib/inode.c
-@@ -22,8 +22,6 @@
- #include "erofs/xattr.h"
- #include "erofs/exclude.h"
- 
-struct erofs_sb_info sbi;
-
- #define S_SHIFT                 12
- static unsigned char erofs_ftype_by_mode[S_IFMT >> S_SHIFT] = {
- 	[S_IFREG >> S_SHIFT]  = EROFS_FT_REG_FILE,
-diff --git a/lib/super.c b/lib/super.c
-index 2d36692..025cefe 100644
--- a/lib/super.c
-+++ b/lib/super.c
-@@ -11,8 +11,6 @@
- #include "erofs/io.h"
- #include "erofs/print.h"
- 
-struct erofs_sb_info sbi;
-
- static bool check_layout_compatibility(struct erofs_sb_info *sbi,
- 				       struct erofs_super_block *dsb)
- {
-- 
-cgit 1.2.3-1.el7
-
--- a/sys-fs/erofs-utils/files/erofs-utils-1.2.1-no-Werror.patch
+++ b/sys-fs/erofs-utils/files/erofs-utils-1.2.1-no-Werror.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 28926c3..6be002b 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR(config)
+-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
+AM_INIT_AUTOMAKE([foreign -Wall])
+ 
+ # Checks for programs.
+ AM_PROG_AR
--- a/sys-kernel/dkms/metadata.xml
+++ b/sys-kernel/dkms/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>denis7774@gmail.com</email>
-		<name>Denis Reva</name>
-		<description>I do not use that package by myself so I can't test it. I port and update it only</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">dell/dkms</remote-id>
 	</upstream>
--- a/www-apps/gogs/metadata.xml
+++ b/www-apps/gogs/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>denis7774@gmail.com</email>
-		<name>Denis Reva</name>
-		<description>Partial maintainer</description>
-	</maintainer>
 	<use>
 		<flag name="cert">Adds support for self-signed certificates</flag>
 	</use>
				`@@ -0,0 +1 @@`
				`DIST ftl-1.0_p20210308.tar.gz 732263 BLAKE2B 2a369b809f2b0d77ffe002d2e9ffaffabcb4f12565c0bb5bcbcce5899bac030dd127427dd8f89b3595d98441b9b145daf8661ed9c46977ac6667f774bb748e91 SHA512 9a1777da96fbde00669586899658d63a64b19252e90a01ccc0440e0f79f948ddd9dc118774365e227a75b80edf4c784760164268efb2d1f69000fe68ac5eb5b9`
				`@@ -0,0 +1 @@`
				`DIST kclock-0.4.0.tar.xz 746848 BLAKE2B 2505b763106a8f881225403c26594db8d308a9dff0d1178d39fa6607e5fde098caffb941095338e1e331caa76e25337c8b44990bb51aec9d3d1057cd69ef2843 SHA512 f8b74f4754b82ece980f7fb263519b4d372f29fab24a7444c59c9701cd75ccdd38e0c31516501675bc6c935351fb6c8b9c6c450faeaf5338539facb6e177da6b`
				`@@ -0,0 +1 @@`
				`DIST kirigami-addons-0.1.tar.xz 58716 BLAKE2B 8b10fb75448235af4e5ae8f037efc5086376a5163ca98e8e1867ccf2b6687c9d2472e8c42b8a9d28cf9cfbf3d50ebd8c10f79f251364d2af032b0ec820ffb22f SHA512 1fda9208f00e3a607653708b390bb8b258e6d5491808d627d7457230f5f6de41ff2f6d505442914dd605791923b1ff25bd04e10a8b778d575bbc0572d427dd5a`
				`@@ -0,0 +1 @@`
				`DIST sionlib-1.7.6.tar.gz 486418 BLAKE2B 885eb2012ec6da031f5ae8b093ee4f3e5bbe31c9b24a11576f2ad01b32ddd8a85051565034f0e6c756af51409fb89f9c79f80b35c8337f2dc7912cb9e54d909b SHA512 afdd8520f489bc940edc51ffa636a25cad778de07bfbb21d2bd2ab767e57b16044990d85ef44d2e6482a376196f5c6a2a6f1a71556dd987f8094dd396a971d1c`