Merge updates from master

18 files changed, 7 insertions, 1071 deletions

diff --git a/dev-lang/rust-bin/rust-bin-1.46.0.ebuild b/dev-lang/rust-bin/rust-bin-1.46.0.ebuild
index 6e586df2fca7..7dd0604d2455 100644
--- a/dev-lang/rust-bin/rust-bin-1.46.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.46.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc rls rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
index 0bc210cd77e7..dbb1d9183f1f 100644
--- a/dev-lang/rust/rust-1.45.2.ebuild
+++ b/dev-lang/rust/rust-1.45.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
diff --git a/dev-lang/rust/rust-1.46.0.ebuild b/dev-lang/rust/rust-1.46.0.ebuild
index d7b1ee49abc1..a6aeacae2492 100644
--- a/dev-lang/rust/rust-1.46.0.ebuild
+++ b/dev-lang/rust/rust-1.46.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
 
@@ -18,7 +18,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 27fbf386c7c3..0d9dc5ba9e74 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,3 +1 @@
-DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
 DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
-DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
diff --git a/dev-libs/sord/sord-0.16.4_p20200803.ebuild b/dev-libs/sord/sord-0.16.4_p20200803.ebuild
deleted file mode 100644
index 281dbee03007..000000000000
--- a/dev-libs/sord/sord-0.16.4_p20200803.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal
-
-DESCRIPTION="Library for storing RDF data in memory"
-HOMEPAGE="http://drobilla.net/software/sord/"
-COMMIT="81e138633076c2d7ef7e1691845757208d02f478"
-COMMIT_AUTOWAF="6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d"
-SRC_URI="https://gitlab.com/drobilla/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz
-	https://github.com/drobilla/autowaf/archive/${COMMIT_AUTOWAF}.tar.gz -> drobilla-autowaf-${COMMIT_AUTOWAF}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre
-	>=dev-libs/serd-0.30.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-src_prepare() {
-	# link in downloaded waf
-	rm -r "${S}/waflib" || die
-	ln -s "${WORKDIR}/autowaf-${COMMIT_AUTOWAF}" "${S}/waflib" || die
-
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
-}
-
-multilib_src_test() {
-	./waf test || die
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-	default
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-	default
-}
diff --git a/licenses/NPSL b/licenses/NPSL
deleted file mode 100644
index 7035e20dfd91..000000000000
--- a/licenses/NPSL
+++ /dev/null
@@ -1,564 +0,0 @@
-Nmap Public Source License Version 0.92
-For more information on this license, see https://nmap.org/npsl/
-
-0. Preamble
-
-The intent of this license is to establish freedom to share and change
-the software regulated by this license under the open source model. It
-also includes a Contributor Agreement and disclaims any warranty on
-Covered Software. Proprietary software companies wishing to use or
-incorporate Covered Software within their programs must contact
-Licensor to purchase a separate license. Open source developers who
-wish to incorporate parts of Covered Software into free software with
-conflicting licenses may write Licensor to request a waiver of terms.
-
-If the Nmap Project (directly or through one of it's commercial
-licensing customers) has granted you additional rights to Nmap or Nmap
-OEM, those additional rights take precedence where they conflict with
-the terms of this license agreement.
-
-This License represents the complete agreement concerning subject
-matter hereof. It contains the license terms themselves, but not the
-reasoning behind them or detailed explanations. For further
-information about this License, see https://nmap.org/npsl/ . That page
-makes a good faith attempt to explain this License, but it does not
-and can not modify its governing terms in any way.
-
-1. Definitions
-
-* "Contribution" means any work of authorship, including the original
-  version of the Work and any modifications or additions to that Work
-  or Derivative Works thereof, that is intentionally submitted to
-  Licensor by the copyright owner or by an individual or Legal Entity
-  authorized to submit on behalf of the copyright owner. For the
-  purposes of this definition, "submitted" means any form of
-  electronic, verbal, or written communication sent to the Licensor or
-  its representatives, including but not limited to communication on
-  electronic mailing lists, source code control systems, web sites,
-  and issue tracking systems that are managed by, or on behalf of, the
-  Licensor for the purpose of discussing and improving the Work, but
-  excluding communication that is conspicuously marked or otherwise
-  designated in writing by the copyright owner as "Not a
-  Contribution."
-
-* "Contributor" means Licensor and any individual or Legal Entity on
-  behalf of whom a Contribution has been received by Licensor and
-  subsequently incorporated within the Work.
-
-* "Covered Software" means the work of authorship, whether in Source
-  or Object form, made available under the License, as indicated by a
-  copyright notice that is included in or attached to the work
-
-* "Derivative Work" or "Collective Work" means any work, whether in
-  Source or Object form, that is based on (or derived from) the Work
-  and for which the editorial revisions, annotations, elaborations, or
-  other modifications represent, as a whole, an original work of
-  authorship. It includes software as described in Section 3 of this
-  License.
-
-* "Executable" means Covered Software in any form other than Source Code.
-
-* "Externally Deploy" means to Deploy the Covered Software in any way
-  that may be accessed or used by anyone other than You, used to
-  provide any services to anyone other than You, or used in any way to
-  deliver any content to anyone other than You, whether the Covered
-  Software is distributed to those parties, made available as an
-  application intended for use over a computer network, or used to
-  provide services or otherwise deliver content to anyone other than
-  You.
-
-* "GPL" means the GNU General Public License Version 2, as published
-  by the Free Software Foundation and provided in Exhibit A.
-
-* "Legal Entity" means the union of the acting entity and all other
-  entities that control, are controlled by, or are under common
-  control with that entity. For the purposes of this definition,
-  "control" means (i) the power, direct or indirect, to cause the
-  direction or management of such entity, whether by contract or
-  otherwise, or (ii) ownership of fifty percent (50%) or more of the
-  outstanding shares, or (iii) beneficial ownership of such entity.
-
-* "License" means this document, including Exhibits.
-
-* "Licensor" means Insecure.Com LLC and its successors and assigns.
-
-* "Main License Body" means all of the terms of this document,
-  excluding Exhibits.
-
-* "You" (or "Your") means an individual or Legal Entity exercising
-  permissions granted by this License.
-
-2. General Terms
-
-Covered Software is licensed to you under the terms of the GPL
-(Exhibit A), with all the exceptions, clarifications, and additions
-noted in this Main License Body. Where the terms in this Main License
-Body conflict in any way with the GPL, the Main License Body terms
-shall take precedence. These additional terms mean that You may not
-distribute Covered Software or Derivative Works under plain GPL terms
-without special permission from Licensor.
-
-You are not required to accept this License. However, nothing else
-grants You permission to use, copy, modify or distribute the software
-or its derivative works. These actions are prohibited by law if You do
-not accept this License. Therefore, by modifying, copying or
-distributing the software (or any work based on the software), You
-indicate your acceptance of this License to do so, and all its terms
-and conditions. In addition, you agree to the terms of this License by
-clicking the Accept button or downloading the software.
-
-3. Derivative Works
-
-This License (including the GPL portion) places important restrictions
-on derived works. Licensor interprets that term quite broadly. To
-avoid any misunderstandings, we consider software to constitute a
-"derivative work" of Covered Software for the purposes of this license
-if it does any of the following:
-
-* Integrates source code from Covered Software
-
-* Reads or includes Covered Software data files, such as nmap-os-db or
-  nmap-service-probes.
-
-* Is designed specifically to execute Covered Software and parse the
-  results (as opposed to typical shell or execution-menu apps, which
-  will execute anything you tell them to).
-
-* Includes Covered Software in a proprietary executable installer. The
-  installers produced by InstallShield are an example of
-  this. Including Nmap with other software in compressed or archival
-  form does not trigger this provision, provided appropriate open
-  source decompression or de-archiving software is widely available
-  for no charge. For the purposes of this license, an installer is
-  considered to include Covered Software even if it actually retrieves
-  a copy of Covered Software from another source during runtime (such
-  as by downloading it from the Internet).
-
-* Links (statically or dynamically) to a library which does any of the
-  above
-
-* Executes a helper program, module, or script to do any of the above.
-  This list is not exclusive, but is meant to clarify Licensor's
-  intentions with some common examples. Distribution of any works
-  which meet these criteria must be under the terms of this license
-  (including this Main License Body and GPL), with no additional
-  conditions or restrictions. They must abide by all restrictions that
-  the GPL places on derivative or collective works, including the
-  requirements for distributing their source code and allowing
-  royalty-free redistribution.
-
-4. Contributor Agreement (Grant of Copyright and Patent Licenses)
-
-Each Contributor hereby grants to Licensor a perpetual, worldwide,
-non-exclusive, no-charge, royalty-free, irrevocable copyright license
-to reproduce, prepare Derivative Works of, publicly display, publicly
-perform, sublicense, and distribute the Contribution and such
-Derivative Works in Source or Object form.
-
-Each Contributor hereby grants to You and Licensor a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except
-as stated in this section) patent license to make, have made, use,
-offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such
-Contributor that are necessarily infringed by their Contribution(s)
-alone or by combination of their Contribution(s) with the Work to
-which such Contribution(s) was submitted. If You institute patent
-litigation against any entity (including a cross-claim or counterclaim
-in a lawsuit) alleging that the Work or a Contribution incorporated
-within the Work constitutes direct or contributory patent
-infringement, then any patent licenses granted to You under this
-License for that Work shall terminate as of the date such litigation
-is filed.
-
-Contributors may impose different terms on their Contributions by
-stating those terms in writing at the time the Contribution is
-made. Contributors may withhold all authority from Licensor to
-incorporate submissions by conspicuously marking or otherwise
-designating them in writing as "Not a Contribution" at the time they
-make the work available.
-
-5. Disclaimer of Warranty and Limitation of Liability
-
-Unless required by applicable law or agreed to in writing, Licensor
-provides the Covered Software (and each Contributor provides its
-Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-OF ANY KIND, either express or implied, including, without limitation,
-any warranties or conditions of TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely
-responsible for determining the appropriateness of using or
-redistributing the Covered Software and assume any risks associated
-with Your exercise of permissions under this License.
-
-In no event and under no legal theory, whether in tort (including
-negligence), contract, or otherwise, unless required by applicable law
-(such as deliberate and grossly negligent acts) or agreed to in
-writing, shall any Contributor be liable to You for damages, including
-any direct, indirect, special, incidental, or consequential damages of
-any character arising as a result of this License or out of the use or
-inability to use the Covered Software (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or
-malfunction, or any and all other commercial damages or losses), even
-if such Contributor has been advised of the possibility of such
-damages.
-
-6. External Deployment
-
-If You Externally Deploy Covered Software, such as hosting a website
-designed to execute Nmap scans for users, the system and its
-documentation must, if technically feasible, prominently display a
-notice stating that the system uses the Nmap Security Scanner to
-perform its tasks. If technically feasible, the notice must contain a
-hyperlink to https://nmap.org/ or provide that URL in the text.
-
-7. Trademarks
-
-This License does not grant permission to use the trade names,
-trademarks, service marks, or product names of the Licensor, except as
-required for reasonable and customary use in describing the origin of
-the Covered Software.
-
-8. Termination for Patent Action
-
-This License shall terminate automatically and You may no longer
-exercise any of the rights granted to You by this License as of the
-date You commence an action, including a cross-claim or counterclaim,
-against Licensor or any licensee alleging that the Covered Software
-infringes a patent. This termination provision shall not apply for an
-action alleging patent infringement by combinations of the Covered
-Software with other software or hardware.
-
-9. Jurisdiction, Venue and Governing Law
-
-This License is governed by the laws of the State of Washington and
-the intellectual property laws of the United States of America,
-excluding the jurisdiction's conflict-of-law provisions. Any
-litigation or other dispute resolution between You and Licensor
-relating to this License shall take place in the Northern District of
-California, and You and Licensor hereby consent to the personal
-jurisdiction of, and venue in, the state and federal courts within
-that District with respect to this License. The application of the
-United Nations Convention on Contracts for the International Sale of
-Goods is expressly excluded.
-
-10. Npcap and the Official Nmap Windows Builds
-
-The official Windows Nmap builds includes the Npcap driver and library
-(https://npcap.org) for packet capture and transmission on
-Windows. That software is under its own separate license terms rather
-than this license. Therefore anyone wishing to use or redistribute
-both pieces of software must comply with both licenses. Since Npcap
-does not allow for redistribution without special permission, the
-official Nmap Windows builds which include Npcap may not be
-redistributed without special permission. Such permission can be
-requested by email to sales@nmap.com.
-
-11. Permission to link with OpenSSL
-
-Licensor grants permission to link Covered Software with any version
-of the OpenSSL library from OpenSSL.Org, and distribute linked
-combinations including the two (assuming such distribution is
-otherwise allowed by this agreement). You must obey this License in
-all respects for all code used other than OpenSSL.
-
-12. Waiver; Construction
-
-Failure by Licensor or any Contributor to enforce any provision of
-this License will not be deemed a waiver of future enforcement of that
-or any other provision. Any law or regulation which provides that the
-language of a contract shall be construed against the drafter will not
-apply to this License.
-
-13. Enforceability
-
-If any provision of this License is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of
-the remainder of the terms of this License, and without further action
-by the parties hereto, such provision shall be reformed to the minimum
-extent necessary to make such provision valid and enforceable.
-
-Exhibit A. The GNU General Public License Version 2
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-Preamble
-
-The licenses for most software are designed to take away your freedom
-to share and change it. By contrast, the GNU General Public License is
-intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
-We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on,
-we want its recipients to know that what they have is not the
-original, so that any problems introduced by others will not reflect
-on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at
-all.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a
-notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the Program
-(independent of having been made by running the Program). Whether that
-is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy an appropriate copyright notice
-and disclaimer of warranty; keep intact all the notices that refer to
-this License and to the absence of any warranty; and give any other
-recipients of the Program a copy of this License along with the
-Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a
-fee.
-
-2. You may modify your copy or copies of the Program or any portion of
-it, thus forming a work based on the Program, and copy and distribute
-such modifications or work under the terms of Section 1 above,
-provided that you also meet all of these conditions:
-
-a) You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-b) You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any part
-thereof, to be licensed as a whole at no charge to all third parties
-under the terms of this License.
-
-c) If the modified program normally reads commands interactively when
-run, you must cause it, when started running for such interactive use
-in the most ordinary way, to print or display an announcement
-including an appropriate copyright notice and a notice that there is
-no warranty (or else, saying that you provide a warranty) and that
-users may redistribute the program under these conditions, and telling
-the user how to view a copy of this License. (Exception: if the
-Program itself is interactive but does not normally print such an
-announcement, your work based on the Program is not required to print
-an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-a) Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections 1
-and 2 above on a medium customarily used for software interchange; or,
-
-b) Accompany it with a written offer, valid for at least three years,
-to give any third party, for a charge no more than your cost of
-physically performing source distribution, a complete machine-readable
-copy of the corresponding source code, to be distributed under the
-terms of Sections 1 and 2 above on a medium customarily used for
-software interchange; or,
-
-c) Accompany it with the information you received as to the offer to
-distribute corresponding source code. (This alternative is allowed
-only for noncommercial distribution and only if you received the
-program in object code or executable form with such an offer, in
-accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt otherwise
-to copy, modify, sublicense or distribute the Program is void, and
-will automatically terminate your rights under this License. However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted
-herein. You are not responsible for enforcing compliance by third
-parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new
-versions of the General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Program does not specify a
-version number of this License, you may choose any version ever
-published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the
-author to ask for permission. For software which is copyrighted by the
-Free Software Foundation, write to the Free Software Foundation; we
-sometimes make exceptions for this. Our decision will be guided by the
-two goals of preserving the free status of all derivatives of our free
-software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
-LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF
-ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-[For brevity, we've cut out the GPL's final section on "How to Apply
-Tehse Terms to Your New Program", but you can find that at
-https://www.gnu.org/licenses/gpl-2.0.html#SEC4 ]
-
diff --git a/licenses/openpbs b/licenses/openpbs
deleted file mode 100644
index d79864ad82f2..000000000000
--- a/licenses/openpbs
+++ /dev/null
@@ -1,76 +0,0 @@
-
-        OpenPBS (Portable Batch System) v2.3 Software License
-
-Copyright (c) 1999-2002 Veridian Information Solutions, Inc.
-All rights reserved.
-
----------------------------------------------------------------------------
-For a license to use or redistribute the OpenPBS software under conditions
-other than those described below, or to purchase support for this software,
-please contact Veridian Systems, PBS Products Department ("Licensor") at:
-
-   www.OpenPBS.org  +1 650 967-4675                  sales@OpenPBS.org
-                       877 902-4PBS (US toll-free)
----------------------------------------------------------------------------
-
-This license covers use of the OpenPBS v2.3 software (the "Software") at
-your site or location, and, for certain users, redistribution of the
-Software to other sites and locations.  Use and redistribution of
-OpenPBS v2.3 in source and binary forms, with or without modification,
-are permitted provided that all of the following conditions are met.
-After December 31, 2003, only conditions 3-6 must be met:
-
-1. Commercial and/or non-commercial use of the Software is permitted
-   provided a current software registration is on file at www.OpenPBS.org.
-   If use of this software contributes to a publication, product, or
-   service, proper attribution must be given; see www.OpenPBS.org/credit.html
-
-2. Redistribution in any form is only permitted for non-commercial,
-   non-profit purposes.  There can be no charge for the Software or any
-   software incorporating the Software.  Further, there can be no
-   expectation of revenue generated as a consequence of redistributing
-   the Software.
-
-3. Any Redistribution of source code must retain the above copyright notice
-   and the acknowledgment contained in paragraph 6, this list of conditions
-   and the disclaimer contained in paragraph 7.
-
-4. Any Redistribution in binary form must reproduce the above copyright
-   notice and the acknowledgment contained in paragraph 6, this list of
-   conditions and the disclaimer contained in paragraph 7 in the
-   documentation and/or other materials provided with the distribution.
-
-5. Redistributions in any form must be accompanied by information on how to
-   obtain complete source code for the OpenPBS software and any
-   modifications and/or additions to the OpenPBS software.  The source code
-   must either be included in the distribution or be available for no more
-   than the cost of distribution plus a nominal fee, and all modifications
-   and additions to the Software must be freely redistributable by any party
-   (including Licensor) without restriction.
-
-6. All advertising materials mentioning features or use of the Software must
-   display the following acknowledgment:
-
-    "This product includes software developed by NASA Ames Research Center,
-    Lawrence Livermore National Laboratory, and Veridian Information Solutions,
-    Inc.  Visit www.OpenPBS.org for OpenPBS software support,
-    products, and information."
-
-7. DISCLAIMER OF WARRANTY
-
-THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT
-ARE EXPRESSLY DISCLAIMED.
-
-IN NO EVENT SHALL VERIDIAN CORPORATION, ITS AFFILIATED COMPANIES, OR THE
-U.S. GOVERNMENT OR ANY OF ITS AGENCIES BE LIABLE FOR ANY DIRECT OR INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This license will be governed by the laws of the Commonwealth of Virginia,
-without reference to its choice of law rules.
diff --git a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
index e8524c5804e4..37b510d6394d 100644
--- a/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.16-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 xdg
 
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index f7ed7dd14803..f5fc3caf85ca 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,2 +1 @@
-DIST hydrogen-1.0.0.tar.gz 11501728 BLAKE2B ccb48cddff2b196e934c712f999109ae4b91513579ec123e57f2ef9f6aa288c1408208bde8608a908e58650c741260fbcc1108dabd7968687d74e4c143fb7de3 SHA512 68a7634a63d409ff8eef789bb9dd86b65535e17b6101fe1e1bd0153cab4852dc2cfa7ff11b2cfddbead337d2faad9ca4c49eed589c47c09aa5f5aa91c59171a7
 DIST hydrogen-1.0.1.tar.gz 11501583 BLAKE2B eb5ac2b80abcdd8e4a6ad72c41b3575c9682e193727714bb13d684bbf79edb1cffde8c18f23ee9ff02de5ad3e15845b8a0fc1600fb8bdb33f90b89fd0973b32c SHA512 66f2db3986a00832558432d17aa6c459a099f314daed23a8eeef34d83d894dfec71d96ceb09113d22be58e4bd47265c105cf57024c43fb5d925b18cabfb146f0
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
deleted file mode 100644
index 075d0d444a0c..000000000000
--- a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt	2020-09-07 08:47:15.743516826 +0200
-+++ b/data/i18n/CMakeLists.txt	2020-09-07 09:03:56.084304480 +0200
-@@ -5,4 +5,9 @@
- 
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+
-+IF(MINGW)
-+	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()
diff --git a/media-sound/hydrogen/hydrogen-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
deleted file mode 100644
index e2d0ee7185f4..000000000000
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Advanced drum machine"
-HOMEPAGE="http://www.hydrogen-music.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
-	KEYWORDS="amd64 ppc ppc64 x86"
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-fi
-
-LICENSE="GPL-2 ZLIB"
-SLOT="0"
-IUSE="alsa +archive doc jack ladspa lash osc oss portaudio portmidi pulseaudio"
-
-REQUIRED_USE="lash? ( alsa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-CDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/libsndfile-1.0.18
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/liblrdf )
-	lash? ( media-sound/lash )
-	osc? ( media-libs/liblo )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="
-	${CDEPEND}
-	dev-qt/qttest:5
-"
-RDEPEND="${CDEPEND}"
-
-DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-i18n-path.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_CPPUNIT=OFF
-		-DWANT_DEBUG=OFF
-		-DWANT_JACK=$(usex jack)
-		-DWANT_JACKSESSION=$(usex jack)
-		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LASH=$(usex lash)
-		-DWANT_LIBARCHIVE=$(usex archive)
-		-DWANT_LRDF=$(usex ladspa)
-		-DWANT_OSC=$(usex osc)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PORTAUDIO=$(usex portaudio)
-		-DWANT_PORTMIDI=$(usex portmidi)
-		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_RUBBERBAND=OFF
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index b5615aa667c9..98bef22425bf 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,3 +1,2 @@
-DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860
 DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958
 DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7
diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
deleted file mode 100644
index e91947eae056..000000000000
--- a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001
-From: Han-Wen Nienhuys <hanwenn@gmail.com>
-Date: Tue, 21 Jul 2020 14:45:08 +0200
-Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode
-
-This prevents executing privileged PostScript and exploiting
-Ghostscript vulnerablilities
-
-Tested:
- $ lilypond -dsafe input/regression/les-nereides.ly
- (works, kinda)
-
- $ cat f.ly
- { c4_ \markup \postscript #" (x) show " }
-
- $ lilypond -dsafe f
- Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...):
-  /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps "
----
- scm/define-stencil-commands.scm | 65 ++++++++++++++++++++++-------------------
- 1 file changed, 35 insertions(+), 30 deletions(-)
-
-diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm
-index 09a2299..e388788 100644
---- a/scm/define-stencil-commands.scm
-+++ b/scm/define-stencil-commands.scm
-@@ -21,36 +21,41 @@
- (define-public (ly:all-stencil-commands)
-   "Return the list of stencil commands that can be
- defined in the output modules (@file{output-*.scm})."
--  '(blank
--    char
--    circle
--    dashed-line
--    draw-line
--    ellipse
--    embedded-ps
--    embedded-svg
--    end-group-node
--    glyph-string
--    grob-cause
--    named-glyph
--    no-origin
--    page-link
--    path
--    partial-ellipse
--    placebox
--    polygon
--    resetcolor
--    resetrotation
--    resetscale
--    round-filled-box
--    setcolor
--    setrotation
--    setscale
--    start-group-node
--    text
--    unknown
--    url-link
--    utf-8-string
-+  (let*
-+      ((commands '(blank
-+                   char
-+                   circle
-+                   dashed-line
-+                   draw-line
-+                   ellipse
-+                   end-group-node
-+                   glyph-string
-+                   grob-cause
-+                   named-glyph
-+                   no-origin
-+                   page-link
-+                   path
-+                   partial-ellipse
-+                   placebox
-+                   polygon
-+                   resetcolor
-+                   resetrotation
-+                   resetscale
-+                   round-filled-box
-+                   setcolor
-+                   setrotation
-+                   setscale
-+                   start-group-node
-+                   text
-+                   unknown
-+                   url-link
-+                   utf-8-string
-+                   )))
-+
-+    (if (ly:get-option 'safe)
-+        commands
-+        (append '(embedded-ps embedded-svg)
-+                commands))
-     ))
- 
- ;; TODO:
--- 
-1.9.1
-
diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
deleted file mode 100644
index 7d751530c323..000000000000
--- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git"
-else
-	MAIN_VER=$(ver_cut 1-2)
-	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-IUSE="debug emacs guile2 profile vim-syntax"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	>=dev-texlive/texlive-metapost-2020
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	virtual/pkgconfig
-"
-RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=x11-libs/pango-1.12.3
-	emacs? ( >=app-editors/emacs-23.1:* )
-	guile2? ( >=dev-scheme/guile-2.2:12 )
-	!guile2? (
-		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	media-gfx/fontforge[png,python]
-	sys-devel/gettext"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch
-	"${FILESDIR}"/${PN}-fix-cve-2020-17353.patch
-)
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# fix hardcoded `ar`
-	sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command"
-
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable profile profiling)
-	)
-
-	export VARTEXFONTS="${T}/fonts"  # https://bugs.gentoo.org/692010
-
-	econf "${myeconfargs[@]}" AR="$(tc-getAR)"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 08d13ea895dd..4c4cd992361d 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -63,7 +63,7 @@ app-arch/unzip natspec
 app-crypt/gnupg smartcard tofu wks-server
 app-crypt/mit-krb5 doc test xinetd
 app-crypt/pinentry fltk gnome-keyring
