gentoo resync : 25.09.2021

7 files changed, 139 insertions, 2 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3ab6245795e0..c3f10b8bc1ae 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index c624ad4a3fd1..ee3b60f311d4 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,7 +4,9 @@ AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9
 DIST unifi-6.2.26.zip 152767218 BLAKE2B 8351b9c0b2088006560ca3896df0b05d78cb9ca669ad32b1d1a73ef22f4329618b44585bff9a26a841b3d28997bc345708df9820149de91b3fc1df99693c3a74 SHA512 fccffca9bcb31a1da2c389e83ea9a48e4cde6d958368d4d623d459bae095b57a4d7946086b0ac0e4dff5c4c565961ed2c11f7bc2dfbf8b5c6d590fb32af351e8
 DIST unifi-6.4.52.zip 158970954 BLAKE2B bda454073e2a75e4f1789431a7e6e1c6585b5cd1eab04a6ff79d4487a276924e66dc5a048d0c2f729690e414191b71aaff846943adb84a9a7f409f66bb498b8f SHA512 169ae984b41325a4685eb21384b9f6e0035b74c4d02e53b357086e466584b2b2d3f98db5d431de4492c2917b60f5b51c0ad9dab248d4f42b07271349de9a2442
 DIST unifi-6.4.54.zip 158992649 BLAKE2B 90f98b1349a5fca3e6d85ef42823c5beaff0a3ac4697622a0387259421fdcfa891b094acb66f798a97b4397a27d477d6fe10d53bed03e15081f4d63abafb9d8e SHA512 d0502f87fe6827cdfabbffce7c7b0159aaad2ac032b59d04d5f233ada279fb90d5e21e043de518260c3380c7e23ff561f04040433a441866421dbe9b2db540c0
+DIST unifi-6.5.42.zip 161190627 BLAKE2B 9eca9169167ce09b27925e02d0ae9a7e96748be7821a920ca438c1ae76ddb7d45547c97b0066a22e66accbfd59a2a40e981ef772a4266c53c4630d1e36ca50dd SHA512 bbbdc046eb1a1e59c0d030c048fba268e1673053de9d8efed1c085a71b376ec2fc0840d08e6f226648629b1370fe9ea7bab147a7584e3fb32fc44d10bf791b86
 EBUILD unifi-6.2.26.ebuild 1576 BLAKE2B 36813058f867c56385f3bae6345e4a743f44d0ec8615bb5091e7ebd1d5d800a19a3b0f6c4bdaabed27d66c22041685565e2866b54148dfff41dafb89d70d4693 SHA512 0b411bc8df77d3cdae4ccc44991e6e5148f2479ae2389991abded23c4d182a8fa42c46c5a1134ba8311478026c86342be20af86767aafa57888c9938f228c6f7
 EBUILD unifi-6.4.52.ebuild 1577 BLAKE2B b0b41f7923a2625a0fb7df0122f924ecac1d30b44c756907c57ef366dea35b8989de8e14a1f6f9447fd569aa149258429a2d0dead386ddef70e781c4072d5398 SHA512 f5417bea5b74aca6127a76d950b27579a8ee8291122d3ac77c0684b722e0bbb5e467dc5b13059e4f89808b700415b98b1d9f238512dce22db41bd1ac78b38208
