gentoo resync : 28.09.2019

7 files changed, 144 insertions, 51 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3612f2829689..37e56916a1cb 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 2d9862347cd0..9f003c02aa2c 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,7 +1,7 @@
 AUX gmap_usr_share_mv.patch 459 BLAKE2B 54afd9183d40041b541325041975b8a20ebfa45a29d9625ba1b22635aa567f57e607215582c4b55f40dc7339fe031c017c98c51216edf80087f4c602526c5b9e SHA512 3ffa7cf9a172642015373df29a8acd952d25a1634b9a7cb3cad8ad67c6ebd95b0a94c47713f444e1270ce52ed04db1282992e31435fca7aacbc0da955d419c59
-DIST dump1090-0.0_p20140919.tar.xz 445108 BLAKE2B 96da9faae0139710b92adfeb921f7b84ea3342c3916d69baebfb2709076c9f3d8e3be3457d8f2c074d3b58255ad745cda9f35a71f6707b8184a83c0c8a54e141 SHA512 4b7f915d5dd9c728da36298ecfe6c0e1da17bb9082e5f1c41376e6425dce429c099b0fd2d8436a966f5d3189788b818602f26fb0aea62e5dbe753e489bf0a760
 DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
-EBUILD dump1090-0.0_p20140919.ebuild 940 BLAKE2B efc8640aead079dfd58a47d31ddf2c51e9c2afd9dfdd18b36e7e7f311b1d71de36fc7970caed9ef1d8a1eb938ec432a1eea0e2a83e71bcadf50f05a10724ed3d SHA512 8beb46b548d5a802b474e32b0f36077c68c3db833a79e4f783bbcc3ad5cfd7b9b7e2b84017eb88b1903a41a2ba6d1de80df79ca40b9b4b771604c6721227de2c
+DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
 EBUILD dump1090-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-EBUILD dump1090-9999.ebuild 1532 BLAKE2B 4c75d55a1401a09800f561b61e6d92d1838113a4fce3cb9d51d5a564395352b8527fc5e8d6d9ce0be0ac1f4f6cf39a05e637ec595146f2cdf8b6b7472df3746d SHA512 c72721881cc2a9e335a2d189551a0b1c36847c4f6101ee1d502f30dbee457ec01a7081d2c9038cc6cdae660b68fdeed779f2a6cbd00a0d4dbd5fd440ffe9846a
+EBUILD dump1090-3.7.2.ebuild 1558 BLAKE2B c300d6d813531d99ee7e9bae8213dfdfa908b90adda44618ab0da162c89b0ccd4f623f90bcdf6b0ae5cec5f1e485c5abad39297d29c02087d27be0275f965a83 SHA512 290bf679ed1b7ed989f8212e32794a91fd255d2bf4d09648383af6620cb6cffc28752731c45c2c8394581f66361eb5a1b61478d8df8cc2360575689a0e60032c
+EBUILD dump1090-9999.ebuild 1558 BLAKE2B c300d6d813531d99ee7e9bae8213dfdfa908b90adda44618ab0da162c89b0ccd4f623f90bcdf6b0ae5cec5f1e485c5abad39297d29c02087d27be0275f965a83 SHA512 290bf679ed1b7ed989f8212e32794a91fd255d2bf4d09648383af6620cb6cffc28752731c45c2c8394581f66361eb5a1b61478d8df8cc2360575689a0e60032c
 MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild b/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild
deleted file mode 100644
index 51c3554567bc..000000000000
--- a/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="simple Mode S decoder for RTLSDR devices"
-HOMEPAGE="https://github.com/antirez/dump1090"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/antirez/${PN}.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-wireless/rtl-sdr"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/gmap_usr_share_mv.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr)" \
-		LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread" \
-		all
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc TODO README.md
-
-	insinto /usr/share/${PN}
-	doins gmap.html
-	doins tools/debug.html
-}
diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild
new file mode 100644
index 000000000000..a34578ba1b3d
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-3.7.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 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"
+	KEYWORDS=""
+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-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index e4ab4ba0cfe8..a34578ba1b3d 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs eutils
 