-app-doc/doxygen latex dot
+app-doc/doxygen dot
 app-editors/emacs alsa json lcms mailutils
 app-misc/pax-utils python
 app-text/asciidoc test
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2d968f54fb1d..07610ecd9d90 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -57,7 +57,6 @@ app-metrics/collectd collectd_plugins_onewire
 # These flags depend on dev-python/pygtk that is masked for removal.
 app-mobilephone/sobexsrv gtk
 <media-gfx/gimp-3 python
-<x11-libs/vte-0.58 python
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-22)
 # These flags depend on packages masked for removal due to py2.
@@ -72,11 +71,9 @@ dev-db/mariadb columnstore
 # Michał Górny <mgorny@gentoo.org> (2020-08-01)
 # Require dev-python/twisted with py2.7.
 net-voip/telepathy-haze test
-<net-voip/telepathy-salut-0.8.1-r3 test
 
 # Michał Górny <mgorny@gentoo.org> (2020-08-01)
 # dev-python/distributed is going to be last rited.
-dev-python/dask distributed
 dev-python/joblib doc
 
 # Michał Górny <mgorny@gentoo.org> (2020-07-30)
@@ -193,7 +190,6 @@ dev-python/zeep tornado
 # Michał Górny <mgorny@gentoo.org> (2020-01-27)
 # Requires old split dev-python/twisted-*.
 net-irc/telepathy-idle test
