diff options
Diffstat (limited to 'dev-libs/sway')
-rw-r--r-- | dev-libs/sway/Manifest | 6 | ||||
-rw-r--r-- | dev-libs/sway/metadata.xml | 10 | ||||
-rw-r--r-- | dev-libs/sway/sway-1.0_beta2.ebuild | 99 | ||||
-rw-r--r-- | dev-libs/sway/sway-9999.ebuild | 26 |
4 files changed, 124 insertions, 17 deletions
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest index 77c4c75037dc..0c3305748e6d 100644 --- a/dev-libs/sway/Manifest +++ b/dev-libs/sway/Manifest @@ -1,6 +1,8 @@ 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 EBUILD sway-0.15.2.ebuild 1925 BLAKE2B f6c56c97ce70d2b01ad6b836894faccff11f0ed74a782ac4621b1ce544c0f167b1a632835842cc5ac97a6ea8c897f50f1b06a8fda5d33e279ebd62213a0eef97 SHA512 7fb00b02563b71dc818d46a7211687499eac1cd6a677a13d76b8e62f0c3394c4fe3a6fbf1e98dc1b36d9d7141e2410dc12e261832f71828612418d03664a22b2 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 +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 diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml index d2aff59d96e9..cb1a5f1eeef6 100644 --- a/dev-libs/sway/metadata.xml +++ b/dev-libs/sway/metadata.xml @@ -2,6 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>bman@gentoo.org</email> + <name>Aaron Bauman</name> + </maintainer> + <maintainer type="person"> <email>hilobakho@gmail.com</email> <name>Mykyta Holubakha</name> </maintainer> @@ -9,10 +13,6 @@ <email>speedjack95@gmail.com</email> <name>Niccolò Scatena</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription lang="en"> "SirCmpwn's Wayland window manager" is an i3-compatible window manager for Wayland. @@ -33,8 +33,10 @@ <flag name="swaybar">Install 'swaybar': sway's status bar component</flag> <flag name="swaybg">Install 'swaybg': allows to set a desktop background image</flag> <flag name="swaygrab">Install 'swaygrab': allows taking screenshots or screencasts</flag> + <flag name="swayidle">Install 'swayidle': idle manager to run commands when user is inactive</flag> <flag name="swaylock">Install 'swaylock': sway's screen locker</flag> <flag name="swaymsg">Install 'swaymsg': tool for communicating with a running sway instance</flag> + <flag name="swaynag">Install 'swaynag': shows a message with buttons</flag> <flag name="tray">Enable support for StatusNotifierItem tray specification</flag> <flag name="wallpapers">Install sway's default wallpaper image</flag> <flag name="X">Enable support for X11 applications (XWayland)</flag> diff --git a/dev-libs/sway/sway-1.0_beta2.ebuild b/dev-libs/sway/sway-1.0_beta2.ebuild new file mode 100644 index 000000000000..1812f7f4dc80 --- /dev/null +++ b/dev-libs/sway/sway-1.0_beta2.ebuild @@ -0,0 +1,99 @@ +# 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 + +DESCRIPTION="i3-compatible Wayland window manager" +HOMEPAGE="https://swaywm.org" + +LICENSE="MIT" +SLOT="0" +IUSE="elogind fish-completion +pam +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion" +REQUIRED_USE="?? ( elogind systemd )" + +RDEPEND="~dev-libs/wlroots-0.2[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? ( + pam? ( virtual/pam ) + x11-libs/gdk-pixbuf:2[jpeg] + ) + systemd? ( >=sys-apps/systemd-237 ) + tray? ( >=sys-apps/dbus-1.10 ) + X? ( x11-libs/libxcb:0= )" +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 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" \ + -e "/completions\/[a-z]\+\/_\?swaynag/d" -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 +} + +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 + if use swaylock && ! use pam; then + fcaps cap_sys_admin usr/bin/swaylock + fi +} diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild index 381dbbb1a604..14be762b4b73 100644 --- a/dev-libs/sway/sway-9999.ebuild +++ b/dev-libs/sway/sway-9999.ebuild @@ -14,14 +14,14 @@ else KEYWORDS="~amd64 ~x86" fi -inherit eutils fcaps meson pam +inherit eutils fcaps meson 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" +IUSE="elogind fish-completion +pam +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion" REQUIRED_USE="?? ( elogind systemd )" RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=] @@ -38,12 +38,12 @@ RDEPEND="~dev-libs/wlroots-9999[systemd=,elogind=,X=] swaybar? ( x11-libs/gdk-pixbuf:2[jpeg] ) swaybg? ( x11-libs/gdk-pixbuf:2[jpeg] ) swaylock? ( - virtual/pam + pam? ( 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] )" + X? ( x11-libs/libxcb:0= )" DEPEND="${RDEPEND}" BDEPEND="app-text/scdoc virtual/pkgconfig" @@ -55,7 +55,14 @@ 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 swaylock || sed -e "s/subdir('swaylock')//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" \ + -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die } src_configure() { @@ -71,12 +78,6 @@ src_configure() { 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="" @@ -91,4 +92,7 @@ pkg_postinst() { 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 } |