gentoo new year resync : 01.01.2021

15 files changed, 102 insertions, 90 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index b6fb0523eedb..799855960fed 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 2be754880225..7a0dd6410bbb 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,7 +1,8 @@
+AUX bladerf-2019.07-gcc10.patch 966 BLAKE2B fe17328ea2c01e3345aab309414384395ac9bff0583bd324c995515a372ea84cb93d42e198a37ac650dcd4d219f8621f58740f15ecf8dbe08624891c228ee422 SHA512 287e0abdd5ba393b3d9376fb3f275bc2a0fe215e2918eef4365b580b0678683b81cabd80cfb1e4f42332b063b3800a6218254f6006b3d747ac6cd5e42686480e
 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
 DIST bladerf-2018.08.tar.gz 2177625 BLAKE2B 8c3970f38f7645ba46c44803fc370e16012b2ea894d16c5101ea9519f5f9ff1aaa0a39819ac13389a33f7e0336e0e89ffcb7a0abf363cb30b091e88502a7a8c3 SHA512 7f8d0ef146da34474774d00503f0838cdf9404bf42bf1f68fd0f6018c7e7d4937da56110d818237f712bd23547cfbed1e2d04455a9d4d7ac0df96336e331c8f4
 DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
 EBUILD bladerf-2018.08.ebuild 1309 BLAKE2B b11a4ddf301c0c8b4c722cfdbf71d43a1b35202499f9abd48d48bf1da365801fd15107f40a3ac5d0fc084de218b7b83dbc33959f4e7539f02035cdf4b371447d SHA512 d51f7e9f7e8cfb3b82224803de35ebf59f95d18c201dd94dd65a2ff20fda71e96b79bc2ff7a486d39536d4b8412c9355923a1eb69bea9bd7922e635ae4d2fa0a
-EBUILD bladerf-2019.07.ebuild 1667 BLAKE2B 748da9575b2bd878c370e94d11ffa616cd68221a55079a4159ba15819d1548036d0923990cc4cbdfe601f08b2b09c7edd3c3c6241e10ef1ef60139f7164822b5 SHA512 419431abc6107275cff0b3211db4a4d8df362d12bab80740d5359a57226ec1f3bb38385d1bf27c2d4432045d02c93f4a2fb2887350740d743f6ebb2a0d59668b
+EBUILD bladerf-2019.07.ebuild 1712 BLAKE2B b2ef0e6fee8dd047ff30a0278ced5fd3893a3dd2bf725c392f152786e9e2f1dd4684ff1e361381c29be7fb603ce1d6c8ebb30dec23e1c27a2ef0a5acd287b330 SHA512 9e3b58f49d6e5781b80bbc3834fa0754da971523a8a22f37f3e3ac393142250a0a5c7ecce2edca60876f3507c77cc9e8e79d53593a0aa5fc610fb38d4a7af7de
 EBUILD bladerf-9999.ebuild 1660 BLAKE2B 65019f05d47d4c7d8003eecd4bd80a2360dbefb379c09643058c2a464175fe970a47a0f87557a851d06715e291f058e26e08dbfb6b3ceebafc1476d776790f05 SHA512 fd802f70997e4418c803edcb31ba4683c5ef6bcebf49323d3d07e970cb90658dde781811e2a8f543dc3abe749d12ba0d216a5f04f07593bd967d16bfec095f98
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
index 3672b069b037..675b62ecbef4 100644
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ b/net-wireless/bladerf/bladerf-2019.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,10 @@ RDEPEND="${CDEPEND}"
 PDEPEND=">=net-wireless/bladerf-firmware-2.3.2
 	>=net-wireless/bladerf-fpga-0.11.0"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_unpack() {
 	if [ "${PV}" = "9999" ]; then
 		git-r3_src_unpack
