Merge updates from master

63 files changed, 86 insertions, 191 deletions

diff --git a/app-emulation/fuse/fuse-1.6.0.ebuild b/app-emulation/fuse/fuse-1.6.0.ebuild
index ddec66d72acc..aec3885d7c5a 100644
--- a/app-emulation/fuse/fuse-1.6.0.ebuild
+++ b/app-emulation/fuse/fuse-1.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib"
+IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png pulseaudio +xml +zlib"
 
 # TODO:
 # - allow using sdl audio driver without using for the UI
diff --git a/app-office/gnucash/gnucash-4.4.ebuild b/app-office/gnucash/gnucash-4.4.ebuild
index 952be652e304..09ce9038f1bf 100644
--- a/app-office/gnucash/gnucash-4.4.ebuild
+++ b/app-office/gnucash/gnucash-4.4.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
-	  python quotes -register2 smartcard sqlite test"
+	  python quotes register2 smartcard sqlite test"
 RESTRICT="!test? ( test )"
 
 # Examples doesn't build unless GUI is also built
diff --git a/app-office/gnucash/gnucash-4.5.ebuild b/app-office/gnucash/gnucash-4.5.ebuild
index d292141e0dbb..7c45aa93aa2c 100644
--- a/app-office/gnucash/gnucash-4.5.ebuild
+++ b/app-office/gnucash/gnucash-4.5.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
-	  python quotes -register2 smartcard sqlite test"
+	  python quotes register2 smartcard sqlite test"
 RESTRICT="!test? ( test )"
 
 # Examples doesn't build unless GUI is also built
diff --git a/app-text/sword-modules/sword-modules-2.3.ebuild b/app-text/sword-modules/sword-modules-2.3.ebuild
index c69774346873..a010666f5900 100644
--- a/app-text/sword-modules/sword-modules-2.3.ebuild
+++ b/app-text/sword-modules/sword-modules-2.3.ebuild
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 LANGS=" af ar az be bea bg bla br ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
-IUSE="-esoteric ${LANGS// / l10n_}"
+IUSE="esoteric ${LANGS// / l10n_}"
 
 RDEPEND="
 	|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs )
diff --git a/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild
index f1d854b8b322..584e135f9540 100644
--- a/dev-db/pgbouncer/pgbouncer-1.15.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.15.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.pgbouncer.org/downloads/files/${PV}/pgbouncer-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+c-ares debug doc pam ssl systemd -udns"
+IUSE="+c-ares debug doc pam ssl systemd udns"
 
 # At-most-one-of, one can be enabled but not both
 REQUIRED_USE="?? ( c-ares udns )"
diff --git a/dev-db/postgresql/postgresql-9.5.25.ebuild b/dev-db/postgresql/postgresql-9.5.25.ebuild
index 5f0e320adeed..adbf87e5ed06 100644
--- a/dev-db/postgresql/postgresql-9.5.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.25.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="debug doc kerberos kernel_linux ldap nls pam perl
-	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-db/postgresql/postgresql-9.6.21.ebuild b/dev-db/postgresql/postgresql-9.6.21.ebuild
index b6150ca0af88..e6c0c5e5df53 100644
--- a/dev-db/postgresql/postgresql-9.6.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.21.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="debug doc kerberos kernel_linux ldap nls pam perl
-	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-db/postgresql/postgresql-9.6.22.ebuild b/dev-db/postgresql/postgresql-9.6.22.ebuild
index 5c7e9f2653e2..dba0d5f7ae26 100644
--- a/dev-db/postgresql/postgresql-9.6.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.22.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"
 
 IUSE="debug doc kerberos kernel_linux ldap nls pam perl
-	  -pg-legacytimestamp python +readline selinux +server systemd ssl
+	  pg-legacytimestamp python +readline selinux +server systemd ssl
 	  static-libs tcl threads uuid xml zlib"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-games/mygui/mygui-3.2.2.ebuild b/dev-games/mygui/mygui-3.2.2.ebuild
