From 79599515788b85b18aa655e7b7f8cc05c1bbddd8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Feb 2019 12:59:29 +0000 Subject: gentoo resync : 16.02.1018 --- dev-libs/sway/Manifest | 14 ++--- dev-libs/sway/metadata.xml | 7 +-- dev-libs/sway/sway-0.15.2.ebuild | 83 ------------------------- dev-libs/sway/sway-1.0_beta1.ebuild | 95 ----------------------------- dev-libs/sway/sway-1.0_beta2.ebuild | 99 ------------------------------ dev-libs/sway/sway-1.0_rc1-r1.ebuild | 113 +++++++++++++++++++++++++++++++++++ dev-libs/sway/sway-1.0_rc1.ebuild | 100 ------------------------------- dev-libs/sway/sway-1.0_rc2.ebuild | 109 +++++++++++++++++++++++++++++++++ dev-libs/sway/sway-9999.ebuild | 79 +++++++++++++----------- 9 files changed, 273 insertions(+), 426 deletions(-) delete mode 100644 dev-libs/sway/sway-0.15.2.ebuild delete mode 100644 dev-libs/sway/sway-1.0_beta1.ebuild delete mode 100644 dev-libs/sway/sway-1.0_beta2.ebuild create mode 100644 dev-libs/sway/sway-1.0_rc1-r1.ebuild delete mode 100644 dev-libs/sway/sway-1.0_rc1.ebuild create mode 100644 dev-libs/sway/sway-1.0_rc2.ebuild (limited to 'dev-libs/sway') diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest index 56df973ebbc0..3f6515093599 100644 --- a/dev-libs/sway/Manifest +++ b/dev-libs/sway/Manifest @@ -1,10 +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 -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-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 +DIST sway-1.0_rc2.tar.gz 5462530 BLAKE2B 95868df3d03a61be33e04602d6891a2827cd1b5eab08644f74e04c3cbae39e686ee046be5ae9762595774fd22190e2460e246b564db92c50509ad61a16bb0835 SHA512 78c93f2326952d9e56ebf38f5d6b646934230b1bf5fac50cf35f16b2c1753ffa31dd9ec874a05025ed0d1d828b9a8643c78e739abbcfba55301255b3d0ed4a3e +EBUILD sway-1.0_rc1-r1.ebuild 3019 BLAKE2B 4cdcf8fec26f9239093ddc4fefd7883190146f0ca0d0a618d6442a23ee4a0187c05f6a84a55a6defe9dc37a546c61b8e4c6e5fb017b12a159700921e254ea83e SHA512 c1e77282fe4b644f06a0805b2971e88e567c01726b165569ddb8318eb86e0111c1bcbdd7db72aefc51783aa20e59ca8418bc74bc26e6bc1884118d9ceb4b5fbf +EBUILD sway-1.0_rc2.ebuild 2942 BLAKE2B 045ac141e67d0872e13c2d17d5ad4cefbaff1bcfce81896eb3117e1a05b52c8ec1a27546b5d969370db4891214680431eefea043cca2ba9c154ef6cd40e55511 SHA512 4577e6e6f9c4046bb892dfc1956f9cfb66445576167bda49e23918b1aa5987074409a0a996dd40bdb3fea043801b4233cfbc5b8261cea6d6dd39a691b9147dce +EBUILD sway-9999.ebuild 2942 BLAKE2B 045ac141e67d0872e13c2d17d5ad4cefbaff1bcfce81896eb3117e1a05b52c8ec1a27546b5d969370db4891214680431eefea043cca2ba9c154ef6cd40e55511 SHA512 4577e6e6f9c4046bb892dfc1956f9cfb66445576167bda49e23918b1aa5987074409a0a996dd40bdb3fea043801b4233cfbc5b8261cea6d6dd39a691b9147dce +MISC metadata.xml 2486 BLAKE2B 2d34da83a8d8726b91189d27a400e705a1b0259a1ca577a85e7c21784274a08a0adccc134cd523e193f8635b26dcb1802e37bfa1831f58c922285341b1eadd5e SHA512 9d382307136a126a614a8361828cb018865243b1a8c2a4dd08fbd484afc53320abf6d64dd82dd93a47d8de284552f1857c028c6c72db06199152e1458b636ec0 diff --git a/dev-libs/sway/metadata.xml b/dev-libs/sway/metadata.xml index ebb759791eb7..e73eacb7359f 100644 --- a/dev-libs/sway/metadata.xml +++ b/dev-libs/sway/metadata.xml @@ -13,7 +13,7 @@ hilobakho@gmail.com Mykyta Holubakha - + speedjack95@gmail.com Niccolò Scatena @@ -30,14 +30,11 @@ 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 - Enable additional image format support via the x11-libs/gdk-pixbuf library + Build and install man pages Install 'swaybar': sway's status bar component Install 'swaybg': allows to set a desktop background image - Install 'swaygrab': allows taking screenshots or screencasts Install 'swayidle': idle manager to run commands when user is inactive Install 'swaylock': sway's screen locker Install 'swaymsg': tool for communicating with a running sway instance diff --git a/dev-libs/sway/sway-0.15.2.ebuild b/dev-libs/sway/sway-0.15.2.ebuild deleted file mode 100644 index 7d8204ffd001..000000000000 --- a/dev-libs/sway/sway-0.15.2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils cmake-utils - -DESCRIPTION="i3-compatible Wayland window manager" -HOMEPAGE="http://swaywm.org/" - -SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion" - -REQUIRED_USE="tray? ( swaybar )" - -RDEPEND=">=dev-libs/wlc-0.0.8[systemd=] - dev-libs/json-c:0= - dev-libs/libpcre - dev-libs/libinput - dev-libs/wayland - sys-libs/libcap - x11-libs/libxkbcommon - x11-libs/cairo - x11-libs/pango - gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) - swaylock? ( virtual/pam ) - tray? ( sys-apps/dbus )" - -DEPEND="${RDEPEND} - app-text/asciidoc - virtual/pkgconfig" - -src_prepare() { - cmake-utils_src_prepare - - # remove bad CFLAGS that upstream is trying to add - sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || 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" - -DVERSION="${PV}" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - use !systemd && fperms u+s /usr/bin/sway -} - -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 - optfeature "experimental xembed tray icons support" kde-plasma/xembed-sni-proxy - fi - - optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland] -} diff --git a/dev-libs/sway/sway-1.0_beta1.ebuild b/dev-libs/sway/sway-1.0_beta1.ebuild deleted file mode 100644 index 76a39cb5232c..000000000000 --- a/dev-libs/sway/sway-1.0_beta1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# 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-1.0_beta2.ebuild b/dev-libs/sway/sway-1.0_beta2.ebuild deleted file mode 100644 index 1812f7f4dc80..000000000000 --- a/dev-libs/sway/sway-1.0_beta2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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-1.0_rc1-r1.ebuild b/dev-libs/sway/sway-1.0_rc1-r1.ebuild new file mode 100644 index 000000000000..47262ad9b430 --- /dev/null +++ b/dev-libs/sway/sway-1.0_rc1-r1.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? ( dev-libs/swayidle ) + swaylock? ( dev-libs/swaylock ) + systemd? ( >=sys-apps/systemd-239 ) + X? ( x11-libs/libxcb:0= ) +" +if [[ ${PV} == 9999 ]]; then + DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]" +else + DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]" +fi +RDEPEND=" + x11-misc/xkeyboard-config + ${DEPEND} +" +BDEPEND=" + >=dev-libs/wayland-protocols-1.14 + virtual/pkgconfig + man? ( >=app-text/scdoc-1.8.1 ) +" + +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 + + if [[ ${PV} != 9999 ]]; then + emesonargs+=("-Dsway-version=${MY_PV}") + 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/dev-libs/sway/sway-1.0_rc1.ebuild b/dev-libs/sway/sway-1.0_rc1.ebuild deleted file mode 100644 index 95621d2f0721..000000000000 --- a/dev-libs/sway/sway-1.0_rc1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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-1.0_rc2.ebuild b/dev-libs/sway/sway-1.0_rc2.ebuild new file mode 100644 index 000000000000..f1d3935e2f12 --- /dev/null +++ b/dev-libs/sway/sway-1.0_rc2.ebuild @@ -0,0 +1,109 @@ +# 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? ( dev-libs/swayidle ) + swaylock? ( dev-libs/swaylock ) + systemd? ( >=sys-apps/systemd-239 ) + X? ( x11-libs/libxcb:0= ) +" +if [[ ${PV} == 9999 ]]; then + DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]" +else + DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]" +fi +RDEPEND=" + x11-misc/xkeyboard-config + ${DEPEND} +" +BDEPEND=" + >=dev-libs/wayland-protocols-1.14 + virtual/pkgconfig + man? ( >=app-text/scdoc-1.8.1 ) +" + +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/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild index 95621d2f0721..f1d3935e2f12 100644 --- a/dev-libs/sway/sway-9999.ebuild +++ b/dev-libs/sway/sway-9999.ebuild @@ -3,59 +3,64 @@ EAPI=7 -inherit eutils fcaps meson +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/sway.git" + EGIT_REPO_URI="https://github.com/swaywm/${PN}.git" else MY_PV=${PV/_rc/-rc} - SRC_URI="https://github.com/swaywm/sway/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + 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="bash-completion clipboard doc elogind fish-completion +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd +tray wallpapers X zsh-completion" -REQUIRED_USE="?? ( elogind systemd )" +IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion" +REQUIRED_USE="?? ( elogind systemd ) + tray? ( || ( elogind systemd ) )" -RDEPEND=" - >=dev-libs/wlroots-0.3[elogind=,systemd=,X=] +DEPEND=" >=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] ) + swaybar? ( x11-libs/gdk-pixbuf:2 ) + swaybg? ( x11-libs/gdk-pixbuf:2 ) 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}" + X? ( x11-libs/libxcb:0= ) +" +if [[ ${PV} == 9999 ]]; then + DEPEND+="~dev-libs/wlroots-9999[elogind=,systemd=,X=]" +else + DEPEND+=">=dev-libs/wlroots-0.3[elogind=,systemd=,X=]" +fi +RDEPEND=" + x11-misc/xkeyboard-config + ${DEPEND} +" BDEPEND=" - dev-libs/wayland-protocols - doc? ( >=app-text/scdoc-1.8.1 ) - virtual/pkgconfig" - -FILECAPS=( cap_sys_admin usr/bin/sway ) + >=dev-libs/wayland-protocols-1.14 + virtual/pkgconfig + man? ( >=app-text/scdoc-1.8.1 ) +" src_prepare() { default - use swaybar || sed -e "s/subdir('swaybar')//g" -i meson.build || die + 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 @@ -65,36 +70,40 @@ src_prepare() { src_configure() { local emesonargs=( - $(meson_use bash-completion bash-completions) - $(meson_use fish-completion fish-completions) + -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) - "-Dtray=$(usex tray enabled disabled)" - "-Dxwayland=$(usex X enabled disabled)" + "-Dbash-completions=true" "-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 " +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 - fcaps_pkg_postinst elog "" elog "If you use ConsoleKit2, remember to launch sway using:" - elog "exec ck-launch-session ${dbus_cmd}sway" + 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 } -- cgit v1.2.3