gentoo resync : 13.06.2020

4 files changed, 18 insertions, 29 deletions

diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 661e3591eeb2..4183e66a89e9 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.ebuild 2287 BLAKE2B 83f8b62d0b931abe3da13c8dd9756ab5b283aa6667f5c89529e87a38639505b19182837f57cb01543703cbebd8cb483dd7d181479b963ff7c11b9f036dacc778 SHA512 422dfd773ec8518110076038ad8ab09337c51a0b0e7f872c7236147b302148bcbb31a3534a704e41d93a344197ac0ab1ae7b51c00d1a00b29d1dcf97df9cd2c1
-EBUILD wayfire-9999.ebuild 2287 BLAKE2B 83f8b62d0b931abe3da13c8dd9756ab5b283aa6667f5c89529e87a38639505b19182837f57cb01543703cbebd8cb483dd7d181479b963ff7c11b9f036dacc778 SHA512 422dfd773ec8518110076038ad8ab09337c51a0b0e7f872c7236147b302148bcbb31a3534a704e41d93a344197ac0ab1ae7b51c00d1a00b29d1dcf97df9cd2c1
-MISC metadata.xml 1180 BLAKE2B 5436b507ccd19b5462a9cd64bd1c0929ac6ed57a94f52945479edc60ebcf655c7f53d7eeaa871ca63c1aef9adfda5ca4c758fa470f5e1e4a422143304be993a3 SHA512 1f84c75e4ef44543221220dcbdf3ecfb9f5e0bf06e3a0b5c9a934dc36412c213c11053e29fa3b6389e7bfaf007dab8a79d9dd3a92f1fd6d30d193b8d8447d920
+EBUILD wayfire-0.4.0-r1.ebuild 2194 BLAKE2B 21a6e27a3588ff7363b677291d873e8a5a346cb6c563f4ab268b5ec10462f268690c41ba1e51d955f2bfb96723c65630feb6e6c8bef7caf3c0eabe05f24cab85 SHA512 1b0d24952d7625a212edc50255e579dafc0a4780ca28f1dc5b0fa38ad2fc0a9a93d70a1342e98bf22c7fbb84e1ea7756ab41a6ac5d31dcb85a50283e1b23dc12
+EBUILD wayfire-9999.ebuild 2192 BLAKE2B 2641ce27a3bf3aed1483d492d21500cba7a06028a462067b732e76e00771b6fb03782d8f9ec93e48935be2eeaebd6b743f2f55c45ba4165e561d1b2adfed04c1 SHA512 a5eaf39d90c03a99166b6193f6e11a82031055626103edb8a65f1c12a9a4b4e5a7e6870245c8a7fe757ef7226847a470ee75f2c8be8d2cc4ae715f21fe6865e7
+MISC metadata.xml 1050 BLAKE2B 4404ae0b4151d021c94faae90c340bfd76cdfc3885c543dfccbb7ce55b47811eaf3066c47026f3767c8b9289612605798db167783e3e466bb383336802649877 SHA512 da70122b6ba9cda31537d7c14b9c2d8b7b6097808e3d07f3e15fdfc9f8e21c3d5db0bf7105dcbafe80c08b22e979f338a702b36a7cbd7f2cade4a2c005d0fadf
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index c61941f4b35f..5765c019ed73 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -15,9 +15,8 @@
         <name>Proxy Maintainers</name>
     </maintainer>
     <use>
-        <flag name="gles2">use libglvnd to do animations more efficiently</flag>
+        <flag name="gles">use libglvnd to do animations more efficiently</flag>
         <flag name='system-wfconfig'>use the system-wide wf-config, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
         <flag name='system-wlroots'>use the system wide wlroots, else build it as a submodule. DO NOT DISABLE UNLESS YOU KNOW WHAT YOU ARE DOING.</flag>
-        <flag name='debug'>add debugging symbols for error reporting. DISABLE ALL SYSTEM USE FLAGS BEFORE REPORTING BUGS.</flag>
     </use>
 </pkgmetadata>
diff --git a/gui-wm/wayfire/wayfire-0.4.0.ebuild b/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild
index 96c6375e2b05..9de00654b844 100644
--- a/gui-wm/wayfire/wayfire-0.4.0.ebuild
+++ b/gui-wm/wayfire/wayfire-0.4.0-r1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+gles2 +system-wfconfig +system-wlroots elogind systemd debug"
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -35,10 +35,10 @@ DEPEND="
 	x11-libs/cairo:=[X,svg]
 	x11-libs/libxkbcommon:=[X]
 	x11-libs/pixman
-	gles2? ( media-libs/libglvnd[X] )
-	system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] )
+	gles? ( media-libs/libglvnd[X] )
+	system-wfconfig? ( ~gui-libs/wf-config-${PV} )
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] )
+	system-wlroots? ( ~gui-libs/wlroots-0.10.1[elogind=,systemd=,X] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
@@ -55,18 +55,13 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.18
 "
 
-src_compile(){
+src_configure() {
 	local emesonargs=(
 		$(meson_feature system-wfconfig use_system_wfconfig)
 		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_use gles2 enable_gles32)
+		$(meson_use gles enable_gles32)
 	)
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
+	meson_src_configure
 }
 
 src_install() {
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 96c6375e2b05..3a3d136e62b0 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+gles2 +system-wfconfig +system-wlroots elogind systemd debug"
+IUSE="+gles +system-wfconfig +system-wlroots elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -35,10 +35,10 @@ DEPEND="
 	x11-libs/cairo:=[X,svg]
 	x11-libs/libxkbcommon:=[X]
 	x11-libs/pixman
-	gles2? ( media-libs/libglvnd[X] )
-	system-wfconfig? ( ~gui-libs/wf-config-${PV}[debug=] )
+	gles? ( media-libs/libglvnd[X] )
+	system-wfconfig? ( ~gui-libs/wf-config-${PV} )
 	!system-wfconfig? ( !gui-libs/wf-config )
-	system-wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] )
+	system-wlroots? ( ~gui-libs/wlroots-9999[elogind=,systemd=,X] )
 	!system-wlroots? ( !gui-libs/wlroots )
 "
 
@@ -55,18 +55,13 @@ BDEPEND="
 	>=dev-libs/wayland-protocols-1.18
 "
 
-src_compile(){
+src_configure() {
 	local emesonargs=(
 		$(meson_feature system-wfconfig use_system_wfconfig)
 		$(meson_feature system-wlroots use_system_wlroots)
-		$(meson_use gles2 enable_gles32)
+		$(meson_use gles enable_gles32)
 	)
-	if use debug; then
-		emesonargs+=(
-			"-Db_sanitize=address,undefined"
-		)
-	fi
-	meson_src_compile
+	meson_src_configure
 }
 
 src_install() {