index dc3766716faf..8d9f41e07cc2 100644
--- a/dev-games/mygui/mygui-3.2.2.ebuild
+++ b/dev-games/mygui/mygui-3.2.2.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=5
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug doc +ogre -opengl plugins samples static-libs test tools l10n_ru"
+IUSE="debug doc +ogre opengl plugins samples static-libs test tools l10n_ru"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="ogre? ( !opengl )
 	opengl? ( !ogre )"
diff --git a/dev-games/mygui/mygui-3.4.0.ebuild b/dev-games/mygui/mygui-3.4.0.ebuild
index 896d211683f2..ab008898965f 100644
--- a/dev-games/mygui/mygui-3.4.0.ebuild
+++ b/dev-games/mygui/mygui-3.4.0.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
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +ogre -opengl plugins samples static-libs test tools l10n_ru"
+IUSE="debug doc +ogre opengl plugins samples static-libs test tools l10n_ru"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="ogre? ( !opengl )
 	opengl? ( !ogre )"
diff --git a/dev-lisp/clisp/clisp-2.49.92.ebuild b/dev-lisp/clisp/clisp-2.49.92.ebuild
index 6a4e241457ee..1403a5e81c59 100644
--- a/dev-lisp/clisp/clisp-2.49.92.ebuild
+++ b/dev-lisp/clisp/clisp-2.49.92.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="2/8"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86"
-IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm -threads +unicode +zlib"
+IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk +pcre postgres +readline svm threads +unicode +zlib"
 # "jit" disabled ATM
 
 RDEPEND=">=dev-lisp/asdf-2.33-r3
diff --git a/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild b/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r2.ebuild
index 1c2acad01e01..390ce254aad9 100644
--- a/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r1.ebuild
+++ b/dev-perl/GD-Barcode/GD-Barcode-1.150.0-r2.ebuild
@@ -1,19 +1,16 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-MODULE_AUTHOR=KWITKNR
-MODULE_VERSION=1.15
+DIST_AUTHOR=KWITKNR
+DIST_VERSION=1.15
 inherit perl-module
 
-DESCRIPTION="GD::Barcode - Create barcode image with GD"
+DESCRIPTION="Create barcode images with GD"
 
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE=""
 
 RDEPEND="dev-perl/GD"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild b/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
deleted file mode 100644
index eed218eb4c48..000000000000
--- a/dev-perl/GD-Graph3d/GD-Graph3d-0.630.0-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=WADG
-MODULE_VERSION=0.63
-inherit perl-module
-
-DESCRIPTION="Create 3D Graphs with GD and GD::Graph"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-perl/GD-1.18
-	>=dev-perl/GDGraph-1.30
-	dev-perl/GDTextUtil"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild b/dev-perl/GD-SVG/GD-SVG-0.330.0-r2.ebuild
index 6d34fc262a61..e0af267239df 100644
--- a/dev-perl/GD-SVG/GD-SVG-0.330.0-r1.ebuild
+++ b/dev-perl/GD-SVG/GD-SVG-0.330.0-r2.ebuild
@@ -1,20 +1,17 @@
-# 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
 
-MODULE_AUTHOR=TWH
-MODULE_VERSION=0.33
+DIST_AUTHOR=TWH
+DIST_VERSION=0.33
 inherit perl-module
 
 DESCRIPTION="Seamlessly enable SVG output from scripts written using GD"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="dev-perl/GD
+RDEPEND="dev-perl/GD
 	dev-perl/SVG"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
