gentoo resync : 28.09.2019

3 files changed, 2 insertions, 118 deletions

diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index edea6cc93ce8..917e0cd92e0b 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,8 +1,6 @@
-DIST sway-1.0.tar.gz 5474548 BLAKE2B bea0a72c374b75f027e466d83e8c06abe32205e0cda80776b0e48e327a6da4e965a6a575595e5a38bcb125294c509b5d9a1db17604dd9e9032acef404366bdb9 SHA512 57e2610244c8bcd2b09bb5396113176d118ee5a0688aea297d4c191eda70ce29b36ff64e05c57d1a32a31cc4f2ac2562fd3cb3890508a8f3c7cbcb9fb017171d
 DIST sway-1.1.1.tar.gz 5480615 BLAKE2B 2cc55535a030d5d057c332a8b2647f394ec8f08a3a5aebe48e0bd21da718eac23bdbcc5a2ce26624efb9360518e5f14eaafe406e1c7d9b3eb81621bab7b6c39c SHA512 2585446ca0936df41c7959b6b48487b25c86f1a8a3bedcd146aab023a873a416ce750698e3cabcd9cb861e35bbd7e280574ff477152906669af9b17d3e54028e
 DIST sway-1.2.tar.gz 5493376 BLAKE2B f059ec7c3db7ff048129c9d701e8730b04f01670dc3b1be826ef3d609f2881ddf1e3bfd82c39bebf5e7e99127f7250239b2af76292f60cfa208fc465f14cd779 SHA512 b43f625d35145a3377e64ea942f8b005946bb0925f08deace2da73ab504038b29331df9943296c97141e2283cd9b55e6cb3bca18c5c3999ecbd461325e36165b
-EBUILD sway-1.0.ebuild 3085 BLAKE2B 62c575e078c9078faca0d58cc0adc18fd52b10f648fdf6cc8cc18b5080fc8844d92a7bdf80141c03bae5d1dac8ccc62b0f263a05b82a407d4ee3e25c573470b5 SHA512 10aeba287ad9113010d60b1e07af1ba6291c575109f89c9501bd42370e8bc1afb148bb6604d95048b4d390b9d66213249c25b5f8867599e5cdce53db0967550b
 EBUILD sway-1.1.1.ebuild 2950 BLAKE2B 9658c0b1282956f91bfa19bce0d0a7bc04cffeac562a4a5c73bf2dc40aa2f15ec1e180d48a66bc7a41bcf03738c2bd7cd926dde5af7cfe46e1ac6fce862d392b SHA512 415489fc1450e4aded50e663cc6f3a96153e56376318fe097ec9419913f65d5f44712ddaaf9ec42b9cdf9e7e20f60b90243804bc074719106141d5ceca447e04
-EBUILD sway-1.2.ebuild 2957 BLAKE2B 2e804aca2d401061e25d9f26fcce12a201303056338434c886a3666bfe44933fa301765152f9d80c52f21895dcf3938475f0d29a37906edead9ad651be0d7c97 SHA512 2bba05be79c29100f880a29eaf5c51126a753ded96dc5142b91f559cfc40d55d55c480ae54ccda115ed692bb9de3b3674b93e74af7320258eddb3b38c27f7a7f
+EBUILD sway-1.2.ebuild 2954 BLAKE2B 6a2536e0ddc4d3cfe76b25ca20150bb05a4c64535585dc4d2c8e6406a1c55c451ed966d4a8cbbbfdfbbdbc5eae34a6b592975f98ca92edc59975120ac34aaeb2 SHA512 e3ca1b54b21a90a7e47370717930e816a012eea9da0f49b3d8dab481f79cd7b0a01273daad8752aaec359e3756cb7e213ad19c19bdaa6a1bf107f424f42db194
 EBUILD sway-9999.ebuild 2957 BLAKE2B 2e804aca2d401061e25d9f26fcce12a201303056338434c886a3666bfe44933fa301765152f9d80c52f21895dcf3938475f0d29a37906edead9ad651be0d7c97 SHA512 2bba05be79c29100f880a29eaf5c51126a753ded96dc5142b91f559cfc40d55d55c480ae54ccda115ed692bb9de3b3674b93e74af7320258eddb3b38c27f7a7f
 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
diff --git a/gui-wm/sway/sway-1.0.ebuild b/gui-wm/sway/sway-1.0.ebuild
deleted file mode 100644
index 34a7896bb450..000000000000
--- a/gui-wm/sway/sway-1.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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 arm64 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? ( gui-apps/swayidle )
-	swaylock? ( gui-apps/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]"
-else
-	DEPEND+=">=gui-libs/wlroots-0.5.0[elogind=,systemd=,X=]
-	<gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
-	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
-
-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/gui-wm/sway/sway-1.2.ebuild b/gui-wm/sway/sway-1.2.ebuild
index e4d011fc2064..7688622a2418 100644
--- a/gui-wm/sway/sway-1.2.ebuild
+++ b/gui-wm/sway/sway-1.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_rc/-rc}
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi