Merge updates from master

40 files changed, 183 insertions, 241 deletions

diff --git a/app-admin/abrt/abrt-2.14.2.ebuild b/app-admin/abrt/abrt-2.14.2.ebuild
index 1071f21d2393..16a5250da01e 100644
--- a/app-admin/abrt/abrt-2.14.2.ebuild
+++ b/app-admin/abrt/abrt-2.14.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools python-single-r1 systemd xdg-utils
+inherit autotools python-single-r1 xdg-utils
 
 DESCRIPTION="Automatic bug detection and reporting tool"
 HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
index 46aa1414b2e9..544312532d31 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
+inherit haskell-cabal
 
 DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
 HOMEPAGE="https://wiki.haskell.org/Gentoo#haskell-updater"
@@ -13,7 +13,6 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
 
diff --git a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
index d2a181f14fed..f01aa00d920b 100644
--- a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
+++ b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,17 +2,17 @@
  #               Copyright (c) 1999-2002 Georg Huettenegger
  #
diff --git a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
index 39a125aaf854..0822d71769e4 100644
--- a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
+++ b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
@@ -1,34 +1,43 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive"
 HOMEPAGE="http://plextor-tool.sourceforge.net/"
 SRC_URI="mirror://sourceforge/plextor-tool/${P}.src.tar.bz2"
+S="${WORKDIR}"/${PN}/src
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static"
 
-S=${WORKDIR}/${PN}/src
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
+
 	gunzip plextor-tool.8.gz || die
 }
 
 src_compile() {
 	local targets="plextor-tool"
+
 	use static && targets="${targets} pt-static"
-	echo ${targets} > my-make-targets
+
+	echo ${targets} > my-make-targets || die
+
 	emake CC="$(tc-getCC)" ${targets}
 }
 
 src_install() {
 	local targets=$(<my-make-targets)
+
 	dodoc ../doc/{NEWS,README} TODO
 	dobin ${targets}
 	doman plextor-tool.8
diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
index 32b3523d9c92..0b867751c373 100644
--- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
+++ b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
@@ -1,5 +1,5 @@
---- a/configure.in	2014-12-02 18:56:23.000000000 +0300
-+++ b/configure.in	2014-12-02 19:09:46.724190436 +0300
+--- a/configure.in
++++ b/configure.in
 @@ -6,13 +6,13 @@
  
  dnl Checks for libraries.
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
deleted file mode 100644
index 9340e06f7dce..000000000000
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Xbox xdvdfs ISO extraction utility"
-HOMEPAGE="https://sourceforge.net/projects/xbiso/"
-SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_prepare() {
-	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
-	epatch "${FILESDIR}/${P}-libs.patch"
-	mv configure.in configure.ac || die #426262
-	eautoreconf
-}
-
-src_configure() {
-	# for this package, interix behaves the same as BSD
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
-
-	econf --disable-ftp
-}
-
-src_install() {
-	dobin xbiso
-	dodoc CHANGELOG README
-}
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
index 5894d4c30c22..6d770560ed44 100644
--- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
index 84219b5394a4..d56aa22bd7e2 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils qmake-utils python-single-r1 desktop
+inherit qmake-utils python-single-r1 desktop
 
 DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
diff --git a/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild b/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
index 8bc84e323834..bc3abad7c8c2 100644
--- a/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
+++ b/app-metrics/prom2json/prom2json-0.1.0_p20170523.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit user golang-build golang-vcs-snapshot
+
+inherit golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/prometheus/${PN}"
 EGIT_COMMIT="4a7436442837da72f9e211d99f0145dff3246b66"
@@ -14,7 +15,6 @@ HOMEPAGE="https://github.com/prometheus/prom2json"
 SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
 DEPEND="dev-util/promu"
 
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
index 32444005ab91..e552ac85380b 100644
--- a/app-misc/cdctl/cdctl-0.16.ebuild
+++ b/app-misc/cdctl/cdctl-0.16.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils autotools toolchain-funcs
+inherit autotools
 
 DESCRIPTION="Utility to control your cd/dvd drive"
 HOMEPAGE="http://cdctl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
 
-S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-0.16-Makefile.in.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.16-Makefile.in.patch
-
+	default
 	eautoreconf
 }
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index 1f428eea3837..04850977dee3 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Easily add ANSI colouring to shell scripts"
 HOMEPAGE="http://www.runslinux.net/?page_id=10"