+BDEPEND="${RDEPEND}"
diff --git a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
deleted file mode 100644
index 8b6ddb3d4c86..000000000000
--- a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=RUZ
-MODULE_VERSION=1.49
-inherit perl-module
-
-DESCRIPTION="Perl5 module to create charts using the GD module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/GDTextUtil
-	dev-perl/GD
-	media-libs/gd"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/GDGraph/GDGraph-1.510.0.ebuild b/dev-perl/GDGraph/GDGraph-1.510.0.ebuild
deleted file mode 100644
index 1154f99a5543..000000000000
--- a/dev-perl/GDGraph/GDGraph-1.510.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RUZ
-DIST_VERSION=1.51
-inherit perl-module
-
-DESCRIPTION="Perl5 module to create charts using the GD module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/GD-1.180.0
-	>=dev-perl/GDTextUtil-0.800.0
-	media-libs/gd
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=dev-perl/Capture-Tiny-0.300.0
-		>=dev-perl/Test-Exception-0.400.0
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/GDGraph/GDGraph-1.520.0.ebuild b/dev-perl/GDGraph/GDGraph-1.520.0.ebuild
deleted file mode 100644
index 720c67c5fe79..000000000000
--- a/dev-perl/GDGraph/GDGraph-1.520.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=RUZ
-DIST_VERSION=1.52
-inherit perl-module
-
-DESCRIPTION="Perl5 module to create charts using the GD module"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-perl/GD-1.180.0
-	>=dev-perl/GDTextUtil-0.800.0
-	media-libs/gd
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.640.0
-	test? (
-		>=dev-perl/Capture-Tiny-0.300.0
-		>=dev-perl/Test-Exception-0.400.0
-		>=virtual/perl-Test-Simple-0.880.0
-	)
-"
diff --git a/dev-perl/GDGraph/Manifest b/dev-perl/GDGraph/Manifest
index 71b80dfc1560..67da43196bc6 100644
--- a/dev-perl/GDGraph/Manifest
+++ b/dev-perl/GDGraph/Manifest
@@ -1,4 +1 @@
-DIST GDGraph-1.49.tar.gz 155643 BLAKE2B da76c442d51713b8839ee89c22734345730121f698f4ed45cc3cc5f5ec6a09f409dc2744cccc8979ac003b5aa6bca922a73ba22af8a8fc22d966e4f7a852a002 SHA512 720cc51dda41963be087bb39418642f75dade1bbab54cd4d788c18c9328f3fbd6a5c0f73027bb0be64d44cd94b0c5f2d67c48d4b0c3c34736ac8f7bc8cba95ab
-DIST GDGraph-1.51.tar.gz 156175 BLAKE2B d2cee141c9702c7584a90bf652f47670d5492ac8836c1c9d229010084ab606caba7cc12f0578e1b89b9b8f7c9b22a3f28d9c222777ed4a3df73576cb0857acad SHA512 c9cafdc90905fea8689cac32d0429ae987a933ae090de9894c9f70668db5c636e9363e76a656898df667dd0b0b4f593a64f3327f0b8a9738f74cd2cd937005e0
-DIST GDGraph-1.52.tar.gz 156349 BLAKE2B 93eefa2a1c342e0e8822bc3bd49837b9a5a882f15085aaf1888511631d064d5c6069b4c95ea11fa519edc3fb061dfe4a4e1dbf2d07cf4db1eba7dd20fe1bedb5 SHA512 9a213a5fb44608f3984ed763659fb0cb631bdbc34e89683eb3d4cb776de7fdd1cf4c9e339cf02e0035d4978bfd0d82723e1576c40720af917f50bb0363fd26e0
 DIST GDGraph-1.54.tar.gz 157158 BLAKE2B d427f135998c8e60e62ea0e94d1a8c2c48756fdd3d7fe2ab230f342657a684cacc3b3a9633cfdac16a5e65d01e2093043b5d8d4050082821e95b30ababc545e4 SHA512 0dd0da5fa0e879cf2addcbfdd02ee8e9e6af715b88b451dc29fe5028f30d7ba7fa0e126d07e7bb4f9a63e40b3be95a9cc0f6c061ea8644ba0ee7fdd2a7964fce
