dev-libs/sway: update live version 9999.

Now version 9999 should build from upstream master branch.

Signed-off-by: Niccolò Scatena <speedjack95@gmail.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index 68d15fce04ab925680f15277473528b7a6fdea53..381dbbb1a60471da08b564f296873a2445c3708f 100644 (file)
--- 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]
-
 }