gentoo resync : 29.06.2020

9 files changed, 128 insertions, 10 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 89ea62a65149..57fea9c1f1c3 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 6b7799c6e7e0..22a7bd6ecb92 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,7 +1,7 @@
 AUX hikari-1.2.0-gnu-make.patch 9378 BLAKE2B 77cb4dce472803167db411114f3259a21d15f46e0427d5c0ecfd59611440581120b6a1488c619ab0b85d8a97312878b59e6f7228392b5a41a740c52c8cc70fde SHA512 15fcdb0a4bcbcb846ce0cb8abb2b7980ff2f6aae191b592b254805a99149f63f65af572e848b9f7a19820b11fd4cd4dce8e6de5ea24e2fc2bac42a81ad98380d
-AUX hikari-2.0.1-gnu-make.patch 10167 BLAKE2B 70c1620b331cac9f3df11576d52f93ebc7c87465ddf9cc1b250a364b88276b8d4a5882d22f3ad4f773ac4bebcc71ef6c997344fa21d41d0dd06338dae34cc826 SHA512 83ab45d6e7debb7ac3304c4314bd02949e507eac10b91f4aba1a1d6692d497df155d93abefd55849bc6f3d18eae9b722be43c01bc3a9ba04b8d5d724822f7c9b
+AUX hikari-2.0.2-gnu-make.patch 10167 BLAKE2B 01b068ecb4921ff57238bac80079bbc399a292c5a22b62b85846f316a5961d7ea7724f9d4a95a3db1e8a4f8394b9f46b44f7fe5b7f4b193c3b4091fc42035cca SHA512 1e1d2a10d2d70bb5561e84007a0393b5ce5e99036caa27b7590877caf61895521cf3aa82aa7864797a7c6d77e5f30d058ec5feece455f259f9323c4d0387fc96
 DIST hikari-1.2.0.tar.gz 98941 BLAKE2B 0b882d483143e307d4b173560f335e85b4c5613b75c51c6b70b68df9b4f70f9a009d95cb8eda1c211f4968b5c8600e7113bca5e014cecfb1917db2acae7e6f3d SHA512 2bd0b6032541ca63a2bd12aee9155e9b0d08e4c541ec2f837073f1498ecb39df969f8821fcbd066e44c5ddaf658e4875bea25f344226b7ea97fe008a0db4d328
-DIST hikari-2.0.1.tar.gz 1003467 BLAKE2B 8a299fe1d85fac5df04f2475295250d78706c5da9c14a965ff8c7c91af36eaf5711675dc07c43c83974411719b88d483eee24ebd24a87eb1b3280a89b521a19e SHA512 18f8f46ae38fa307b63c44011da084ee0ec4a0925ff8ea3677fda9171bfd25b42853719cea812aabee2d377e6208ddcaf69692e1fb0655110f8d1905d1be00e8
+DIST hikari-2.0.2.tar.gz 1003593 BLAKE2B 89a2ec29673e7ac371a7e4f179b3dc398fbacb3daf859a9f1a53cf74aac9dc36ca33f3dc1878360fdae80ef39315a0b06d0988d897c9ce58693404fd3099d6bf SHA512 12e6cf2f1f24a4c0b64e6c035c518bdc5dbfa094a220147c374f599df8b52a4ee4c1f3cdffe1080fe87c665841a6ca018de4a48ec65aaa5b60e9e968087d83d6
 EBUILD hikari-1.2.0.ebuild 1081 BLAKE2B ff23f482966cb8b8487bbe001618d9fcfffc6eb4e2e76e49a8160e5859eeb5240432be3f0ff3ad2d796ac441e0bb4cf0a71dedbb1c701b6d470b26c68d4b578c SHA512 78676b87836d736bc6c7cf8f905e5d74b93c6739117089694db827307d1ecaa362c93399c3c73e5ce8a1035129b6acebe471bbf595ce35f9f496e1992abefc2b
-EBUILD hikari-2.0.1-r1.ebuild 1242 BLAKE2B eca47da1d671e007c9974754ff7dcba0c79f69108252f986e71557022cd44bf125ebee3556ac8b80c63c9cb43784129eeeb33e4540b1846969696c67df7f2cf7 SHA512 7219322dd4310a02b2b620edcef313ac780c77baec2ccc80bbaed4832b0b067e5607a7d0d88cd8bb38abe080f6321895d6c131797bd0113a2d0beeccb866dc4a
+EBUILD hikari-2.0.2.ebuild 1266 BLAKE2B 6a4010e117e93d65079736dffb07cedcf4074152b9ed60783a910ceb2c4bcafa79e62b4420008decb879d53d8b18d597a2fe407c5e7f64e97cc72bd61345657b SHA512 f371790d40e13c191b9deffa805f0929a3ea61a597b89d0fcffc950ac468511165d29ad4e0505ced4c6c2e3855ff092e31696a2da5b31b9aff9280161ac067d3
 MISC metadata.xml 970 BLAKE2B 3862fa99df4057da6ef427fefe51f33b1ac2adcc2c9ce51393f5189fa85ffea7b19b06898b23433e1980e32c08f5597f92e133095a4a849f3447bf77e1e4623e SHA512 c1032c3c177cdc0ad4afea2276f451bf39a7220c6d7f015d89c7a193b6fc194dae9e0711382126cf6df828c8b93e2445f3c28d93a2459cae1991d39fb2340430