diff --git a/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild b/dev-perl/Template-GD/Template-GD-2.660.0-r2.ebuild
index eb06ad545ba9..32993ed15f52 100644
--- a/dev-perl/Template-GD/Template-GD-2.660.0-r1.ebuild
+++ b/dev-perl/Template-GD/Template-GD-2.660.0-r2.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=5
@@ -20,6 +20,6 @@ RDEPEND="dev-perl/GD
 	dev-perl/GD-Graph3d
 	>=dev-perl/Template-Toolkit-2.15-r1"
 DEPEND="${RDEPEND}
-	test? ( dev-perl/GD[png] )"
+	test? ( dev-perl/GD[png(+)] )"
 
 SRC_TEST="do"
diff --git a/dev-python/imapclient/imapclient-2.2.0.ebuild b/dev-python/imapclient/imapclient-2.2.0.ebuild
index 584b7a19fed0..0c541676f444 100644
--- a/dev-python/imapclient/imapclient-2.2.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pip/pip-21.1.1.ebuild b/dev-python/pip/pip-21.1.1.ebuild
index 0176ffcc3092..461915435ffe 100644
--- a/dev-python/pip/pip-21.1.1.ebuild
+++ b/dev-python/pip/pip-21.1.1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
 LICENSE="MIT"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
-IUSE="test -vanilla"
+IUSE="test vanilla"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-python/pip/pip-21.1.2.ebuild b/dev-python/pip/pip-21.1.2.ebuild
index a075eebd7662..8dd2850878c5 100644
--- a/dev-python/pip/pip-21.1.2.ebuild
+++ b/dev-python/pip/pip-21.1.2.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
 LICENSE="MIT"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 SLOT="0"
-IUSE="test -vanilla"
+IUSE="test vanilla"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-python/zeep/zeep-3.4.0.ebuild b/dev-python/zeep/zeep-3.4.0.ebuild
index f688e7d10a23..2bc63cbeff40 100644
--- a/dev-python/zeep/zeep-3.4.0.ebuild
+++ b/dev-python/zeep/zeep-3.4.0.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
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="async -tornado"
+IUSE="async tornado"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-vcs/fossil/fossil-2.12.1.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index 71d847dfb53c..2a0190cc2661 100644
--- a/dev-vcs/fossil/fossil-2.12.1.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.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
@@ -12,7 +12,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
+IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
 REQUIRED_USE="ssl? ( !miniz )"
diff --git a/dev-vcs/fossil/fossil-2.13.ebuild b/dev-vcs/fossil/fossil-2.13.ebuild
index edbf33e450ca..d15ac6e0ea52 100644
--- a/dev-vcs/fossil/fossil-2.13.ebuild
+++ b/dev-vcs/fossil/fossil-2.13.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
@@ -12,7 +12,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
+IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
 		  tcl-private-stubs th1-docs th1-hooks"
 
 REQUIRED_USE="ssl? ( !miniz )"
diff --git a/dev-vcs/fossil/fossil-2.14.ebuild b/dev-vcs/fossil/fossil-2.14.ebuild
index cec9cc187d00..c1c0418835cb 100644
--- a/dev-vcs/fossil/fossil-2.14.ebuild
+++ b/dev-vcs/fossil/fossil-2.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
+IUSE="debug fusefs json miniz system-sqlite +ssl static tcl tcl-stubs
 	  tcl-private-stubs th1-docs th1-hooks"
 
 REQUIRED_USE="ssl? ( !miniz )"
diff --git a/mail-mta/notqmail/notqmail-1.08-r3.ebuild b/mail-mta/notqmail/notqmail-1.08-r3.ebuild
index 3e4ded9011a2..e2dc2632e8d4 100644
--- a/mail-mta/notqmail/notqmail-1.08-r3.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r3.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
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume -pop3 qmail-spp ssl test vanilla"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
diff --git a/mail-mta/notqmail/notqmail-9999.ebuild b/mail-mta/notqmail/notqmail-9999.ebuild
index f5ec0ad8013c..d19ad72c59fc 100644
--- a/mail-mta/notqmail/notqmail-9999.ebuild
+++ b/mail-mta/notqmail/notqmail-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
@@ -56,7 +56,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="public-domain"
 SLOT="0"
