app-metrics/queuemetrics, app-metrics/uniloader: port to acct-*

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>

7 files changed, 18 insertions, 22 deletions

diff --git a/app-metrics/queuemetrics/Manifest b/app-metrics/queuemetrics/Manifest
index b6e7c3f..e7893fd 100644
--- a/app-metrics/queuemetrics/Manifest
+++ b/app-metrics/queuemetrics/Manifest
@@ -6,7 +6,7 @@ AUX queuemetrics.service.conf 1149 SHA256 c5e7f5a7347967eaba34af182d1e80873f4000
 AUX queuemetrics.socket 126 SHA256 a04679c03f2cd417cd03e6e6d233cdc749a4adc86cb04ad992c586ec52519496 SHA512 7c2040504c36b49970895bfaf4874977275a3e51aad36f065efbd3a956832f486f07b98d6ab2c521a77a3f67e8b494cf5600e4b7025e733d9304b1b614315dcc WHIRLPOOL af2836262d5e0e3b62929f7a46a054bdccf1e4299b0a95b934d10e45185cdf7536481fd6c41dc6fd244c027405db12a32cea1a8b9f6d1df94546492ff741c354
 AUX server.xml 1628 SHA256 6efaee54a0a4246a82e835ff94ec37906f0846b517bf066d0b728ce74d08298a SHA512 6e5134dbb9e616c01dd2f827002bd947875234d19bce8c320e0f279d56f46062ce77f0ade56cd29e87cfbba85fb02d1c0983c5e21b8621b1544d383bd53df1cc WHIRLPOOL 0ac36562cf9cd2b7f55f2293fbfed6a3f89f24c5572ae36ca59769ea90e4cdf2ac374dd9d7c8f71aeb7dbfe734c762fdf1bc1bcd580186763ae3adeb8fb66fe3
 DIST QueueMetrics-19.10.10.tar.gz 16191044 SHA256 fe25199d37f0b59785ac8b2965cc22de50f1e450ee9ef90a946f088b1007a1f3 SHA512 8097335aab1aac51b940deb8abf508013dc0a6b200f9acc61e9b6e307fd52e944634771336fb72be5e92dceafdf4e3816bce84846f1a99f9b5d6fb3e6bf198b6 WHIRLPOOL 4a501c0ed8cc605517365ab9dc57e9d790135871066890e4575214403fd0e82332a7b293ef3a4b734ee53b822d3672be26bafba7046172e76fba02176a822913
-DIST apache-tomcat-8.5.50.tar.gz 10305939 SHA256 ea762293e889f85d40f5ec14ac4474e133a379522d623f4ba5993da6260bf06e SHA512 ffca86027d298ba107c7d01c779318c05b61ba48767cc5967ee6ce5a88271bb6ec8eed60708d45453f30eeedddcaedd1a369d6df1b49eea2cd14fa40832cfb90 WHIRLPOOL 9c7874dcbfac53e6b9ccacee8bcb907c845888079d90147985238a2aa73e2f149d6eacbefc192e97864e81705c4117fc52b017954063db9d356565d1f0017d77
-EBUILD queuemetrics-19.10.10.ebuild 1983 SHA256 a49ef530748165d176808647aab94abab0bf4016fe673923ae9795c2db978881 SHA512 2ff5123b186040e071723c77d7db6c65a3be27aa351b7e0c4f55cd68af623d46792a84a3d391e370b89e246809571a988cfe5d02599f473062963a2ce9291ddc WHIRLPOOL 2d618346c2f6943530eb1dfbf29d6022a00a5f2e89ba96730df76a1470fb5043495c51ea917958c2262253f46d8f46af17d28114a1cbe3f528cc04eadaa16326
+DIST apache-tomcat-8.5.51.tar.gz 10315164 SHA256 836ecd816605e281636cae78c5b494ccaeb168c24f8266a72e9e704b2204affe SHA512 bb9207d33d7b4408292186523f3556a3d1454ea172b4a6cde6e0028e2f7a5d9408615cb4ccf8d9fdb75a9f8ce227580f56f929a811eb24ef99e26f980e4bcb48 WHIRLPOOL 6b7e66a1976aa3cb6666ea63a7b473b02422c74fd1c511e78c2d42c76072cbda2f24d6436279d0d6ab4f34346ba1e6f58334715dd55b032aa8a3e2095af05700
+EBUILD queuemetrics-19.10.10.ebuild 1979 SHA256 c86d139b2b29ead65230d83a6bce889052b15f54b047413cad584e02fa29c170 SHA512 a1932df88df94fec025323bc9e1ed9af0ff86551121f1ca63909218c5949ea766994be069abc368509f92e34dc1ec9ab5be59efea611072e1368ff4893ea728e WHIRLPOOL cc2b9f2bac3a476449c00d9830f9c2b7cd946de6ff9efbd9601baec1aa582d8e6477c68dc92d53b1ddeca3ab6e619bfaa70c66c33cb93bab5e26e0ec2fe2f9fd
 MISC ChangeLog 4239 SHA256 f4fbba48dc3db8bb43ded545cd9b3940baa854c5e9edac9136ee7241111ab96d SHA512 da96d0ca914ec9e0f7430d086af70b0ae0ee8ca2fa844e3de0036cbce67f20ed4234e2c497187f38748241d138d706ead958081e156a5f0460de6ec45a19227f WHIRLPOOL 931adaead27a72a295209ec8cd064b50f6fe7410a11c282422d796407a4092ba6d10beab0d94268fea84f9cfd80dcfa645361fac944b691c2ab3febca6b4e5bb
 MISC metadata.xml 389 SHA256 3d4f1ca7609f74c3bddef49ce0d31edb1b23cd221ee6abe001abecaac65ec87e SHA512 52df615f053daaa05ae886a8c32149d4b714e7cb8e03804fc39b16160dd3f1381645c9d5a15ce113e875234fbecbf005879dd57bbb418eddfcc901354da498f2 WHIRLPOOL 506f357243b5b1bb8e427132b19b86865932dba8344c895debb1074fa301f308850ced982a2eb29c5becebfa788b5ed7465fd285e2bf53bae95a8d680fe8cc20
