Merge updates from master

31 files changed, 278 insertions, 279 deletions

diff --git a/app-emulation/softgun/softgun-0.22.ebuild b/app-emulation/softgun/softgun-0.22.ebuild
index 15758fcf1687..adba0132e20a 100644
--- a/app-emulation/softgun/softgun-0.22.ebuild
+++ b/app-emulation/softgun/softgun-0.22.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="ARM software emulator"
 HOMEPAGE="http://softgun.sourceforge.net/"
@@ -12,13 +12,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="media-libs/alsa-lib"
-RDEPEND=""
+RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.22-make.patch
+PATCHES=( "${FILESDIR}"/${PN}-0.22-make.patch )
+
+src_configure() {
+	append-cflags -fcommon
+	default
 }
 
 src_compile() {
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r1.ebuild
index c141b5c7c517..5a800a9ab6ee 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
 MY_P="${P}-BlameMichelson.src"
-
 DESCRIPTION="A powerful text processing tool, mainly used for spam filtering"
 HOMEPAGE="http://crm114.sourceforge.net/"
 SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
@@ -14,12 +13,11 @@ SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples mew mimencode nls normalizemime static test"
+IUSE="examples mew mimencode nls normalizemime test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	static? ( dev-libs/tre[static-libs] )
-	!static? ( dev-libs/tre )
+	dev-libs/tre
 	mew? ( app-emacs/mew )
 	mimencode? ( net-mail/metamail )
 	normalizemime? ( mail-filter/normalizemime )"
@@ -49,9 +47,7 @@ src_prepare() {
 src_compile() {
 	# Restore GNU89 inline semantics to
 	# emit external symbols, bug 571062
-	append-cflags -std=gnu89
-
-	use static && append-ldflags -static -static-libgcc
+	append-cflags -std=gnu89 -fcommon
 
 	emake CC="$(tc-getCC)"
 }
@@ -77,5 +73,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "The spam-filter CRM files are installed in ${EROOT%/}/usr/share/${PN}."
+	elog "The spam-filter CRM files are installed in ${EROOT}/usr/share/${PN}."
 }
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index e7411c45f7bb..6948a216bce8 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
-  <use>
-    <flag name="mew">Add support for using the mewdecode mime decoder
-    (<pkg>app-emacs/mew</pkg>)</flag>
-    <flag name="mimencode">Add support for using the mimencode mime
-    (<pkg>net-mail/metamail</pkg>)</flag>
-    <flag name="normalizemime">Add support for using the normalizemime
-    (<pkg>mail-filter/normalizemime</pkg>)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">crm114</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<use>
+		<flag name="mew">Add support for using the mewdecode mime decoder (<pkg>app-emacs/mew</pkg>)</flag>
+		<flag name="mimencode">Add support for using the mimencode mime (<pkg>net-mail/metamail</pkg>)</flag>
+		<flag name="normalizemime">Add support for using the normalizemime (<pkg>mail-filter/normalizemime</pkg>)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">crm114</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 6c5606192474..c0568eb3c13e 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,2 @@
-DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
 DIST netCDF4-1.5.5.tar.gz 793676 BLAKE2B 15783e359ed65062464874de24b3fabf07c5666f54f979cb4abd5429cb1668df9dc5aee6d96fb171f597b670ac87ac15400549659c82754da60dc9b00ab734cd SHA512 da6ead22ca60900468fbefdb5d1e9486555e73cf4d99096227404094e94cd4d0488320fe4eb2b7944e1183c39817d9e593065297f921016811b7dc6eabb918ef
 DIST netCDF4-1.5.6.tar.gz 763732 BLAKE2B 0bb08ed81206c7d14817dad0f93683b5c44678869c760467071e2a0a76be76c9d78c0f714a043d77dba9b4535a83d59d8197340c105070a4f0204900b1e50410 SHA512 cc5bdb476fa034576f8e1a19e709dba53ad2db68cd10221df2de46a47fc7e5bacfc90fe8c4458ef45b20bf24a1cf52f275b1891af5574e2a139e95cb0d793a8b
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
deleted file mode 100644
index b74d15d31698..000000000000
--- a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-MY_PN="netCDF4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python/numpy interface to the netCDF C library"
-HOMEPAGE="https://unidata.github.io/netcdf4-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/hdf5
-	sci-libs/netcdf:=[hdf,hdf5]"
-BDEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	cd test || die
-	${PYTHON} run_all.py || die
-}
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
index 27988248d7dd..1c167f70ec4d 100644
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ b/games-fps/qudos/qudos-0.40.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils toolchain-funcs games
+
+inherit eutils flag-o-matic toolchain-funcs games
 
 FILE_STEM="QuDos-${PV}-src"
 PK3_FILE="QuDos-${PV}.pk3"