-IUSE="authcram gencertdaily highvolume -pop3 qmail-spp ssl test vanilla"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl test vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume !authcram !gencertdaily ) gencertdaily? ( ssl )"
 RESTRICT="!test? ( test )"
 
diff --git a/mate-base/mate/mate-1.24.ebuild b/mate-base/mate/mate-1.24.ebuild
index 7fb11931a3e8..d1dcbedfdcb3 100644
--- a/mate-base/mate/mate-1.24.ebuild
+++ b/mate-base/mate/mate-1.24.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=6
@@ -20,7 +20,7 @@ HOMEPAGE="https://mate-desktop.org"
 LICENSE="metapackage"
 
 SLOT="0"
-IUSE="+base -bluetooth help +notification +themes +extras"
+IUSE="+base bluetooth help +notification +themes +extras"
 
 S="${WORKDIR}"
 
diff --git a/media-gfx/freecad/freecad-0.19.1.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild
index 5ffecf7de50a..1d7e61445995 100644
--- a/media-gfx/freecad/freecad-0.19.1.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -39,7 +39,7 @@ for module in ${FREECAD_STABLE_MODULES}; do
 	IUSE="${IUSE} +${module}"
 done
 for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-	IUSE="${IUSE} -${module}"
+	IUSE="${IUSE} ${module}"
 done
 unset module
 
diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild
index 4719298feb3b..393c42ede035 100644
--- a/media-gfx/freecad/freecad-0.19.2.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2.ebuild
@@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do
 	IUSE="${IUSE} +${module}"
 done
 for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-	IUSE="${IUSE} -${module}"
+	IUSE="${IUSE} ${module}"
 done
 unset module
 
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 8b29013224e1..765ee01a7a03 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -41,7 +41,7 @@ for module in ${FREECAD_STABLE_MODULES}; do
 	IUSE="${IUSE} +${module}"
 done
 for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
-	IUSE="${IUSE} -${module}"
+	IUSE="${IUSE} ${module}"
 done
 unset module
 
diff --git a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
index f4ed995d10ca..172c5a559c36 100644
--- a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
+++ b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-${PV}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="double-precision -minimal"
+IUSE="double-precision minimal"
 
 DEPEND="
 	dev-cpp/eigen:3
diff --git a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
index 8e798c30c35f..c70aa2893ded 100644
--- a/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.ebuild
+++ b/media-plugins/vdr-vdrmanager/vdr-vdrmanager-0.14.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=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="gzip +ssl -stream zlib"
+IUSE="gzip +ssl stream zlib"
 
 DEPEND=">=media-video/vdr-2
 		ssl? ( dev-libs/openssl )"
diff --git a/media-sound/cadence/cadence-0.9.1.ebuild b/media-sound/cadence/cadence-0.9.1.ebuild
index 026f01179e6d..7ce406e271d8 100644
--- a/media-sound/cadence/cadence-0.9.1.ebuild
+++ b/media-sound/cadence/cadence-0.9.1.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="a2jmidid -pulseaudio opengl"
+IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index d99be6470613..8aa575803de1 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="a2jmidid -pulseaudio opengl"
+IUSE="a2jmidid pulseaudio opengl"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-dns/bind/bind-9.16.15.ebuild b/net-dns/bind/bind-9.16.15.ebuild
index 9fab32caeb82..d4149f3a69aa 100644
--- a/net-dns/bind/bind-9.16.15.ebuild
+++ b/net-dns/bind/bind-9.16.15.ebuild
@@ -35,7 +35,7 @@ LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 # -berkdb by default re bug 602682
-IUSE="-berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
 json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
 # sdb-ldap - patch broken
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
diff --git a/net-fs/autofs/autofs-5.1.6-r1.ebuild b/net-fs/autofs/autofs-5.1.6-r1.ebuild
index 743ec6519497..cbbf2773535c 100644
--- a/net-fs/autofs/autofs-5.1.6-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
+IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
 RDEPEND=">=sys-apps/util-linux-2.20