@@ -12,7 +12,6 @@ SRC_URI="http://runslinux.net/projects/color/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
 
 src_prepare() {
 	eapply "${FILESDIR}"/${PV}-ldflags.patch
diff --git a/app-misc/crunch/crunch-3.6.ebuild b/app-misc/crunch/crunch-3.6.ebuild
index 68517dd07322..d04886f3953c 100644
--- a/app-misc/crunch/crunch-3.6.ebuild
+++ b/app-misc/crunch/crunch-3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A wordlist generator"
 HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
@@ -13,10 +13,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~x86"
 
-src_prepare() {
-	epatch_user
-}
-
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
diff --git a/app-misc/cw/cw-1.0.16-r3.ebuild b/app-misc/cw/cw-1.0.16-r3.ebuild
index 5a667b143f95..3a0b86621c4a 100644
--- a/app-misc/cw/cw-1.0.16-r3.ebuild
+++ b/app-misc/cw/cw-1.0.16-r3.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 eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands"
 HOMEPAGE="http://cwrapper.sourceforge.net/"
@@ -12,15 +12,17 @@ SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${PV}-path.patch \
-		"${FILESDIR}"/${PV}-collision.patch \
-		"${FILESDIR}"/${PV}-format-security.patch
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-ldflags.patch
+	"${FILESDIR}"/${PV}-path.patch
+	"${FILESDIR}"/${PV}-collision.patch
+	"${FILESDIR}"/${PV}-format-security.patch
+)
+
+src_configure() {
 	tc-export CC
+	econf
 }
 
 src_compile() {
diff --git a/app-misc/cw/files/1.0.16-collision.patch b/app-misc/cw/files/1.0.16-collision.patch
index 52bb8cab8f3b..78ca0f99e395 100644
--- a/app-misc/cw/files/1.0.16-collision.patch
+++ b/app-misc/cw/files/1.0.16-collision.patch
@@ -1,5 +1,3 @@
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..a7811d8 100644
 --- a/src/cw.c
 +++ b/src/cw.c
 @@ -1336,7 +1336,7 @@ unsigned char is_cwfile(char *file){
@@ -11,8 +9,6 @@ index d7b4875..a7811d8 100644
   return(0);
  }
  /* sets left and right borders. */
-diff --git a/src/cwu.c b/src/cwu.c
-index 823618d..63f566b 100644
 --- a/src/cwu.c
 +++ b/src/cwu.c
 @@ -37,12 +37,12 @@ signed int main(signed int argc,char **argv){
diff --git a/app-misc/cw/files/1.0.16-format-security.patch b/app-misc/cw/files/1.0.16-format-security.patch
index 20f0b1d06b1e..ceb92c69a096 100644
--- a/app-misc/cw/files/1.0.16-format-security.patch
+++ b/app-misc/cw/files/1.0.16-format-security.patch
@@ -1,8 +1,3 @@
- src/cw.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cw.c b/src/cw.c
-index d7b4875..3ec1ac1 100644
 --- a/src/cw.c
 +++ b/src/cw.c
 @@ -643,7 +643,7 @@ void sighandler(signed int sig){
diff --git a/app-misc/cw/files/1.0.16-ldflags.patch b/app-misc/cw/files/1.0.16-ldflags.patch
index 46037312c6c3..4063de48d7f3 100644
--- a/app-misc/cw/files/1.0.16-ldflags.patch
+++ b/app-misc/cw/files/1.0.16-ldflags.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 9a6e4ec..e510493 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -19,11 +19,11 @@ all:
diff --git a/app-misc/cw/files/1.0.16-path.patch b/app-misc/cw/files/1.0.16-path.patch
index f62b5bd994d4..76c3fbf1d673 100644
--- a/app-misc/cw/files/1.0.16-path.patch
+++ b/app-misc/cw/files/1.0.16-path.patch
@@ -1,5 +1,3 @@
-diff --git a/bin/colorcfg b/bin/colorcfg
-index cf73b50..3e78c73 100755
 --- a/bin/colorcfg
 +++ b/bin/colorcfg
 @@ -10,13 +10,7 @@ echo "[ cw/color wrapper: user setup script. ]"
diff --git a/app-misc/esekeyd/esekeyd-1.2.7.ebuild b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
index 1afe1e9d064c..ba1cc0bce966 100644
--- a/app-misc/esekeyd/esekeyd-1.2.7.ebuild
+++ b/app-misc/esekeyd/esekeyd-1.2.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Multimedia key daemon that uses the Linux event interface"
 HOMEPAGE="http://freshmeat.net/projects/esekeyd/"
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 9e32653271ab..7514e810fb65 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils bash-completion-r1 toolchain-funcs
+EAPI=7
+
+inherit bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="program for making large letters out of ordinary text"
 HOMEPAGE="http://www.figlet.org/"
diff --git a/app-misc/jot/jot-9.0-r1.ebuild b/app-misc/jot/jot-9.0-r1.ebuild
index 477b2f953e88..54ae2ec49a33 100644
--- a/app-misc/jot/jot-9.0-r1.ebuild
+++ b/app-misc/jot/jot-9.0-r1.ebuild
@@ -1,23 +1,21 @@
-# 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 rpm toolchain-funcs
 
 RH_REV=3
-
 DESCRIPTION="Print out increasing, decreasing, random, or redundant data"
 HOMEPAGE="http://freshmeat.net/projects/bsd-jot/"
 SRC_URI="http://www.mit.edu/afs/athena/system/rhlinux/athena-${PV}/free/SRPMS/athena-${P}-${RH_REV}.src.rpm"
+S="${WORKDIR}/athena-${P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/athena-${P}"
 
 src_prepare() {
+	default
 	tc-export CC
 }
diff --git a/app-misc/nut/nut-20.1.ebuild b/app-misc/nut/nut-20.1.ebuild
index 3c028aa44a87..bdf69006e68b 100644
--- a/app-misc/nut/nut-20.1.ebuild
+++ b/app-misc/nut/nut-20.1.ebuild
@@ -1,7 +1,8 @@
-# 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
 
 DESCRIPTION="Record what you eat and analyze your nutrient levels"
@@ -15,7 +16,8 @@ KEYWORDS="~alpha amd64 ~arm ppc x86"
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		OPT="${CFLAGS}" FOODDIR=\\\"/usr/share/nut\\\" \
+		OPT="${CFLAGS}" \
+		FOODDIR=\\\"/usr/share/nut\\\" \
 		nut
 }
 
diff --git a/app-misc/regionset/regionset-0.2.ebuild b/app-misc/regionset/regionset-0.2.ebuild
index ccfb8796d511..6986cf9d3f32 100644
--- a/app-misc/regionset/regionset-0.2.ebuild
+++ b/app-misc/regionset/regionset-0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 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
 
@@ -12,14 +12,14 @@ SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 src_prepare() {
+	default
 	sed "/^\.IR/s@${PN}@${PF}@" -i ${PN}.8 || die
 }
 
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c dvd_udf.c || die
+	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c dvd_udf.c || die
 }
 
 src_install() {
@@ -29,7 +29,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "By default regionset uses /dev/dvd, specify a different device"
+	ewarn "By default, regionset uses /dev/dvd, specify a different device"
 	ewarn "as a command line argument if you need to. You need write access"
 	ewarn "to do this, preferably as root."
 	ewarn
diff --git a/app-misc/tprint/tprint-1.1.0-r1.ebuild b/app-misc/tprint/tprint-1.1.0-r1.ebuild
index b473dcc73077..fc7e22cc6f76 100644
--- a/app-misc/tprint/tprint-1.1.0-r1.ebuild
+++ b/app-misc/tprint/tprint-1.1.0-r1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
@@ -12,9 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE=""
 
 src_prepare() {
+	default
+
 	sed -i Makefile \
 		-e 's:cc:$(CC):g' \
 		-e 's:-g -O2:$(CFLAGS) $(LDFLAGS):g' \
@@ -22,7 +23,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
index 70a5b32243c0..eb54949ddad6 100644
--- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
+++ b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Collection of general purpose C++-classes"
 HOMEPAGE="http://www.tntnet.org/cxxtools.html"
@@ -10,18 +10,14 @@ SRC_URI="http://www.tntnet.org/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
-IUSE=""
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}"
 
+DOCS=( AUTHORS ChangeLog )
+
 src_configure() {
 	econf \
 		--disable-demos \
 		--disable-unittest
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
-}
diff --git a/dev-libs/libmba/libmba-0.9.1-r3.ebuild b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
index b0ffe135dfad..e16e8608b47c 100644
--- a/dev-libs/libmba/libmba-0.9.1-r3.ebuild
+++ b/dev-libs/libmba/libmba-0.9.1-r3.ebuild
@@ -1,22 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils flag-o-matic multilib toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A library of generic C modules"
 LICENSE="MIT"
 HOMEPAGE="http://www.ioplex.com/~miallen/libmba/"
 SRC_URI="http://www.ioplex.com/~miallen/libmba/dl/${P}.tar.gz"
+
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs"
 
-src_prepare() {
-	use static-libs && export STATIC="1"
+PATCHES=(
+	"${FILESDIR}"/${P}-qa.patch
+	"${FILESDIR}"/${P}-glibc-2.20.patch
+)
 
-	epatch "${FILESDIR}"/${P}-qa.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.20.patch
+src_prepare() {
+	default
 
 	tc-export CC
 	sed -i -e "s:gcc:${CC}:g" mktool.c || die
@@ -33,9 +36,10 @@ src_install() {
 	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
 
 	dodoc README.txt docs/*.txt
-	dohtml -r docs/*.html docs/www/* docs/ref
+	docinto html
+	dodoc -r docs/*.html docs/www/* docs/ref
 
-	insinto /usr/share/doc/${PF}/examples
+	docinto examples
 	doins examples/*
 
 	gunzip -v $(find "${ED}" -name '*.[0-9]*.gz') || die
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
index 007ee19fa8dd..c8e80b830392 100644
--- a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
+++ b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
@@ -1,23 +1,23 @@
---- rapidxml_print.hpp.orig	2015-06-21 15:46:43.330070116 +0200
-+++ rapidxml_print.hpp	2015-06-21 15:50:58.745053512 +0200
+--- a/rapidxml_print.hpp
++++ b/rapidxml_print.hpp
 @@ -102,6 +102,20 @@
-         ///////////////////////////////////////////////////////////////////////////

-         // Internal printing operations

-     

-+        // =====================================

-+        // fix for clang for this bug in gcc and others: https://sourceforge.net/p/rapidxml/bugs/16/

-+

-+        template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+        template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+        template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+        template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+        template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+        template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+        template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+        template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);

-+

-+        // =====================================

-+

-         // Print node

-         template<class OutIt, class Ch>

-         inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)

+         ///////////////////////////////////////////////////////////////////////////
+         // Internal printing operations
+     
++        // =====================================
++        // fix for clang for this bug in gcc and others: https://sourceforge.net/p/rapidxml/bugs/16/
++
++        template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++        template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
++
++        // =====================================
++
+         // Print node
+         template<class OutIt, class Ch>
+         inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
index 316fb1fc0d33..80a5284c808b 100644
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
+++ b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Fast XML parser"
 HOMEPAGE="http://rapidxml.sourceforge.net/"
@@ -12,11 +10,12 @@ SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
 LICENSE="Boost-1.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-clang.patch
-}
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
 
 src_install() {
 	insinto /usr/include/rapidxml
diff --git a/dev-libs/rapidxml/rapidxml-1.13.ebuild b/dev-libs/rapidxml/rapidxml-1.13.ebuild
deleted file mode 100644
index 4b8625867211..000000000000
--- a/dev-libs/rapidxml/rapidxml-1.13.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Fast XML parser"
-HOMEPAGE="http://rapidxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
-
-LICENSE="Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	insinto /usr/include/rapidxml
-	doins *.hpp
-	dohtml manual.html
-}
diff --git a/dev-vcs/git-crypt/git-crypt-0.6.0.ebuild b/dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
index f107562053ad..c7e0f1a2401a 100644
--- a/dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
+++ b/dev-vcs/git-crypt/git-crypt-0.6.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="transparent file encryption in git"
 HOMEPAGE="https://www.agwa.name/projects/git-crypt/"
 SRC_URI="https://github.com/AGWA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="dev-vcs/git"
 DEPEND="${RDEPEND}"
 
 src_install() {
-	mkdir -p "${D}"/usr/bin
+	mkdir -p "${D}"/usr/bin || die
 	emake PREFIX="${D}"/usr install
 }
diff --git a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild b/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
index 939921d2acf6..43f1384db120 100644
--- a/media-libs/fidlib/fidlib-0.9.10-r1.ebuild
+++ b/media-libs/fidlib/fidlib-0.9.10-r1.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=5
+EAPI=7
 
-inherit toolchain-funcs flag-o-matic eutils multilib
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Run-time filter design and execution library"
 HOMEPAGE="http://uazu.net/fidlib/"
@@ -13,13 +13,17 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-extern.patch
+)
+
 doecho() {
 	echo "$@"
 	"$@" || die
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-extern.patch
+	default
 
 	# Avoid ICE under gcc-4.6, fixed in 4.6.3
 	if [[ $(gcc-version) == "4.6" && $(gcc-micro-version) -le 2 ]] ; then
diff --git a/media-libs/fidlib/files/fidlib-0.9.10-extern.patch b/media-libs/fidlib/files/fidlib-0.9.10-extern.patch
index 0e819942907e..691a9e273c46 100644
--- a/media-libs/fidlib/files/fidlib-0.9.10-extern.patch
+++ b/media-libs/fidlib/files/fidlib-0.9.10-extern.patch
@@ -1,5 +1,5 @@
---- fidlib-0.9.10/fidlib.h
-+++ fidlib-0.9.10/fidlib.h
+--- a/fidlib.h
++++ b/fidlib.h
 @@ -2,6 +2,13 @@
  //	fidlib include file
  //
diff --git a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
index f0bb7d6d1368..7128eaac5191 100644
--- a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
+++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="top-like program for network activity"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -19,10 +19,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc411.patch
+	"${FILESDIR}"/${P}-offbyone.patch
+)
+
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc411.patch \
-		"${FILESDIR}"/${P}-offbyone.patch
+	default
 	tc-export CC
 }
 
diff --git a/net-mail/libdbx/files/bad_c.patch b/net-mail/libdbx/files/bad_c.patch
index 1f7dc6d8ba03..af6a065064fc 100644
--- a/net-mail/libdbx/files/bad_c.patch
+++ b/net-mail/libdbx/files/bad_c.patch
@@ -1,6 +1,5 @@
-diff -ru libdbx_1.0.3/libdbx.c libdbx_1.0.3-new/libdbx.c
---- libdbx_1.0.3/libdbx.c	2002-10-05 15:07:36.000000000 +0200
-+++ libdbx_1.0.3-new/libdbx.c	2006-09-20 08:53:46.000000000 +0200
+--- a/libdbx.c
++++ b/libdbx.c
 @@ -485,11 +485,11 @@
  	    switch (blockp.type) {
  	    case 0x01: //pointer to flag
@@ -24,11 +23,8 @@ diff -ru libdbx_1.0.3/libdbx.c libdbx_1.0.3-new/libdbx.c
  				readtype = W32FT_TYPE;
  				break;
  	    case 0x13: //recipient's name
-Only in libdbx_1.0.3-new: libdbx.o
-Only in libdbx_1.0.3-new: readdbx
-diff -ru libdbx_1.0.3/readdbx.c libdbx_1.0.3-new/readdbx.c
---- libdbx_1.0.3/readdbx.c	2002-10-05 15:20:25.000000000 +0200
-+++ libdbx_1.0.3-new/readdbx.c	2006-09-20 08:54:10.000000000 +0200
+--- a/readdbx.c
++++ b/readdbx.c
 @@ -19,6 +19,7 @@
  #include <getopt.h>
  #include <time.h>
@@ -37,5 +33,3 @@ diff -ru libdbx_1.0.3/readdbx.c libdbx_1.0.3-new/readdbx.c
  
  #include "libdbx.h"
  #include "common.h"
-Only in libdbx_1.0.3-new: readoe
-Files libdbx_1.0.3/timeconv.o and libdbx_1.0.3-new/timeconv.o differ
diff --git a/net-mail/libdbx/libdbx-1.0.3.ebuild b/net-mail/libdbx/libdbx-1.0.3.ebuild
index 4f8dd3227f74..199b0c314a25 100644
--- a/net-mail/libdbx/libdbx-1.0.3.ebuild
+++ b/net-mail/libdbx/libdbx-1.0.3.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 eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="libdbx"
 MYFILE="${MY_PN}_${PV}.tgz"
@@ -11,16 +11,19 @@ MYFILE="${MY_PN}_${PV}.tgz"
 DESCRIPTION="Tools and library for reading Outlook Express mailboxes (.dbx format)"
 HOMEPAGE="https://sourceforge.net/projects/ol2mbox"
 SRC_URI="mirror://sourceforge/ol2mbox/${MYFILE}"
+S="${WORKDIR}/${MY_PN}_${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
-S="${WORKDIR}/${MY_PN}_${PV}"
+PATCHES=(
+	"${FILESDIR}"/bad_c.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/bad_c.patch"
+	default
+
 	sed -i -e 's/-g/$(CFLAGS) $(LDFLAGS)/;s|gcc|$(CC)|g' Makefile || die
 	tc-export CC
 }
diff --git a/net-mail/pop2imap/pop2imap-1.21.ebuild b/net-mail/pop2imap/pop2imap-1.21.ebuild
index cef59036ef8d..17462534e4a3 100644
--- a/net-mail/pop2imap/pop2imap-1.21.ebuild
+++ b/net-mail/pop2imap/pop2imap-1.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Synchronize mailboxes between a pop and an imap servers"
 HOMEPAGE="http://www.linux-france.org/prj/pop2imap/"
@@ -10,7 +10,6 @@ SRC_URI="http://www.linux-france.org/prj/pop2imap/dist/${P}.tgz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild
index b03935f66fb7..42582ee48b6a 100644
--- a/net-mail/renattach/renattach-1.2.4-r1.ebuild
+++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Filter that renames/deletes dangerous email attachments"
 HOMEPAGE="http://www.pc-tools.net/unix/renattach/"
@@ -10,12 +10,11 @@ SRC_URI="http://www.pc-tools.net/files/unix/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	mv "${D}"/etc/renattach.conf.ex "${D}"/etc/renattach.conf || die
+	mv "${ED}"/etc/renattach.conf.ex "${ED}"/etc/renattach.conf || die
 
 	dodoc AUTHORS ChangeLog README NEWS
 }
diff --git a/net-misc/dhcping/dhcping-1.2.ebuild b/net-misc/dhcping/dhcping-1.2.ebuild
index 83adc5fd6eb9..b288cce6699a 100644
--- a/net-misc/dhcping/dhcping-1.2.ebuild
+++ b/net-misc/dhcping/dhcping-1.2.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=5
+EAPI=7
 
-DESCRIPTION="Utility for sending a dhcp request to a dhcp server to see if it is responding"
+DESCRIPTION="Utility to send DHCP requests to DHCP servers to see if responding"
 HOMEPAGE="http://www.mavetju.org/unix/general.php"
 SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
 
diff --git a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
index cc7e4cb41180..2d94fe2f5dfc 100644
--- a/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
+++ b/net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Display NAT connections"
 HOMEPAGE="http://tweegy.nl/projects/netstat-nat/index.html"
@@ -12,7 +13,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc sparc x86"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-install.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-install.patch
+	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
diff --git a/net-misc/sipcalc/sipcalc-1.1.6.ebuild b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
index 25bc9b8a9cd2..4d992820870b 100644
--- a/net-misc/sipcalc/sipcalc-1.1.6.ebuild
+++ b/net-misc/sipcalc/sipcalc-1.1.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Sipcalc is an advanced console-based IP subnet calculator"
 HOMEPAGE="http://www.routemeister.net/projects/sipcalc/"
 SRC_URI="http://www.routemeister.net/projects/${PN}/files/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
diff --git a/net-news/yydecode/yydecode-0.2.10-r1.ebuild b/net-news/yydecode/yydecode-0.2.10-r1.ebuild
index 1f94a29951d9..03e4f0cc3c81 100644
--- a/net-news/yydecode/yydecode-0.2.10-r1.ebuild
+++ b/net-news/yydecode/yydecode-0.2.10-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A decoder for yENC format, popular on Usenet"
 HOMEPAGE="http://yydecode.sourceforge.net/"
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/yydecode/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~ppc ~sparc x86"
-IUSE=""
 
 src_prepare() {
+	default
 	sed -e "s/t3.sh//" -e "s/t7.sh//" -i checks/Makefile.in || die
 }