@@ -108,6 +109,11 @@ src_prepare() {
 		"${FILESDIR}"/${P}-gnusource.patch
 }
 
+src_configure() {
+	append-cflags -fcommon
+	default
+}
+
 src_compile() {
 	yesno() { usex $1 YES NO; }
 
diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml
index e38074e80020..99c804e9dc66 100644
--- a/mail-filter/policyd/metadata.xml
+++ b/mail-filter/policyd/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">policyd</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">policyd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/mail-filter/policyd/policyd-1.82-r3.ebuild b/mail-filter/policyd/policyd-1.82-r4.ebuild
index 1fc4a90aaeda..ff0daf33992c 100644
--- a/mail-filter/policyd/policyd-1.82-r3.ebuild
+++ b/mail-filter/policyd/policyd-1.82-r4.ebuild
@@ -1,41 +1,44 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Policy daemon for postfix and other MTAs"
 HOMEPAGE="http://policyd.sf.net/"
-
-# This is not available through SF mirrors
 SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
-IUSE="libressl"
-DEPEND="dev-db/mysql-connector-c:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
+
+DEPEND="
+	dev-db/mysql-connector-c:0=
+	dev-libs/openssl:0="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-post182.patch"
-	"${FILESDIR}/${PN}-makefile.patch"
+	"${FILESDIR}"/${PN}-post182.patch
+	"${FILESDIR}"/${PN}-makefile.patch
 )
 
 src_prepare() {
 	default
 	sed -i -e 's/@${CC}/${CC}/' -e 's/@$(CC)/$(CC)/' Makefile
 
-	ebegin "Applying config patches"
+	# config patches
 	sed -i -e s:UID=0:UID=65534:g \
-	    -e s:GID=0:GID=65534:g \
-	    -e s:DAEMON=0:DAEMON=1:g \
-	    -e s:DEBUG=3:DEBUG=0:g \
-	    -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
-	    policyd.conf || die "sed failed"
-	eend
+		-e s:GID=0:GID=65534:g \
+		-e s:DAEMON=0:DAEMON=1:g \
+		-e s:DEBUG=3:DEBUG=0:g \
+		-e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
+		policyd.conf || die
+}
+
+src_configure() {
+	append-cflags -fcommon
+	default
 }
 
 src_compile() {
@@ -44,8 +47,8 @@ src_compile() {
 
 src_install() {
 	insopts -o root -g nobody -m 0750
-	mv cleanup policyd_cleanup
-	mv stats policyd_stats
+	mv cleanup policyd_cleanup || die
+	mv stats policyd_stats || die
 
 	dosbin policyd policyd_cleanup policyd_stats
 
@@ -55,12 +58,12 @@ src_install() {
 
 	insopts -o root -g nobody -m 0700
 	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
+	newexe "${FILESDIR}"/${PN}-cleanup.cron ${PN}-cleanup.cron
 
 	dodoc ChangeLog DATABASE.mysql README doc/support.txt
 
-	newinitd "${FILESDIR}/${PN}.rc" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}"/${PN}.rc policyd
+	newconfd "${FILESDIR}"/${PN}.confd policyd
 }
 
 pkg_postinst() {
diff --git a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
index 37e21cbb86a2..d9867b0c86c0 100644
--- a/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
+++ b/media-video/subtitler-yuv/subtitler-yuv-0.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="for mjpegtools for adding subtitles, pictures & effects embedded in the picture"
 HOMEPAGE="http://panteltje.com/panteltje/subtitles/"
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
 src_configure() {
+	append-cflags -fcommon
 	tc-export CC
 }
 
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 6a4fa3234060..0722bb99c587 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,2 +1 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
-DIST cgminer-4.9.2.tar.bz2 1476371 BLAKE2B 01ff700cb5dc2fb12709da41aeaa22c6fc6b9dc6fb1e12116eef3a382ad328961b8d6ddd6ac6fce47ab8084c96e1a7be74a697b3d885c7e78dfadf07b678ad24 SHA512 48371657c84f09ad8c500a29ca85f35af70eb8720d9d97b565cd8c5356289d889ee60c06f37c0507a53c8f50ae827a77fa0c41609bac6b1e8849ad26b55d67d4
diff --git a/net-misc/cgminer/cgminer-4.10.0.ebuild b/net-misc/cgminer/cgminer-4.10.0.ebuild
index 1ac87f413dbc..bcfc4b2aa996 100644
--- a/net-misc/cgminer/cgminer-4.10.0.ebuild
+++ b/net-misc/cgminer/cgminer-4.10.0.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=7
@@ -19,7 +19,8 @@ IUSE="doc examples udev hardened ncurses ${HARDWARE}"
 
 REQUIRED_USE="|| ( ${HARDWARE} )"
 
-RDEPEND="net-misc/curl
+RDEPEND="
+	net-misc/curl
 	>=dev-libs/jansson-2.6
 	virtual/libusb:1[udev]
 	ncurses? ( sys-libs/ncurses:0= )
@@ -29,6 +30,7 @@ BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	use hardened && append-cflags "-no-pie"
+	append-cflags -fcommon
 
 	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
 	export PKG_CONFIG="$(tc-getPKG_CONFIG)"
diff --git a/net-misc/cgminer/cgminer-4.9.2.ebuild b/net-misc/cgminer/cgminer-4.9.2.ebuild
deleted file mode 100644
index 6cf544e6b085..000000000000
--- a/net-misc/cgminer/cgminer-4.9.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
-SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
-#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.5/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HARDWARE="ants1 ants2 ants3 avalon avalon2 avalon4 bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30"
-IUSE="doc examples udev hardened ncurses ${HARDWARE}"
-
-REQUIRED_USE="|| ( ${HARDWARE} )"
-
-RDEPEND="net-misc/curl
-	>=dev-libs/jansson-2.6
-	virtual/libusb:1[udev]
-	ncurses? ( sys-libs/ncurses:0= )
-	udev? ( virtual/libudev )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-src_configure() {
-	use hardened && append-cflags "-no-pie"
-
-	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
-	export PKG_CONFIG=/usr/bin/pkg-config
-	econf $(use_with ncurses curses) \
-		$(use_enable ants1) \
-		$(use_enable ants2) \
-		$(use_enable ants3) \
-		$(use_enable avalon) \
-		$(use_enable avalon2) \
-		$(use_enable avalon4) \
-		$(use_enable bab) \
-		$(use_enable bitmine_A1) \
-		$(use_enable bflsc) \
-		$(use_enable bitforce) \
-		$(use_enable bitfury) \
-		$(use_enable blockerupter) \
-		$(use_enable cointerra) \
-		$(use_enable drillbit) \
-		$(use_enable hashfast) \
-		$(use_enable hashratio) \
-		$(use_enable icarus) \
-		$(use_enable klondike) \
-		$(use_enable knc) \
-		$(use_enable minion) \
-		$(use_enable modminer) \
-		$(use_enable sp10) \
-		$(use_enable sp30) \
-		$(use_enable udev) \
-		--disable-forcecombo \
-		--with-system-libusb \
-		--with-system-jansson
-	# sanitize directories (is this still needed?)
-	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
-}
-
-src_install() { # How about using some make install?
-	dobin cgminer
-
-	if use udev; then
-		insinto /lib/udev/rules.d
-		use udev && doins 01-cgminer.rules
-	fi
-
-	if use doc; then
-		dodoc AUTHORS NEWS README API-README
-		use icarus || use bitforce || use modminer && dodoc FPGA-README
-		use avalon || use bflsc && dodoc ASIC-README
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc api-example.php miner.php API.java api-example.c example.conf
-	fi
-}
diff --git a/net-print/mtink/files/mtink-1.0.16-flags.patch b/net-print/mtink/files/mtink-1.0.16-flags.patch
index bee6c339e3f8..f1c4fe680247 100644
--- a/net-print/mtink/files/mtink-1.0.16-flags.patch
+++ b/net-print/mtink/files/mtink-1.0.16-flags.patch
@@ -1,6 +1,5 @@
-diff -ruN mtink-1.0.16.orig/Makefile.ORG mtink-1.0.16/Makefile.ORG
---- mtink-1.0.16.orig/Makefile.ORG	2007-08-28 12:52:30.000000000 +0200
-+++ mtink-1.0.16/Makefile.ORG	2017-01-29 18:09:40.550182789 +0100
+--- a/Makefile.ORG
++++ b/Makefile.ORG
 @@ -4,7 +4,7 @@
  setUid=1
  gimpVersion=
diff --git a/net-print/mtink/files/mtink-1.0.16-fno-common.patch b/net-print/mtink/files/mtink-1.0.16-fno-common.patch
new file mode 100644
index 000000000000..289e2af1517c
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-fno-common.patch
@@ -0,0 +1,20 @@
+https://sources.debian.org/patches/mtink/1.0.16-11/gcc-10/
+Author: Graham Inggs <ginggs@debian.org>
+--- a/mainSrc/mtink.h
++++ b/mainSrc/mtink.h
+@@ -133,11 +133,11 @@
+ 
+ #endif
+ 
+-wConfig_data_t firstConfig;
+-wConfig_data_t newPrinter;
++extern wConfig_data_t firstConfig;
++extern wConfig_data_t newPrinter;
+ 
+-wConfig_data_t exchangeCartridge;
+-wConfig_data_t alignHead;
++extern wConfig_data_t exchangeCartridge;
++extern wConfig_data_t alignHead;
+ 
+ #if WITH_X
+ extern Widget createNoPrinterBox(char *);
diff --git a/net-print/mtink/files/mtink-1.0.16-motif.patch b/net-print/mtink/files/mtink-1.0.16-motif.patch
new file mode 100644
index 000000000000..ac66c450b056
--- /dev/null
+++ b/net-print/mtink/files/mtink-1.0.16-motif.patch
@@ -0,0 +1,49 @@
+https://sources.debian.org/patches/mtink/1.0.16-11/lesstif-multiarch/
+--- a/Configure
++++ b/Configure
+@@ -127,6 +127,8 @@
+ /usr/openwin/lib
+ /usr/local/lib
+ /usr/dt/lib'
++LIBDIRS="$LIBDIRS `${CC-gcc} -print-search-dirs 2>/dev/null |
++                   awk '/^libraries:/{print $2}' | tr ':' ' '`"
+ 
+ # Add gimp-2.0 for fedora core 2
+ INCLDIRS='/usr/include/gimp-2.0/libgimp
+@@ -279,11 +281,6 @@
+       exit 1
+    fi
+ 
+-   case $OS in
+-      Linux) . ./checkMotifVersion.sh;;
+-      Darwin) . ./checkMotifVersion.sh;;
+-   esac
+-
+    if [ "$MotifLib" != "" ]
+    then
+       mlCmd="s@^MOLIB.*@MOLIB = $MotifLib@"
+@@ -297,24 +294,6 @@
+       miCmd=
+    fi
+ 
+-   # Check for the Xp libary, some Motif libraries need this
+-
+-   xplibFound=0
+-   for dir in $LIBDIRS
+-   do
+-      if [ "`ls -c $dir/libXp.* 2>/dev/null`" != "" ]
+-      then
+-         xplibFound=1
+-         break
+-      fi
+-   done
+-
+-   # but not for Solaris
+-   if [ `uname` = SunOS ]
+-   then
+-      xplibFound=0
+-   fi
+-
+    # Gimp part ################################################
+    # check for gimp
+    includeFileFound=0
diff --git a/net-print/mtink/files/mtink-1.0.16-overflow.patch b/net-print/mtink/files/mtink-1.0.16-overflow.patch
index d57e2cd0139e..b0858485293e 100644
--- a/net-print/mtink/files/mtink-1.0.16-overflow.patch
+++ b/net-print/mtink/files/mtink-1.0.16-overflow.patch
@@ -1,5 +1,5 @@
---- a/server/mtinkd.c	2012-01-15 13:03:41.000000000 +0000
-+++ b/server/mtinkd.c	2012-01-15 13:03:58.000000000 +0000
+--- a/server/mtinkd.c
++++ b/server/mtinkd.c
 @@ -244,7 +244,7 @@
           /* look for pid into /var/run/mtink(<fifo> */
           if ( (fp = fopen(runFile,"r")) )
diff --git a/net-print/mtink/metadata.xml b/net-print/mtink/metadata.xml
index c439b06d8c84..8223018128a3 100644
--- a/net-print/mtink/metadata.xml
+++ b/net-print/mtink/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>printing@gentoo.org</email>
-	<name>Gentoo Printing Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/mtink/mtink-1.0.16-r2.ebuild b/net-print/mtink/mtink-1.0.16-r2.ebuild
index 79e369b73084..8f231fa1e74e 100644
--- a/net-print/mtink/mtink-1.0.16-r2.ebuild
+++ b/net-print/mtink/mtink-1.0.16-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="mtink is a status monitor and inkjet cartridge changer for some Epson printers"
 HOMEPAGE="http://xwtools.automatix.de/"
@@ -12,19 +14,31 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="cups doc X"
 
-DEPEND="X? ( x11-libs/libX11
+DEPEND="
+	virtual/libusb:0
+	cups? ( net-print/cups )
+	X? (
+		x11-libs/libX11
 		x11-libs/libXpm
 		x11-libs/libXt
-		>=x11-libs/motif-2.3:0 )
+		x11-libs/motif:0
+	)
 	cups? ( net-print/cups )
 	virtual/libusb:0"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-overflow.patch"
-	"${FILESDIR}/${P}-flags.patch"
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-motif.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
+src_prepare() {
+	default
+	sed -i -e "s/gcc/$(tc-getCC)/g" Makefile.ORG || die
+}
+
 src_configure() {
 	if use X ; then
 		./Configure || die
@@ -48,9 +62,7 @@ src_compile() {
 src_install() {
 	dobin ttink detect/askPrinter
 
-	if use X; then
-		dobin mtinkc mtink
-	fi
+	use X && dobin mtinkc mtink
 
 	dosbin mtinkd
 
@@ -62,9 +74,8 @@ src_install() {
 		doexe etc/mtink-cups
 	fi
 
-	dodoc README CHANGE.LOG
-	use doc && \
-		dohtml html/*.gif html/*.html
+	dodoc html/README CHANGE.LOG
+	use doc && dodoc -r html/*.{gif,html}
 }
 
 pkg_postinst() {
diff --git a/sci-astronomy/swarp/Manifest b/sci-astronomy/swarp/Manifest
index 0f01ec9b2be7..cfd7879045b2 100644
--- a/sci-astronomy/swarp/Manifest
+++ b/sci-astronomy/swarp/Manifest
@@ -1 +1 @@
-DIST swarp-2.38.0.tar.gz 2063462 BLAKE2B 589429b714d3e0bec78a613285f09422f7aa53093436bb6c9215bdff87ac701558d6e76438c1efc773f17b595ea9f3c50b7f70c1f1b38dfad759a10df5b5d528 SHA512 80f4ade59738df3d4c9b47bda04148b53c6ba995d523fa8d1e02fb5d952b6078a53cc7d273849a033505de127a4f318b95adf2bf5a2dc38e8cc9bdaf5658487a
+DIST swarp-2.41.5.tar.gz 444035 BLAKE2B a76f9a68c9668c33f578262ec360234f2aebd5fe1ac1708c57819d63b3d4c70fbaa8442b1d025811d024321cb580a212854049ecba53a714cc84e4c7f20334ba SHA512 f397abb9c1a8a22c3bde2d1f5337492f8264df3bb43d4e263dbf175c8845d8cfea44bdfc977f2481ae8a1644722a56c82b818d40e4539d9f895fd91718d8aafe
diff --git a/sci-astronomy/swarp/metadata.xml b/sci-astronomy/swarp/metadata.xml
index 4f4367037c18..57aacfb6f10e 100644
--- a/sci-astronomy/swarp/metadata.xml
+++ b/sci-astronomy/swarp/metadata.xml
@@ -5,4 +5,7 @@
 		<email>sci-astronomy@gentoo.org</email>
 		<name>Gentoo Astronomy Project</name>
 	</maintainer>
+	<use>
+		<flag name="cfitsio">Link with <pkg>sci-libs/cfitsio</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-astronomy/swarp/swarp-2.38.0.ebuild b/sci-astronomy/swarp/swarp-2.38.0.ebuild
deleted file mode 100644
index 493c4478dca7..000000000000
--- a/sci-astronomy/swarp/swarp-2.38.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Resample and coadd astronomical FITS images"
-HOMEPAGE="http://www.astromatic.net/software/swarp"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="doc threads"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable threads)
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/*
-}
diff --git a/sci-astronomy/swarp/swarp-2.41.5.ebuild b/sci-astronomy/swarp/swarp-2.41.5.ebuild
new file mode 100644
index 000000000000..87ae8276154d
--- /dev/null
+++ b/sci-astronomy/swarp/swarp-2.41.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Resample and coadd astronomical FITS images"
+HOMEPAGE="http://www.astromatic.net/software/swarp"
+SRC_URI="https://github.com/astromatic/swarp/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cfitsio doc threads"
+
+RDEPEND="cfitsio? ( sci-libs/cfitsio )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with cfistio) \
+		$(use_enable threads)
+}
+
+src_install() {
+	default
+	use doc && dodoc -r doc/.
+}
diff --git a/sci-chemistry/prekin/files/6.51.081122-Makefile.patch b/sci-chemistry/prekin/files/6.51.081122-Makefile.patch
index 5fd9d00d9b06..b562f27e51d3 100644
--- a/sci-chemistry/prekin/files/6.51.081122-Makefile.patch
+++ b/sci-chemistry/prekin/files/6.51.081122-Makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.linux b/Makefile.linux
-index 65a021a..3daacd8 100755
 --- a/Makefile.linux
 +++ b/Makefile.linux
 @@ -1,15 +1,15 @@
diff --git a/sci-chemistry/prekin/files/6.51.081122-overflow.patch b/sci-chemistry/prekin/files/6.51.081122-overflow.patch
index 27bc01d61a52..1c6ded314315 100644
--- a/sci-chemistry/prekin/files/6.51.081122-overflow.patch
+++ b/sci-chemistry/prekin/files/6.51.081122-overflow.patch
@@ -1,5 +1,3 @@
-diff --git a/PKIN.h b/PKIN.h
-index 6cb6670..c9c6b89 100755
 --- a/PKIN.h
 +++ b/PKIN.h
 @@ -533,8 +533,8 @@ EXTERN float xnext,ynext,znext,onext,Bnext,Uvalnext;
diff --git a/sci-chemistry/prekin/files/prekin-6.51.081122-fno-common.patch b/sci-chemistry/prekin/files/prekin-6.51.081122-fno-common.patch
new file mode 100644
index 000000000000..207d30152027
--- /dev/null
+++ b/sci-chemistry/prekin/files/prekin-6.51.081122-fno-common.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/707310
+--- a/PKININIT.c
++++ b/PKININIT.c
+@@ -65,6 +65,8 @@ void writeversiontooutput(void); /*041011*/
+ void writechangestooutput(void); /*040215*/
+ void writecmdhelptooutput(void); /*040425*/
+ 
++extern int Lribbonnew;
++
+ static char* prekinchanges[] =
+ {"\r"
+ ,"020514 Cbeta:Superpos,NB:Prekin,IOmage\r"
+--- a/PKINRIBB.c
++++ b/PKINRIBB.c
+@@ -6,6 +6,8 @@
+ #define   PKINRIBB
+ #include "PKINRIBB.h"
+ #undef    PKINRIBB
++
++extern int Lribbonnew;
+  
+ /*{{{--NOTE--  version, etc. */
+ /*051025  for now, just work with one model, and let prekin's levels==sections*/
+--- a/PKINRIBB.h
++++ b/PKINRIBB.h
+@@ -5,7 +5,7 @@
+ #define PKINRIBB extern
+ #endif
+ 
+-PKINRIBB    int   Lribbonnew;  /*051025 new ribbon structures: PKINRIBB*/
++extern int   Lribbonnew;  /*051025 new ribbon structures: PKINRIBB*/
+ 
+ #define CORDER 4  /*order of the B-spline defined here*/
+ 
diff --git a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
index db0c34eca49b..d6f5e98ced6b 100644
--- a/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
+++ b/sci-chemistry/prekin/prekin-6.51.081122-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,6 @@ EAPI=6
 inherit toolchain-funcs
 
 MY_P=${PN}.${PV}
-
 DESCRIPTION="Prepares molecular kinemages from PDB-format coordinate files"
 HOMEPAGE="http://kinemage.biochem.duke.edu/software/prekin.php"
 SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/${PN}/${MY_P}.src.tgz"
@@ -19,15 +18,17 @@ IUSE="X"
 RDEPEND="
 	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libX11
 	x11-libs/libXt
+	x11-libs/libX11
 	X? ( >=x11-libs/motif-2.3:0= )"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
+
 PATCHES=(
 	"${FILESDIR}"/${PV}-Makefile.patch
 	"${FILESDIR}"/${PV}-overflow.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_configure() {
diff --git a/sci-libs/libecpint/Manifest b/sci-libs/libecpint/Manifest
index b8a71480926f..53231659574e 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1 +1,2 @@
 DIST libecpint-1.0.4.tar.gz 1313698 BLAKE2B 63f7ce2001ae9bdc975af083735f82fd03e133e880061d3c8659bf18d8236d09a7337049977cea6867a4e0e586d4112ccef6a8ee098903869111551364f614fb SHA512 ff38b598351e4499cd2d270a15e8c2dedcb0a6bc6aafcfc7a88ed8053199356e209bdb630713370aacbc3bba2a169050520405f7003feea7b064140d6d5337b6
+DIST libecpint-1.0.5.tar.gz 1313876 BLAKE2B 279618262bc32928964d559bda3f2d6235340bf807abb755c676a20ea6712d36d80a84a2522dd16d19290f5d622e47c4c0a34b549ffdb628f6c07372a5109981 SHA512 ad68599c1a220556ebb265968da6701596cf2388aa422100b80863bd8f73eaa1be5a2349c0db8c8864c3c8cf57151fe3d4520a3670f3b40ce147195079886d86
diff --git a/sci-libs/libecpint/libecpint-1.0.5.ebuild b/sci-libs/libecpint/libecpint-1.0.5.ebuild
new file mode 100644
index 000000000000..47004ee7019c
--- /dev/null
+++ b/sci-libs/libecpint/libecpint-1.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Efficient evaluation of integrals over ab initio effective core potentials"
+HOMEPAGE="https://github.com/robashaw/libecpint"
+SRC_URI="https://github.com/robashaw/libecpint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/pugixml"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBECPINT_BUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/sci-libs/openlibm/Manifest b/sci-libs/openlibm/Manifest
index a863ff69ae10..f70c939c7e2b 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,2 +1 @@
-DIST openlibm-0.7.3.tar.gz 366268 BLAKE2B 31cb50e64a3211770b1b91550382a2d4844af020a3e71dd2a7268f8faf3b3b4b54feedf4de19f27b7b74efa05961999d2b76416b1b615a554dc794cac782306f SHA512 433ec9ed5c0364b58fe1eff8760b64ad4203c7711fef02ed12d0070a34442b10c806fe6bccd81eadaa7758af2dd116c76bb769480c56e3320d548aff29d249a7
 DIST openlibm-0.7.4.tar.gz 366281 BLAKE2B fde965cdf66e8a872761e3df0715527d768a12a44b03af16a16898e66223ddb16809d13966a3ec222eb1b4fda2d560b614975c731df755a99b1d5f53a3da12fe SHA512 d824f909c52dfe78a5e090187d32f8c4744776235bfe3ad1fdb68ea3d3f8d1d358f228d0c83fbd5baa558a603c66c171e74e3f2c0cdb3d517f19930eadd35a91
diff --git a/sci-libs/openlibm/openlibm-0.7.3.ebuild b/sci-libs/openlibm/openlibm-0.7.3.ebuild
deleted file mode 100644
index baa2bdfd1729..000000000000
--- a/sci-libs/openlibm/openlibm-0.7.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="High quality system independent, open source libm"
-HOMEPAGE="https://github.com/JuliaLang/openlibm"
-SRC_URI="https://github.com/JuliaMath/openlibm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="public-domain MIT ISC BSD-2 LGPL-2.1+"
-# See https://abi-laboratory.pro/index.php?view=timeline&l=openlibm
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-make_inc.patch )
-
-src_prepare() {
-	default
-	sed -e "/^OLM_LIBS :=/s/^/#/" \
-		-e "/install: /s/install-static//" \
-	-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX FC AR LD
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc README.md
-}
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index d86b0157384e..b01710bd8a84 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cflags -fcommon
 	local myconf=""
 
 	use elibc_uclibc && myconf+=" --uclib-mode"