Merge updates from master

17 files changed, 99 insertions, 10 deletions

diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
index cad28ecbcd52..8b3d5287533e 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/maxmind/libmaxminddb/releases/download/${PV}/${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0/0.0.7"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="static-libs"
 
 DOCS=( Changes.md )
diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass
index a357760017f4..58bf285e0e91 100644
--- a/eclass/autotools-multilib.eclass
+++ b/eclass/autotools-multilib.eclass
@@ -8,6 +8,7 @@
 # Author: Michał Górny <mgorny@gentoo.org>
 # @SUPPORTED_EAPIS: 4 5
 # @BLURB: autotools-utils wrapper for multilib builds
+# @DEPRECATED: multilib-minimal
 # @DESCRIPTION:
 # The autotools-multilib.eclass provides a glue between
 # autotools-utils.eclass(5) and multilib-minimal.eclass(5), aiming
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 06c79fd652a6..3fcaa79f80ab 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: autotools-utils.eclass
@@ -7,6 +7,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @SUPPORTED_EAPIS: 4 5
 # @BLURB: common ebuild functions for autotools-based packages
+# @DEPRECATED: out-of-source
 # @DESCRIPTION:
 # autotools-utils.eclass is autotools.eclass(5) and base.eclass(5) wrapper
 # providing all inherited features along with econf arguments as Bash array,
diff --git a/eclass/base.eclass b/eclass/base.eclass
index 76eee973dee5..0f9a2e576b78 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # DEPRECATED
@@ -24,6 +24,7 @@
 # Original author: Dan Armak <danarmak@gentoo.org>
 # @SUPPORTED_EAPIS: 0 1 2 3 4 5
 # @BLURB: The base eclass defines some default functions and variables.
+# @DEPRECATED: none
 # @DESCRIPTION:
 # The base eclass defines some default functions and variables.
 
diff --git a/eclass/darcs.eclass b/eclass/darcs.eclass
index 1c1a051f8c1c..12e7289cc7d0 100644
--- a/eclass/darcs.eclass
+++ b/eclass/darcs.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: darcs.eclass
@@ -11,6 +11,7 @@
 # Andres Loeh   <kosmikus@gentoo.org> (darcs.eclass author)
 # Alexander Vershilov <alexander.vershilov@gmail.com> (various contributions)
 # @BLURB: This eclass provides functions for fetch and unpack darcs repositories
+# @DEPRECATED: none
 # @DESCRIPTION:
 # This eclass provides the generic darcs fetching functions.
 #
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
index da9364136777..fbb4f0b5bc0d 100644
--- a/eclass/epatch.eclass
+++ b/eclass/epatch.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: epatch.eclass
@@ -6,6 +6,7 @@
 # base-system@gentoo.org
 # @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
 # @BLURB: easy patch application functions
+# @DEPRECATED: eapply from EAPI 7
 # @DESCRIPTION:
 # An eclass providing epatch and epatch_user functions to easily apply
 # patches to ebuilds. Mostly superseded by eapply* in EAPI 6.
diff --git a/eclass/fdo-mime.eclass b/eclass/fdo-mime.eclass
index 8fb563766bd6..3aa45919b37e 100644
--- a/eclass/fdo-mime.eclass
+++ b/eclass/fdo-mime.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @DEAD
@@ -10,6 +10,7 @@
 # @AUTHOR:
 # Original author: foser <foser@gentoo.org>
 # @BLURB: Utility eclass to update the desktop mime info as laid out in the freedesktop specs & implementations
+# @DEPRECATED: xdg-utils
 # @DESCRIPTION:
 # This eclass is DEPRECATED. Please use xdg-utils or xdg instead.
 
diff --git a/eclass/games.eclass b/eclass/games.eclass
index d651dc7d868a..a2a5ce066a57 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: games.eclass
@@ -6,6 +6,7 @@
 # Games team <games@gentoo.org>
 # @SUPPORTED_EAPIS: 0 1 2 3 4 5
 # @BLURB: Standardizing the install of games.
+# @DEPRECATED: none
 # @DESCRIPTION:
 # This eclass makes sure that games are consistently handled in gentoo.
 # It installs game files by default in FHS-compatible directories
diff --git a/eclass/ltprune.eclass b/eclass/ltprune.eclass
index 7374716e6dd2..e7d8cd2c4f92 100644
--- a/eclass/ltprune.eclass
+++ b/eclass/ltprune.eclass
@@ -6,6 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
 # @BLURB: Smart .la file pruning
+# @DEPRECATED: none
 # @DESCRIPTION:
 # A function to locate and remove unnecessary .la files.
 #
diff --git a/eclass/mono.eclass b/eclass/mono.eclass
index 913c04c85c70..b1dc1e56d487 100644
--- a/eclass/mono.eclass
+++ b/eclass/mono.eclass
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: mono.eclass
 # @MAINTAINER:
 # dotnet@gentoo.org
 # @BLURB: common settings and functions for mono and dotnet related packages
+# @DEPRECATED: mono-env
 # @DESCRIPTION:
 # The mono eclass contains common environment settings that are useful for
 # dotnet packages.  Currently, it provides no functions, just exports
diff --git a/eclass/user.eclass b/eclass/user.eclass
index abbbb661b4bc..f8993b827741 100644
--- a/eclass/user.eclass
+++ b/eclass/user.eclass
@@ -6,6 +6,7 @@
 # base-system@gentoo.org (Linux)
 # Michał Górny <mgorny@gentoo.org> (NetBSD)
 # @BLURB: user management in ebuilds
+# @DEPRECATED: acct-user/acct-group packages
 # @DESCRIPTION:
 # The user eclass contains a suite of functions that allow ebuilds
 # to quickly make sure users in the installed system are sane.
diff --git a/eclass/versionator.eclass b/eclass/versionator.eclass
index 0f5d5770350b..24f9fb2c20bc 100644
--- a/eclass/versionator.eclass
+++ b/eclass/versionator.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: versionator.eclass
@@ -11,6 +11,7 @@
 # This eclass provides functions which simplify manipulating $PV and similar
 # variables. Most functions default to working with $PV, although other
 # values can be used.
+# @DEPRECATED: ver_* functions from EAPI 7
 # @EXAMPLE:
 # Simple Example 1: $PV is 1.2.3b, we want 1_2.3b:
 #     MY_PV=$(replace_version_separator 1 '_' )
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
new file mode 100644
index 000000000000..f2e4ab15a830
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.10.13-metadata-xsd.patch
@@ -0,0 +1,24 @@
+From 780bf8e6a2b83a244461304017ab036bcf8c6eb9 Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gmail.com>
+Date: Thu, 5 Nov 2020 07:20:18 -0700
+Subject: [PATCH] data/xml-schema: update metadata.xsd
+
+---
+ data/xml-schema/metadata.xsd | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/xml-schema/metadata.xsd b/data/xml-schema/metadata.xsd
+index 8b8ac0b5..db243abb 100644
+--- a/data/xml-schema/metadata.xsd
++++ b/data/xml-schema/metadata.xsd
+@@ -272,6 +272,7 @@
+ 			<xs:enumeration value='gitlab'/>
+ 			<xs:enumeration value='gitorious'/>
+ 			<xs:enumeration value='google-code'/>
++			<xs:enumeration value='heptapod'/>
+ 			<xs:enumeration value='launchpad'/>
+ 			<xs:enumeration value='pear'/>
+ 			<xs:enumeration value='pecl'/>
+-- 
+2.29.2
+
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
index 185be89d3ad1..a83f747b80ae 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13-r1.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-metadata-xsd.patch"
+)
+
 python_test() {
 	esetup.py test
 }
