gentoo resync : 04.05.2021

14 files changed, 113 insertions, 823 deletions

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e2e0fd0940e9..5512bba5e4dc 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 0c4d1c0005fd..bd84548f6de8 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -93,7 +93,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 # built-in modules
 
 IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
-IUSE="${IUSE} debug doc gdbm ldap libressl selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads"
+IUSE="${IUSE} debug doc gdbm ldap selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads"
 
 for module in ${IUSE_MODULES} ; do
 	case ${module} in
@@ -153,15 +153,13 @@ RDEPEND="
 		kernel_linux? ( sys-apps/util-linux )
 	)
 	apache2_modules_session_crypto? (
-		libressl? ( dev-libs/apr-util[libressl] )
-		!libressl? ( dev-libs/apr-util[openssl] )
+		dev-libs/apr-util[openssl]
 	)
 	gdbm? ( sys-libs/gdbm:= )
 	ldap? ( =net-nds/openldap-2* )
 	selinux? ( sec-policy/selinux-apache )
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.2:0= )
-		libressl? ( dev-libs/libressl:0= )
+		>=dev-libs/openssl-1.0.2:0=
 		kernel_linux? ( sys-apps/util-linux )
 	)
 "
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 2994993e63e8..a02b6d059bd1 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -861,7 +861,10 @@ distutils-r1_python_install() {
 
 	esetup.py install --skip-build --root="${root}" "${args[@]}"
 
-	local forbidden_package_names=( examples test tests .pytest_cache )
+	local forbidden_package_names=(
+		examples test tests
+		.pytest_cache .hypothesis
+	)
 	local p
 	for p in "${forbidden_package_names[@]}"; do
 		if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 67ad4acc1fef..f1f23f6a0e46 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1241,8 +1241,32 @@ unipatch() {
 			local GCC_MAJOR_VER=$(gcc-major-version)
 			local GCC_MINOR_VER=$(gcc-minor-version)
 
-			# optimization patch for gcc < 8.X and kernel > 4.13
-			if kernel_is ge 4 13 ; then 
+			# this section should be the target state to handle the cpu opt
+			# patch for kernels > 4.19.189, 5.4.115, 5.10.33 and 5.11.17,
+			# 5.12.0 and gcc >= 9  The patch now handles the
+			# gcc version enabled on the system through the Kconfig file as
+			# 'depends'. The legacy section can hopefully be retired in the future
+			# Note the patch for 4.19-5.8 version are the same and the patch for 
+			# 5.8+ version is the same
+			# eventually we can remove everything except the gcc ver <9 check
+			# based on stablization, time, kernel removals or a combo of all three
+			if ( kernel_is eq 4 19 && kernel_is gt 4 19 189 ) ||
+				( kernel_is eq 5 4 && kernel_is gt 5 4 115 ) ||
+				( kernel_is eq 5 10 && kernel_is gt 5 10 33 ) ||
+				( kernel_is eq 5 11 && kernel_is gt 5 11 17 ) ||
+				( kernel_is eq 5 12 && kernel_is gt 5 12 0 ); then
+				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
+				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
+				UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
+				UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
+				UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
+				if [[ ${GCC_MAJOR_VER} -lt 9 ]]; then
+					UNIPATCH_DROP+=" 5010_enable-cpu-optimizations-universal.patch"
+				fi
+				# this legacy section should be targeted for removal
+				# optimization patch for gcc < 8.X and kernel > 4.13 and <  4.19
+			elif kernel_is ge 4 13; then
+				UNIPATCH_DROP+=" 5010_enable-cpu-optimizations-universal.patch"
 				if [[ ${GCC_MAJOR_VER} -lt 8 ]] && [[ ${GCC_MAJOR_VER} -gt 4 ]]; then
 					UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
 					UNIPATCH_DROP+=" 5012_enable-cpu-optimizations-for-gcc91.patch"
@@ -1272,6 +1296,7 @@ unipatch() {
 					UNIPATCH_DROP+=" 5013_enable-cpu-optimizations-for-gcc10.patch"
 				fi
 			else
+				UNIPATCH_DROP+=" 5010_enable-cpu-optimizations-universal.patch"
 				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc.patch"
 				UNIPATCH_DROP+=" 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch"
 				UNIPATCH_DROP+=" 5011_enable-cpu-optimizations-for-gcc8.patch"
diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass
index 0b154c89dbbf..b4dd39e7493b 100644
--- a/eclass/nsplugins.eclass
+++ b/eclass/nsplugins.eclass
@@ -1,6 +1,7 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
+# @DEAD
 # @ECLASS: nsplugins.eclass
 # @MAINTAINER:
 # Mozilla Team <mozilla@gentoo.org>
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 77fbab7431b7..60526b1f6b14 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -42,7 +42,7 @@ inherit toolchain-funcs
 # All supported Python implementations, most preferred last.
 _PYTHON_ALL_IMPLS=(
 	pypy3
-	python3_7 python3_8 python3_9
+	python3_{7..10}
 )
 readonly _PYTHON_ALL_IMPLS
 
@@ -125,7 +125,7 @@ _python_set_impls() {
 			# please keep them in sync with _PYTHON_ALL_IMPLS
 			# and _PYTHON_HISTORICAL_IMPLS
 			case ${i} in
-				jython2_7|pypy|pypy1_[89]|pypy2_0|pypy3|python2_[5-7]|python3_[1-9])
+				jython2_7|pypy|pypy1_[89]|pypy2_0|pypy3|python2_[5-7]|python3_[1-9]|python3_10)
 					;;
 				*)
 					if has "${i}" "${_PYTHON_ALL_IMPLS[@]}" \
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index 0dd65b894c83..0c569bfcdcc6 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -607,7 +607,7 @@ ruby-ng_src_install() {
 # @USAGE: rbconfig item
 # @RETURN: Returns the value of the given rbconfig item of the Ruby interpreter in ${RUBY}.
 ruby_rbconfig_value() {
-	echo $(${RUBY} --disable=did_you_mean -rrbconfig -e "puts RbConfig::CONFIG['$1']")
+	echo $(${RUBY} --disable=did_you_mean -rrbconfig -e "puts RbConfig::CONFIG['$1']" || die "Could not read ruby configuration for '${1}'")
 }
 
 # @FUNCTION: doruby
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index a774f9b8b9ec..36945be3cd65 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -46,10 +46,10 @@ esac
 
 if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then
 	if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then
-		SSL_DEPEND="${SSL_CERT_USE}? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) )"
+		SSL_DEPEND="${SSL_CERT_USE}? ( dev-libs/openssl:0 )"
 		IUSE="${SSL_CERT_USE}"
 	else
-		SSL_DEPEND="|| ( dev-libs/openssl:0 dev-libs/libressl:0 )"
+		SSL_DEPEND="dev-libs/openssl:0"
 	fi
 
 	case "${EAPI}" in
@@ -141,12 +141,8 @@ get_base() {
 gen_key() {
 	local base=$(get_base "$1")
 	ebegin "Generating ${SSL_BITS} bit RSA key${1:+ for CA}"
-	if openssl version | grep -i libressl > /dev/null; then
-		openssl genrsa -out "${base}.key" "${SSL_BITS}" &> /dev/null
-	else
 		openssl genrsa -rand "${SSL_RANDOM}" \
 			-out "${base}.key" "${SSL_BITS}" &> /dev/null
-	fi
 	eend $?
 
 	return $?
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index ebd1e39e5af6..e2aee26c423a 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -368,7 +368,7 @@ vdr-plugin-2_pkg_setup() {
 	VDR_INCLUDE_DIR="/usr/include/vdr"
 	DVB_INCLUDE_DIR="/usr/include"
 
-	TMP_LOCALE_DIR="${WORKDIR}/tmp-locale"
+	TMP_LOCALE_DIR="${T}/tmp-locale"
 
 	LOCDIR=$(pkg-config --variable=locdir vdr)
 
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index a0ba714f6e6e..6b72d66111d3 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-plugin.eclass
 # @MAINTAINER:
 # vim@gentoo.org
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: used for installing vim plugins
 # @DESCRIPTION:
 # This eclass simplifies installation of app-vim plugins into
@@ -11,7 +12,12 @@
 # which is read automatically by vim.  The only exception is
 # documentation, for which we make a special case via vim-doc.eclass.
 
-inherit estack vim-doc
+case ${EAPI} in
+	6|7);;
+	*) die "EAPI ${EAPI:-0} unsupported (too old)";;
+esac
+
+inherit vim-doc
 EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 
 VIM_PLUGIN_VIM_VERSION="${VIM_PLUGIN_VIM_VERSION:-7.3}"
@@ -33,47 +39,17 @@ SLOT="0"
 # * installs all files in "${ED}"/usr/share/vim/vimfiles.
 vim-plugin_src_install() {
 	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
-	local f
-
-	# When globbing, if nothing exists, the shell literally returns the glob
-	# pattern. So turn on nullglob and extglob options to avoid this.
-	eshopts_push -s extglob
-	eshopts_push -s nullglob
-
-	ebegin "Cleaning up unwanted files and directories"
-	# We're looking for dotfiles, dotdirectories and Makefiles here.
-	local obj
-	eval "local matches=(@(.[^.]|.??*|Makefile*))"
-	for obj in "${matches[@]}"; do
-		rm -rv "${obj}" || die "cannot remove ${obj}"
-	done
-	eend $?
-
-	# Turn those options back off.
-	eshopts_pop
-	eshopts_pop
 
 	# Install non-vim-help-docs
-	cd "${S}" || die "couldn't cd in ${S}"
-	local f
-	for f in *; do
-		[[ -f "${f}" ]] || continue
-		if [[ "${f}" = *.html ]]; then
-			dohtml "${f}"
-		else
-			dodoc "${f}"
-		fi
-		rm "${f}" || die
-	done
+	einstalldocs
 
 	# Install remainder of plugin
-	cd "${WORKDIR}" || die "couldn't cd in ${WORKDIR}"
-	dodir /usr/share/vim
-	mv "${S}" "${ED}"/usr/share/vim/vimfiles || die \
-		"couldn't move ${S} to ${ED}/usr/share/vim/vimfiles"
-
-	# Set permissions
-	fperms -R a+rX /usr/share/vim/vimfiles
+	insinto /usr/share/vim/vimfiles/
+	local d
+	for d in *; do
+		[[ -d "${d}" ]] || continue
+		doins -r "${d}"
+	done
 }
 
 # @FUNCTION: vim-plugin_pkg_postinst
diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass
index f762a6bfd315..baf77221bc97 100644
--- a/eclass/vim-spell.eclass
+++ b/eclass/vim-spell.eclass
@@ -119,9 +119,7 @@ vim-spell_src_install() {
 		fi
 	done
 
-	for f in README*; do
-		dodoc "${f}"
-	done
+	einstalldocs
 
 	[[ -z "${had_spell_file}" ]] && die "Didn't install any spell files?"
 }
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index a95f8a7e1c14..ca52e8d2815c 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -6,23 +6,17 @@
 # x11@gentoo.org
 # @AUTHOR:
 # Original author: Martin Schlemmer <azarah@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 6 7
 # @BLURB: This eclass can be used for packages that needs a working X environment to build.
 
-if [[ ! ${_VIRTUAL_X} ]]; then
-
-case "${EAPI:-0}" in
-	0|1|2|3)
-		die "virtualx.eclass: EAPI ${EAPI} is too old."
-		;;
-	4|5|6|7)
-		;;
-	*)
-		die "virtualx.eclass: EAPI ${EAPI} is not supported yet."
-		;;
+case ${EAPI:-0} in
+	[0-5]) die "virtualx.eclass: EAPI ${EAPI} is too old." ;;
+	6|7) ;;
+	*) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." ;;
 esac
 
