From d9b3cd854ae51e89d1ac37ccd6a4b0b9860a4cc5 Mon Sep 17 00:00:00 2001
From: Ultrabug <ultrabug@gentoo.org>
Date: Wed, 16 Sep 2020 13:26:43 +0200
Subject: app-admin/scylla-manager-agent: fix systemd user

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
---
 app-admin/scylla-manager-agent/Manifest                | 18 +++++++++---------
 .../scylla-manager-agent-2.1.2.ebuild                  | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app-admin/scylla-manager-agent/Manifest b/app-admin/scylla-manager-agent/Manifest
index bfbaf24..b777147 100644
--- a/app-admin/scylla-manager-agent/Manifest
+++ b/app-admin/scylla-manager-agent/Manifest
@@ -5,19 +5,19 @@ AUX scylla-manager-agent.initd 755 BLAKE2B 3e7f53f21944774af391cba38117f695ebd57
 DIST scylla-manager-agent-2.1.0-0.20200611.9be1c609.x86_64.rpm 12554832 BLAKE2B 6cb55b231f768ac6a9f73106b9c042fd3593908047ec93218eaa24b722209027971974a5d36db7e0bcb0505ed3f567571d8eda00c1dd57338764f71f34342e7d SHA512 420d9e170e7b0d978efd8fc1a7774b8359f7b3d756fb4a8ae823e3cdbcfc14bc26b31dc99d699a189fa6a2b609b7dd10024fca3852dfe2e73a11afc2a0f80599
 DIST scylla-manager-agent-2.1.2-0.20200816.76cc4dcc.x86_64.rpm 12555372 BLAKE2B 9fb8839094f7a20a4393ec588c1a3bb09131ac1a364600acdab0e85d5e2ac8ad476fa9aa8028d199b0582c52bc37cbc43a41698adb7d8f863e110e42c7e682e1 SHA512 bacc8cc537c03bfa21e836c8f5cb9614fbcf82ef3dcc7098815da63a2245383c3f9cefc7182dc1ce144e3cdade83fd3c45404ce98a1e774de0c462ad0f3fe14a
 EBUILD scylla-manager-agent-2.1.0.ebuild 1100 BLAKE2B e251e04ba6d590c871900ff3e24f88dc50bac94ed9435d516fbdfdb8c407e8d2f8cef7b5008797a7e0596da96d8f7bcd025ed3c26bb1c94a57ed2e50e7cb5eb7 SHA512 e26318a55a9edc225c9ca2376a4ae60cad58f37f3c991654c302231200dc8aee2a15a28e7d6667724cf4b3d61213636c88fc217b505412680570ada1dcf02796
-EBUILD scylla-manager-agent-2.1.2.ebuild 1100 BLAKE2B 6d1bb7039f30a745dccc9ec6175bca167919b62cff361be57fcc5de90ec81cc1e23a9486906595cf2c5ae89ed713227c372ebc851e064083bba2977aecc01a16 SHA512 9d9f566cd8dc318db317c0dab5ed58ffa3a72d0fdb8e9967f4fcb407998a7dac1a6f442b4e2b40b2393ccaf919b552c6c7fdbd2ac720f93a834feaeef03e78cb
+EBUILD scylla-manager-agent-2.1.2.ebuild 1324 BLAKE2B 23007eb0bb53e84719de91b2fbfa27f373ce9381b826c802ae2f43c09b93b8512745756116f9f3b438140735cbe73ea7c94339f6c3098a9414a21664a1668c77 SHA512 d510472d43f26f192700e35ee1012a9dd05f224b4c22225226e62107e86e9cad47b277f2042c9c2451a9fb9aeefa00a8a59fa6bb8dac020e4b30e4917ce54ba4
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl9h82ZfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl9h9ldfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy9+kggAwmvqwMQdEzcUP5O3NijwxJd4wo1LrFETUQsB051kgRbkUKHTvCZSBTvd
-29yjQRGhUHN79UI65XJlSGaIB+rrGwi5snUKMpwANxwsw4BQtPsbO5zk0ovP6bqq
-QIZ/KVJUSWF5ThuYaEJqHvCwVGXxPSj4ClUByAxocDkR41QFchLAZrGXyODk2NGA
-+5aW3mvpQzkrXahVSx1DzkK+6gLMUFOeGztJ5cjbkP893NqSwzv67Mkg0HFXul+4
-53hWUTAkEMFQBdSjQxgBiYZTIxAEYKQap/hWQ34SeakHDmq0mw5Dxpvlj9mIZpD9
-JmTJy2GRQ1/N/rW7UFSaNlj40teTsA==
-=5wT+
+dy+nNAf6AtS7X/2H8OLH1ZjS8nLizLJXTrbj6mJoPch/I68DrMhGIcDoZo+v/ytr
+M32hy3PRp4F/vp0v1U2qiS91+RVbQAppr6dh8qqLcY5B4wHGjIqW24QyRt2j5rAV
+9DXUEQfPNhhMGzBMlzgLtczcNRjVPUAmeG8sBCHUWacKkkPDG465L9RFa1m211XR
+CYSSiJcDjzqLFg8+lkZNVMZuayROMTXI2KDmFY76ElWcCajpNPYLr2U4IACXud7a
+Fim62WQeGkEdIbZvpgFj3jPq5BMoK2NXOHaPEahmsU7GgMURtmUUYuwdp4SCbxLO
++lvcZuNxwB4LwNRe17mQVsPQ2hky+w==
+=olb6
 -----END PGP SIGNATURE-----
diff --git a/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild b/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild
index 94f0edc..8c71da9 100644
--- a/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild
+++ b/app-admin/scylla-manager-agent/scylla-manager-agent-2.1.2.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 RESTRICT="fetch"
-S=${WORKDIR}
+S="${WORKDIR}/${PN}-${MY_V}.x86_64"
 
 src_unpack() {
 	for rpm in ${A}; do
@@ -28,6 +28,14 @@ src_unpack() {
 	done
 }
 
+src_prepare() {
+	default
+	sed -e 's/User=scylla-manager/User=scylla/g' -i usr/lib/systemd/system/*.service || die
+	sed -e 's/Group=scylla-manager/User=scylla/g' -i usr/lib/systemd/system/*.service || die
+
+	rm -rf usr/share || die
+}
+
 src_install() {
 	default
 
@@ -35,12 +43,10 @@ src_install() {
 	fowners scylla:scylla "/var/lib/scylla-manager"
 
 	insinto /etc
-	doins -r */etc/*
-
-	rm -rf */usr/share || die
+	doins -r etc/*
 
 	insinto /usr
-	doins -r */usr/*
+	doins -r usr/*
 
 	fperms +x /usr/bin/scylla-manager-agent
 	fperms +x /usr/lib/scylla-manager/scyllamgr_agent_setup
-- 
cgit v1.2.3-65-gdbad