From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- dev-libs/sway/Manifest | 6 ++- dev-libs/sway/metadata.xml | 5 ++ dev-libs/sway/sway-1.0_rc1.ebuild | 100 ++++++++++++++++++++++++++++++++++++++ dev-libs/sway/sway-9999.ebuild | 72 ++++++++++++++------------- 4 files changed, 146 insertions(+), 37 deletions(-) create mode 100644 dev-libs/sway/sway-1.0_rc1.ebuild (limited to 'dev-libs/sway') diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest index 0c3305748e6d..56df973ebbc0 100644 --- a/dev-libs/sway/Manifest +++ b/dev-libs/sway/Manifest @@ -1,8 +1,10 @@ DIST sway-0.15.2.tar.gz 5398956 BLAKE2B 6bb527e802b7837ef39cb1e29597d55fd33831231dbfb7f12225e50c38e49ae17d8bf2eb43672c195c6e074986d254b1680bac7c9d60b80b84feaf07e09718df SHA512 c457ace514f5c69ebd366d313cce93a76b199bb51c7540debc9c0586bff490401e6374f9725c784474afdfcca15bcab686a972c6c178117e45e2de83825ed370 DIST sway-1.0_beta1.tar.gz 5444424 BLAKE2B b2803b6770ac3fbb3c21b892a208008e60780b6002e983e6d144d4f97e04992d3a3e5589abe36042221d67a107e31f5e76ae193cbf3e36c71fcf027095140944 SHA512 745b16be7641446c54e1b8777be1f8a26e8275f7826590f594bf4a2001a6de42e394b602e1ccd26a1e8ebe256fde6f9b393f5560a1dd0a610867819076645c69 DIST sway-1.0_beta2.tar.gz 5454362 BLAKE2B 2cb7f3042a53879c962e7204917765b4a7a2e90f2a6a7eb6bbb63383e31d7526e71ad7ac4edd708c47a31f3166f70c1633719c9cddf5b751327da79b523d6780 SHA512 532acb6f1510578b7d9d222f04ff8104c836428ef215ddb6d7181839231d65101b3d47c8389a38f14cf59692116495b60759062ebd797edf83cf77aebaac379f +DIST sway-1.0_rc1.tar.gz 5461910 BLAKE2B a9b3a14dfbb40a616b58fce896f0088dfc722e942129e12e7dae3f2121cb84ffcd565902ee49712275e01d6b6a344642d85d8cf394a35b151725dcc94d19b40d SHA512 6532bae679774fcdb1bcc3044740ff5c56f5f6a007a08e910f4d9ee43ac0488be7666a87106b493923432f975088c90ff47369fa1a01c5e1cb67d3a1f9b74bce EBUILD sway-0.15.2.ebuild 1925 BLAKE2B f6c56c97ce70d2b01ad6b836894faccff11f0ed74a782ac4621b1ce544c0f167b1a632835842cc5ac97a6ea8c897f50f1b06a8fda5d33e279ebd62213a0eef97 SHA512 7fb00b02563b71dc818d46a7211687499eac1cd6a677a13d76b8e62f0c3394c4fe3a6fbf1e98dc1b36d9d7141e2410dc12e261832f71828612418d03664a22b2 EBUILD sway-1.0_beta1.ebuild 2512 BLAKE2B 11cc39dab4ce22ffe0e7103e052e2c4c039f0123347b4c92f6d09d45385619ee7f1b9d25d6ebe7de0c24352cdf46b3aac50abceae879cae7049e79d699e15fb2 SHA512 2c06f38eda3e672adfeb847e7d6f92870e15e4f100746265d03d062d01f372f8c84a60877a53d5f6d212c8c106888bb62d8ce630b8fdcbac2afe2d1f6c29fd6e EBUILD sway-1.0_beta2.ebuild 3023 BLAKE2B cfd076509a8d914293011e28b176663ea64678d466b31814f3daa8ab0a848fb32adbfb149b531559a64929c5bf8c3149c399ee4eaa6be9d0ddda8629ef3d8015 SHA512 09985ae6bcaa3a12f56791034af182fccce1b109041863fbb6a5ae5a1f1d034c25a6fc0c16fd1b2c492be7e01d6bcd08e3e90591729bf7e475cfb7467aa1643a -EBUILD sway-9999.ebuild 2994 BLAKE2B f641bd42370747f47e4a079fe4fd7e9ac9fda74b1b42f6ca85b84e40faa51f982a286fe9f4268ec98be41667d74bad87f622a69525c4305e638a01183d2a035b SHA512 e685c535a3edcb35508f828043b6ec92d2f3cb925cdeea3c4dc784ce3e27cc99996ec75d838a2d9688862f16fca1d8e02db4b1bbcd261473c24a3fe9f6fd7ffa -MISC metadata.xml 2669 BLAKE2B 398de74534eb7b959b61bb37665191d209f0b69351065756afa78d5247028402ad462d47399070b6093741e17a64aeaa7a21e34de55a22c5992c4972d009fb30 SHA512 6e83d7727329bbffa21dea9dc304e34d58fe1feb442ef5a808cb08d1d7949362e7a5eee26e67f2fc0be72dec184abad7e2fb743343157b66641d96915cc78626 +EBUILD sway-1.0_rc1.ebuild 2839 BLAKE2B f678b2a22f5c91f80a43306b943bda22b5a1a80b409e4efc0a6b744589898f2c6fcf880774bff509a8da3886d8a3b03bb2c952e14b6746a1a30a6c55102a482e SHA512 27d90cf3ca8341b573be8c40da8fc7534df8903b0e2911cf984cadb9af0f764b44f1913e4a68de22edd0f7d1376004d969cea69a1c6b547f436c08d9ea50f199 +EBUILD sway-9999.ebuild 2839 BLAKE2B f678b2a22f5c91f80a43306b943bda22b5a1a80b409e4efc0a6b744589898f2c6fcf880774bff509a8da3886d8a3b03bb2c952e14b6746a1a30a6c55102a482e SHA512 27d90cf3ca8341b573be8c40da8fc7534df8903b0e2911cf984cadb9af0f764b44f1913e4a68de22edd0f7d1376004d969cea69a1c6b547f436c08d9ea50f199 +MISC metadata.xml 2861 BLAKE2B 171bbc535d23e1837289cfe4cd1030f5094ec229276dd8ef1253a1959c118979a3faa2a1d47168375c6f901cb9ff05cfb65d8148140574eac932a02129b10b0f SHA512 8fdfd266c750edf35de7088e89488358272ad819bba539aa0f75f5bd01fe021c60e758080a0d45cade9a52969d8ddf16b70ab63ec6243a8b9ba7f6ddbf9cb2d0 diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml index cb1a5f1eeef6..ebb759791eb7 100644 --- a/dev-libs/sway/metadata.xml +++ b/dev-libs/sway/metadata.xml @@ -5,6 +5,10 @@ bman@gentoo.org Aaron Bauman + + prometheanfire@gentoo.org + Matthew Thode + hilobakho@gmail.com Mykyta Holubakha @@ -26,6 +30,7 @@ something else. + Install 'wl-clipboard': clipboard management Enable support for rootless session via elogind Use Linux capability SYS_CAP_ADMIN rather than set*id for sway binary Enable fish completion support diff --git a/dev-libs/sway/sway-1.0_rc1.ebuild b/dev-libs/sway/sway-1.0_rc1.ebuild new file mode 100644 index 000000000000..95621d2f0721 --- /dev/null +++ b/dev-libs/sway/sway-1.0_rc1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils fcaps 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/sway.git" +else + MY_PV=${PV/_rc/-rc} + SRC_URI="https://github.com/swaywm/sway/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${MY_PV}" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="bash-completion clipboard doc elogind fish-completion +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion" +REQUIRED_USE="?? ( elogind systemd )" + +RDEPEND=" + >=dev-libs/wlroots-0.3[elogind=,systemd=,X=] + >=dev-libs/json-c-0.13:0= + >=dev-libs/libinput-1.6.0:0= + dev-libs/libpcre + dev-libs/wayland + >=dev-libs/wayland-protocols-1.14 + x11-libs/cairo + x11-libs/libxkbcommon + x11-libs/pango + x11-libs/pixman + sys-libs/libcap + clipboard? ( dev-libs/wl-clipboard ) + elogind? ( >=sys-auth/elogind-239 ) + swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] ) + swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] ) + swayidle? ( dev-libs/swayidle ) + swaylock? ( dev-libs/swaylock ) + systemd? ( >=sys-apps/systemd-239 ) + tray? ( >=sys-apps/dbus-1.10 ) + X? ( x11-libs/libxcb:0= )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/wayland-protocols + doc? ( >=app-text/scdoc-1.8.1 ) + virtual/pkgconfig" + +FILECAPS=( cap_sys_admin usr/bin/sway ) + +src_prepare() { + default + + use swaybar || sed -e "s/subdir('swaybar')//g" -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=( + $(meson_use bash-completion bash-completions) + $(meson_use fish-completion fish-completions) + $(meson_use wallpapers default-wallpaper) + $(meson_use zsh-completion zsh-completions) + "-Dtray=$(usex tray enabled disabled)" + "-Dxwayland=$(usex X enabled disabled)" + "-Dwerror=false" + ) + if use swaybar || use swaybg; then + emesonargs+=("-Dgdk-pixbuf=enabled") + else + emesonargs+=("-Dgdk-pixbuf=disabled") + fi + if [[ ${PV} != 9999 ]]; then + emesonargs+=("-Dsway-version=${PV}") + fi + + meson_src_configure +} + +pkg_postinst() { + elog "You must be in the input group to allow sway to access input devices!" + local dbus_cmd="" + if use tray; then + dbus_cmd="dbus-launch --sh-syntax --exit-with-session " + fi + if ! use systemd && ! use elogind; then + fcaps_pkg_postinst + elog "" + elog "If you use ConsoleKit2, remember to launch sway using:" + elog "exec ck-launch-session ${dbus_cmd}sway" + fi +} diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild index 14be762b4b73..95621d2f0721 100644 --- a/dev-libs/sway/sway-9999.ebuild +++ b/dev-libs/sway/sway-9999.ebuild @@ -1,30 +1,30 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/swaywm/sway.git" - inherit git-r3 -else - # Version format: major.minor-beta.betanum - SWAY_PV="$(ver_cut 1-2)-$(ver_cut 3).$(ver_cut 4)" - SRC_URI="https://github.com/swaywm/sway/archive/${SWAY_PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/sway-${SWAY_PV}" - KEYWORDS="~amd64 ~x86" -fi - inherit eutils fcaps 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/sway.git" +else + MY_PV=${PV/_rc/-rc} + SRC_URI="https://github.com/swaywm/sway/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 +pam +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion" +IUSE="bash-completion clipboard doc elogind fish-completion +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion" REQUIRED_USE="?? ( elogind systemd )" -RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=] +RDEPEND=" + >=dev-libs/wlroots-0.3[elogind=,systemd=,X=] >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre @@ -34,18 +34,20 @@ RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=] x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman - elogind? ( >=sys-auth/elogind-237 ) + sys-libs/libcap + clipboard? ( dev-libs/wl-clipboard ) + elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] ) swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] ) - swaylock? ( - pam? ( virtual/pam ) - x11-libs/gdk-pixbuf:2[jpeg] - ) - systemd? ( >=sys-apps/systemd-237 ) + swayidle? ( dev-libs/swayidle ) + swaylock? ( dev-libs/swaylock ) + systemd? ( >=sys-apps/systemd-239 ) tray? ( >=sys-apps/dbus-1.10 ) X? ( x11-libs/libxcb:0= )" DEPEND="${RDEPEND}" -BDEPEND="app-text/scdoc +BDEPEND=" + dev-libs/wayland-protocols + doc? ( >=app-text/scdoc-1.8.1 ) virtual/pkgconfig" FILECAPS=( cap_sys_admin usr/bin/sway ) @@ -55,10 +57,6 @@ src_prepare() { use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die - use swayidle || sed -e "s/subdir('swayidle')//g" -e "/swayidle.[0-9].scd/d" \ - -e "/completions\/[a-z]\+\/_\?swayidle/d" -i meson.build || die - use swaylock || sed -e "s/subdir('swaylock')//g" -e "/swaylock.[0-9].scd/d" \ - -e "/completions\/[a-z]\+\/_\?swaylock/d" -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" \ @@ -67,13 +65,22 @@ src_prepare() { src_configure() { local emesonargs=( + $(meson_use bash-completion bash-completions) + $(meson_use fish-completion fish-completions) $(meson_use wallpapers default-wallpaper) $(meson_use zsh-completion zsh-completions) - $(meson_use fish-completion fish-completions) - $(meson_use X enable-xwayland) - "-Dbash-completions=true" + "-Dtray=$(usex tray enabled disabled)" + "-Dxwayland=$(usex X enabled disabled)" "-Dwerror=false" ) + if use swaybar || use swaybg; then + emesonargs+=("-Dgdk-pixbuf=enabled") + else + emesonargs+=("-Dgdk-pixbuf=disabled") + fi + if [[ ${PV} != 9999 ]]; then + emesonargs+=("-Dsway-version=${PV}") + fi meson_src_configure } @@ -81,18 +88,13 @@ src_configure() { pkg_postinst() { elog "You must be in the input group to allow sway to access input devices!" local dbus_cmd="" - if use tray ; then - elog "" - optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy + if use tray; then dbus_cmd="dbus-launch --sh-syntax --exit-with-session " fi - if ! use systemd && ! use elogind ; then + if ! use systemd && ! use elogind; then fcaps_pkg_postinst elog "" elog "If you use ConsoleKit2, remember to launch sway using:" elog "exec ck-launch-session ${dbus_cmd}sway" fi - if use swaylock && ! use pam; then - fcaps cap_sys_admin usr/bin/swaylock - fi } -- cgit v1.2.3