diff --git a/net-fs/autofs/autofs-5.1.7.ebuild b/net-fs/autofs/autofs-5.1.7.ebuild
index 5387d293f411..da73cde6f2a0 100644
--- a/net-fs/autofs/autofs-5.1.7.ebuild
+++ b/net-fs/autofs/autofs-5.1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
+IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
 RDEPEND=">=sys-apps/util-linux-2.20
diff --git a/net-libs/libpcap/libpcap-1.10.0.ebuild b/net-libs/libpcap/libpcap-1.10.0.ebuild
index e17ca9253266..ead6948c37ee 100644
--- a/net-libs/libpcap/libpcap-1.10.0.ebuild
+++ b/net-libs/libpcap/libpcap-1.10.0.ebuild
@@ -25,7 +25,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
+IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index b0505e64ff65..f7cc40d1b868 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
+IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
diff --git a/net-libs/mbedtls/mbedtls-2.16.10.ebuild b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
index 42ecb298a481..ce4c7c2ec070 100644
--- a/net-libs/mbedtls/mbedtls-2.16.10.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.10.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
 LICENSE="Apache-2.0"
 SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs -static-libs test threads zlib"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/net-libs/mbedtls/mbedtls-2.26.0.ebuild b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
index 6d5cc4a6daae..9818d7945121 100644
--- a/net-libs/mbedtls/mbedtls-2.26.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.26.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${P}
 LICENSE="Apache-2.0"
 SLOT="0/6.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_sse2 doc havege programs -static-libs test threads zlib"
+IUSE="cpu_flags_x86_sse2 doc havege programs static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/net-libs/onion/onion-0.8.ebuild b/net-libs/onion/onion-0.8.ebuild
index 2be5752a9a3d..a283da472b81 100644
--- a/net-libs/onion/onion-0.8.ebuild
+++ b/net-libs/onion/onion-0.8.ebuild
@@ -25,7 +25,7 @@ LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
 SLOT="0"
 IUSE="
 	gnutls pam png jpeg xml systemd sqlite boehm-gc
-	test examples cxx -libev -libevent
+	test examples cxx libev libevent
 	redis
 "
 RESTRICT="!test? ( test )"
diff --git a/net-libs/onion/onion-9999.ebuild b/net-libs/onion/onion-9999.ebuild
index 96a276b10f55..10ba2b76bbf0 100644
--- a/net-libs/onion/onion-9999.ebuild
+++ b/net-libs/onion/onion-9999.ebuild
@@ -25,7 +25,7 @@ LICENSE="|| ( GPL-2+ Apache-2.0 ) AGPL-3"
 SLOT="0"
 IUSE="
 	gnutls pam png jpeg xml systemd sqlite boehm-gc
-	test examples cxx -libev -libevent
+	test examples cxx libev libevent
 	redis
 "
 RESTRICT="!test? ( test )"
diff --git a/net-misc/asterisk/asterisk-18.4.0-r1.ebuild b/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
index ad920ebb0ab2..5bd2a374d9aa 100644
--- a/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug deprecated doc freetds gtalk http iconv ilbc ldap lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
diff --git a/net-nds/openldap/openldap-2.4.57.ebuild b/net-nds/openldap/openldap-2.4.57.ebuild
index 275d24ff2e0b..2a461032a16c 100644
--- a/net-nds/openldap/openldap-2.4.57.ebuild
+++ b/net-nds/openldap/openldap-2.4.57.ebuild
@@ -29,7 +29,7 @@ IUSE_BACKEND="+berkdb"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
 IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 RESTRICT="!test? ( test )"