diff --git a/app-metrics/queuemetrics/queuemetrics-19.10.10.ebuild b/app-metrics/queuemetrics/queuemetrics-19.10.10.ebuild
index 2d1db1e..403c8ad 100644
--- a/app-metrics/queuemetrics/queuemetrics-19.10.10.ebuild
+++ b/app-metrics/queuemetrics/queuemetrics-19.10.10.ebuild
@@ -6,9 +6,9 @@
 
 EAPI=7
 
-inherit user systemd
+inherit systemd
 
-TOMCAT_VERSION="8.5.50"
+TOMCAT_VERSION="8.5.51"
 
 DESCRIPTION="A monitoring and reporting suite for asterisk based PBX"
 HOMEPAGE="https://www.queuemetrics.com"
@@ -20,16 +20,16 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+mysql uniloader"
 
-RDEPEND="virtual/jdk:1.8"
+
+RDEPEND="acct-group/queuemetrics
+	acct-user/queuemetrics
+	virtual/jdk:1.8"
 PDEPEND="mysql? ( virtual/mysql[server] )
 	uniloader? ( app-metrics/uniloader )"
 
 S="${WORKDIR}"
 
 pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-
 	if [ "$( cat /opt/queuemetrics/tomcat/VERSION )" != "${TOMCAT_VERSION}" ]
 	then
 		ewarn
diff --git a/app-metrics/uniloader/Manifest b/app-metrics/uniloader/Manifest
index 8e42509..f514cc3 100644
--- a/app-metrics/uniloader/Manifest
+++ b/app-metrics/uniloader/Manifest
@@ -4,9 +4,9 @@ DIST uniloader-0.6.0.tar.gz 12290148 SHA256 1fecf244b9fafefd9cb7012a98e0365d95ba
 DIST uniloader-0.6.5.tar.gz 12502438 SHA256 d804a25b93b58956f5a6936fc8a518dfc74f07db361b8f6852e097867ee087e3 SHA512 4e005f24545c46ed7db6b5833562974b2ded579f4251ef236aca38cc491e4ecf3aa9e4acf76d6416d7520925710714033eb5ed39bcdd71c6e0667f6f124e4a0c WHIRLPOOL e6be66205e2d1cfcbd81a7449dd7708b89a6454a6e151fcd0a4d3b87d21dceb22d43217b7697278a5cc83b2329692d040d9c3e3816fac6a25b8efe97403bcbd8
 DIST uniloader-0.6.6.tar.gz 12501344 SHA256 b3518b63de780ef675f115736ee2f4a1b80e077e996842beaf0a2abb8ed26c59 SHA512 16c14ff0acd17133b2052fb381017ff5a606c206c8e8ad4f65f257fde1c3eea175011726f2bed914b156872620b7e1839c69d956efa92a4b78c33c24cb3dd86c WHIRLPOOL c4dcfff5b32f91ee72156897b5510eba8619984c53ec8c4cb60028a277d5233717562fef4800d1736b22bdfbd3d45324224d009223004e71a1d2c0439e5b92f0
 DIST uniloader-0.6.7.tar.gz 12503997 SHA256 02e4b0b12bfeea08d0311f4f346ecf5d589e46e41087fefad115d1c91d0b4335 SHA512 d63b2945e4601fd7753d3f5c75424c0e5da3998fd2e11c7cea7e599163dc8f869fbabaa9ce6ff9ff06efa0cb09b6759348843089d2052c61901da4269b537f0f WHIRLPOOL ea9f1fb10466ca1f6a5075fb15ce98d2057300b0a6e8344058e77826996a1f16b31a84e66f9bca4a50b8e5d39584e64cbf63f3a12ba32709ffceb51a0682014d
