diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 79e0954f4..25b6d3ee8 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,2 +1,2 @@
-DIST crda-1.1.0.tar.bz2 21418 SHA256 82695b11263e6b329b4789fbc6b43b7a2d91de667904767bd5d3e4a49556bfc1
-DIST crda-1.1.1.tar.bz2 21666 SHA256 59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5
+DIST crda-1.1.0.tar.gz 23600 BLAKE2B cfcac248c3c3f72899f529b4e9070225750ec067f386831e160f2b81299e74b520160a87c928213aa176d82a002d9853fbd7cd39b111b0b9d8d20c8988936723 SHA512 58570d06ff3aafb845d9d2bf650de0af80d7813603027dcfd7eda1d1ffddb4e4a341bfb4208ab014a9ea6e2c06730e10fdf1ae3b41f532172213e250ebb911d8
+DIST crda-1.1.1.tar.gz 23852 BLAKE2B 54e5f05accae0d4048432c37a4b6ae221a19a4ddbc9129daf4f20d422d9b4ee5fa82b0fa9696da253536ea893bc7cbc9372a1b0739c718b5dd88a025f1228fcc SHA512 14be77a351f1cd749144b587e5013e0ae3c7e06cfea5c222664e0e984d047ff968899b0fe58f76b46ffaa18cc480f82a687e4bd82b78b6deebafa653ea59975d
diff --git a/net-wireless/crda/crda-1.1.0-r1.ebuild b/net-wireless/crda/crda-1.1.0-r1.ebuild
index 4616d1f74..6cc66208d 100644
--- a/net-wireless/crda/crda-1.1.0-r1.ebuild
+++ b/net-wireless/crda/crda-1.1.0-r1.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.0.1-r1.ebuild,v 1.2 2009/01/29 18:37:01 gentoofan23 Exp $
+
+EAPI=7
 
 inherit toolchain-funcs multilib
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
 HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${P}.tar.gz"
+
+LICENSE="ISC"
 SLOT="0"
 
 DESIRED_REGDB="20090817"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 DEPEND="dev-libs/libgcrypt
-	dev-libs/libnl
+	dev-libs/libnl:1.1
 	dev-python/m2crypto
 	=net-wireless/wireless-regdb-${DESIRED_REGDB}"
 RDEPEND="dev-libs/libnl
diff --git a/net-wireless/crda/crda-1.1.1.ebuild b/net-wireless/crda/crda-1.1.1.ebuild
index 122c12626..7ed9a8687 100644
--- a/net-wireless/crda/crda-1.1.1.ebuild
+++ b/net-wireless/crda/crda-1.1.1.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+
+EAPI=7
 
 inherit toolchain-funcs multilib
 
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/crda/${P}.tar.bz2"
-LICENSE="as-is"
+DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/${P}.tar.gz"
+
+LICENSE="ISC"
 SLOT="0"
 
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 DEPEND="dev-libs/openssl
 	dev-libs/libgcrypt
