From 768744de39c5ec4b86c5d0213372f844e40841b8 Mon Sep 17 00:00:00 2001
From: Mykyta Holubakha <hilobakho@gmail.com>
Date: Sat, 31 Dec 2016 04:09:16 +0200
Subject: dev-libs/sway: revbump to 0.11-r2.

* preserve SUID bit.
* add cap_sys_tty_config to sway binary.

Gentoo-Bug: https://bugs.gentoo.org/604098

Closes: https://github.com/gentoo/gentoo/pull/3292
---
 dev-libs/sway/sway-0.11-r1.ebuild | 78 ---------------------------------------
 dev-libs/sway/sway-0.11-r2.ebuild | 72 ++++++++++++++++++++++++++++++++++++
 dev-libs/sway/sway-9999.ebuild    |  8 +---
 3 files changed, 73 insertions(+), 85 deletions(-)
 delete mode 100644 dev-libs/sway/sway-0.11-r1.ebuild
 create mode 100644 dev-libs/sway/sway-0.11-r2.ebuild

(limited to 'dev-libs/sway')

diff --git a/dev-libs/sway/sway-0.11-r1.ebuild b/dev-libs/sway/sway-0.11-r1.ebuild
deleted file mode 100644
index 3ca3576b4e4d..000000000000
--- a/dev-libs/sway/sway-0.11-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils cmake-utils fcaps
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="http://swaywm.org/"
-
-SRC_URI="https://github.com/SirCmpwn/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd"
-
-RDEPEND=">=dev-libs/wlc-0.0.5[systemd=]
-	dev-libs/json-c
-	dev-libs/libpcre
-	dev-libs/libinput
-	x11-libs/libxkbcommon
-	dev-libs/wayland
-	sys-libs/libcap
-	x11-libs/pango
-	x11-libs/cairo
-	swaylock? ( virtual/pam )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bad CFLAGS that upstream is trying to add
-	sed -i -e '/FLAGS.*-Werror/d' 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)
-
-		-Ddefault-wallpaper=$(usex wallpapers)
-
-		-Denable-gdk-pixbuf=$(usex gdk-pixbuf)
-		-Dzsh-completions=$(usex zsh-completion)
-
-		-DCMAKE_INSTALL_SYSCONFDIR="/etc"
-		-DLD_LIBRARY_PATH="${EPREFIX}/usr/lib"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use !systemd && fperms u+s /usr/bin/sway
-}
-
-FILECAPS=( cap_sys_ptrace usr/bin/sway )
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	if use swaygrab
-	then
-		optfeature "swaygrab screenshot support" media-gfx/imagemagick[png]
-		optfeature "swaygrab video capture support" virtual/ffmpeg
-	fi
-	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
-}
diff --git a/dev-libs/sway/sway-0.11-r2.ebuild b/dev-libs/sway/sway-0.11-r2.ebuild
new file mode 100644
index 000000000000..dbea8b27f68b
--- /dev/null
+++ b/dev-libs/sway/sway-0.11-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils cmake-utils fcaps
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="http://swaywm.org/"
+
+SRC_URI="https://github.com/SirCmpwn/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd"
+
+RDEPEND=">=dev-libs/wlc-0.0.5[systemd=]
+	dev-libs/json-c
+	dev-libs/libpcre
+	dev-libs/libinput
+	x11-libs/libxkbcommon
+	dev-libs/wayland
+	sys-libs/libcap
+	x11-libs/pango
+	x11-libs/cairo
+	swaylock? ( virtual/pam )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/asciidoc"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bad CFLAGS that upstream is trying to add
+	sed -i -e '/FLAGS.*-Werror/d' 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)
+
+		-Ddefault-wallpaper=$(usex wallpapers)
+
+		-Denable-gdk-pixbuf=$(usex gdk-pixbuf)
+		-Dzsh-completions=$(usex zsh-completion)
+
+		-DCMAKE_INSTALL_SYSCONFDIR="/etc"
+		-DLD_LIBRARY_PATH="${EPREFIX}/usr/lib"
+	)
+
+	cmake-utils_src_configure
+}
+
+FILECAPS=( -M 4711 cap_sys_ptrace,cap_sys_tty_config usr/bin/sway )
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	if use swaygrab
+	then
+		optfeature "swaygrab screenshot support" media-gfx/imagemagick[png]
+		optfeature "swaygrab video capture support" virtual/ffmpeg
+	fi
+	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
+}
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index 9e9acbcc76d4..56c4b6ee1de9 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -59,13 +59,7 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-
-	use !systemd && fperms u+s /usr/bin/sway
-}
-
-FILECAPS=( cap_sys_ptrace usr/bin/sway )
+FILECAPS=( -M 4711 cap_sys_ptrace,cap_sys_tty_config usr/bin/sway )
 
 pkg_postinst() {
 	fcaps_pkg_postinst
-- 
cgit v1.2.3-65-gdbad