-EBUILD uniloader-0.6.0.ebuild 912 SHA256 84d0d81b3f81b56c480c31c983401a4fd84c5f10ef0f8970c19229d93dd8f228 SHA512 156a0ca8682682a1e399d475a74356d76406b7f03e7fd4396d544e8a88658151fa33d2006a99bb9dfa26dede2cd7f3f525e2436518902be76322a3a2245ff280 WHIRLPOOL 6c0c728a289717e326fe37df03273bf9d25aad9559f1246d0f022466412d750d9bd1f4a1040b3e4880fc4f118176c441ce82cbce1b3de56dfdd1ea6eba7deae9
-EBUILD uniloader-0.6.5.ebuild 912 SHA256 84d0d81b3f81b56c480c31c983401a4fd84c5f10ef0f8970c19229d93dd8f228 SHA512 156a0ca8682682a1e399d475a74356d76406b7f03e7fd4396d544e8a88658151fa33d2006a99bb9dfa26dede2cd7f3f525e2436518902be76322a3a2245ff280 WHIRLPOOL 6c0c728a289717e326fe37df03273bf9d25aad9559f1246d0f022466412d750d9bd1f4a1040b3e4880fc4f118176c441ce82cbce1b3de56dfdd1ea6eba7deae9
-EBUILD uniloader-0.6.6.ebuild 912 SHA256 84d0d81b3f81b56c480c31c983401a4fd84c5f10ef0f8970c19229d93dd8f228 SHA512 156a0ca8682682a1e399d475a74356d76406b7f03e7fd4396d544e8a88658151fa33d2006a99bb9dfa26dede2cd7f3f525e2436518902be76322a3a2245ff280 WHIRLPOOL 6c0c728a289717e326fe37df03273bf9d25aad9559f1246d0f022466412d750d9bd1f4a1040b3e4880fc4f118176c441ce82cbce1b3de56dfdd1ea6eba7deae9
-EBUILD uniloader-0.6.7.ebuild 912 SHA256 84d0d81b3f81b56c480c31c983401a4fd84c5f10ef0f8970c19229d93dd8f228 SHA512 156a0ca8682682a1e399d475a74356d76406b7f03e7fd4396d544e8a88658151fa33d2006a99bb9dfa26dede2cd7f3f525e2436518902be76322a3a2245ff280 WHIRLPOOL 6c0c728a289717e326fe37df03273bf9d25aad9559f1246d0f022466412d750d9bd1f4a1040b3e4880fc4f118176c441ce82cbce1b3de56dfdd1ea6eba7deae9
+EBUILD uniloader-0.6.0.ebuild 912 SHA256 2d7421320b3f0bf5bf634dccfc9e7db52eea85191927fdd0d3071d46e9eabd61 SHA512 d6d5c1639b42b5defb3a9e5e1d3217c29fa90449ac39781c597b889e15728a7a095912f189fdd3157a3d4dfb4ec376313ecb732869108349ae310fe3241d4905 WHIRLPOOL c8411d1606f03822d94b79e1bc9285d69e3958a8c8e5298eef7045a6b435c5a2ef5a1201b163a8f1753f8b6376a09e08cace16cb3fc173c36bdb46f3a18b9e52
+EBUILD uniloader-0.6.5.ebuild 912 SHA256 2d7421320b3f0bf5bf634dccfc9e7db52eea85191927fdd0d3071d46e9eabd61 SHA512 d6d5c1639b42b5defb3a9e5e1d3217c29fa90449ac39781c597b889e15728a7a095912f189fdd3157a3d4dfb4ec376313ecb732869108349ae310fe3241d4905 WHIRLPOOL c8411d1606f03822d94b79e1bc9285d69e3958a8c8e5298eef7045a6b435c5a2ef5a1201b163a8f1753f8b6376a09e08cace16cb3fc173c36bdb46f3a18b9e52
+EBUILD uniloader-0.6.6.ebuild 912 SHA256 2d7421320b3f0bf5bf634dccfc9e7db52eea85191927fdd0d3071d46e9eabd61 SHA512 d6d5c1639b42b5defb3a9e5e1d3217c29fa90449ac39781c597b889e15728a7a095912f189fdd3157a3d4dfb4ec376313ecb732869108349ae310fe3241d4905 WHIRLPOOL c8411d1606f03822d94b79e1bc9285d69e3958a8c8e5298eef7045a6b435c5a2ef5a1201b163a8f1753f8b6376a09e08cace16cb3fc173c36bdb46f3a18b9e52
+EBUILD uniloader-0.6.7.ebuild 871 SHA256 f3c5a612a9ec068610e7fda33b707e8e09f5228e2efc8796d5d4d4d0eb27f3a3 SHA512 248f9edfb96998705c003e57790d27a41fab08ef8bd6912f7eecaab6816834f3fd6ef5aaca586e639a511875c8434f143e194d70ea82b40c5551ca91541f0519 WHIRLPOOL dced371e67ed1566a4c540072b8c11b0f6c1303caf7373b5081cf6d4e07262eeb0d024de1b9b0d72adc882127f0ed2653b96cdbb679813f9e39e457ee96a7b53
 MISC ChangeLog 698 SHA256 40795f51149fb14dc8f319cff867a8c9177e43da41f541458ec8fb27d13ada7f SHA512 7fe2996181155ff6d674bce69083452772c8bb12d46a2ef877f33d053c2b4c1150edc7033dfdd57fffaf9fd4b511c031eb474a3ba0462d154895c1f1277c015c WHIRLPOOL 89119bc414099e1ca8327bbea3eac469ec38be0441259dea3042186fb468243fdd117efdc9b5cb2bd2db18b9b9383bd0d9d30d1774bde7f7b7c830178fdc4f2f
 MISC metadata.xml 246 SHA256 7865004b5e3824d4a508188497473a0a56c96498237986c4f1f692151bf0a01e SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c WHIRLPOOL d7c29be66bc7bb8ea3a5c4948597ab70efd83982aaa759f621477aefa2a1203186473bc0ac961685249cf48560e011e1d457a934982c562392c289c85edd39a0
