gentoo resync : 25.11.2020

5 files changed, 82 insertions, 12 deletions

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 2b2a424ee5b3..dee3fb0360bd 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,11 +3,13 @@ AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb857
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88e67947df8948abddb149e6522f4851108191f0f91605cc0168fcaa73170a40a9908fd64b49897f5123dc7a37 SHA512 b21be9cf360bfc6e1f2bff073db431a653a7b53f138cd9249873eaadf93777a3eecde87a8ada2db46f2fe69b2eacf747ed13c78045ba12748469dab3d068c881
-DIST unifi-6.0.24.zip 219639979 BLAKE2B a96df3d87ca5e22791ea7480012add840b09a76fe603d24057ffa74f61c12a3fdcceffafe9a2aeb5c31111cdd00348c7bc5193929ef350a2f9dd6730260759a3 SHA512 d12c49d429659b504a132597aa1eba89d173b9671a231c4c4d27ec23c81be2b964e96439469ef467a212af5ca91c1b3bc4080d4ee0c3b71f7d4576b530a5e8b0
-DIST unifi-6.1.16.zip 220033149 BLAKE2B 4e965c1577ef35d3dd28357aa884f8234f3cc9c45783dd261153ecc87bda24fc4b58ea4f49096304331bd11896251c29eaaa8e8b44046e50ee7e9d54d997223a SHA512 d1b241d5a47ee34c66a08b847405f615f83782fc67a38fe5fc4c281bac6335bc2ab8b021774cafb98753759b9924e773a2c4883a1ed2b30cb2e58ab56b3c07f3
+DIST unifi-6.0.36.zip 232051560 BLAKE2B 94a2780c40588c2afb64993d839dedb6064f437cdf29cd6dd9124ef3944ae25d1942f3eed0ea080007800575b37d9063b3f007b91d02bc30d35179cb4263d873 SHA512 bab68b649c84cf62e4e646c62a8adf8006ab6d434907352f3970e7c81c779b4dcbaf8d1b5558cf69e7daede9c96fe0b02216700cb62de5659cf496dc899ec2ee
+DIST unifi-6.0.37.zip 236439236 BLAKE2B 764c6406c3ac4a51617f6236280d63af3b6bd9c23a065f56bf8302ca72535b9cad8c2a78bac3ba07bc07f0997b635dea4d4fb71c395d46cf45fdbb05cb8d5b9b SHA512 07b452d84d8cd5d5d67db8d274a710bfbf3d3d19529b8692073ca5ec8108267694cdf85e8a101926599acc8aba9ac5f774dd78f2d5868da5b57c3d462748a2b4
+DIST unifi-6.1.25.zip 235499342 BLAKE2B 77de866d2c04136b32e06698f3c20563dc68cf1bf5d260a23cad46ee208c5d4012d788c67dc3324578d2c944e8eceecf6b5473f4d77304e10ee15a3b14286fc7 SHA512 0eb916f06546a5b33da664ada77391a69d21c9ec4545244a1a6f55ceeb7546fe77a07a121df03ba606e98ddbd23429207f86bb5b2c24ddfb3174eb2d00c5daaf
+DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
-EBUILD unifi-6.0.23.ebuild 1565 BLAKE2B 56f4a5e9740cdd7bc9e34349164c9612152fc969f042bb82d0a7b08c46fc5ec2efa7539f0b1bda1f0469cd04c8a8988f773367497cb8b208f0df5cdd1d7fcabd SHA512 2a24a46c8656413cc847693580f830b6a4a379fb585640418b025cdb5c0c972fd0ef3ef2fc2a8ba7a9df98fd15fbd2c196e519bff47a54d652edfb69a45c41be
-EBUILD unifi-6.0.24.ebuild 1566 BLAKE2B 1d2f8558ab7608c4d2db9e28f244c92aa7416439eb63bd02a27131debff9abed084cf03a1b4bce7d7286bad82ef686fed5d0940b8a2d27f5c3a76ae56505fd18 SHA512 9084039cfe18b5192bf3fe7afb21642c0fe1b17ecacfaef8c9007fc7ae0a308d91d3db6e2e13f943dd9be5ab667f72a4618e218b6d59aab7457dabbdfc924ea0
-EBUILD unifi-6.1.16.ebuild 1566 BLAKE2B c937d09d3157202e6fa4eb1ecd18826e9338f81f8e1b6a99d2b5ce46fcd302c57460d54d56b0e40125c1f1291cffc37c9c7dceb927454c42a4854b97a9bd0bb0 SHA512 2073f720ca81bde8256e043ca4eb5352daaf9e4d7e1bf238affb529c873862040defcf8d56db9b907a27484129980415e3fd9ea56b312b485a979f1e5f174d9b
+EBUILD unifi-6.0.36.ebuild 1556 BLAKE2B 6df2bb70ec315f7563d0960752b1bc96bae42e86a405e1f0ce3fd6aba545946a1366a2b64330b4ccbd2440c869047ffe156691354cbb056d5c3cc31fd29d0775 SHA512 4ba4a362ede45d1d39f004420e5b8739e75192f40135b62baea81697d466f99141a2fba7345cab114164190823735bc6f7b01c82966fe1642a5123093c066ef8
+EBUILD unifi-6.0.37.ebuild 1566 BLAKE2B 06315a7418702776055d5c6e1ff2f7557e1b10cc5b26ba15904880d54992414ee16071803bbf8d7a3b15f952f7b9970b04ff170c7636c7780e5e10606d290997 SHA512 3233d5449c71fa4bb585afc5f838553a23582b3c18fe5676b79e0ba55fd62c803d6c1d4ab6880da045fe2795f2ed4c315bbcc9947dd54777be8719f871dae9d4
+EBUILD unifi-6.1.25.ebuild 1566 BLAKE2B e59fb68b8f475fe749a31cf89adcc03d52a9de40348f4f62a84a761afa8a883c787f6f4b8254da00ba712fa3adcfb76e901f94525b294b364f47ccfa31ead4f2 SHA512 d1563a980e956e414e414ec1ff544c7a952bbe9bfb8e433be52ea81cf45124ddc75f10d67973b1a940bff593aa0c43b3149215a2b8bc2d1bed5709bc7ee9d497
+EBUILD unifi-6.1.26.ebuild 1566 BLAKE2B 1e7c0b6b4dffc76041f23daa3d6523a7e4b088f4cf3be529bf1acc7bf48c94049d51e351c425bf6a488bb253708bcb62983c2918364ac8f0792231e67c486023 SHA512 f1b22181098927c83c0cefd7359c112ea38f1b4c096edbb4eaee97cbc0ef56261292ddc19e5208319bdfa85908d5203dfaf91f4dc9b893052fc6047f6ff73a9a
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.0.24.ebuild b/net-wireless/unifi/unifi-6.0.36.ebuild
index b9e8e79d0068..2100bb3c54c9 100644
--- a/net-wireless/unifi/unifi-6.0.24.ebuild
+++ b/net-wireless/unifi/unifi-6.0.36.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-b200bf6446"
+#RC_SUFFIX=""
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.0.23.ebuild b/net-wireless/unifi/unifi-6.0.37.ebuild
index 53d19bcb20c0..02e3fe060f99 100644
--- a/net-wireless/unifi/unifi-6.0.23.ebuild
+++ b/net-wireless/unifi/unifi-6.0.37.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-20b313f50d"
+RC_SUFFIX="-db4f549ad2"
 
 inherit systemd
 
@@ -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/6.0"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-6.1.16.ebuild b/net-wireless/unifi/unifi-6.1.25.ebuild
index 195b85deca48..dae3aad8362c 100644
--- a/net-wireless/unifi/unifi-6.1.16.ebuild
+++ b/net-wireless/unifi/unifi-6.1.25.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-6e18ee6227"
+RC_SUFFIX="-7de38fe4fa"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.1.26.ebuild b/net-wireless/unifi/unifi-6.1.26.ebuild
new file mode 100644
index 000000000000..6663cad81218
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.1.26.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 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="-a072032c50"
+
+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.1"
+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
+}