diff --git a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
new file mode 100644
index 000000000000..bdd99c5cadcc
--- /dev/null
+++ b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
@@ -0,0 +1,23 @@
+From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001
+From: Robert Ghilduta <robert.ghilduta@nuand.com>
+Date: Mon, 25 May 2020 21:36:50 -0500
+Subject: [PATCH] libbladeRF: define bladerf2_state_to_string as extern in
+ header
+
+---
+ host/libraries/libbladeRF/src/board/bladerf2/common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h
+index 23187ba6c..efbebc867 100644
+--- a/host/libraries/libbladeRF/src/board/bladerf2/common.h
++++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h
+@@ -207,7 +207,7 @@ extern const float ina219_r_shunt;
+ /* Constants */
+ /******************************************************************************/
+ 
+-char const *bladerf2_state_to_string[4];
++extern char const *bladerf2_state_to_string[4];
+ 
+ 
+ /******************************************************************************/
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 9e069e5e67a6..aabbeeb0fedd 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,4 +1,6 @@
 DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
+DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
 EBUILD dump1090-3.7.2.ebuild 1543 BLAKE2B ef4ea5495cd0a264c993ba40bc0a2d564f497b56b8248dfbbb4323bb293159017ac729eb5e17bcdcecd7e56bd04a001a9613e6fc986e3d6b8932039bfccaf272 SHA512 d70dbea5cef1ea41cfbfa430f8800057e12f5bb2a265368d5e7b6310f5386e2a4ed042ed971738efc242df37e098228371c999cf7596bd179d38a48cf58efd6a
-EBUILD dump1090-9999.ebuild 1545 BLAKE2B f4ad78598d6b99c66fa7eb716ecdda2d2091fb1a3e3722d9922f961a6ed58f8ea699c98a1fab6e6fbb4c10a20630955648851defcbeffd9e028b94e74e9fdbe5 SHA512 bc82f2db887f9290883bc82948a43793f5c953fc77dd3bdfb9a58dd405d71444204421bbfaef7767120b46d26379cc1376e8bd30d6706b05f24ad72c9c51630f
+EBUILD dump1090-4.0.ebuild 1200 BLAKE2B f228e05164a56a0ab88d4db5adc12c14faa34b5229f419bbd24bdb1b107ab66bc1aab5b232990bdaef014dc1c11bd0923fa3805e3c5d3a41f7f083bb1aefb13d SHA512 a8b894977f7d26ac853d784bb72635f8a0354bc309ae13b0b3cb77bbdb23b06e877f9c26d3205136f5431f325f515d5ea20dc24c5ef19563cd087a2e32120620
+EBUILD dump1090-9999.ebuild 1177 BLAKE2B 9d7fc48eec212479ab0b5e8eff2ee88e7fa8764546da69a8df7efaea579a80ed21720ac7c6e6eb7588be68a7bcdbe6e5f0b4d1a7e2d62d3fd9de273313f655ba SHA512 8dade3337cd83b09b4cb7748464410bf1765a9af86d03ad57dad51a0c5b1937025631b8bc8cee89b94dccb03de27457a050f2c7e8bccbc4374141e4b84a67f04
 MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-4.0.ebuild b/net-wireless/dump1090/dump1090-4.0.ebuild