diff --git a/app-metrics/uniloader/uniloader-0.6.0.ebuild b/app-metrics/uniloader/uniloader-0.6.0.ebuild
index 9fc24b2..892d4e6 100644
--- a/app-metrics/uniloader/uniloader-0.6.0.ebuild
+++ b/app-metrics/uniloader/uniloader-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # DISCLAIMER:
diff --git a/app-metrics/uniloader/uniloader-0.6.5.ebuild b/app-metrics/uniloader/uniloader-0.6.5.ebuild
index 9fc24b2..892d4e6 100644
--- a/app-metrics/uniloader/uniloader-0.6.5.ebuild
+++ b/app-metrics/uniloader/uniloader-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # DISCLAIMER:
diff --git a/app-metrics/uniloader/uniloader-0.6.6.ebuild b/app-metrics/uniloader/uniloader-0.6.6.ebuild
index 9fc24b2..892d4e6 100644
--- a/app-metrics/uniloader/uniloader-0.6.6.ebuild
+++ b/app-metrics/uniloader/uniloader-0.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # DISCLAIMER:
diff --git a/app-metrics/uniloader/uniloader-0.6.7.ebuild b/app-metrics/uniloader/uniloader-0.6.7.ebuild
index 9fc24b2..3acc564 100644
--- a/app-metrics/uniloader/uniloader-0.6.7.ebuild
+++ b/app-metrics/uniloader/uniloader-0.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # DISCLAIMER:
@@ -6,8 +6,6 @@
 
 EAPI=7
 
-inherit user
-
 DESCRIPTION="A go-based program that uploads data to a local or remote QueueMetrics"
 HOMEPAGE="https://www.queuemetrics-live.com/uniloader.jsp"
 LICENSE="all-rights-reserved"
@@ -17,10 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-pkg_setup() {
-	enewgroup queuemetrics
-	enewuser queuemetrics -1 -1 -1 queuemetrics
-}
+RDEPEND="acct-group/queuemetrics
+	acct-user/queuemetrics"
 
 src_install() {
 	dodir /opt/${PN}/bin