diff --git a/net-nds/openldap/openldap-2.4.58.ebuild b/net-nds/openldap/openldap-2.4.58.ebuild
index 02f6d9096b6b..67b024653c5f 100644
--- a/net-nds/openldap/openldap-2.4.58.ebuild
+++ b/net-nds/openldap/openldap-2.4.58.ebuild
@@ -29,7 +29,7 @@ IUSE_BACKEND="+berkdb"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
 IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 RESTRICT="!test? ( test )"
diff --git a/net-nds/openldap/openldap-2.5.4.ebuild b/net-nds/openldap/openldap-2.5.4.ebuild
index dccb2e94a857..b43e411f2758 100644
--- a/net-nds/openldap/openldap-2.5.4.ebuild
+++ b/net-nds/openldap/openldap-2.5.4.ebuild
@@ -28,7 +28,7 @@ IUSE_DAEMON="crypt samba tcpd experimental minimal"
 IUSE_OVERLAY="overlays perl"
 IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
 IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
-IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE_CONTRIB="${IUSE_CONTRIB} cxx"
 IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
 
 RESTRICT="!test? ( test )"
diff --git a/net-proxy/haproxy/haproxy-2.4.0.ebuild b/net-proxy/haproxy/haproxy-2.4.0.ebuild
index f7b7893abab1..ec2939f568a0 100644
--- a/net-proxy/haproxy/haproxy-2.4.0.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.0.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax -zlib lua device-atlas 51degrees wurfl"
+ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index f7b7893abab1..ec2939f568a0 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -21,7 +21,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax -zlib lua device-atlas 51degrees wurfl"
+ssl systemd +threads tools vim-syntax zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
 	pcre2-jit? ( pcre2 )
 	pcre? ( !pcre2 )
diff --git a/sci-biology/GBrowse/GBrowse-2.48-r1.ebuild b/sci-biology/GBrowse/GBrowse-2.48-r1.ebuild
index 739950568156..2fcef3b41aff 100644
--- a/sci-biology/GBrowse/GBrowse-2.48-r1.ebuild
+++ b/sci-biology/GBrowse/GBrowse-2.48-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit perl-module webapp
 DESCRIPTION="Generic Model Organism Database Project - The Generic Genome Browser"
 HOMEPAGE="http://gmod.org/wiki/GBrowse"
 KEYWORDS="~amd64 ~x86"
-IUSE="-minimal mysql postgres +sqlite"
+IUSE="minimal mysql postgres +sqlite"
 
 SLOT="0"
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/sci-biology/bioperl-run/bioperl-run-1.6.9.ebuild b/sci-biology/bioperl-run/bioperl-run-1.6.9.ebuild
index e5dc816bc78a..461c4f51b071 100644
--- a/sci-biology/bioperl-run/bioperl-run-1.6.9.ebuild
+++ b/sci-biology/bioperl-run/bioperl-run-1.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.bioperl.org/"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="-minimal test"
+IUSE="minimal test"
 #SRC_TEST="do"
 
 RESTRICT="test"
diff --git a/sys-apps/duc/duc-1.4.3-r1.ebuild b/sys-apps/duc/duc-1.4.3-r1.ebuild
index 7425a6401b06..e3f8f9050fbe 100644
--- a/sys-apps/duc/duc-1.4.3-r1.ebuild
+++ b/sys-apps/duc/duc-1.4.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/zevv/duc"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo gui -leveldb ncurses -sqlite +tokyocabinet X"
+IUSE="cairo gui leveldb ncurses sqlite +tokyocabinet X"
 
 REQUIRED_USE="
 	^^ ( tokyocabinet leveldb sqlite )
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index 7425a6401b06..e3f8f9050fbe 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/zevv/duc"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo gui -leveldb ncurses -sqlite +tokyocabinet X"
+IUSE="cairo gui leveldb ncurses sqlite +tokyocabinet X"
 
 REQUIRED_USE="
 	^^ ( tokyocabinet leveldb sqlite )