new file mode 100644
index 000000000000..ea826fc4f16a
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-4.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="simple Mode S decoder for RTLSDR devices"
+HOMEPAGE="https://github.com/flightaware/dump1090"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bladerf +rtlsdr"
+
+DEPEND="
+	sys-libs/ncurses:=[tinfo]
+	virtual/libusb:1
+	bladerf? ( net-wireless/bladerf:= )
+	rtlsdr? ( net-wireless/rtl-sdr:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's#-O3 -g -Wall -Wmissing-declarations -Werror -W##' Makefile || die
+	sed -i -e "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		BLADERF=$(usex bladerf) \
+		RTLSDR=$(usex rtlsdr)
+}
+
+src_install() {
+	dobin ${PN}
+	dobin view1090
+	dodoc README.md
+
+	insinto /usr/share/${PN}/html
+	doins -r public_html/*
+
+	insinto /usr/share/${PN}
+	doins -r tools
+
+	insinto /usr/share/${PN}
+	newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
+}
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index f0099d87455f..9e0920b465cf 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -3,24 +3,16 @@
 
 EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="simple Mode S decoder for RTLSDR devices"
-#Original repo
-#HOMEPAGE="https://github.com/antirez/dump1090"
-#Repo that has actually been touched recenly
-#HOMEPAGE="https://github.com/mutability/dump1090"
-#And now we move to the next one in line
 HOMEPAGE="https://github.com/flightaware/dump1090"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
 else
 	KEYWORDS="~amd64 ~x86"
-	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	#SRC_URI="https://github.com/flightaware/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
 	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -28,16 +20,17 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="bladerf +rtlsdr"
 
-RDEPEND="bladerf? ( net-wireless/bladerf:= )
-		rtlsdr? ( net-wireless/rtl-sdr:= )
-		sys-libs/ncurses:=
-		virtual/libusb:1"
-DEPEND="${RDEPEND}"
+DEPEND="
+	sys-libs/ncurses:=[tinfo]
+	virtual/libusb:1
+	bladerf? ( net-wireless/bladerf:= )
+	rtlsdr? ( net-wireless/rtl-sdr:= )"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	sed -i 's#-O2 -g -Wall -Werror -W##' Makefile
-	sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile
+	sed -i -e 's#-O2 -g -Wall -Werror -W##' Makefile || die
+	sed -i -e "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die
 }
 
 src_compile() {
@@ -54,8 +47,8 @@ src_install() {
 	insinto /usr/share/${PN}/html
 	doins -r public_html/*
 
-	insinto /usr/share/${PN}/tools
-	doins -r tools/*
+	insinto /usr/share/${PN}
+	doins -r tools
 
 	insinto /usr/share/${PN}
 	newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index 477b52c01694..b6142f8f93d7 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,4 +1,3 @@
-AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
 DIST gqrx-2.14.3.tar.gz 1343813 BLAKE2B 19bb721a355f4b61c6a048aa5c2f1e2415ea2447fb6e6b2a0c1913d3dd0b1971523c51b5e27e0f07e671ce90e15996de8d22f54fdeb9873f08229cce50c5f9ab SHA512 436080f18a560a817921e451c2d5784b48b0e2e59ae1485578fe8d2afac9ad052b899fc0e3bb84976519ebaf2e061df31e6215d8957a5d06cc2e8431b9b55bef
 EBUILD gqrx-2.14.3-r1.ebuild 1226 BLAKE2B 247da437a3e740c67eb7345c9c6a8afea176576012c96ac3350b764e199dc9fc48f6e62e1f0e224d405825e2b432a5c9abf343396208b86facb62d15af7c807f SHA512 af94fd78c359ff8b0d0839ec6df771c2a11fc404bc1177180a8528005a36d7f4ae670c9f834443eb6867c71e459ec6d55cdf16ef4c1bd1bc40579ce4cb120e25
 EBUILD gqrx-9999.ebuild 1492 BLAKE2B 8b0006db9383bc4ed07283190e6bb3dfd6eeffb6c06b1c9ccfa1c8033582d765b3666a9bb141b273007845da3660cbb5a77d230325eda5ffc62d019e0340c6a6 SHA512 fd067021d092b0c13f67cc1987aec52d36a57f1b079a6ba9573587c0afe8f63ac17791474fec6bdb546a5127fe8bbe9a9a4cd2f93b4817651e2d7e64929af1fb
diff --git a/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch b/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch
deleted file mode 100644
index 76cc7e5dffae..000000000000
--- a/net-wireless/gqrx/files/gqrx-bladerf-samplerate.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/qtgui/ioconfig.cpp b/src/qtgui/ioconfig.cpp
-index e4fdd8f..ad072a1 100644
---- a/src/qtgui/ioconfig.cpp
-+++ b/src/qtgui/ioconfig.cpp
-@@ -384,8 +384,6 @@ void CIoConfig::updateInputSampleRates(int rate)
-     }
-     else if (ui->inDevEdit->text().contains("bladerf"))
-     {
--        if (rate > 0)
--            ui->inSrCombo->addItem(QString("%1").arg(rate));
-         ui->inSrCombo->addItem("160000");
-         ui->inSrCombo->addItem("250000");
-         ui->inSrCombo->addItem("500000");
-@@ -400,6 +398,17 @@ void CIoConfig::updateInputSampleRates(int rate)
-         ui->inSrCombo->addItem("30000000");
-         ui->inSrCombo->addItem("35000000");
-         ui->inSrCombo->addItem("40000000");
-+        ui->inSrCombo->addItem("45000000");
-+        ui->inSrCombo->addItem("50000000");
-+        ui->inSrCombo->addItem("55000000");
-+        ui->inSrCombo->addItem("60000000");
-+        if (rate > 0)
-+        {
-+            ui->inSrCombo->insertItem(0, QString("%1").arg(rate));
-+            ui->inSrCombo->setCurrentIndex(0);
-+        }
-+        else
-+            ui->inSrCombo->setCurrentIndex(5); // select 5 MHz
-     }
-     else if (ui->inDevEdit->text().contains("sdr-iq"))
-     {
diff --git a/net-wireless/inspectrum/Manifest b/net-wireless/inspectrum/Manifest
index 53bb1732a8fd..f6bcbe13fc82 100644
--- a/net-wireless/inspectrum/Manifest
+++ b/net-wireless/inspectrum/Manifest
@@ -1,4 +1,3 @@
-AUX inspectrum-0.2.2-qt-5.15.patch 526 BLAKE2B 5262b6d57ca5161ba185d051ca7d2c757ac4427954ef5ee7d03998607a74d604c5e1ae5977c95858310ce70e55e003bc27e1d4383d29666ecb03971effad4391 SHA512 012c4fa5e7fdf0bb995d71c761137733f693ccafa557577fc6599cc88efa381246f81febd342b94c60c3441ed07fea3a84cf425734c6ae56aaa3461eeb03f19c
 DIST inspectrum-0.2.3.tar.gz 109567 BLAKE2B 91ca0148d2382ba4413d66ddbb741826db002ef36b0676b630f5b65fcdf030a5fcf5862788b1d9048384751dedeb65998501cb8ccddcef2320f8f54ed9b8ed22 SHA512 517e6fc8048a41377dcb3cf72dfb308b7ae5fafadc6056abe37ac3ef7deb5bc1931b02a5d6bdac45c81dddb4d943550830f55d076e591c19053339ed836389c6
 EBUILD inspectrum-0.2.3.ebuild 690 BLAKE2B 3ec85ef5ced6fafb7fcb667584d3289b7b532c8213182872a9e9d89e041b1f0ffa272c4e4b2272a1b220bdade1970c1db9fa8afd74f7fdaab6c5b366167e15dd SHA512 695d6ed182377da010e113e52e26a43c0a9d00e913f980ee10924a4241e3d677df3b2b5931c932f3d5466596ef8cd41a2b17daf15e6472106fcbf74f5d5f6296
 EBUILD inspectrum-9999.ebuild 690 BLAKE2B 3ec85ef5ced6fafb7fcb667584d3289b7b532c8213182872a9e9d89e041b1f0ffa272c4e4b2272a1b220bdade1970c1db9fa8afd74f7fdaab6c5b366167e15dd SHA512 695d6ed182377da010e113e52e26a43c0a9d00e913f980ee10924a4241e3d677df3b2b5931c932f3d5466596ef8cd41a2b17daf15e6472106fcbf74f5d5f6296
diff --git a/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch b/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
deleted file mode 100644
index 3e55e814ecbe..000000000000
--- a/net-wireless/inspectrum/files/inspectrum-0.2.2-qt-5.15.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1f2b4587ec2c6d1a1945eee8bbf361dbdf3dc8af Mon Sep 17 00:00:00 2001
-From: Martin Hauke <mardnh@gmx.de>
-Date: Sun, 7 Jun 2020 21:56:38 +0200
-Subject: [PATCH] Fix build with Qt 5.15+
-
----
- traceplot.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/traceplot.cpp b/traceplot.cpp
-index 3704d24..04bdba8 100644
---- a/traceplot.cpp
-+++ b/traceplot.cpp
-@@ -20,6 +20,7 @@
- #include <QPixmapCache>
- #include <QTextStream>
- #include <QtConcurrent>
-+#include <QPainterPath>
- #include "samplesource.h"
- #include "traceplot.h"
- 
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index bb32730231a2..8b71ede25f02 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,4 +1,3 @@
-AUX wavemon-0.6.7-dont-override-CFLAGS.patch 295 BLAKE2B 367667b2d8db179c198f2bf02183f3e65afb5e32fdf0d0bc5229b1fda1e68280a2c8b4caa24204e13fae91d05e4b3c38c08f5eff5eeb81d9d458637305d1748f SHA512 1837707455d1718e3a067f5799e8c627f536d91ed75a9ab3c1cf432337776a41680214093be8863b158be5ddff305281fabac0b38d657bb9c3a1a9a72060c32e
 AUX wavemon-0.7.6-ncurses-tinfo.patch 669 BLAKE2B 78d027ef6ca14fda651cb6fa06563f9f60c339af8567b0e743dff2975b812198b4ad2166fa59fd28219dfd51c0983eb4890719718412459d733c78ae6154e0d9 SHA512 46e43f1eef87a4a81cf812f7e576f0c7d8e867fcda6494a81aaf5c45609ae0b4ef4f21f671cfc4d763700ae2eb198c7c8d3d52de95ec0416f9b1e675077de2a1
 AUX wavemon-0.8.0-build.patch 945 BLAKE2B 149355ed7a956d230014e8957efc71bff787d1c6890bd277fc64bfe83c8acdd8cb844d071cdabd0c470465443404b279a600d0dd02b9e8d136ed68d088a58015 SHA512 0c1463974431f51fea24ceb14de785012b89c7d8901d91a50979fdc07d2b11bf7980312b6006ec6f1d2bdaca768d2a947820b5fc6429d361dd6ad957b3798ac2
 AUX wavemon-0.9.1-build.patch 1407 BLAKE2B 55ab2df35083d2ce08c8a0b0a1a48605b0c7d62254cc0622a298cdd6bcbd61b3845f8175bdbb9505ec31032b3649fd4fb49cb2739c4456496f8366ff2df85422 SHA512 5364a9a35d7c4fc7dbf4822d177dfd39bb36405453aae5d5844a1b23291a3e83a7ffc4da9dcd7d7d5ae62ffd906626e47331148e4d1b5770626464b6865465e6
diff --git a/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch b/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
deleted file mode 100644
index df98db7cd590..000000000000
--- a/net-wireless/wavemon/files/wavemon-0.6.7-dont-override-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -9,8 +9,6 @@
- AC_DEFINE_UNQUOTED([BUILD_DATE], ["`/bin/date`"],
- 		   [date wavemon was last configured and built])
- 
--CFLAGS="-O2 -Wall"
--
- # wavemon is only supported on Linux, warn user about futile compilations
- AC_CANONICAL_HOST
- case "$host_os" in
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index 17b91b761770..df0bae35dbce 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +1,4 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9-r1.ebuild 1775 BLAKE2B 154b536864dab7a1b024d17a8a996c8641674a936ab08580b98eff46d6024d0eb61b28b427515e80cd93302cdc0c8c6435af2b5ef34f59270642a40ce83703b0 SHA512 27bba166483e60c9daee81683d4de75010491245297a556a7b6e1440f61cb2906051571101577a5bed624662ac23b4efa115da15b545f7d0569dd13fd46dc52e
+EBUILD wireless-tools-30_pre9-r1.ebuild 1776 BLAKE2B 05271ab15e9fc49a63454a9099477ee4532bd31e276bf42ab72ed25f0c8049f9903f6d55c350bccae5bd4323b0616d6be5a01f0b27418c79ae441e153cd95796 SHA512 d1a44e968ca19424d81e0c8d7f8188b61227ea6929db3e45eacb8ca4faaea2c125f3179e2d16005319e6ebdd3a101ab2659c820765a25f6030a2363d6c856406
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
index b6ebdfd2dde9..b43c43b91367 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="multicall"
 
 DEPEND="sys-apps/sed"