-[[ ${EAPI} == [45] ]] && inherit eutils
+if [[ ! ${_VIRTUAL_X} ]]; then
+_VIRTUAL_X=1
 
 # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
 # @PRE_INHERIT
@@ -55,66 +49,17 @@ case ${VIRTUALX_REQUIRED} in
 	manual)
 		;;
 	always)
-		if [[ ${EAPI:-0} != [0123456] ]]; then
-			BDEPEND="${VIRTUALX_DEPEND}"
-		else
-			DEPEND="${VIRTUALX_DEPEND}"
-		fi
-		RDEPEND=""
-		;;
-	optional|tests)
-		[[ ${EAPI} == [45] ]] \
-			|| die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5'
-		# deprecated section YAY.
-		eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated."
-		eqawarn "You can drop the variable definition completely from ebuild,"
-		eqawarn "because it is default behaviour."
-
-		if [[ -n ${VIRTUALX_USE} ]]; then
-			# so they like to specify the useflag
-			eqawarn "VIRTUALX_USE variable is deprecated."
-			eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED"
-			eqawarn "to achieve the same behaviour."
-		fi
-
-		[[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test"
-		DEPEND="${VIRTUALX_USE}? ( ${VIRTUALX_DEPEND} )"
-		RDEPEND=""
-		IUSE="${VIRTUALX_USE}"
+		BDEPEND="${VIRTUALX_DEPEND}"
 		;;
 	*)
-		if [[ ${EAPI:-0} != [0123456] ]]; then
-			BDEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
-		else
-			DEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
-		fi
-		RDEPEND=""
+		BDEPEND="${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )"
 		IUSE="${VIRTUALX_REQUIRED}"
 		[[ ${VIRTUALX_REQUIRED} == test ]] &&
 			RESTRICT+=" !test? ( test )"
 		;;
 esac
 
-# @FUNCTION: virtualmake
-# @DESCRIPTION:
-# Function which start new Xvfb session
-# where the VIRTUALX_COMMAND variable content gets executed.
-virtualmake() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx"
-
-	# backcompat for maketype
-	if [[ -n ${maketype} ]]; then
-		[[ ${EAPI} == [45] ]] || die "maketype is banned in EAPI > 5"
-		eqawarn "ebuild is exporting \$maketype=${maketype}"
-		eqawarn "Ebuild should be migrated to use 'virtx command' instead."
-		VIRTUALX_COMMAND=${maketype}
-	fi
-
-	virtx "${VIRTUALX_COMMAND}" "${@}"
-}
+[[ ${EAPI} == 6 ]] && DEPEND="${BDEPEND}"
 
 
 # @FUNCTION: virtx