@@ -58,5 +58,6 @@ src_install() {
 	insinto /usr/share/${PN}/tools
 	doins -r tools/*
 
-	newdoc debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
+	insinto /usr/share/${PN}
+	newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
 }
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index a0d9a9be627a..de1f0e7dbe78 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,11 +4,13 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b
 DIST unifi-5.11.47.zip 112374653 BLAKE2B 42e981f526dcdc7f7c35b7884aaa81cd96de4105d8700e8f8625a1fbd14640d248d46153328dbc852591f96221ab5753b65e2038d948a3d5b091f17b3e47e4bb SHA512 ec2a1f8e3a3c3bf5cf8ab25ece9ee164fbaaeef4b03585d2ff9add74a34992a24fe0becbd28b212b470d4fd87eea67e4291724addc8b12e5d1c463a73817569c
+DIST unifi-5.11.48.zip 112379777 BLAKE2B da30a094350229aebdda958a966412a350c918d6d6cef775fce675bb139cb13f27dc5e3efbd7b68eb0a1b75adb11f9352cf330ca45af89bb9690c9d4a2505e8c SHA512 f09e2fd280cc6c1859d89536f9c517308c6945f7f4b38f9ef46a8231551284049baf50309ecc3cf7f9523b5c9f85758a56ee2520652c10ad22035491d8ee32d9
 DIST unifi-5.12.5.zip 113544662 BLAKE2B 7b79a1b107927fbb6ee2c7bb531901b5cedef0768146b369e8653e0e34e41758914b5108a01681e806c117dd80561091b6064bffe779e913774d61ff2fba369d SHA512 ff3ab833ce13889f1f6c2d1ee71f28bf8d48789c053c84b1f427e95e09aedb4d9f66a640a1891262f31300af50859581dc874a613f5f92b3bcf18b05c0140052
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.11.46-r1.ebuild 1789 BLAKE2B ec4e389a2bc3acfc0cf52a7d6bbc4e07efcfe38821a3a51b3c6295f4e736a0e1bae4e9e65f8886769e6b2f9bc22efb8cd26873c2d5847ca3a74d37b1e4b33b5f SHA512 2c1721e731fd9e800ffc331c1e79fa0fddfae5f29815b8780312a2b560ca7734b90f48502f267eb568f57320fe0c22c0a7efe233867c91c9bc48c987b9ee3342
 EBUILD unifi-5.11.46.ebuild 1832 BLAKE2B e47b011986e7abc36e9df65eea9fcc1fb56a19dadc78a18c74699043cd0024b7d74676efcf9882e70d19247435ce0ff8e28dcc23ea905c4562b6285aae3685be SHA512 9b9cfc432580c3ecc8b8e79f73a5549f54fb6b46b23ff29ead84b85cc360bb091b278210d57e5889b319d3fa5c0a4a066fa01f4a85eab1e12b2c443f70c33bce
 EBUILD unifi-5.11.47.ebuild 1789 BLAKE2B f60faeba740a9e49e0bf313f62bbf6fcfa437652616206ae266518d39f330a0c5f01ae00de74139c4e5557dad0f13615e128230fcace4d0369d29a743462ce83 SHA512 7f10f359e1cd77333a4e59845fb844476ef973d968164361f0a0879a32da8c3427fec5692aeb06f66324177b464554a4d96bfeee520fbeeec752054fd0f0dc89
+EBUILD unifi-5.11.48.ebuild 1789 BLAKE2B d656f824d3312769b225b7e65e4c9abe2e9be318520c47c3794e87a96ef5d9deac9e763d981b8c27627802cd694e4bdd9b83d3a9de4d64a74a3af856ef01b4cb SHA512 0d75d95541a097cb0885d98bb4529688ef7513df7d28f793a2e4ecb679ac531384288db5cd1dc9db66c9ce8453d57d1d3efdb0a9aa642c8e64e81b0dc415ffde
 EBUILD unifi-5.12.5-r1.ebuild 1789 BLAKE2B a2cc863351a4d4a0d4b210931a86de25220357d8479a86f13b3bbeadaf4e451af2f82b90ab433fb05154d70d678ebdc5db92cdd0e2f353ac9dc00022d2c45bd9 SHA512 8bfbd9d2cab24b2584880f42c2fd60748520147868c134ae34c4af8e1ead24501ddde7c4460a2884ded81dcd4ed8965f6274e1417eecc2742ff79af7d2b595d5
 EBUILD unifi-5.12.5.ebuild 1833 BLAKE2B f9e7cae98e23b3525c628d0e987884f2e211d806073a97824bed45e4fb43dd131a849489d5c0bbb64cd7b865db71e600b9926a7b8ab38c70f2aa7e37e90dbb01 SHA512 46c149a06ee68e3e89a2ec3404c8eb501299649c2fd58a33a053d72caa85fc66cb1c6334e338d4aedcc3c3bee4bb18ae6468a2cdd882e46a213bb578cfc05d8d
 EBUILD unifi-5.6.42-r1.ebuild 1668 BLAKE2B 0db78f1241b651079c1c37326ef9c5414037c1bf192b344d55f9fd03a7af8f1cfc709f80b7257b9930f6c19d7cb77ec52e2cb5b492a571a60098436672c9514d SHA512 952253c6e51ac78796c7ee7729f75c1eaf0fa997832b60aaa7e9d73d0f6d3f444e632cd81550637733bf21ec1013d0a974edf12897dfc2fe70157403363eba86
diff --git a/net-wireless/unifi/unifi-5.11.48.ebuild b/net-wireless/unifi/unifi-5.11.48.ebuild
new file mode 100644
index 000000000000..793968b05c2a
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.11.48.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-0023c8f3bf"
+
+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/5.11"
+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() {
+	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
+	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+	exeinto /usr/lib/unifi/bin
+	newexe "${FILESDIR}"/mongod-wrapper mongod
+
+	insinto /usr/lib/unifi
+	doins -r 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
+}