commit: 4d4f2384118ceb291cf227fdc3fbbdcf8632711b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 09:42:07 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 09:42:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d4f2384
net-wireless/wireless-regdb: remove USE=crda
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-wireless/wireless-regdb/metadata.xml | 3 ---
.../wireless-regdb-20230503-r2.ebuild | 22 +---------------------
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/net-wireless/wireless-regdb/metadata.xml
b/net-wireless/wireless-regdb/metadata.xml
index 101c017e6f75..a61f7bfb3196 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -6,7 +6,4 @@
<name>Rick Farina</name>
</maintainer>
<stabilize-allarches/>
- <use>
- <flag name="crda">Use obsolete <pkg>net-wireless/crda</pkg> for
regulatory domain loading instead of in-kernel (4.15+) support</flag>
- </use>
</pkgmetadata>
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild
b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild
index 4bf9984598e8..8860373ea93f 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20230503-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,11 +14,6 @@ S="${WORKDIR}/${MY_P}"
LICENSE="ISC"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86"
-IUSE="crda"
-
-#PDEPEND is required here or crda test dep causes circular deps
-PDEPEND="crda? ( net-wireless/crda )"
-
REQUIRED_USE="kernel_linux"
pkg_pretend() {
@@ -40,12 +35,6 @@ pkg_pretend() {
ewarn "You can safely disable
CFG80211_CRDA_SUPPORT"
fi
fi
-
- if has_version net-wireless/crda || use crda; then
- ewarn "Starting from kernel version 4.15
net-wireless/crda is no longer needed."
- ewarn "The crda USE flag will be removed on or after
Feb 01, 2024"
- fi
-
else
CONFIG_CHECK="~CFG80211_CRDA_SUPPORT"
WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \
@@ -61,15 +50,6 @@ src_compile() {
}
src_install() {
- if use crda; then
- # This file is not ABI-specific, and crda itself always
hardcodes
- # this path. So install into a common location for all ABIs to
use.
- insinto /usr/lib/crda
- doins regulatory.bin
-
- insinto /etc/wireless-regdb/pubkeys
- doins sforshee.key.pub.pem
- fi
# install the files the kernel needs unconditionally,
# they are small and kernels get upgraded
insinto /lib/firmware