-	dev-libs/libnl
+	dev-libs/libnl:1.1
 	dev-python/m2crypto"
 RDEPEND="dev-libs/libnl
 	dev-libs/openssl
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 8c009950c..0b0e052c2 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,4 +1 @@
-DIST wireless-regdb-2009.01.30.tar.bz2 11515 SHA256 8b86eeab87497b708b2ec590ebf32659244dbfba57d33329ce0310c8564dd75b
-DIST wireless-regdb-2009.03.09.tar.bz2 11855 SHA256 794c5f7d59cd83ba6fe33ef5a25cd28fa655f395df43b648157ccec2fe5faf35
-DIST wireless-regdb-2009.08.17.tar.bz2 12745 SHA256 6b1e39bec4c1122e5639e979f2632430e41a2acac8ba251a13bf5c953f4775a1
-DIST wireless-regdb-2009.11.25.tar.bz2 12844 SHA256 b9d569a41f66323339b7aa203db6e2d8f39c98192f134b5eef2135cf09cd943f
+DIST wireless-regdb-master-2009-11-25.tar.gz 13670 BLAKE2B 7e1322ee959e547370a3edc0874a550ef160fc13fad615e3feb1db412d629a554ceab97352ce288e4bd54f8aa0cf81afdf043708d54de8c2b11cf18e0fe79976 SHA512 8297100e1ba519f0780a63be45fd36a38113876d5ea8f75c71991381e1e1acfd6a9a9bc4c16c840d5e6f4cedf01fe9602e6f5ef043d069f684cf4fb8df8fb7fe
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20090130-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20090130-r1.ebuild
deleted file mode 100644
index 6b5e521b8..000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20090130-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-inherit eutils
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl
-	dev-lang/python
-	dev-python/m2crypto"
-#RDEPEND="${DEPEND}" It doesn't actually have runtime deps afaik
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-    unpack ${A}
-    cd "${S}"
-    epatch "${FILESDIR}"/extra-monitor.patch
-    emake maintainer-clean || die "make maintainer-clean failed"
-}
-
-src_compile() {
-	emake key.priv.pem || die "make key.priv.pem failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /usr/lib/crda/
-	doins regulatory.bin
-	doins key.pub.pem
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20090309.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20090309.ebuild
deleted file mode 100644
index e5b84e8a7..000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20090309.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-inherit eutils
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl
-	dev-lang/python
-	dev-python/m2crypto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-    unpack ${A}
-    cd "${S}"
-    epatch "${FILESDIR}"/extra-monitor-debug.patch
-    emake maintainer-clean || die "make maintainer-clean failed"
-}
-
-src_compile() {
-	emake key.priv.pem || die "make key.priv.pem failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /usr/lib/crda/
-	doins regulatory.bin
-	doins key.pub.pem
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20090817.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20090817.ebuild
deleted file mode 100644
index 867166e09..000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20090817.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-inherit eutils
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl
-	dev-lang/python
-	dev-python/m2crypto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-    unpack ${A}
-    cd "${S}"
-    epatch "${FILESDIR}"/extra-monitor-${PV}.patch
-}
-
-src_compile() {
-	emake install-distro-key || die "make install-distro-key failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /usr/lib/crda/
-	doins regulatory.bin
-	doins custom-distro.key.pub.pem
-}
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild
index c8060c717..d0b57cbca 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20091125-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $
 
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+EAPI=7
+
+MY_P="wireless-regdb-master-${PV:0:4}-${PV:4:2}-${PV:6:2}"
 DESCRIPTION="Binary regulatory database for CRDA"
 HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
+#SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/snapshot/${MY_P}.tar.gz"
+#https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/snapshot/wireless-regdb-master-2021-04-21.tar.gz
 LICENSE="as-is"
 SLOT="0"
 
-inherit eutils
-
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 DEPEND="dev-libs/openssl
-	dev-lang/python
 	dev-python/m2crypto"
 
 S="${WORKDIR}/${MY_P}"
@@ -22,7 +22,11 @@ S="${WORKDIR}/${MY_P}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/extra-monitor-${PV}.patch
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/extra-monitor-${PV}.patch
+	eapply_user
 }
 
 #TODO: add pentoo use flag to not patch the regdb, maybe adjust deps
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild
deleted file mode 100644
index 9d8166d6a..000000000
--- a/net-wireless/wireless-regdb/wireless-regdb-20091125.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-regdb/wireless-regdb-20090130.ebuild,v 1.1 2009/02/02 18:42:21 chainsaw Exp $
-
-MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Binary regulatory database for CRDA"
-HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://wireless.kernel.org/download/wireless-regdb/${MY_P}.tar.bz2"
-LICENSE="as-is"
-SLOT="0"
-
-inherit eutils
-
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl
-	dev-lang/python
-	dev-python/m2crypto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-    unpack ${A}
-    cd "${S}"
-    epatch "${FILESDIR}"/extra-monitor-${PV}.patch
-}
-
-#TODO: add pentoo use flag to not patch the regdb, maybe adjust deps
-
-src_compile() {
-	emake install-distro-key || die "make install-distro-key failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/crda/
-	doins regulatory.bin
-	doins custom-distro.key.pub.pem
-}