net-wireless/unifi: fix subslot on 5.10 series, and drop old

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Ben Kohler <bkohler@gentoo.org>

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 46999622f43be7a2fc0700fc840ac10b30a006f6..7d56f762490cf79299edbb1ee903e4a8363b0dcd 100644 (file)
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,7 +1,5 @@
 DIST unifi-5.10.5.zip 77373497 BLAKE2B 0716c2ce948a909959d52325d97f9fdbf867492e54bfc12f286659f825f3d5719d334612d71af4bad8d9f1ff076d418df54af8cea18019adbc32cb1972eb5ae6 SHA512 9c8da7fc8b1068a60e5702d377d9cfaa6ea8d90014c3b4e3478bfc0b6a3a1614853befa9cca08c78ebffcdaf4dad119b251c69c52eb8df44acdbe225a28b54ed
 DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
-DIST unifi-5.8.29.zip 80125147 BLAKE2B d7fcfd8ea5c29c79803f4ee715136a82fb69b3e69802a9a9c4b92e9d4c52d5a72eaeaa3b10405a4eb10df35f1a926c4fb51dcd0c30816d3e58efd15f48b2ea51 SHA512 8c69f406c632661fe713251304910016bed25c2bbabb3aef355626cf6ea6475ba9348d0bec4d2e0f64824190db4deff669ab748cb17cc289112ac07421b56128
-DIST unifi-5.8.30.zip 80120131 BLAKE2B c7e53ff047cd3fc6b0b551d8388a739adf86d0518a86c76aa1688534e2a708bdf9d38d30848ad6a41b03aea12de8f038cd5eb8e9186ecfa3c2a1b782464b7e21 SHA512 0d4a714ba875e17ce359b28e2a0a967366125971f021eb95f598c7e4860c03016afadcef0a4bb6e64f30b99afb790b65aaa166ccc31bb31f268412c1a1f1bffd
 DIST unifi-5.9.29.zip 105327499 BLAKE2B 9c5c1cb804231b72521fce968cb1240b7c64e75621eb6577fe09f43186e90347339159e0cb95e772a936d4d6e82b2ae77126c263fbf25ab244db7e5639972c45 SHA512 f00ba9470d78fa5922e81a5ff2e53927d2a2ec7d08ab543abf4b236ff9fb8761b060083025fc410f72c0ff48c75c915dd3561a3869dc4a2de0f8900e19af0976
 DIST unifi-5.9.32.zip 105373782 BLAKE2B c15b576fe745f1d8f2783a50a0265378a0b4947654ab79e1ba2526dfade73eb83890118d8a97d1d186539a428fc6705943e19cecde583b73c2f098575f3496f0 SHA512 c0269c9e9be723eb19dc541dbb7547b284082792c41c6a8012b677ca83e562848024b95ebd6dbae95042bde07c41375907fd9b47e725f3ae8ece661bcd77a71a

diff --git a/net-wireless/unifi/unifi-5.10.5.ebuild b/net-wireless/unifi/unifi-5.10.5-r1.ebuild
similarity index 99%
rename from net-wireless/unifi/unifi-5.10.5.ebuild
rename to net-wireless/unifi/unifi-5.10.5-r1.ebuild
index 291cdbe3baf32f791aff2dd64b718ca04189beca..0d79c61ec8160f06026a5d7d3ec44b48a8a5afe2 100644 (file)
--- a/net-wireless/unifi/unifi-5.10.5.ebuild
+++ b/net-wireless/unifi/unifi-5.10.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
 KEYWORDS=""
 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.9"
+SLOT="0/5.10"
 IUSE="systemd"
 
 RDEPEND="dev-db/mongodb

diff --git a/net-wireless/unifi/unifi-5.8.29.ebuild b/net-wireless/unifi/unifi-5.8.29.ebuild
deleted file mode 100644 (file)
index 2fee194..0000000
--- a/net-wireless/unifi/unifi-5.8.29.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this for unstable, beta or release candidate
-RC_SUFFIX="-ff003bb0ce"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.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.8"
-IUSE="systemd"
-
-RDEPEND="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"
-
-pkg_setup() {
-       enewgroup unifi
-       enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-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
-}

diff --git a/net-wireless/unifi/unifi-5.8.30.ebuild b/net-wireless/unifi/unifi-5.8.30.ebuild
deleted file mode 100644 (file)
index f9f4e14..0000000
--- a/net-wireless/unifi/unifi-5.8.30.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this for unstable, beta or release candidate
-RC_SUFFIX="-d628c2e01d"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.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.8"
-IUSE="systemd"
-
-RDEPEND="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"
-
-pkg_setup() {
-       enewgroup unifi
-       enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-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
-}