[gentoo-commits] repo/gentoo:master commit in: gui-wm/sway/

[Matthew Thode]

commit:     557b3181070270fefe2b0fc6cc754a3660ea5fb2
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 14:37:37 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:50:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557b3181

gui-wm/sway: 1.5 bump

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 gui-wm/sway/Manifest                                 | 2 +-
 gui-wm/sway/{sway-1.5_rc1.ebuild => sway-1.5.ebuild} | 6 ++++--
 gui-wm/sway/sway-9999.ebuild                         | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index d8c7edcc2d3..6dee4daad21 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,2 +1,2 @@
 DIST sway-1.4.tar.gz 5514489 BLAKE2B 
31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971
 SHA512 
3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71
-DIST sway-1.5_rc1.tar.gz 5535472 BLAKE2B 
54ecad147a7ce262231196afd8853bef2093e43516b89397d3fdaeb891beafeab29ca23aa12de02801b875330864261454a63593c881a25a12f85c0dedecd200
 SHA512 
0841122414d719ba183caf4c4ecb314d8a262a091e674f6884ed2f4f37f1e922f1415ecf985e81c785d5646481628f14c684523087a2dd7664628120be423a28
+DIST sway-1.5.tar.gz 5535966 BLAKE2B 
e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9
 SHA512 
702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4

diff --git a/gui-wm/sway/sway-1.5_rc1.ebuild b/gui-wm/sway/sway-1.5.ebuild
similarity index 94%
rename from gui-wm/sway/sway-1.5_rc1.ebuild
rename to gui-wm/sway/sway-1.5.ebuild
index 86f96883dab..08f025b76e3 100644
--- a/gui-wm/sway/sway-1.5_rc1.ebuild
+++ b/gui-wm/sway/sway-1.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
        MY_PV=${PV/_rc/-rc}
        SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
-       #KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+       KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
        S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
@@ -47,7 +47,8 @@ if [[ ${PV} == 9999 ]]; then
        DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
 else
        DEPEND+="
-               ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+               >=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
+               <gui-libs/wlroots-0.12.0:=[elogind=,systemd=,X=]
        "
 fi
 RDEPEND="
@@ -56,6 +57,7 @@ RDEPEND="
 "
 BDEPEND="
        >=dev-libs/wayland-protocols-1.14
+       >=dev-util/meson-0.53.0
        virtual/pkgconfig
 "
 if [[ ${PV} == 9999 ]]; then

diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index bf84713b3e9..08f025b76e3 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -47,8 +47,8 @@ if [[ ${PV} == 9999 ]]; then
        DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
 else
        DEPEND+="
-               >=gui-libs/wlroots-0.10.0:=[elogind=,systemd=,X=]
-               <gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
+               >=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
+               <gui-libs/wlroots-0.12.0:=[elogind=,systemd=,X=]
        "
 fi
 RDEPEND="
@@ -57,6 +57,7 @@ RDEPEND="
 "
 BDEPEND="
        >=dev-libs/wayland-protocols-1.14
+       >=dev-util/meson-0.53.0
        virtual/pkgconfig
 "
 if [[ ${PV} == 9999 ]]; then