commit:     ea69e24ce5d887004269e25c7d8d73b23ceebb6b
Author:     Kirill Chibisov <contact <AT> kchibisov <DOT> com>
AuthorDate: Tue Sep  1 14:45:37 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 01:52:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea69e24c

gui-apps/gtkgreet: various fixes

This commit fixes the git url for live ebuild, since the one that
was there before was giving 404, and it also makes 'gtk-layer-shell'
optional via existing 'layershell' use flag.

Signed-off-by: Kirill Chibisov <contact <AT> kchibisov.com>
Package-Manager: Portage-3.0.5, Repoman-2.3.23
Closes: https://github.com/gentoo/gentoo/pull/17360
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gui-apps/gtkgreet/{gtkgreet-0.6.ebuild => gtkgreet-0.6-r1.ebuild} | 7 ++++---
 gui-apps/gtkgreet/gtkgreet-9999.ebuild                            | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gui-apps/gtkgreet/gtkgreet-0.6.ebuild 
b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
similarity index 74%
rename from gui-apps/gtkgreet/gtkgreet-0.6.ebuild
rename to gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
index 9bd30fd0243..8cbbbaaad70 100644
--- a/gui-apps/gtkgreet/gtkgreet-0.6.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
@@ -10,9 +10,10 @@ inherit meson
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
-       EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet.git";
+       EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet";
 else
-       SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
+       MY_PV=${PV/_rc/-rc}
+       
SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -22,7 +23,7 @@ IUSE="+layershell +man"
 
 DEPEND="
        dev-libs/json-c:=
-       gui-libs/gtk-layer-shell
+       layershell? ( gui-libs/gtk-layer-shell )
        x11-libs/gtk+:3
 "
 RDEPEND="

diff --git a/gui-apps/gtkgreet/gtkgreet-9999.ebuild 
b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
index 9bd30fd0243..bc41aaec11f 100644
--- a/gui-apps/gtkgreet/gtkgreet-9999.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
@@ -10,7 +10,7 @@ inherit meson
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
-       EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet.git";
+       EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet";
 else
        SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
        KEYWORDS="~amd64 ~ppc64 ~x86"
@@ -22,7 +22,7 @@ IUSE="+layershell +man"
 
 DEPEND="
        dev-libs/json-c:=
-       gui-libs/gtk-layer-shell
+       layershell? ( gui-libs/gtk-layer-shell )
        x11-libs/gtk+:3
 "
 RDEPEND="

Reply via email to