gentoo resync : 15.11.2017

3 files changed, 18 insertions, 8 deletions

diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
index 2d3e13149346..5007d0b52f4b 100644
--- a/dev-libs/sway/Manifest
+++ b/dev-libs/sway/Manifest
@@ -1,7 +1,7 @@
-DIST sway-0.13.0.tar.gz 5355130 SHA256 56a20c9d28d92777bf99381edd09078f72bf39b8ac586242950d514456a77f7d SHA512 7f137e103bb278777ee3e36b40446156ee02bfbba3ce099b23b093751832a67155cd9519f7583364608d584d2d7c9206a8945f2114ae58220b47bd0f1ff362e8 WHIRLPOOL bff2fd4550334625533984c3bfaa1b479609b7b62cd62935fc5e96eae4a518242d69f553775f44368b76c87ed64fcd6011df785339bd71fb62e09eb426948b1f
 DIST sway-0.14.0.tar.gz 5376243 SHA256 e63efee81cd3952ee00c7bd379cf90b065530b03423f593895584aa51e9c7f1b SHA512 2c2e45ddc935504bd240288386662d05f284eb0d540e05b6e56ca577e9b1f2303929b9659eaa3cb99b8cdadb60bd1bfa4104624bf2574e41365e1b3df5361410 WHIRLPOOL d9a5ce41e3063d041cf1f22ebbb48ffc966b34b7d2e23caa77528035176dd9b5d74a8e6cdb238be3191849a349102562becb797835240309b245d554b63753cd
-EBUILD sway-0.13.0.ebuild 1703 SHA256 d5acb682eb6379ce4f35f127de24e7d341c09c006f32ba2d55df77be9d928794 SHA512 5d8ad99a05870f33d5d662fcf8bbfdad900c3f806f2eff2dbebf61910204da06f31b29cfa12d694ff50fbfc8bd52dee66f5c93e1060a64eb7f918796c6edd943 WHIRLPOOL 31432b3d32d8a13e04ea8669c4e9ad11aced244e93396364390d3582976912aa49bb2883461d8244f41958f2cdff3056456e3b4c24e17c834efb8dd33dae6252
+DIST sway-0.15.0.tar.gz 5394917 SHA256 4fe62708feb9c3bfc53d5a8133a992078f8a5216581b5e4a519fbef620f9762c SHA512 2ac448f16cae83563b4ed7039b355c238cdf45bf16af58002c56781fbbac640a5b61b2fd05eb8bcfea5cc06a65707a48e093a68e80be44c14cf1d5d0a9410331 WHIRLPOOL c882915e3f14c6ee310f8ad45eb5ccefa9af283d4d165b83db4bb6131f60c19d650f332e6a52bfa5c7244d82b4f57256813e4fd954f0adb19cdb824f86b4d72a
 EBUILD sway-0.14.0.ebuild 1904 SHA256 20823a498ab1e3b95cec799ce2aa4ea34d41a7762957031912b3f3a1050068b7 SHA512 5361fccc2b5bf411c899734eeda8895df59eff760459e6133a5af12e2e16f1af70e0bd9af50eb8b1f9775b2d9673bfd14e2f6cdcc2da8e77391dea5d419230c6 WHIRLPOOL 889e07a44a6e1b6bfe71dc671911d3338825374b18ffd48f4a23c8d29387844b2ba9e379e4403acb3358fc238509be5b95b993c87d7c2c80d7c02207dcff0709
