gentoo resync : 21.06.2020

6 files changed, 4 insertions, 126 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index b9da8f75dded..89ea62a65149 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 1b1e95e12b6d..6b7799c6e7e0 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -3,5 +3,5 @@ AUX hikari-2.0.1-gnu-make.patch 10167 BLAKE2B 70c1620b331cac9f3df11576d52f93ebc7
 DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
 DIST hikari-2.0.1.tar.gz 1003467 BLAKE2B 8a299fe1d85fac5df04f2475295250d78706c5da9c14a965ff8c7c91af36eaf5711675dc07c43c83974411719b88d483eee24ebd24a87eb1b3280a89b521a19e SHA512 18f8f46ae38fa307b63c44011da084ee0ec4a0925ff8ea3677fda9171bfd25b42853719cea812aabee2d377e6208ddcaf69692e1fb0655110f8d1905d1be00e8
 EBUILD hikari-1.2.0.ebuild 1081 BLAKE2B ff23f482966cb8b8487bbe001618d9fcfffc6eb4e2e76e49a8160e5859eeb5240432be3f0ff3ad2d796ac441e0bb4cf0a71dedbb1c701b6d470b26c68d4b578c SHA512 78676b87836d736bc6c7cf8f905e5d74b93c6739117089694db827307d1ecaa362c93399c3c73e5ce8a1035129b6acebe471bbf595ce35f9f496e1992abefc2b
-EBUILD hikari-2.0.1.ebuild 1250 BLAKE2B 078f91684adbf93f2463aa9e64563698f0138a6a4ffdb5e1ce29b88151a7ef256de902187c584a3fd1c60905694340cdc754169f0a0fc446c06bc6973f5911f2 SHA512 6a906f7b769ab00719be409365fccd7e64a380edcb5a964ff40b39dc4d8fcac2ab4b4b1ff800fedb49616145109dd004b2880bd45ad5545b9b71db82b3336f04
+EBUILD hikari-2.0.1-r1.ebuild 1242 BLAKE2B eca47da1d671e007c9974754ff7dcba0c79f69108252f986e71557022cd44bf125ebee3556ac8b80c63c9cb43784129eeeb33e4540b1846969696c67df7f2cf7 SHA512 7219322dd4310a02b2b620edcef313ac780c77baec2ccc80bbaed4832b0b067e5607a7d0d88cd8bb38abe080f6321895d6c131797bd0113a2d0beeccb866dc4a
 MISC metadata.xml 970 BLAKE2B 3862fa99df4057da6ef427fefe51f33b1ac2adcc2c9ce51393f5189fa85ffea7b19b06898b23433e1980e32c08f5597f92e133095a4a849f3447bf77e1e4623e SHA512 c1032c3c177cdc0ad4afea2276f451bf39a7220c6d7f015d89c7a193b6fc194dae9e0711382126cf6df828c8b93e2445f3c28d93a2459cae1991d39fb2340430
diff --git a/gui-wm/hikari/hikari-2.0.1.ebuild b/gui-wm/hikari/hikari-2.0.1-r1.ebuild
index 58e416a60cc6..ba2a76d4e9e3 100644
--- a/gui-wm/hikari/hikari-2.0.1.ebuild
+++ b/gui-wm/hikari/hikari-2.0.1-r1.ebuild
@@ -56,8 +56,8 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${D}/usr" ETC_PREFIX="${D}/etc" install
+	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install
 	if use man; then
-		emake PREFIX="${D}/usr" ETC_PREFIX="${D}/etc" install-doc
+		emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install-doc
 	fi
 }
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 130fc8b804fa..c41a8912769b 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,7 +1,6 @@
 AUX sway-1.4-gcc-10.patch 1147 BLAKE2B 5ccd4d4b5320389f0b0f521bf40c1d68016098951b2196f5045b6323eb622ea865390d82c01b4a12ce3e77779fbde60a5ff452a58a3121bf83284af961bdf7b4 SHA512 1aaa87327c4f2b83325de3eb33d5976a62e60fab0d95e78bee7697f1293e326b039bbb135d2b0dce17328fe95705b87b4e206b4605cd212d914cb5714f03bb69
 DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71
 EBUILD sway-1.4-r2.ebuild 3133 BLAKE2B 84082c22f9aaee17f4779ca857aff8f0af679c1a1e114ea33198ee767dacfebd894134428b33cf141bfcfaeb7daebf7284281c9a18f7b38a4b8af3e31d5b4f28 SHA512 8e53dca4dd27e4b2b2f751299fc3eb3ca90bd965e13b378d1eada64c5d054fd1e7dbd750a9abf9d185074030fe61878f4caf02092e59d560385f261a6e357ff6
-EBUILD sway-1.4-r3.ebuild 3182 BLAKE2B 57da09638c27b8fb371c16dda3b5dd3c02b36f95709ee95165bbf9cfb891d74145f3326338668b6847433b3ba9f7f5122faac17febb71f59f7851e40652791a4 SHA512 69202970d00f8e0bedd4f49ed7cd2a62efdd2f9614087d23d97717469cd8e712ee02166b68e41f40d1e68414c478d14af0915dc6c4a58ba2993d2da1ee039716
 EBUILD sway-1.4.ebuild 3042 BLAKE2B ed83ac7e11b7d9261a8f1ab419c625dfe79b5df0d4aaae40b7b8f19f0efc3c4566f1efe5e31388a90c7448ebad5afa2817d45453380a03d7793b0f28ccf463ba SHA512 bb74a92ffe6ebf4e6f167ceba1f2ab49c08d17ab7a3837d7245b9b917d3a83e788fc860d9612146456d21c4ed9039cc419b74ef940bac88a1f3d6eeb597a03a5
-EBUILD sway-9999.ebuild 3139 BLAKE2B c601d6dc353ccb6aa616704b2cf2284c886a0c93d0d855ee5c7c71b3f30e0ad9f51f29c82a09c810a41a2588e7aba43cecca5f2b1bfdd4d039de7da3ef7cbaf7 SHA512 ec245a600d7dbba9b3c7324cd327d38a4ffd92f2b502314762dcd5053220a79bf758cab4d56c0677afcac5d41161e4869704e0734cc5be4e01302b8d93ebae6d
+EBUILD sway-9999.ebuild 3090 BLAKE2B e14238694d2cec935caf206e4cbd029f84760acc099539a76295f8ce659a29611387c5d716d2e9cb537700e17db9d010bebeb82efdd8bbf1036a879fb3c9aed5 SHA512 0ebf33f6efc5e0b9357b642c060c5877b294a7f60f7f623a16cdce779fb83061cdf8eb5bff1dfc95a9007ae909ea1e27c4ab4e746c498de8189497b8ef3025f1
 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
diff --git a/gui-wm/sway/sway-1.4-r3.ebuild b/gui-wm/sway/sway-1.4-r3.ebuild
deleted file mode 100644
index 1f261585bb13..000000000000
--- a/gui-wm/sway/sway-1.4-r3.ebuild
+++ /dev/null
@@ -1,120 +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
-	!elogind? ( !systemd? ( sys-auth/consolekit ) )
-	${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
-}
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index c1b6403cdb81..e4618c207ab9 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -53,7 +53,6 @@ else
 fi
 RDEPEND="
 	x11-misc/xkeyboard-config
-	!elogind? ( !systemd? ( sys-auth/consolekit ) )
 	${DEPEND}
 "
 BDEPEND="