@@ -232,44 +177,4 @@ virtx() {
 	return 0 # always return 0, it can be altered by failed kill for Xvfb
 }
 
-# @FUNCTION: Xmake
-# @DESCRIPTION:
-# Same as "make", but set up the Xvfb hack if needed.
-# Deprecated call.
-Xmake() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 ....'"
-
-	eqawarn "you should not execute make directly"
-	eqawarn "rather execute Xemake -j1 if you have issues with parallel make"
-	VIRTUALX_COMMAND="emake -j1" virtualmake "$@"
-}
-
-# @FUNCTION: Xemake
-# @DESCRIPTION:
-# Same as "emake", but set up the Xvfb hack if needed.
-Xemake() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake ....'"
-
-	VIRTUALX_COMMAND="emake" virtualmake "$@"
-}
-
-# @FUNCTION: Xeconf
-# @DESCRIPTION:
-# Same as "econf", but set up the Xvfb hack if needed.
-Xeconf() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${EAPI} == [45] ]] \
-		|| die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf ....'"
-
-	VIRTUALX_COMMAND="econf" virtualmake "$@"
-}
-
-_VIRTUAL_X=1
 fi
diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass
index e1f77f0b7c2b..4357e7367cc7 100644
--- a/eclass/wxwidgets.eclass
+++ b/eclass/wxwidgets.eclass
@@ -4,14 +4,14 @@
 # @ECLASS: wxwidgets.eclass
 # @MAINTAINER:
 # wxwidgets@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @BLURB: Manages build configuration for wxGTK-using packages.
 # @DESCRIPTION:
 # This eclass sets up the proper environment for ebuilds using the wxGTK
 # libraries.  Ebuilds using wxPython do not need to inherit this eclass.
 #
 # More specifically, this eclass controls the configuration chosen by the
-# /usr/bin/wx-config wrapper.
+# ${ESYSROOT}/usr/bin/wx-config wrapper.
 #
 # Using the eclass is simple:
 #