-EBUILD sway-9999.ebuild 1867 SHA256 e509919884787474c06503c8aa693edf2ce73962660b9658c05eca45570e2810 SHA512 2458d1782660153ac869133226574276c2f848338f431c2dceac3fd4100327f284d7d1663873547478289849e5911812ceb95eddf9ef3626f8214c90ec52499a WHIRLPOOL ad5e1882da0451afb844b309d52d77b938b87db9adb37738bb35311e41468c79483e215388ee0f9a8fc448422e569ff21fa3c1f618c7718d4fba5cd6a048a72b
+EBUILD sway-0.15.0.ebuild 1928 SHA256 d1ed65d7baff9b8ef07dba3e10ab7ce889bcab2f4d0db612fdfa804279dc79cb SHA512 974b2898dd6f28167b4f0879611fd36042b998c132d39248258741f8593371c182f10663fb873052aa7981582110c94239ccf0967f0989a8b64fbaa30f5b132c WHIRLPOOL 062f6e0477814c6dbcaf84ee8aef0b20a98127f31b9fb6a8de41799e9beefae5685f263c49c8405423a30db4b1dbac1a045092e4c16c52a9b651b68181c69f85
+EBUILD sway-9999.ebuild 1876 SHA256 64221c3f13570e99a5197a665911f1db4b9ef0a3dc1f31c1d9eba9964313f758 SHA512 35ec15c4333e8a7336fd0c97ea9e20dad945cc1cec826e065d2dd52297b7b02749ff1b8f74afd882edbbbdca0e8b226f4489f80ca5c20de45c7ee7f07d5f02ea WHIRLPOOL f874db71ab31b4a4aef24eaefc01872c30dba1e01e4d6592b0b4550cf4246e2c393bcbb7cc91dad467fd8acd74175b3be1b40241d1030fca81733b52a9af0987
 MISC ChangeLog 2577 SHA256 3f9ddde6363f683d67f1146bac3901bc1f44d5ec4088e39f491362249606a65e SHA512 9813bd79d9dbb3d242efda06422132311b9f727c6fb7ce2eec44ab782a8761034ec3a31d79839e097790757eca9ad9ea448018c1d02ad95a46e031f457a6c62b WHIRLPOOL 238d79212a4899d1d9e60d36b7d00267864f48a48d0029a787e1876f174e9f7510fd0ce6e1a4cad8ca7e71b53798ebf531aff3371927863b6a5e585680511dc6
 MISC metadata.xml 1756 SHA256 02fcb175316df7192618463e4ea220e9b8994b666b4964bd5714220a4f158599 SHA512 c66066c76ea1c1cbbdf79664fdd123d22a681e82bfa5c3ffe92ae12fd6fd4adaf51d12767b3ca4e2f88405df59a386e7dfe8f9f5a8fd382918b7566f6461d27a WHIRLPOOL 71dcced2d90adf8323f76aefd714b24af28afd0f5b19e1180bba20e0072c9b8bca09b1ac4158567dd30ccccd516a874a4fb85b97784fdc032a1cc657f9a685b0
diff --git a/dev-libs/sway/sway-0.13.0.ebuild b/dev-libs/sway/sway-0.15.0.ebuild
index 4d10147e17d3..20a662ea70aa 100644
--- a/dev-libs/sway/sway-0.13.0.ebuild
+++ b/dev-libs/sway/sway-0.15.0.ebuild
@@ -13,10 +13,12 @@ SRC_URI="https://github.com/swaywm/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"
+IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray"
+
+REQUIRED_USE="tray? ( swaybar )"
 
 RDEPEND=">=dev-libs/wlc-0.0.8[systemd=]
-	dev-libs/json-c
+	>=dev-libs/json-c-0.12.1
 	dev-libs/libpcre
 	dev-libs/libinput
 	x11-libs/libxkbcommon
@@ -25,6 +27,7 @@ RDEPEND=">=dev-libs/wlc-0.0.8[systemd=]
 	x11-libs/pango
 	x11-libs/cairo
 	swaylock? ( virtual/pam )
+	tray? ( sys-apps/dbus )
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )"
 
 DEPEND="${RDEPEND}
@@ -35,7 +38,7 @@ src_prepare() {
 	cmake-utils_src_prepare
 
 	# remove bad CFLAGS that upstream is trying to add
-	sed -i -e '/FLAGS.*-Werror/d' CMakeLists.txt || die
+	sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die
 }
 
 src_configure() {
@@ -45,6 +48,7 @@ src_configure() {
 		-Denable-swaygrab=$(usex swaygrab)
 		-Denable-swaylock=$(usex swaylock)
 		-Denable-swaymsg=$(usex swaymsg)
+		-Denable-tray=$(usex tray)
 
 		-Ddefault-wallpaper=$(usex wallpapers)
 
@@ -70,5 +74,11 @@ pkg_postinst() {
 		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" \
+			x11-misc/xembedsniproxy
+	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 8961800a2b13..38835e599f74 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wal
 REQUIRED_USE="tray? ( swaybar )"
 
 RDEPEND="=dev-libs/wlc-9999[systemd=]
-	dev-libs/json-c
+	>=dev-libs/json-c-0.12.1
 	dev-libs/libpcre
 	dev-libs/libinput
 	x11-libs/libxkbcommon