commit: 7363a32a6f2e815d9091ced5f10a8cace4b0b053 Author: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Tue Jul 23 20:57:07 2024 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Tue Jul 23 20:59:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7363a32a
gui-apps/ReGreet: fix user in systemd-tmpfiles.conf Closes: https://bugs.gentoo.org/936294 Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com> gui-apps/ReGreet/Manifest | 2 +- .../{ReGreet-0.1.1-r6.ebuild => ReGreet-0.1.1-r7.ebuild} | 12 ++++++++---- gui-apps/ReGreet/ReGreet-9999.ebuild | 6 +++++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gui-apps/ReGreet/Manifest b/gui-apps/ReGreet/Manifest index b36b892f3..bd10181aa 100644 --- a/gui-apps/ReGreet/Manifest +++ b/gui-apps/ReGreet/Manifest @@ -1,4 +1,4 @@ -DIST ReGreet.tar.gz 62289 BLAKE2B 3ef05c0da2c8974dbdbfa6a73a3be96340d517f2510c075e2587f977a6a16125d40815a8d837e54ad0b08f968124861911ed424ff1eba662141608aebca03169 SHA512 c2276c9ee3699974a5ebdefe811bfdb15d5642f6d3d20f6ea6b4f5ce3b40a9691ed42441e50f506a503ef523b894ff28d1746844b26bc32dff5db18a1d5e8150 +DIST ReGreet-0.1.1.tar.gz 62289 BLAKE2B 3ef05c0da2c8974dbdbfa6a73a3be96340d517f2510c075e2587f977a6a16125d40815a8d837e54ad0b08f968124861911ed424ff1eba662141608aebca03169 SHA512 c2276c9ee3699974a5ebdefe811bfdb15d5642f6d3d20f6ea6b4f5ce3b40a9691ed42441e50f506a503ef523b894ff28d1746844b26bc32dff5db18a1d5e8150 DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 DIST ahash-0.8.7.crate 42894 BLAKE2B 56f4b2f577eb2752e675fa2b3191c65e0bb88575f92e8d906714296fca1daace46e93256672fce08cc5b4ac11d40a690a06b32a99fb50fd0df4f042773c33b6c SHA512 2c9eaa22f7bda47a781994c769d4a2ef15ba0f511fdd4ec4680c13d4c1809f1ce01adecc3b3776793158062d28ad9e5f0b1d1c0a9429e43dd07cd99540eae7a6 diff --git a/gui-apps/ReGreet/ReGreet-0.1.1-r6.ebuild b/gui-apps/ReGreet/ReGreet-0.1.1-r7.ebuild similarity index 96% rename from gui-apps/ReGreet/ReGreet-0.1.1-r6.ebuild rename to gui-apps/ReGreet/ReGreet-0.1.1-r7.ebuild index cd024c04e..586490ae3 100644 --- a/gui-apps/ReGreet/ReGreet-0.1.1-r6.ebuild +++ b/gui-apps/ReGreet/ReGreet-0.1.1-r7.ebuild @@ -215,7 +215,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/rharish101/${PN}.git"; else SRC_URI=" - https://github.com/rharish101/${PN}/archive/refs/tags/${PV}.tar.gz -> ${PN}.tar.gz + https://github.com/rharish101/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " KEYWORDS="~amd64" @@ -250,7 +250,7 @@ src_unpack() { git-r3_src_unpack cargo_live_src_unpack else - unpack "${PN}.tar.gz" + unpack "${P}.tar.gz" cargo_src_unpack fi } @@ -265,6 +265,10 @@ src_configure() { src_prepare() { default + + if use systemd; then + sed -i 's/greeter/greetd/g' "${S}/systemd-tmpfiles.conf" || die + fi } src_compile() { @@ -287,7 +291,7 @@ src_install() { cargo_src_install if use systemd; then - newtmpfiles "${WORKDIR}/${P}/systemd-tmpfiles.conf" regreet.conf + newtmpfiles "${S}/systemd-tmpfiles.conf" regreet.conf elif use openrc; then keepdir /var/log/regreet fowners greetd:greetd /var/log/regreet @@ -298,7 +302,7 @@ src_install() { fperms 0755 /var/cache/regreet fi # Install ReGreet template config file as a doc - dodoc "${WORKDIR}/${P}/regreet.sample.toml" + dodoc "${S}/regreet.sample.toml" # Create README.gentoo doc file readme.gentoo_create_doc diff --git a/gui-apps/ReGreet/ReGreet-9999.ebuild b/gui-apps/ReGreet/ReGreet-9999.ebuild index 27369bc3a..e4ca09f36 100644 --- a/gui-apps/ReGreet/ReGreet-9999.ebuild +++ b/gui-apps/ReGreet/ReGreet-9999.ebuild @@ -215,7 +215,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/rharish101/${PN}.git"; else SRC_URI=" - https://github.com/rharish101/${PN}/archive/refs/tags/${PV}.tar.gz -> ${PN}.tar.gz + https://github.com/rharish101/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz ${CARGO_CRATE_URIS} " KEYWORDS="~amd64" @@ -263,6 +263,10 @@ src_configure() { src_prepare() { default + + if use systemd; then + sed -i 's/greeter/greetd/g' "${S}/systemd-tmpfiles.conf" || die + fi } src_compile() {
