summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@gentoo.org>2019-09-12 11:43:36 -0400
committerCraig Andrews <candrews@gentoo.org>2019-10-08 10:23:56 -0400
commit1a7287dd77efdbc5986dbf5f39a040aab82761f4 (patch)
tree644a1f3c9166187067f3ce73319fdb7f1231adac /net-analyzer/netdata/netdata-9999.ebuild
parentacct-user/netdata: add 'netdata' user (UID 290) (diff)
downloadgentoo-1a7287dd77efdbc5986dbf5f39a040aab82761f4.tar.gz
gentoo-1a7287dd77efdbc5986dbf5f39a040aab82761f4.tar.bz2
gentoo-1a7287dd77efdbc5986dbf5f39a040aab82761f4.zip
net-analyzer/netdata: Use GLEP 81 for user/group instead of user eclass
Closes: https://github.com/gentoo/gentoo/pull/12910 Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Craig Andrews <candrews@gentoo.org>
Diffstat (limited to 'net-analyzer/netdata/netdata-9999.ebuild')
-rw-r--r--net-analyzer/netdata/netdata-9999.ebuild18
1 files changed, 7 insertions, 11 deletions
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index b12cc034edfb..cf406dbe2d87 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-inherit autotools fcaps linux-info python-r1 systemd user
+inherit autotools fcaps linux-info python-r1 systemd
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
@@ -27,6 +27,8 @@ REQUIRED_USE="
# most unconditional dependencies are for plugins.d/charts.d.plugin:
RDEPEND="
+ acct-group/netdata
+ acct-user/netdata
app-misc/jq
>=app-shells/bash-4:0
|| (
@@ -73,18 +75,12 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig"
-: ${NETDATA_USER:=netdata}
-: ${NETDATA_GROUP:=netdata}
-
FILECAPS=(
'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
)
pkg_setup() {
linux-info_pkg_setup
-
- enewgroup ${PN}
- enewuser ${PN} -1 -1 / ${PN}
}
src_prepare() {
@@ -95,7 +91,7 @@ src_prepare() {
src_configure() {
econf \
--localstatedir="${EPREFIX}"/var \
- --with-user=${NETDATA_USER} \
+ --with-user=netdata \
--disable-jsonc \
$(use_enable cups plugin-cups) \
$(use_enable dbengine) \
@@ -114,13 +110,13 @@ src_install() {
# Remove unneeded .keep files
find "${ED}" -name ".keep" -delete || die
- fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/log/netdata
+ fowners -Rc netdata:netdata /var/log/netdata
keepdir /var/log/netdata
- fowners -Rc ${NETDATA_USER}:${NETDATA_GROUP} /var/lib/netdata
+ fowners -Rc netdata:netdata /var/lib/netdata
keepdir /var/lib/netdata
keepdir /var/lib/netdata/registry
- fowners -Rc root:${NETDATA_GROUP} /usr/share/${PN}
+ fowners -Rc root:newdata /usr/share/${PN}
newinitd system/netdata-openrc ${PN}
systemd_dounit system/netdata.service