-EBUILD unifi-6.4.54.ebuild 1577 BLAKE2B afaaf21cacd06c111a5a86de5d74c91ccc76aab031743b34a6d765edad5467ff0d9ac6a04d38e8bc073400b1c1d4d9f0cce27f159dea1b2530d653fa6c9cba9b SHA512 d632f40e8f72173cd69ad662019ef6a34076376c58a8c646639958aeb08810195187ced5843568361764bd0dd246a5f287417cd45ebb14b38008805ed72392e0
+EBUILD unifi-6.4.54.ebuild 1576 BLAKE2B 0bec65374520f4f332ba0235559346e7c5cc5c6f010ce7a3d633f47ebc3416f8427cdf0ed864f2e313cf4cdc2cbc01d944adb2ecec2762c90929e57292929609 SHA512 f4d31f319708b44357e0b105aa9dcf1c4ae73885f37ea985d2dd2c2ad87df2ea7b07e4ab6a536aa742ba1c39cf841a2c04368b36c03ad08c1e67af4b96f70dbd
+EBUILD unifi-6.5.42.ebuild 1577 BLAKE2B 94b07baf3cb368d0a66766f6c8d7acc2f103480f908819c5530c127d32e60183999107f05a34cfb25a499089a5a021499426c2ec9929966d6b3c5cf0913ed78a SHA512 85a0fd9cb3274dda3597c6b36844ce0c44fad7f3d838fdeec283a84444b574e8e005ebeb6ddab6e725bfe16e8865f9a17443e7e5154162cc98552eef6b31d90e
 MISC metadata.xml 684 BLAKE2B 3c8638e2b38691bc33fd9c9cb8a79bb9b7421ec5f6d01cb6411f8cfdf8451b37855662c6e9e0dd519eda4a08b0c8e7543c2f358bf78a9dc41d52ba0cf7664600 SHA512 2f5bc4a8d9ecc37c85c6685aa1f201678a0f1236d65d8f1c72137a4ffb03ed82ed0d44c6c7231405467f77b5dbcfb375477c8cb0c0a6d8924bac822391fc2f3c
diff --git a/net-wireless/unifi/unifi-6.4.54.ebuild b/net-wireless/unifi/unifi-6.4.54.ebuild
index b1ac7e1f63ff..868b59c5a214 100644
--- a/net-wireless/unifi/unifi-6.4.54.ebuild
+++ b/net-wireless/unifi/unifi-6.4.54.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-6.5.42.ebuild b/net-wireless/unifi/unifi-6.5.42.ebuild
new file mode 100644
index 000000000000..857371196894
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.5.42.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-7bfe5b2ead"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index 7c3bad60f0cc..f438f245805b 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,4 +1,7 @@
 AUX wavemon-0.9.3-build.patch 1712 BLAKE2B f23fa28006e0361660c74cfb1628adecd3c9f48ddcf6adc98a9bcfe20614757bd5d416828a7c78a70090e70f24875b667207e154c272edc12a3d0a8eaa8047d3 SHA512 32b839ef6270de5e94e9a16ffb74d9696dec2411ccc05da3a377cb32a1ad127455eaf6ab3a8b1c9ff3af3f6c03d9566b51de08e4100c611c2d2f3f7e5dcf7290
+AUX wavemon-0.9.4-build.patch 322 BLAKE2B 393965a2a70efcd5b93de82c53cffe9b56edb90c998aaa979b53ec3a2580c00ee7e7331f323b9e42234a854da444f7fa1c219a4dbca9d3bebcb907800f29c98f SHA512 851e6785ee330fc4e26b6ff73436ef2568884ddc41af8d43b414087ec2eeeca64c5853053719ce34ac198decf2ac6499ae187940c8d348ac74801f2cef60645e
 DIST wavemon-0.9.3.tar.gz 220372 BLAKE2B 383e5462e6f3abf86b3604499764060927321018f9dfaef9b742d933e832e568249e41f348788184e125324f81672f2f2b2ff9ca970c215f95a80ec140e0ca11 SHA512 0e4f6db1dfd1915a3c0e1c9708eea501d7180e80df891d0c5a59bb72d48777731c67a256d2d7d6c748ade8e1a3efad9004f5e13971e0b4e16eefdd4f8c6fe1c1
