gentoo resync : 16.09.2020

3 files changed, 0 insertions, 121 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index d7a41c0cbeb9..f678d8c748c1 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index f29870713cae..be9927d8b4b3 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,7 +1,5 @@
 AUX sway-1.4-gcc-10.patch 1147 BLAKE2B 5ccd4d4b5320389f0b0f521bf40c1d68016098951b2196f5045b6323eb622ea865390d82c01b4a12ce3e77779fbde60a5ff452a58a3121bf83284af961bdf7b4 SHA512 1aaa87327c4f2b83325de3eb33d5976a62e60fab0d95e78bee7697f1293e326b039bbb135d2b0dce17328fe95705b87b4e206b4605cd212d914cb5714f03bb69
-DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71
 DIST sway-1.5.tar.gz 5535966 BLAKE2B e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9 SHA512 702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4
-EBUILD sway-1.4-r2.ebuild 3130 BLAKE2B 693a483255dcc93f975cf8ed229499fa944cf094fa18372d095141e3757438fd0788d9082999700b34f3a020d641e3e0c694da652c228b4dc3788df1eec7fefe SHA512 5a5a0de6261f2be9f35357c84c893290e63e7234bd1e474a3e418f07bad344b3a4f9cec6d9cc2076e1f526df920a3f46eb8f21a19e567608bd42fd5f59d875c5
 EBUILD sway-1.5.ebuild 3121 BLAKE2B 45f2a604243345be2d31b20b33f17fc75d120740c438a667ea39220b39639854577c4d84e4dd3e2f93f9594e7e7dbcbca8df4b00999849376fe568414e84141c SHA512 15abe6e2bb12dfc38194f9d4ffd14fba05a16e1dc4abc312bb6102a8a513dff2d8355908536f643d4a0ec57fca1724ffd574fd9020270fba2d2d1c7a3f2acad3
 EBUILD sway-9999.ebuild 3124 BLAKE2B ab46472c87e47763615ba86ac40a4b79c010c4565c3e11546ed56de119758c54914c43fad9d39199eccc6c5ca8b43a270308958bb1d68cd147a418970cbf4b93 SHA512 90442f48633fbd3358449b6b2eab95055f496d1d2bc6ddca3810ba8e9ea6d5ec1f9dc2a16adf52705fd277bffef166ebe0c772dc8ae19b2c018d46c16e348e84
 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
diff --git a/gui-wm/sway/sway-1.4-r2.ebuild b/gui-wm/sway/sway-1.4-r2.ebuild
deleted file mode 100644
index 80125677e211..000000000000
--- a/gui-wm/sway/sway-1.4-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 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 ~ppc64 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
-	media-libs/mesa[gles2]
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( gui-apps/swaybg )
-	swayidle? ( gui-apps/swayidle )
-	swaylock? ( gui-apps/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
-	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
-else
-	DEPEND+="
-		>=gui-libs/wlroots-0.10.0:=[elogind=,systemd=,X=]
-		<gui-libs/wlroots-0.11.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
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-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 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; 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
-}