-net-voip/telepathy-rakia test
 
 # Michał Górny <mgorny@gentoo.org> (2020-01-12)
 # libcxxrt is unmaintained and it's going to be removed.
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index 71cd464991f3..86c47cbbcfb4 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -18,11 +18,6 @@ media-video/ffmpeg -appkit
 media-video/mplayer xv dga X xinerama xscreensaver
 media-video/mplayer dvb lirc jack joystick
 
-# Fabian Groffen <grobian@gentoo.org> (2008-08-06)
-# runtime loading is horribly broken (it uses fixed .so.0, but when
-# that's fixed it still doesn't work)
-dev-vcs/subversion dso
-
 # Elias Pipping <pipping@gentoo.org> (2007-08-27)
 # elinks does not compile with USE=perl (tested with 0.11.{2,3})
 www-client/elinks perl
diff --git a/virtual/rust/rust-1.46.0.ebuild b/virtual/rust/rust-1.46.0.ebuild
index 7cf8d65440f8..c9c318a4de65 100644
--- a/virtual/rust/rust-1.46.0.ebuild
+++ b/virtual/rust/rust-1.46.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
 
 BDEPEND=""
 RDEPEND="|| ( ~dev-lang/rust-${PV}[${MULTILIB_USEDEP}] ~dev-lang/rust-bin-${PV}[${MULTILIB_USEDEP}] )"