@@ -21,107 +21,71 @@
 # The configuration chosen is based on the version required and the flags
 # wxGTK was built with.
 
-if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
-_WXWIDGETS_ECLASS=1
-
-inherit flag-o-matic
-
 case ${EAPI:-0} in
-	0|1|2|3|4|5)
-		inherit eutils multilib
-
-		# This was used to set up a sane default for ebuilds so they could
-		# avoid calling need-wxwidgets if they didn't need a particular build.
-		# This was a bad idea for a couple different reasons, and because
-		# get_libdir() is now illegal in global scope in EAPI 6 we can't do it
-		# anymore.  All ebuilds must now use setup-wxwidgets and this code is
-		# only here for backwards compatability.
-		if [[ -z ${WX_CONFIG} ]]; then
-			if [[ -n ${WX_GTK_VER} ]]; then
-				for _wxtoolkit in mac gtk2 base; do
-					# newer versions don't have a seperate debug config
-					for _wxdebug in xxx release- debug-; do
-						_wxconf="${_wxtoolkit}-unicode-${_wxdebug/xxx/}${WX_GTK_VER}"
+	[0-6]) die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" ;;
+	7)     ;;
+	*)     die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+esac
 
-						[[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf} ]] \
-							|| continue
+if [[ -z ${_WXWIDGETS_ECLASS} ]]; then
+_WXWIDGETS_ECLASS=1
 
-						WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf}"
-						WX_ECLASS_CONFIG="${WX_CONFIG}"
-						break
-					done
-					[[ -n ${WX_CONFIG} ]] && break
-				done
-				[[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG
-			fi
-		fi
-		unset _wxtoolkit
-		unset _wxdebug
-		unset _wxconf
-		;;
-	6)	inherit multilib ;; # compatibility only, not needed by eclass
-	7)	;;
-	*)	die "${ECLASS}: EAPI ${EAPI:-0} is not supported" ;;
+# @ECLASS-VARIABLE: WX_GTK_VER
+# @PRE_INHERIT
+# @REQUIRED
+# @DESCRIPTION:
+# The SLOT of the x11-libs/wxGTK you're targeting.  Needs to be defined before
+# inheriting the eclass.  Can be either "3.0" or "3.0-gtk3".
+case ${WX_GTK_VER} in
+	3.0|3.0-gtk3) ;;
+	"")           die "WX_GTK_VER not declared" ;;
+	*)            die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT ('3.0' or '3.0-gtk3')" ;;
 esac
+readonly WX_GTK_VER
+
+inherit flag-o-matic
 
 # @FUNCTION: setup-wxwidgets
 # @DESCRIPTION:
-# Call this in your ebuild to set up the environment for wxGTK.  Besides
-# controlling the wx-config wrapper this exports WX_CONFIG containing
-# the path to the config in case it needs to be passed to a build system.
+# Call this in your ebuild to set up the environment for wxGTK in src_configure.
+# Besides controlling the wx-config wrapper, this exports WX_CONFIG containing
+# the path to the config in case it needs to be passed to the build system.
 #
-# In wxGTK-2.9 and later it also controls the level of debugging output
-# from the libraries.  In these versions debugging features are enabled
-# by default and need to be disabled at the package level.  Because this
-# causes many warning dialogs to pop up during runtime we add -DNDEBUG to
-# CPPFLAGS to disable debugging features (unless your ebuild has a debug
-# USE flag and it's enabled).  If you don't like this behavior you can set
-# WX_DISABLE_NDEBUG to override it.
+# This function also controls the level of debugging output from the libraries.
+# Debugging features are enabled by default and need to be disabled at the
+# package level.  Because this causes many warning dialogs to pop up during
+# runtime, we add -DNDEBUG to CPPFLAGS to disable debugging features (unless
+# your ebuild has a debug USE flag and it's enabled).  If you don't like this
+# behavior, you can set WX_DISABLE_NDEBUG to override it.
 #
-# See: http://docs.wxwidgets.org/trunk/overview_debugging.html
-
+# See: https://docs.wxwidgets.org/trunk/overview_debugging.html
 setup-wxwidgets() {
-	local w wxtoolkit wxdebug wxconf
+	local w wxtoolkit wxconf
 
-	[[ -z ${WX_GTK_VER} ]] \
-		&& die "WX_GTK_VER must be set before calling $FUNCNAME."
-
-	case "${WX_GTK_VER}" in
-		3.0-gtk3)
-			wxtoolkit=gtk3
-			if [[ -z ${WX_DISABLE_NDEBUG} ]]; then
-				( in_iuse debug && use debug ) || append-cppflags -DNDEBUG
-			fi
-			;;
-		2.9|3.0)
-			wxtoolkit=gtk2
-			if [[ -z ${WX_DISABLE_NDEBUG} ]]; then
-				( in_iuse debug && use debug ) || append-cppflags -DNDEBUG
-			fi
-			;;
-		2.8)
-			wxtoolkit=gtk2
-			wxdebug="release-"
-			has_version x11-libs/wxGTK:${WX_GTK_VER}[debug] && wxdebug="debug-"
-			;;
-		*)
-			die "Invalid WX_GTK_VER: must be set to a valid wxGTK SLOT"
-			;;
+	case ${WX_GTK_VER} in
+		3.0-gtk3) wxtoolkit=gtk3 ;;
+		3.0)      wxtoolkit=gtk2
+		          eqawarn "This package relies on the deprecated GTK 2 slot, which will go away soon (https://bugs.gentoo.org/618642)"
+		          ;;
 	esac
 
