5 files changed, 71 insertions, 65 deletions
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index e7c7ffe25084..2e1c6203b23c 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,2 +1 @@
-DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild
deleted file mode 100644
index 742de05fd100..000000000000
--- a/net-wireless/dump1090/dump1090-3.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs eutils
-
-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
-	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
-
-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}"
-
-src_prepare() {
-	default
-	sed -i 's#-O2 -g -Wall -Werror -W##' Makefile
-	sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile
-}
-
-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}/tools
-	doins -r tools/*
-
-	insinto /usr/share/${PN}
-	newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
-}
diff --git a/net-wireless/dump1090/dump1090-4.0.ebuild b/net-wireless/dump1090/dump1090-4.0.ebuild
index ea826fc4f16a..006faa02a61b 100644
--- a/net-wireless/dump1090/dump1090-4.0.ebuild
+++ b/net-wireless/dump1090/dump1090-4.0.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
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 255ffd401abe..c07d8d10873f 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,2 +1,3 @@
 DIST unifi-6.0.43.zip 136844666 BLAKE2B fb330f9ba8c2d22dacd5e37fbeccc411101e388525cdf7ae76fd2ade629c8230d10a5098d01453fcd9e091d581961b556c7f86d1625baff735fa76a2896b2d94 SHA512 16cfec8f12aa31c146ebd38b946a51730f7ca600f36f16058e06ec20d6d3597a34fa8fa8efef1bad1980b73a15c13d5c6458f03d08cee6eda5cedf62ef17a6b8
+DIST unifi-6.0.45.zip 147691229 BLAKE2B ad8e34e4934449151b0244bb32e2ce81e2506f228c995e72c2756279ce22f1ce06d44c37f1cfd6156cee0d03066e36d99f98b56d2a1c759ee98ada6569b8309e SHA512 6b2aebf33b6e2114a2b274ce332e2bd88a30406e3a21bc66dc0eddee3ee27ee2e4d3948dea73ff85289cbc2ed0e4f2b646e095091c54120f718b5fb2f0b35943
 DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b
diff --git a/net-wireless/unifi/unifi-6.0.45.ebuild b/net-wireless/unifi/unifi-6.0.45.ebuild
new file mode 100644
index 000000000000..bd6bfa83ab99
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.45.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="-564eef1dda"
+
+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/6.0"
+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
+}