+DIST wavemon-0.9.4.tar.gz 221133 BLAKE2B e07feb16dba86b1a91dc9b7d7df51da1b4498d8ea1a6ca36f6ae1e30e0e0bb09971330a470cde3425e7ae785bbd2819460ac2f1ddc2bc8da3aae29de3356bdbb SHA512 5121c6216d6697cc20ef55b2e365098e327a4966758af27a5a58cc13fe84d6e0828336031d9dcfe141210821f72fc3eaefc41fa3ab8a2e572a3b92c168c1ceb1
 EBUILD wavemon-0.9.3-r1.ebuild 1132 BLAKE2B 0a44b0b9cf12a5930cadbf908f65d3c4a14e9a5e27aa4b430b404736c33f85ca971f3ed134a1633fb63152a04321e092c5eca8deaa718c103f29e04dfbc2f156 SHA512 20f1a13c34e2f62ff76ecc28f820ceb11dffbb6cc98bd4d83cd01c9ed1966cc1390d908f4465867454ef4d85ba1f032ee28dbc0deecb17c8dedcd77fe1d67ba5
+EBUILD wavemon-0.9.4.ebuild 1090 BLAKE2B fb2312424b4031ce11e5754f1a85e4cb2fa9d047ff8f84587b00e7aab0d70b4f38151bc259d20c91fe53f9ef20370e8e6d9a7f1444e8e0d7a9cd73ac6909766e SHA512 bc420578caef9bd1d004cdd05e990b5ef952b077c36bb4a3c591f762bce3bcd6896f60db81ddf35e5d271d9d2cfd35f8b8a70e2dabec224dde2afd5843312be7
 MISC metadata.xml 476 BLAKE2B 7c1da837509c0dcf1cdc98e0658302a67712ca4c51a7396743cd9c67a6699e7fe4b502e582033dced7112695c5c7b9a0ff0287a51f94626abacbd2897c2d6e8a SHA512 3c2bda86a08d74cf98373b92d07587dccba0d11bc343c92a8eef9f0ba9851dae46ec75719de29eb637b02632dc5ea1e1d07fe85efb47d73047fe6b584ed8228e
diff --git a/net-wireless/wavemon/files/wavemon-0.9.4-build.patch b/net-wireless/wavemon/files/wavemon-0.9.4-build.patch
new file mode 100644
index 000000000000..afce0a712049
--- /dev/null
+++ b/net-wireless/wavemon/files/wavemon-0.9.4-build.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2021-09-21 10:27:24.966739165 +0200
++++ b/Makefile.in	2021-09-21 10:27:57.537003815 +0200
+@@ -9,7 +9,7 @@
+ install-suid-root: exec_perms = 4755
+ 
+ CC	 ?= @CC@
+-CFLAGS	 ?= @CFLAGS@ @LIBNL3_CLI_CFLAGS@
++CFLAGS	 = @CFLAGS@ @LIBNL3_CLI_CFLAGS@
+ CPPFLAGS ?= @CPPFLAGS@
+ LDFLAGS  ?= @LDFLAGS@
+ DEFS	 ?= @DEFS@
diff --git a/net-wireless/wavemon/wavemon-0.9.4.ebuild b/net-wireless/wavemon/wavemon-0.9.4.ebuild
new file mode 100644
index 000000000000..34f9f37a2b5b
--- /dev/null
+++ b/net-wireless/wavemon/wavemon-0.9.4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
+HOMEPAGE="https://github.com/uoaerg/wavemon/"
+SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+IUSE="caps"
+RDEPEND="
+	dev-libs/libnl:3[utils]
+	sys-libs/ncurses:0=
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~CFG80211"
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Do not install docs to /usr/share
+	sed -i -e '/^install:/s/install-docs//' Makefile.in || die \
+		'sed on Makefile.in failed'
+
+	# automagic on libcap, discovered in bug #448406
+	use caps || export ac_cv_lib_cap_cap_get_flag=false
+
+	default_src_prepare
+	eautoreconf
+}
+
+src_install() {
+	default_src_install
+	# Install man files manually(bug #397807)
+	doman wavemon.1
+	doman wavemonrc.5
+}