diff --git a/sys-cluster/keepalived/keepalived-2.0.20.ebuild b/sys-cluster/keepalived/keepalived-2.0.20.ebuild
index 89feaa62df58..5deb4e2046eb 100644
--- a/sys-cluster/keepalived/keepalived-2.0.20.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.0.20.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="+bfd dbus -json regex snmp"
+IUSE="+bfd dbus json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
 	dev-libs/openssl:=
diff --git a/sys-cluster/keepalived/keepalived-2.1.5.ebuild b/sys-cluster/keepalived/keepalived-2.1.5.ebuild
index 89feaa62df58..5deb4e2046eb 100644
--- a/sys-cluster/keepalived/keepalived-2.1.5.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.1.5.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
-IUSE="+bfd dbus -json regex snmp"
+IUSE="+bfd dbus json regex snmp"
 
 RDEPEND="dev-libs/libnl:=
 	dev-libs/openssl:=
diff --git a/sys-cluster/keepalived/keepalived-2.2.2.ebuild b/sys-cluster/keepalived/keepalived-2.2.2.ebuild
index 395a98ee08f7..cf42b4616536 100644
--- a/sys-cluster/keepalived/keepalived-2.2.2.ebuild
+++ b/sys-cluster/keepalived/keepalived-2.2.2.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
@@ -12,7 +12,7 @@ SRC_URI="https://www.keepalived.org/software/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+bfd dbus -json regex snmp systemd"
+IUSE="+bfd dbus json regex snmp systemd"
 
 RDEPEND="dev-libs/libnl:=
 	dev-libs/openssl:=
diff --git a/www-misc/xxv/xxv-1.6.1-r2.ebuild b/www-misc/xxv/xxv-1.6.1-r2.ebuild
index a129061522eb..13b7f874d3a9 100644
--- a/www-misc/xxv/xxv-1.6.1-r2.ebuild
+++ b/www-misc/xxv/xxv-1.6.1-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="-mplayer themes"
+IUSE="mplayer themes"
 
 RDEPEND=">=media-video/vdr-1.2.6
 	media-video/vdr2jpeg
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index e211f86a380c..47ed44923c33 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -20,10 +20,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 # jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}"
 
 PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
 
 # uclibc is often compiled without backtrace info so we should
 # force this off.  If someone complains, consider relaxing it.
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index d818807591ad..dc3dfa6306e1 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -20,10 +20,10 @@ LICENSE="GPL-2"
 SLOT="0"
 
 # jemalloc is also off until we figure out how to work CMakeLists.txt magic.
-#IUSE="cgi -debug fastcgi jemalloc php static-plugins ${PLUGINS}"
+#IUSE="cgi debug fastcgi jemalloc php static-plugins ${PLUGINS}"
 
 PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah monkeyd_plugins_dirlisting +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_tls"
-IUSE="cgi -debug fastcgi php static-plugins ${PLUGINS}"
+IUSE="cgi debug fastcgi php static-plugins ${PLUGINS}"
 
 # uclibc is often compiled without backtrace info so we should
 # force this off.  If someone complains, consider relaxing it.
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index e5f86137a933..ffe1c9122b52 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="aalib doc -gtk nls png svga threads X"
+IUSE="aalib doc gtk nls png svga threads X"
 
 RDEPEND="
 	sci-libs/gsl:=
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
index bbc44b3c15e6..2e9acbe9987a 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r9.ebuild
@@ -15,8 +15,8 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
-IUSE="-24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
-	+perl -sgrmouse startup-notification unicode3 +utmp +wtmp xft"
+IUSE="24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel
+	+perl sgrmouse startup-notification unicode3 +utmp +wtmp xft"
 
 RESTRICT="test"