diff --git a/sys-auth/rtkit/rtkit-0.13-r1.ebuild b/sys-auth/rtkit/rtkit-0.13-r1.ebuild
index feb00a847531..3c98455fe28f 100644
--- a/sys-auth/rtkit/rtkit-0.13-r1.ebuild
+++ b/sys-auth/rtkit/rtkit-0.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/heftig/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-3 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="systemd"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index ec22a3f67ccf..53d58c25b8a7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -32,4 +32,5 @@ DIST gentoo-kernel-5.9.4-1.amd64.xpak 63394036 BLAKE2B edd598813b571961fab223266
 DIST gentoo-kernel-5.9.4-1.arm64.xpak 61419964 BLAKE2B b2acaecc3092c6fefb522794810cc0519b38a2f550b4fc6afb97edb36ceecc2830deb07711501566f7823aa348c0c83f8d338ed38dae859cf84160e6b2189cef SHA512 21f8a520d064c06fe2fe645eabb221302ab27f73b559b4014e1c12da5fc7e35a30a74b6514d7d115997261e1ce652901e3a526fea898c8f5febf4da407a08d49
 DIST gentoo-kernel-5.9.4-1.x86.xpak 56602346 BLAKE2B 635381b4478e1e61954b11b32710c050f4861519018bb4b993a5b3da4c6d82859e2d6cc79ff30d1269c30119aa51b2043b2e8346c6cd5fb9f251de4ee0d59f8a SHA512 2df8f4f40bd10cc2e4187aa19cc5093445fcd08da8c2acbeb7785da6332cd59c235f385a3beff12ccdc1956251ec7860b2e0b6191ec1c090e0fa8452acb84e88
 DIST gentoo-kernel-5.9.6-1.amd64.xpak 63385088 BLAKE2B ecc78d04934a45d1212d273a0c94afb9bf5d8cad8c20023abec78d0b534c842e3d665df87ef06fa103a875bc773f867da209b99dbe2818ccfbc091ef83d9c55e SHA512 7988bb8847379bbbe6378ed8d278dc03ac49da3d11c23fa7c8a4b76cb5ca9d26a02d7d209e4ddce9e1a106268c973230300eac8807d3cb592aa97f454c213d34
+DIST gentoo-kernel-5.9.6-1.arm64.xpak 61472831 BLAKE2B 8ac36915092f66c092bd4b023a03bbdf177beacc82df8d6ea1200077833987bd432d40c6acff588c172a1df66063ffd910565239397431827aed6142497c5f2c SHA512 dbcb8619f831cf107286a8790fcd65f47a2e6c19068e0fc015e8dbea05f383adeee69d43da2469b23902aef225950f734881aa3b469d4460364a2d5225e0751a
 DIST gentoo-kernel-5.9.6-1.x86.xpak 56608737 BLAKE2B dab2c89399dbdfa9e0955b4d5138e6be9c2e196ff679f351e12657cdf2b539c90dee415069a410c3c1826232aac3e63f83efb00edc3f70877a237e34b2ded8ee SHA512 fcaeb41b67b738914bbcbb5d57cb60d48fddf1dd2231e01dfb3cfdd5a6f109835dcf5bcbc32ef24f2912503c6aa87bd53988e00e3e8701e3fc4ef30e23da5aa2
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6-r1.ebuild
new file mode 100644
index 000000000000..ad9181bc4960
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.9.6-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.arm64.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}