gui-wm/sway: 1.0 bump

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>

diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index f56060dabc84210cc63569860ea771dedfc337ea..1ba4ab63b78fcc4551b84ea2c62f0d880224af33 100644 (file)
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,3 +1,4 @@
+DIST sway-1.0.tar.gz 5474548 BLAKE2B bea0a72c374b75f027e466d83e8c06abe32205e0cda80776b0e48e327a6da4e965a6a575595e5a38bcb125294c509b5d9a1db17604dd9e9032acef404366bdb9 SHA512 57e2610244c8bcd2b09bb5396113176d118ee5a0688aea297d4c191eda70ce29b36ff64e05c57d1a32a31cc4f2ac2562fd3cb3890508a8f3c7cbcb9fb017171d
 DIST sway-1.0_rc1.tar.gz 5461910 BLAKE2B a9b3a14dfbb40a616b58fce896f0088dfc722e942129e12e7dae3f2121cb84ffcd565902ee49712275e01d6b6a344642d85d8cf394a35b151725dcc94d19b40d SHA512 6532bae679774fcdb1bcc3044740ff5c56f5f6a007a08e910f4d9ee43ac0488be7666a87106b493923432f975088c90ff47369fa1a01c5e1cb67d3a1f9b74bce
 DIST sway-1.0_rc2.tar.gz 5462530 BLAKE2B 95868df3d03a61be33e04602d6891a2827cd1b5eab08644f74e04c3cbae39e686ee046be5ae9762595774fd22190e2460e246b564db92c50509ad61a16bb0835 SHA512 78c93f2326952d9e56ebf38f5d6b646934230b1bf5fac50cf35f16b2c1753ffa31dd9ec874a05025ed0d1d828b9a8643c78e739abbcfba55301255b3d0ed4a3e
 DIST sway-1.0_rc3.tar.gz 5463453 BLAKE2B 2db52506e6f07f92ab02c48e0cc1b08bad55f355989226f07ed43392f3bfdc088cdd9183b76e349eb83eff331e5236456c1189208619748a9d78ed5ea8de7652 SHA512 95966bfc7431345a6c4c12bf4aa11980f56acc70fc902aa489bb88368bc5412953780ebaa9eae27908dbabf0ed96881ce3bf00cd51879815631b463801ce11cf

diff --git a/gui-wm/sway/sway-1.0.ebuild b/gui-wm/sway/sway-1.0.ebuild
new file mode 100644 (file)
index 0000000..0c25852
--- /dev/null
+++ b/gui-wm/sway/sway-1.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils meson
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="https://swaywm.org"
+
+if [[ ${PV} == 9999 ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+       MY_PV=${PV/_rc/-rc}
+       SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~x86"
+       S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )
+       tray? ( || ( elogind systemd ) )"
+
+DEPEND="
+       >=dev-libs/json-c-0.13:0=
+       >=dev-libs/libinput-1.6.0:0=
+       dev-libs/libpcre
+       dev-libs/wayland
+       x11-libs/cairo
+       x11-libs/libxkbcommon
+       x11-libs/pango
+       x11-libs/pixman
+       elogind? ( >=sys-auth/elogind-239 )
+       swaybar? ( x11-libs/gdk-pixbuf:2 )
+       swaybg? ( x11-libs/gdk-pixbuf:2 )
+       swayidle? ( gui-apps/swayidle )
+       swaylock? ( gui-apps/swaylock )
+       systemd? ( >=sys-apps/systemd-239 )
+       X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+       DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]"
+else
+       DEPEND+=">=gui-libs/wlroots-0.5.0[elogind=,systemd=,X=]"
+fi
+RDEPEND="
+       x11-misc/xkeyboard-config
+       ${DEPEND}
+"
+BDEPEND="
+       >=dev-libs/wayland-protocols-1.14
+       virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+       BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+       BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
+fi
+
+src_prepare() {
+       default
+
+       use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
+               -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
+       use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
+       use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
+               -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
+       use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
+               -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
+}
+
+src_configure() {
+       local emesonargs=(
+               -Dman-pages=$(usex man enabled disabled)
+               -Dtray=$(usex tray enabled disabled)
+               -Dxwayland=$(usex X enabled disabled)
+               $(meson_use wallpapers default-wallpaper)
+               $(meson_use fish-completion fish-completions)
+               $(meson_use zsh-completion zsh-completions)
+               "-Dbash-completions=true"
+               "-Dwerror=false"
+       )
+
+       if use swaybar || use swaybg; then
+               emesonargs+=("-Dgdk-pixbuf=enabled")
+       else
+               emesonargs+=("-Dgdk-pixbuf=disabled")
+       fi
+
+       meson_src_configure
+}
+
+pkg_preinst() {
+       if ! use systemd && ! use elogind; then
+               fowners root:0 /usr/bin/sway
+               fperms 4511 /usr/bin/sway
+       fi
+}
+
+pkg_postinst() {
+       if ! use systemd && ! use elogind; then
+               elog ""
+               elog "If you use ConsoleKit2, remember to launch sway using:"
+               elog "exec ck-launch-session sway"
+               elog ""
+               elog "If your system does not set the XDG_RUNTIME_DIR environment"
+               elog "variable, you must set it manually to run Sway. See wiki"
+               elog "for details: https://wiki.gentoo.org/wiki/Sway"
+       fi
+}

diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 9a8de212b485271613018d87d229f93f5249834f..0c258524b1508967b161354656ff3a6f08498139 100644 (file)
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="
 if [[ ${PV} == 9999 ]]; then
        DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]"
 else
-       DEPEND+=">=gui-libs/wlroots-0.4.1[elogind=,systemd=,X=]"
+       DEPEND+=">=gui-libs/wlroots-0.5.0[elogind=,systemd=,X=]"
 fi
 RDEPEND="
        x11-misc/xkeyboard-config
@@ -53,12 +53,11 @@ RDEPEND="
 BDEPEND="
        >=dev-libs/wayland-protocols-1.14
        virtual/pkgconfig
-       man? ( >=app-text/scdoc-1.8.1 )
 "
 if [[ ${PV} == 9999 ]]; then
-       BDEPEND+="~app-text/scdoc-9999"
+       BDEPEND+="man? ( ~app-text/scdoc-9999 )"
 else
-       BDEPEND+=">=app-text/scdoc-1.9.3"
+       BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
 fi
 
 src_prepare() {