From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- dev-libs/sway/Manifest | 6 +- dev-libs/sway/metadata.xml | 34 +++++++---- dev-libs/sway/sway-1.0_beta1.ebuild | 95 ++++++++++++++++++++++++++++++ dev-libs/sway/sway-9999.ebuild | 111 ++++++++++++++++++++---------------- 4 files changed, 183 insertions(+), 63 deletions(-) create mode 100644 dev-libs/sway/sway-1.0_beta1.ebuild (limited to 'dev-libs/sway') diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest index 05949ff415c3..77c4c75037dc 100644 --- a/dev-libs/sway/Manifest +++ b/dev-libs/sway/Manifest @@ -1,4 +1,6 @@ DIST sway-0.15.2.tar.gz 5398956 BLAKE2B 6bb527e802b7837ef39cb1e29597d55fd33831231dbfb7f12225e50c38e49ae17d8bf2eb43672c195c6e074986d254b1680bac7c9d60b80b84feaf07e09718df SHA512 c457ace514f5c69ebd366d313cce93a76b199bb51c7540debc9c0586bff490401e6374f9725c784474afdfcca15bcab686a972c6c178117e45e2de83825ed370 +DIST sway-1.0_beta1.tar.gz 5444424 BLAKE2B b2803b6770ac3fbb3c21b892a208008e60780b6002e983e6d144d4f97e04992d3a3e5589abe36042221d67a107e31f5e76ae193cbf3e36c71fcf027095140944 SHA512 745b16be7641446c54e1b8777be1f8a26e8275f7826590f594bf4a2001a6de42e394b602e1ccd26a1e8ebe256fde6f9b393f5560a1dd0a610867819076645c69 EBUILD sway-0.15.2.ebuild 1925 BLAKE2B f6c56c97ce70d2b01ad6b836894faccff11f0ed74a782ac4621b1ce544c0f167b1a632835842cc5ac97a6ea8c897f50f1b06a8fda5d33e279ebd62213a0eef97 SHA512 7fb00b02563b71dc818d46a7211687499eac1cd6a677a13d76b8e62f0c3394c4fe3a6fbf1e98dc1b36d9d7141e2410dc12e261832f71828612418d03664a22b2 -EBUILD sway-9999.ebuild 1885 BLAKE2B 7e289919c2910ff3d70900ea48b3f1cb67b38d69f279a6bce4e1fe20c4cb77dc05582786ac7552cefeee20330ee02cd1de280bf599e979077b31abba4964685f SHA512 8cdf3e6a4c42a207e5a32379ac9c5f03d23bba139888370385102260c70b84a33e76e3d7397a03bfc370fa46fb96e2adf28a6103eeeec61f0d746005aa967274 -MISC metadata.xml 1756 BLAKE2B 98c5ea811df7218a945de7d8ae3891692ae7fa137f320ab316f985c99ac288ac62fe006879cdd539f48ea9207a953434f3a5dbaf815f32a40a5c7ff73376c594 SHA512 c66066c76ea1c1cbbdf79664fdd123d22a681e82bfa5c3ffe92ae12fd6fd4adaf51d12767b3ca4e2f88405df59a386e7dfe8f9f5a8fd382918b7566f6461d27a +EBUILD sway-1.0_beta1.ebuild 2512 BLAKE2B 11cc39dab4ce22ffe0e7103e052e2c4c039f0123347b4c92f6d09d45385619ee7f1b9d25d6ebe7de0c24352cdf46b3aac50abceae879cae7049e79d699e15fb2 SHA512 2c06f38eda3e672adfeb847e7d6f92870e15e4f100746265d03d062d01f372f8c84a60877a53d5f6d212c8c106888bb62d8ce630b8fdcbac2afe2d1f6c29fd6e +EBUILD sway-9999.ebuild 2483 BLAKE2B f113708d24cb0f92e519645a60223e1552bc689c36b2283ccf865ae419675a5b4e4c26e80b306e2d31aaa5d5a6248e543d60f37a2ed2d1be1f58c352c002d387 SHA512 4bf8b44757e68e1641b55ebc74c998e3d9382fa3311e8075942955f3b60fcf3957642b93ded3ee2226b22763179df34dfbb8cb88547a81cebf71c23387fcca02 +MISC metadata.xml 2502 BLAKE2B 723534164daf4391cf1ecb79a2a2bd5e5e2ae671bda113ca27de8b5e57fb317b5e1d1230932ddbe6c39cccaf10488369c00b9c38bddc8761b6f3e2b1adc7af85 SHA512 364adb6db9a56e01b504ff2a12eee6bf8f4cd228b1752aba67a61faf9ab230ddf04b0e8ad5b8582db7378f8305bf45ffb9101472385958bfa0cb88cba2b25f41 diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml index a4e44bee20a1..d2aff59d96e9 100644 --- a/dev-libs/sway/metadata.xml +++ b/dev-libs/sway/metadata.xml @@ -5,6 +5,10 @@ hilobakho@gmail.com Mykyta Holubakha + + speedjack95@gmail.com + Niccolò Scatena + proxy-maint@gentoo.org Proxy Maintainers @@ -22,19 +26,27 @@ something else. - - Enable additional image format support via the - x11-libs/gdk-pixbuf library. - - Build 'swaybar': sway's status bar component. - Build 'swaybg': allows to set a desktop background image. - Build 'swaygrab': allows taking screenshots or screencasts. - Build 'swaylock': sway's screen locker. - Build 'swaymsg': tool for communicating with a running sway instance. - Install sway's default wallpaper image. - Enable support for StatusNotifierItem tray specification. + Enable support for rootless session via elogind + Use Linux capability SYS_CAP_ADMIN rather than set*id for sway binary + Enable fish completion support + Enable additional image format support via the x11-libs/gdk-pixbuf library + Install 'swaybar': sway's status bar component + Install 'swaybg': allows to set a desktop background image + Install 'swaygrab': allows taking screenshots or screencasts + Install 'swaylock': sway's screen locker + Install 'swaymsg': tool for communicating with a running sway instance + Enable support for StatusNotifierItem tray specification + Install sway's default wallpaper image + Enable support for X11 applications (XWayland) swaywm/sway + + sir@cmpwn.com + Drew DeVault + + https://github.com/swaywm/sway/issues + https://github.com/swaywm/sway/wiki + https://github.com/swaywm/sway/releases diff --git a/dev-libs/sway/sway-1.0_beta1.ebuild b/dev-libs/sway/sway-1.0_beta1.ebuild new file mode 100644 index 000000000000..76a39cb5232c --- /dev/null +++ b/dev-libs/sway/sway-1.0_beta1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2018 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 pam + +DESCRIPTION="i3-compatible Wayland window manager" +HOMEPAGE="https://swaywm.org" + +LICENSE="MIT" +SLOT="0" +IUSE="elogind fish-completion +swaybar +swaybg +swaylock systemd +tray wallpapers X zsh-completion" +REQUIRED_USE="?? ( elogind systemd )" + +RDEPEND="~dev-libs/wlroots-0.1[systemd=,elogind=,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 + elogind? ( >=sys-auth/elogind-237 ) + swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] ) + swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] ) + swaylock? ( + virtual/pam + x11-libs/gdk-pixbuf:2[jpeg] + ) + systemd? ( >=sys-apps/systemd-237 ) + tray? ( >=sys-apps/dbus-1.10 ) + X? ( x11-libs/libxcb:0=[xkb] )" +DEPEND="${RDEPEND}" +BDEPEND="app-text/scdoc + 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 swaylock || sed -e "s/subdir('swaylock')//g" -i meson.build || die +} + +src_configure() { + local emesonargs=( + "-Dsway-version=${SWAY_PV}" + $(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" + "-Dwerror=false" + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + use swaylock && newpamd swaylock/pam/swaylock.linux swaylock +} + +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 + 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 68d15fce04ab..381dbbb1a604 100644 --- a/dev-libs/sway/sway-9999.ebuild +++ b/dev-libs/sway/sway-9999.ebuild @@ -1,83 +1,94 @@ # Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit git-r3 eutils cmake-utils +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 -DESCRIPTION="i3-compatible Wayland window manager" -HOMEPAGE="http://swaywm.org/" +inherit eutils fcaps meson pam -EGIT_REPO_URI="https://github.com/swaywm/sway.git" -EGIT_BRANCH="0.15" +DESCRIPTION="i3-compatible Wayland window manager" +HOMEPAGE="https://swaywm.org" LICENSE="MIT" SLOT="0" -KEYWORDS="" -IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion" +IUSE="elogind fish-completion +swaybar +swaybg +swaylock systemd +tray wallpapers X zsh-completion" +REQUIRED_USE="?? ( elogind systemd )" -REQUIRED_USE="tray? ( swaybar )" - -RDEPEND="=dev-libs/wlc-9999[systemd=] - dev-libs/json-c:0= +RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=] + >=dev-libs/json-c-0.13:0= + >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre - dev-libs/libinput dev-libs/wayland - sys-libs/libcap - x11-libs/libxkbcommon + >=dev-libs/wayland-protocols-1.14 x11-libs/cairo + x11-libs/libxkbcommon x11-libs/pango - gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) - swaylock? ( virtual/pam ) - tray? ( sys-apps/dbus )" - -DEPEND="${RDEPEND} - app-text/asciidoc + x11-libs/pixman + elogind? ( >=sys-auth/elogind-237 ) + swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] ) + swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] ) + swaylock? ( + virtual/pam + x11-libs/gdk-pixbuf:2[jpeg] + ) + systemd? ( >=sys-apps/systemd-237 ) + tray? ( >=sys-apps/dbus-1.10 ) + X? ( x11-libs/libxcb:0=[xkb] )" +DEPEND="${RDEPEND}" +BDEPEND="app-text/scdoc virtual/pkgconfig" +FILECAPS=( cap_sys_admin usr/bin/sway ) + src_prepare() { - cmake-utils_src_prepare + default - # remove bad CFLAGS that upstream is trying to add - sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die + 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 swaylock || sed -e "s/subdir('swaylock')//g" -i meson.build || die } src_configure() { - local mycmakeargs=( - -Denable-swaybar=$(usex swaybar) - -Denable-swaybg=$(usex swaybg) - -Denable-swaygrab=$(usex swaygrab) - -Denable-swaylock=$(usex swaylock) - -Denable-swaymsg=$(usex swaymsg) - -Denable-tray=$(usex tray) - - -Ddefault-wallpaper=$(usex wallpapers) - - -Denable-gdk-pixbuf=$(usex gdk-pixbuf) - -Dzsh-completions=$(usex zsh-completion) - - -DCMAKE_INSTALL_SYSCONFDIR="/etc" + local emesonargs=( + $(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" + "-Dwerror=false" ) - cmake-utils_src_configure + meson_src_configure } src_install() { - cmake-utils_src_install + meson_src_install - use !systemd && fperms u+s /usr/bin/sway + use swaylock && newpamd swaylock/pam/swaylock.linux swaylock } pkg_postinst() { - if use swaygrab - then - optfeature "swaygrab screenshot support" media-gfx/imagemagick[png] - optfeature "swaygrab video capture support" virtual/ffmpeg - fi - if use tray - then + 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 + 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 - optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland] - } -- cgit v1.2.3