diff --git a/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
index 0f5a67a62425..338fcd8745ff 100644
--- a/gui-wm/hikari/files/hikari-2.0.1-gnu-make.patch
+++ b/gui-wm/hikari/files/hikari-2.0.2-gnu-make.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 0f104d0..39d6972 100644
+index 0f104d0..6a1d640 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,22 @@
@@ -298,7 +298,7 @@ index 0f104d0..39d6972 100644
 +	mkdir -p $(PREFIX)/share/wayland-sessions
 +	mkdir -p $(ETC_PREFIX)/etc/hikari
 +	mkdir -p $(ETC_PREFIX)/etc/pam.d
-+	sed "s,PREFIX,$(PREFIX)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
++	sed "s,PREFIX,$(prefix)," etc/hikari/hikari.conf > $(ETC_PREFIX)/etc/hikari/hikari.conf
 +	chmod 644 $(ETC_PREFIX)/etc/hikari/hikari.conf
 +	install -m $(PERMS) hikari $(PREFIX)/bin
 +	install -m 4555 hikari-unlocker $(PREFIX)/bin
diff --git a/gui-wm/hikari/hikari-2.0.1-r1.ebuild b/gui-wm/hikari/hikari-2.0.2.ebuild
index ba2a76d4e9e3..45ebbda8ca0d 100644
--- a/gui-wm/hikari/hikari-2.0.1-r1.ebuild
+++ b/gui-wm/hikari/hikari-2.0.2.ebuild
@@ -56,7 +56,7 @@ src_compile() {
 }
 
 src_install() {
-	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install
+	emake PREFIX="${D}/usr" ETC_PREFIX="${D}" prefix="${SYSROOT}/usr" install
 	if use man; then
 		emake PREFIX="${D}/usr" ETC_PREFIX="${D}" install-doc
 	fi
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index c41a8912769b..830366653c17 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,8 @@
 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_rc1.tar.gz 5535472 BLAKE2B 54ecad147a7ce262231196afd8853bef2093e43516b89397d3fdaeb891beafeab29ca23aa12de02801b875330864261454a63593c881a25a12f85c0dedecd200 SHA512 0841122414d719ba183caf4c4ecb314d8a262a091e674f6884ed2f4f37f1e922f1415ecf985e81c785d5646481628f14c684523087a2dd7664628120be423a28
 EBUILD sway-1.4-r2.ebuild 3133 BLAKE2B 84082c22f9aaee17f4779ca857aff8f0af679c1a1e114ea33198ee767dacfebd894134428b33cf141bfcfaeb7daebf7284281c9a18f7b38a4b8af3e31d5b4f28 SHA512 8e53dca4dd27e4b2b2f751299fc3eb3ca90bd965e13b378d1eada64c5d054fd1e7dbd750a9abf9d185074030fe61878f4caf02092e59d560385f261a6e357ff6
 EBUILD sway-1.4.ebuild 3042 BLAKE2B ed83ac7e11b7d9261a8f1ab419c625dfe79b5df0d4aaae40b7b8f19f0efc3c4566f1efe5e31388a90c7448ebad5afa2817d45453380a03d7793b0f28ccf463ba SHA512 bb74a92ffe6ebf4e6f167ceba1f2ab49c08d17ab7a3837d7245b9b917d3a83e788fc860d9612146456d21c4ed9039cc419b74ef940bac88a1f3d6eeb597a03a5
-EBUILD sway-9999.ebuild 3090 BLAKE2B e14238694d2cec935caf206e4cbd029f84760acc099539a76295f8ce659a29611387c5d716d2e9cb537700e17db9d010bebeb82efdd8bbf1036a879fb3c9aed5 SHA512 0ebf33f6efc5e0b9357b642c060c5877b294a7f60f7f623a16cdce779fb83061cdf8eb5bff1dfc95a9007ae909ea1e27c4ab4e746c498de8189497b8ef3025f1
+EBUILD sway-1.5_rc1.ebuild 3046 BLAKE2B 0e73428d39e84d4ddb6b8b5bbd5704820c38485144933864a9e332fd7287b78533bdd431a3ca3e64126198f185cfcda7184aed91a6d73105012c397d03bbe257 SHA512 7f8a97b261e970488f34d9e9cd1c3b0bdf6e3274272b6fc024ce243975791666a9ccd072d5ab403460ea61a4ce99e802c3cccd600c968de182b5cf0ddb94d543
+EBUILD sway-9999.ebuild 3099 BLAKE2B d0c795d635b4c5f449972597906f82bdc9f3fc04324071a5b74989a6496d8b93f686a3308535a81b0c420291d3b2ac0d9a9a86386911a208bc76975e2e560fd7 SHA512 feb93d35d39d6558aeb614af0008e0c4b1a2426250013998ab72784fee2144865966342a64c973eb7a41333da23133b3411b93cf9c1330259389749df5515aff
 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
diff --git a/gui-wm/sway/sway-1.5_rc1.ebuild b/gui-wm/sway/sway-1.5_rc1.ebuild
new file mode 100644
index 000000000000..86f96883dab7
--- /dev/null
+++ b/gui-wm/sway/sway-1.5_rc1.ebuild
@@ -0,0 +1,116 @@
+# 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,libglvnd]
+	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-9999:=[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 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 e4618c207ab9..bf84713b3e9a 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	media-libs/mesa[gles2]
+	media-libs/mesa[gles2,libglvnd]
 	elogind? ( >=sys-auth/elogind-239 )
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	swaybg? ( gui-apps/swaybg )
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 4183e66a89e9..88dc2e3db549 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,4 +1,4 @@
 DIST wayfire-0.4.0.tar.xz 588904 BLAKE2B b720297b3ffb868761ea61615b4d0fefc2687f8a2060208f8cc002ff7adaf7622da906ad98e25664c3e72c04de2fb74741d0a417cce4826483407bdf10d63b43 SHA512 e96cdb90ce36c005476e08608683983aa167e58aea80fcfd3b24ab0836ec4aa50fb5a7eeb0872a1b1014e3073ed826e1c83d3146b39d3cdb2a8b3a0895155649
-EBUILD wayfire-0.4.0-r1.ebuild 2194 BLAKE2B 21a6e27a3588ff7363b677291d873e8a5a346cb6c563f4ab268b5ec10462f268690c41ba1e51d955f2bfb96723c65630feb6e6c8bef7caf3c0eabe05f24cab85 SHA512 1b0d24952d7625a212edc50255e579dafc0a4780ca28f1dc5b0fa38ad2fc0a9a93d70a1342e98bf22c7fbb84e1ea7756ab41a6ac5d31dcb85a50283e1b23dc12
+EBUILD wayfire-0.4.0-r2.ebuild 2195 BLAKE2B 5efde918474d27f67fc4f92d5f8698cc37f3c0c7a51ce9ec18c3de83665fa389bedcd216b6a677324d772bc0aac4932836ff78a0aa23f29d6fcfdfe14ca19e85 SHA512 f2ff58e2db827ecdaac14d00cfefca63d7bcba311733bfa38ecf9f3cdff23c1a7bcd9f0ae21110ced8752056bb86fdd6907716d5955ff7a656c2abbd61415451
 EBUILD wayfire-9999.ebuild 2192 BLAKE2B 2641ce27a3bf3aed1483d492d21500cba7a06028a462067b732e76e00771b6fb03782d8f9ec93e48935be2eeaebd6b743f2f55c45ba4165e561d1b2adfed04c1 SHA512 a5eaf39d90c03a99166b6193f6e11a82031055626103edb8a65f1c12a9a4b4e5a7e6870245c8a7fe757ef7226847a470ee75f2c8be8d2cc4ae715f21fe6865e7
 MISC metadata.xml 1050 BLAKE2B 4404ae0b4151d021c94faae90c340bfd76cdfc3885c543dfccbb7ce55b47811eaf3066c47026f3767c8b9289612605798db167783e3e466bb383336802649877 SHA512 da70122b6ba9cda31537d7c14b9c2d8b7b6097808e3d07f3e15fdfc9f8e21c3d5db0bf7105dcbafe80c08b22e979f338a702b36a7cbd7f2cade4a2c005d0fadf
diff --git a/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild
index 9de00654b844..bf539ba4965a 100644
--- a/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild
+++ b/gui-wm/wayfire/wayfire-0.4.0-r2.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 	x11-libs/libxkbcommon:=[X]
 	x11-libs/pixman
 	gles? ( media-libs/libglvnd[X] )
-	system-wfconfig? ( ~gui-libs/wf-config-${PV} )
+	system-wfconfig? ( >=gui-libs/wf-config-${PV} )
 	!system-wfconfig? ( !gui-libs/wf-config )
 	system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] )
 	!system-wlroots? ( !gui-libs/wlroots )