commit: c8304ce9c031cbe83e54296013e9ddbc312d4cd6 parent 2233eeeb79eb0469a625d39b05511c110e0e095c Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Sun, 18 Dec 2022 18:30:48 +0100 gui-wm/sway: remove 1.7_rc1, add 1.8_rc3Diffstat:
| M | gui-wm/sway/Manifest | 2 | +- |
| D | gui-wm/sway/sway-1.7_rc1.ebuild | 94 | ------------------------------------------------------------------------------- |
| A | gui-wm/sway/sway-1.8_rc3.ebuild | 113 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
3 files changed, 114 insertions(+), 95 deletions(-)diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest@@ -1 +1 @@ -DIST sway-1.7_rc1.tar.gz 5558544 BLAKE2B 04efec79b5bbb6aaa26ab1952f2ca2cd29880623004d1bcad3d1965c518af1d6affb16010a5b3128e2a2c32deb7089d8bd784ded7ccbed25a4637fb3914de0ae SHA512 a8d6b94d51736fd894b5eb660a3a9ff9800d0626aaf16e5b0f7e52569f249f7ddafed6500b977fde64dd275807b4ac187c2bfae8df452e696835424685dad9e7 +DIST sway-1.8_rc3.tar.gz 5577115 BLAKE2B 744ca5e8bce4ca3061ab7cd95d8b968d73717345c3a844d16042ba63bb77c98fd0c315178507b8e791f30dbb682594d6383d5f5ff04f7b960a359af7032bf581 SHA512 6de80c4fae8cbf7bbd433d1ccc5c4834acfec1730247442f8495305dfd581597629850a74a8798f711871ff9d98c70b8aee4651bb39ca1eb61cf4f81b06b10b2diff --git a/gui-wm/sway/sway-1.7_rc1.ebuild b/gui-wm/sway/sway-1.7_rc1.ebuild@@ -1,94 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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="" - S="${WORKDIR}/${PN}-${MY_PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X" - -DEPEND=" - >=dev-libs/json-c-0.13:0= - >=dev-libs/libinput-1.6.0:0= - sys-auth/seatd:= - dev-libs/libpcre - dev-libs/wayland - x11-libs/cairo - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - media-libs/mesa[gles2,libglvnd(+)] - swaybar? ( x11-libs/gdk-pixbuf:2 ) - swaybg? ( gui-apps/swaybg ) - swayidle? ( gui-apps/swayidle ) - swaylock? ( gui-apps/swaylock ) - wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) - X? ( x11-libs/libxcb:0= ) -" -if [[ ${PV} == 9999 ]]; then - DEPEND+="~gui-libs/wlroots-9999:=[X=]" -else - DEPEND+=" - >=gui-libs/wlroots-0.15:=[X=] - <gui-libs/wlroots-0.16:=[X=] - " -fi -RDEPEND=" - x11-misc/xkeyboard-config - ${DEPEND} -" -BDEPEND=" - >=dev-libs/wayland-protocols-1.14 - >=dev-util/meson-0.60.0 - 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 swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \ - -e "/completions\/[a-z]\+\/_\?swaymsg/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) - -Dfish-completions=true - -Dzsh-completions=true - -Dbash-completions=true - -Dwerror=false - -Dswaybar=$(usex swaybar true false) - -Dswaynag=$(usex swaybar true false) - ) - - if use swaybar; then - emesonargs+=( -Dgdk-pixbuf=enabled ) - else - emesonargs+=( -Dgdk-pixbuf=disabled ) - fi - - meson_src_configure -}diff --git a/gui-wm/sway/sway-1.8_rc3.ebuild b/gui-wm/sway/sway-1.8_rc3.ebuild@@ -0,0 +1,113 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson optfeature + +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="" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="grimshot +man +swaybar +swaynag tray wallpapers X" + +DEPEND=" + >=dev-libs/json-c-0.13:0= + >=dev-libs/libinput-1.6.0:0= + sys-auth/seatd:= + dev-libs/libpcre2 + >=dev-libs/wayland-1.20.0 + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + media-libs/mesa[gles2,libglvnd(+)] + swaybar? ( x11-libs/gdk-pixbuf:2 ) + tray? ( || ( + sys-apps/systemd + sys-auth/elogind + sys-libs/basu + ) ) + wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] ) + X? ( x11-libs/libxcb:0= ) +" +if [[ ${PV} == 9999 ]]; then + DEPEND+="~gui-libs/wlroots-9999:=[X?]" +else + DEPEND+=" + >=gui-libs/wlroots-0.16:=[X?] + <gui-libs/wlroots-0.17:=[X?] + " +fi +RDEPEND=" + x11-misc/xkeyboard-config + grimshot? ( + app-misc/jq + gui-apps/grim + gui-apps/slurp + gui-apps/wl-clipboard + x11-libs/libnotify + ) + ${DEPEND} +" +BDEPEND=" + >=dev-libs/wayland-protocols-1.24 + >=dev-util/meson-0.60.0 + virtual/pkgconfig +" +if [[ ${PV} == 9999 ]]; then + BDEPEND+="man? ( ~app-text/scdoc-9999 )" +else + BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )" +fi +REQUIRED_USE="tray? ( swaybar )" + +src_configure() { + local emesonargs=( + $(meson_feature man man-pages) + $(meson_feature tray) + $(meson_feature X xwayland) + $(meson_feature swaybar gdk-pixbuf) + $(meson_use swaynag) + $(meson_use swaybar) + $(meson_use wallpapers default-wallpaper) + -Dfish-completions=true + -Dzsh-completions=true + -Dbash-completions=true + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + if use grimshot; then + doman contrib/grimshot.1 + dobin contrib/grimshot + fi +} + +pkg_postinst() { + optfeature_header "There are several packages that may be useful with sway:" + optfeature "wallpaper utility" gui-apps/swaybg + optfeature "idle management utility" gui-apps/swayidle + optfeature "simple screen locker" gui-apps/swaylock + optfeature "lightweight notification daemon" gui-apps/mako + echo + einfo "For a list of additional addons and tools usable with sway please" + einfo "visit the offical wiki at:" + einfo "https://github.com/swaywm/sway/wiki/Useful-add-ons-for-sway" + einfo "Please note that some of them might not (yet) available on gentoo" +}