+	if [[ -z ${WX_DISABLE_NDEBUG} ]]; then
+		{ in_iuse debug && use debug; } || append-cppflags -DNDEBUG
+	fi
+
 	# toolkit overrides
-	if has_version "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then
+	if has_version -d "x11-libs/wxGTK:${WX_GTK_VER}[aqua]"; then
 		wxtoolkit="mac"
-	elif ! has_version "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then
+	elif ! has_version -d "x11-libs/wxGTK:${WX_GTK_VER}[X]"; then
 		wxtoolkit="base"
 	fi
 
-	wxconf="${wxtoolkit}-unicode-${wxdebug}${WX_GTK_VER}"
+	wxconf="${wxtoolkit}-unicode-${WX_GTK_VER}"
 	for w in "${CHOST:-${CBUILD}}-${wxconf}" "${wxconf}"; do
-		[[ -f ${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${w} ]] && wxconf=${w} && break
+		[[ -f ${ESYSROOT}/usr/$(get_libdir)/wx/config/${w} ]] && wxconf=${w} && break
 	done || die "Failed to find configuration ${wxconf}"
 
-	export WX_CONFIG="${ESYSROOT:-${EPREFIX}}/usr/$(get_libdir)/wx/config/${wxconf}"
+	export WX_CONFIG="${ESYSROOT}/usr/$(get_libdir)/wx/config/${wxconf}"
 	export WX_ECLASS_CONFIG="${WX_CONFIG}"
 
 	einfo
@@ -130,13 +94,4 @@ setup-wxwidgets() {
 	einfo
 }
 
-case ${EAPI:-0} in
-	0|1|2|3|4|5|6)
-		# deprecated
-		need-wxwidgets() {
-			setup-wxwidgets
-		}
-		;;
-esac
-
 fi
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass
deleted file mode 100644
index e6ec80523ae2..000000000000
--- a/eclass/xorg-2.eclass
+++ /dev/null
@@ -1,567 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# @ECLASS: xorg-2.eclass
-# @MAINTAINER:
-# x11@gentoo.org
-# @AUTHOR:
-# Author: Tomáš Chvátal <scarabeus@gentoo.org>
-# Author: Donnie Berkholz <dberkholz@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5
-# @BLURB: Reduces code duplication in the modularized X11 ebuilds.
-# @DEPRECATED: xorg-3.eclass
-# @DESCRIPTION:
-# This eclass makes trivial X ebuilds possible for apps, fonts, drivers,
-# and more. Many things that would normally be done in various functions
-# can be accessed by setting variables instead, such as patching,
-# running eautoreconf, passing options to configure and installing docs.
-#
-# All you need to do in a basic ebuild is inherit this eclass and set
-# DESCRIPTION, KEYWORDS and RDEPEND/DEPEND. If your package is hosted
-# with the other X packages, you don't need to set SRC_URI. Pretty much
-# everything else should be automatic.
-
-GIT_ECLASS=""
-if [[ ${PV} == *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	XORG_EAUTORECONF="yes"
-fi
-
-# If we're a font package, but not the font.alias one
-FONT_ECLASS=""
-if [[ ${CATEGORY} = media-fonts ]]; then
-	case ${PN} in
-	font-alias|font-util)
-		;;
-	font*)
-		# Activate font code in the rest of the eclass
-		FONT="yes"
-		FONT_ECLASS="font"
-		;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: XORG_MULTILIB
-# @PRE_INHERIT
-# @DESCRIPTION:
-# If set to 'yes', the multilib support for package will be enabled. Set
-# before inheriting this eclass.
-: ${XORG_MULTILIB:="no"}
-
-# we need to inherit autotools first to get the deps
-inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \
-	flag-o-matic ${FONT_ECLASS} ${GIT_ECLASS}
-
-if [[ ${XORG_MULTILIB} == yes ]]; then
-	inherit autotools-multilib
-fi
-
-EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm"
-case "${EAPI:-0}" in
-	4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;;
-	*) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# exports must be ALWAYS after inherit
-EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
-
-IUSE=""
-
-# @ECLASS-VARIABLE: XORG_EAUTORECONF
-# @PRE_INHERIT
-# @DESCRIPTION:
-# If set to 'yes' and configure.ac exists, eautoreconf will run. Set
-# before inheriting this eclass.
-: ${XORG_EAUTORECONF:="no"}
-
-# @ECLASS-VARIABLE: XORG_BASE_INDIVIDUAL_URI
-# @PRE_INHERIT
-# @DESCRIPTION:
-# Set up SRC_URI for individual modular releases. If set to an empty
-# string, no SRC_URI will be provided by the eclass.
-: ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"}
-
-# @ECLASS-VARIABLE: XORG_MODULE
-# @PRE_INHERIT
-# @DESCRIPTION:
-# The subdirectory to download source from. Possible settings are app,
-# doc, data, util, driver, font, lib, proto, xserver. Set above the
-# inherit to override the default autoconfigured module.
-: ${XORG_MODULE:="auto"}
-if [[ ${XORG_MODULE} == auto ]]; then
-	case ${CATEGORY} in
-		app-doc)             XORG_MODULE=doc/     ;;
-		media-fonts)         XORG_MODULE=font/    ;;
-		x11-apps|x11-wm)     XORG_MODULE=app/     ;;
-		x11-misc|x11-themes) XORG_MODULE=util/    ;;
-		x11-base)            XORG_MODULE=xserver/ ;;
-		x11-drivers)         XORG_MODULE=driver/  ;;
-		x11-libs)            XORG_MODULE=lib/     ;;
-		*)                   XORG_MODULE=         ;;
-	esac
-fi
-
-# @ECLASS-VARIABLE: XORG_PACKAGE_NAME
-# @PRE_INHERIT
-# @DESCRIPTION:
-# For git checkout the git repository might differ from package name.
-# This variable can be used for proper directory specification
-: ${XORG_PACKAGE_NAME:=${PN}}
-
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}"
-
-if [[ -n ${GIT_ECLASS} ]]; then
-	: ${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}
-elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then
-	SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.bz2"
-fi
-
-: ${SLOT:=0}
-
-# Set the license for the package. This can be overridden by setting
-# LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages
-# are under the MIT license. (This is what Red Hat does in their rpms)
-: ${LICENSE:=MIT}
-
-# Set up autotools shared dependencies
-# Remember that all versions here MUST be stable
-XORG_EAUTORECONF_ARCHES="x86-winnt"
-EAUTORECONF_DEPEND+="
-	>=sys-devel/libtool-2.2.6a
-	sys-devel/m4"
-if [[ ${PN} != util-macros ]] ; then
-	EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18"
-	# Required even by xorg-server
-	[[ ${PN} == "font-util" ]] || EAUTORECONF_DEPEND+=" >=media-fonts/font-util-1.2.0"
-fi
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-for arch in ${XORG_EAUTORECONF_ARCHES}; do
-	EAUTORECONF_DEPENDS+=" ${arch}? ( ${EAUTORECONF_DEPEND} )"
-done
-DEPEND+=" ${EAUTORECONF_DEPENDS}"
-[[ ${XORG_EAUTORECONF} != no ]] && DEPEND+=" ${EAUTORECONF_DEPEND}"
-unset EAUTORECONF_DEPENDS
-unset EAUTORECONF_DEPEND
-
-if [[ ${FONT} == yes ]]; then
-	RDEPEND+=" media-fonts/encodings
-		>=x11-apps/mkfontscale-1.2.0"
-	PDEPEND+=" media-fonts/font-alias"
-	DEPEND+=" >=media-fonts/font-util-1.2.0
-		>=x11-apps/mkfontscale-1.2.0"
-
-	# @ECLASS-VARIABLE: FONT_DIR
-	# @PRE_INHERIT
-	# @DESCRIPTION:
-	# If you're creating a font package and the suffix of PN is not equal to
-	# the subdirectory of /usr/share/fonts/ it should install into, set
-	# FONT_DIR to that directory or directories. Set before inheriting this
-	# eclass.
-	[[ -z ${FONT_DIR} ]] && FONT_DIR=${PN##*-}
-
-	# Fix case of font directories
-	FONT_DIR=${FONT_DIR/ttf/TTF}
-	FONT_DIR=${FONT_DIR/otf/OTF}
-	FONT_DIR=${FONT_DIR/type1/Type1}
-	FONT_DIR=${FONT_DIR/speedo/Speedo}
-
-	# Set up configure options, wrapped so ebuilds can override if need be
-	[[ -z ${FONT_OPTIONS} ]] && FONT_OPTIONS="--with-fontdir=\"${EPREFIX}/usr/share/fonts/${FONT_DIR}\""
-
-	[[ ${PN} = font-misc-misc || ${PN} = font-schumacher-misc || ${PN##*-} = 75dpi || ${PN##*-} = 100dpi || ${PN##*-} = cyrillic ]] && IUSE+=" nls"
-fi
-
-# If we're a driver package, then enable DRIVER case
-[[ ${PN} == xf86-video-* || ${PN} == xf86-input-* ]] && DRIVER="yes"
-
-DEPEND+=" virtual/pkgconfig"
-
-# @ECLASS-VARIABLE: XORG_DRI
-# @DESCRIPTION:
-# Possible values are "always" or the value of the useflag DRI capabilities
-# are required for. Default value is "no"
-#
-# Eg. XORG_DRI="opengl" will pull all dri dependant deps for opengl useflag
-: ${XORG_DRI:="no"}
-
-DRI_COMMON_DEPEND="
-	x11-base/xorg-server[-minimal]
-	x11-libs/libdrm
-"
-case ${XORG_DRI} in
-	no)
-		;;
-	always)
-		COMMON_DEPEND+=" ${DRI_COMMON_DEPEND}"
-		;;
-	*)
-		COMMON_DEPEND+=" ${XORG_DRI}? ( ${DRI_COMMON_DEPEND} )"
-		IUSE+=" ${XORG_DRI}"
-		;;
-esac
-unset DRI_COMMON_DEPEND
-
-if [[ -n "${DRIVER}" ]]; then
-	COMMON_DEPEND+="
-		x11-base/xorg-server[xorg]
-	"
-fi
-if [[ -n "${DRIVER}" && ${PN} == xf86-input-* ]]; then
-	DEPEND+=" x11-base/xorg-proto"
-fi
-if [[ -n "${DRIVER}" && ${PN} == xf86-video-* ]]; then
-	COMMON_DEPEND+="
-		x11-libs/libpciaccess
-	"
-	DEPEND+=" x11-base/xorg-proto"
-fi
-
-# @ECLASS-VARIABLE: XORG_DOC
-# @DESCRIPTION:
-# Possible values are "always" or the value of the useflag doc packages
-# are required for. Default value is "no"
-#
-# Eg. XORG_DOC="manual" will pull all doc dependant deps for manual useflag
-: ${XORG_DOC:="no"}
-
-DOC_DEPEND="
-	doc? (
-		|| ( app-text/asciidoc dev-ruby/asciidoctor )
-		app-text/xmlto
-		app-doc/doxygen
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.3
-	)
-"
-case ${XORG_DOC} in
-	no)
-		;;
-	always)
-		DEPEND+=" ${DOC_DEPEND}"
-		;;
-	*)
-		DEPEND+=" ${XORG_DOC}? ( ${DOC_DEPEND} )"
-		IUSE+=" ${XORG_DOC}"
-		;;
-esac
-unset DOC_DEPEND
-
-if [[ ${DRIVER} == yes ]]; then
-	case ${EAPI} in
-		4)
-			;;
-		*)
-			RDEPEND+=" x11-base/xorg-server:="
-			;;
-	esac
-fi
-
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}"
-unset COMMON_DEPEND
-
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: DEPEND=${DEPEND}"
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: RDEPEND=${RDEPEND}"
-debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: PDEPEND=${PDEPEND}"
-
-# @FUNCTION: xorg-2_pkg_setup
-# @DESCRIPTION:
-# Setup prefix compat
-xorg-2_pkg_setup() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	[[ ${FONT} == yes ]] && font_pkg_setup "$@"
-}
-
-# @FUNCTION: xorg-2_src_unpack
-# @DESCRIPTION:
-# Simply unpack source code.
-xorg-2_src_unpack() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -n ${GIT_ECLASS} ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${A}
-	fi
-
-	[[ -n ${FONT_OPTIONS} ]] && einfo "Detected font directory: ${FONT_DIR}"
-}
-
-# @FUNCTION: xorg-2_patch_source
-# @DESCRIPTION:
-# Apply all patches
-xorg-2_patch_source() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Use standardized names and locations with bulk patching
-	# Patch directory is ${WORKDIR}/patch
-	# See epatch() in eutils.eclass for more documentation
-	EPATCH_SUFFIX=${EPATCH_SUFFIX:=patch}
-
-	[[ -d "${EPATCH_SOURCE}" ]] && epatch
-}
-
-# @FUNCTION: xorg-2_reconf_source
-# @DESCRIPTION:
-# Run eautoreconf if necessary, and run elibtoolize.
-xorg-2_reconf_source() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	case ${CHOST} in
-		*-aix* | *-winnt*)
-			# some hosts need full eautoreconf
-			[[ -e "./configure.ac" || -e "./configure.in" ]] \
-				&& AUTOTOOLS_AUTORECONF=1
-			;;
-		*)
-			# elibtoolize required for BSD
-			[[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] \
-				&& AUTOTOOLS_AUTORECONF=1
-			;;
-	esac
-}
-
-# @FUNCTION: xorg-2_src_prepare
-# @DESCRIPTION:
-# Prepare a package after unpacking, performing all X-related tasks.
-xorg-2_src_prepare() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	xorg-2_patch_source
-	xorg-2_reconf_source
-	autotools-utils_src_prepare "$@"
-}
-
-# @FUNCTION: xorg-2_font_configure
-# @DESCRIPTION:
-# If a font package, perform any necessary configuration steps
-xorg-2_font_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if has nls ${IUSE//+} && ! use nls; then
-		if grep -q -s "disable-all-encodings" ${ECONF_SOURCE:-.}/configure; then
-			FONT_OPTIONS+="
-				--disable-all-encodings
-				--enable-iso8859-1"
-		else
-			FONT_OPTIONS+="
-				--disable-iso8859-2
-				--disable-iso8859-3
-				--disable-iso8859-4
-				--disable-iso8859-5
-				--disable-iso8859-6
-				--disable-iso8859-7
-				--disable-iso8859-8
-				--disable-iso8859-9
-				--disable-iso8859-10
-				--disable-iso8859-11
-				--disable-iso8859-12
-				--disable-iso8859-13
-				--disable-iso8859-14
-				--disable-iso8859-15
-				--disable-iso8859-16
-				--disable-jisx0201
-				--disable-koi8-r"
-		fi
-	fi
-}
-
-# @FUNCTION: xorg-2_flags_setup
-# @DESCRIPTION:
-# Set up CFLAGS for a debug build
-xorg-2_flags_setup() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	# Win32 require special define
-	[[ ${CHOST} == *-winnt* ]] && append-cppflags -DWIN32 -D__STDC__
-	# hardened ldflags
-	[[ ${PN} = xorg-server || -n ${DRIVER} ]] && append-ldflags -Wl,-z,lazy
-
-	# Quite few libraries fail on runtime without these:
-	if has static-libs ${IUSE//+}; then
-		filter-flags -Wl,-Bdirect
-		filter-ldflags -Bdirect
-		filter-ldflags -Wl,-Bdirect
-	fi
-}
-
-# @FUNCTION: xorg-2_src_configure
-# @DESCRIPTION:
-# Perform any necessary pre-configuration steps, then run configure
-xorg-2_src_configure() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	xorg-2_flags_setup
-
-	# @VARIABLE: XORG_CONFIGURE_OPTIONS
-	# @DESCRIPTION:
-	# Array of an additional options to pass to configure.
-	# @DEFAULT_UNSET
-	if [[ $(declare -p XORG_CONFIGURE_OPTIONS 2>&-) != "declare -a"* ]]; then
-		# fallback to CONFIGURE_OPTIONS, deprecated.
-		if [[ -n "${CONFIGURE_OPTIONS}" ]]; then
-			eqawarn "CONFIGURE_OPTIONS are deprecated. Please migrate to XORG_CONFIGURE_OPTIONS"
-			eqawarn "to preserve namespace."
-		fi
-
-		local xorgconfadd=(${CONFIGURE_OPTIONS} ${XORG_CONFIGURE_OPTIONS})
-	else
-		local xorgconfadd=("${XORG_CONFIGURE_OPTIONS[@]}")
-	fi
-
-	[[ -n "${FONT}" ]] && xorg-2_font_configure
-
-	# Check if package supports disabling of dep tracking
-	# Fixes warnings like:
-	#    WARNING: unrecognized options: --disable-dependency-tracking
-	if grep -q -s "disable-depencency-tracking" ${ECONF_SOURCE:-.}/configure; then
-		local dep_track="--disable-dependency-tracking"
-	fi
-
-	# Check if package supports disabling of selective -Werror=...
-	if grep -q -s "disable-selective-werror" ${ECONF_SOURCE:-.}/configure; then
-		local selective_werror="--disable-selective-werror"
-	fi
-
-	# Check if package supports disabling of static libraries
-	if grep -q -s "able-static" ${ECONF_SOURCE:-.}/configure; then
-		local no_static="--disable-static"
-	fi
-
-	local myeconfargs=(
-		${dep_track}
-		${selective_werror}
-		${no_static}
-		${FONT_OPTIONS}
-		"${xorgconfadd[@]}"
-	)
-
-	if [[ ${XORG_MULTILIB} == yes ]]; then
-		autotools-multilib_src_configure "$@"
-	else
-		autotools-utils_src_configure "$@"
-	fi
-}
-
-# @FUNCTION: xorg-2_src_compile
-# @DESCRIPTION:
-# Compile a package, performing all X-related tasks.
-xorg-2_src_compile() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${XORG_MULTILIB} == yes ]]; then
-		autotools-multilib_src_compile "$@"
-	else
-		autotools-utils_src_compile "$@"
-	fi
-}
-
-# @FUNCTION: xorg-2_src_install
-# @DESCRIPTION:
-# Install a built package to ${D}, performing any necessary steps.
-# Creates a ChangeLog from git if using live ebuilds.
-xorg-2_src_install() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	local install_args=( docdir="${EPREFIX}/usr/share/doc/${PF}" )
-
-	if [[ ${XORG_MULTILIB} == yes ]]; then
-		autotools-multilib_src_install "${install_args[@]}"
-	else
-		autotools-utils_src_install "${install_args[@]}"
-	fi
-
-	if [[ -n ${GIT_ECLASS} ]]; then
-		pushd "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" > /dev/null || die
-		git log ${EGIT_COMMIT} > "${S}"/ChangeLog
-		popd > /dev/null || die
-	fi
-
-	if [[ -e "${S}"/ChangeLog ]]; then
-		dodoc "${S}"/ChangeLog || die "dodoc failed"
-	fi
-
-	# Don't install libtool archives (even for modules)
-	find "${D}" -type f -name '*.la' -delete || die
-
-	[[ -n ${FONT} ]] && remove_font_metadata
-}
-
-# @FUNCTION: xorg-2_pkg_postinst
-# @DESCRIPTION:
-# Run X-specific post-installation tasks on the live filesystem. The
-# only task right now is some setup for font packages.
-xorg-2_pkg_postinst() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -n ${FONT} ]]; then
-		create_fonts_scale
-		create_fonts_dir
-		font_pkg_postinst "$@"
-
-		ewarn "Installed fonts changed. Run 'xset fp rehash' if you are using non-fontconfig applications."
-	fi
-}
-
-# @FUNCTION: xorg-2_pkg_postrm
-# @DESCRIPTION:
-# Run X-specific post-removal tasks on the live filesystem. The only
-# task right now is some cleanup for font packages.
-xorg-2_pkg_postrm() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ -n ${FONT} ]]; then
-		# if we're doing an upgrade, postinst will do
-		if [[ -z ${REPLACED_BY_VERSION} ]]; then
-			create_fonts_scale
-			create_fonts_dir
-			font_pkg_postrm "$@"
-		fi
-	fi
-}
-
-# @FUNCTION: remove_font_metadata
-# @DESCRIPTION:
-# Don't let the package install generated font files that may overlap
-# with other packages. Instead, they're generated in pkg_postinst().
-remove_font_metadata() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
-		einfo "Removing font metadata"
-		rm -rf "${ED}"/usr/share/fonts/${FONT_DIR}/fonts.{scale,dir,cache-1}
-	fi
-}
-
-# @FUNCTION: create_fonts_scale
-# @DESCRIPTION:
-# Create fonts.scale file, used by the old server-side fonts subsystem.
-create_fonts_scale() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${FONT_DIR} != Speedo && ${FONT_DIR} != CID ]]; then
-		ebegin "Generating fonts.scale"
-			mkfontscale \
-				-a "${EROOT}/usr/share/fonts/encodings/encodings.dir" \
-				-- "${EROOT}/usr/share/fonts/${FONT_DIR}"
-		eend $?
-	fi
-}
-
-# @FUNCTION: create_fonts_dir
-# @DESCRIPTION:
-# Create fonts.dir file, used by the old server-side fonts subsystem.
-create_fonts_dir() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	ebegin "Generating fonts.dir"
-			mkfontdir \
-				-e "${EROOT}"/usr/share/fonts/encodings \
-				-e "${EROOT}"/usr/share/fonts/encodings/large \
-				-- "${EROOT}/usr/share/fonts/${FONT_DIR}"
-	eend $?
-}