commit:     2a213c5219cba78a9d1c6adf669b29f5f55b73f5
Author:     Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Thu Jun  6 18:47:45 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 05:46:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a213c52

gui-libs/wlroots: drop USE=tinywl

wlroots is now slotted, USE=tinywl causes file collisions between slots
split tinywl into its own package to avoid it.

Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 gui-libs/wlroots/wlroots-0.17.3-r3.ebuild | 8 ++------
 gui-libs/wlroots/wlroots-9999.ebuild      | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild 
b/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
index d9dee7d3ca13..4002b88934c6 100644
--- a/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
+++ b/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="liftoff +libinput +drm +session tinywl vulkan x11-backend xcb-errors X"
+IUSE="liftoff +libinput +drm +session vulkan x11-backend xcb-errors X"
 REQUIRED_USE="
        drm? ( session )
        libinput? ( session )
@@ -89,7 +89,7 @@ src_configure() {
        local meson_backends=$(IFS=','; echo "${backends[*]}")
        local emesonargs=(
                $(meson_feature xcb-errors)
-               $(meson_use tinywl examples)
+               -Dexamples=false
                -Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
                $(meson_feature X xwayland)
                -Dbackends=${meson_backends}
@@ -103,10 +103,6 @@ src_configure() {
 src_install() {
        meson_src_install
        dodoc docs/*
-
-       if use tinywl; then
-               dobin "${BUILD_DIR}"/tinywl/tinywl
-       fi
 }
 
 pkg_postinst() {

diff --git a/gui-libs/wlroots/wlroots-9999.ebuild 
b/gui-libs/wlroots/wlroots-9999.ebuild
index 32f3a4f0b961..05772f2c09af 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -19,7 +19,7 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="liftoff +libinput +drm +session tinywl lcms vulkan x11-backend 
xcb-errors X"
+IUSE="liftoff +libinput +drm +session lcms vulkan x11-backend xcb-errors X"
 REQUIRED_USE="
        drm? ( session )
        libinput? ( session )
@@ -82,7 +82,7 @@ src_configure() {
        local meson_backends=$(IFS=','; echo "${backends[*]}")
        local emesonargs=(
                $(meson_feature xcb-errors)
-               $(meson_use tinywl examples)
+               -Dexamples=false
                -Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
                $(meson_feature X xwayland)
                -Dbackends=${meson_backends}
@@ -97,10 +97,6 @@ src_configure() {
 src_install() {
        meson_src_install
        dodoc docs/*
-
-       if use tinywl; then
-               dobin "${BUILD_DIR}"/tinywl/tinywl
-       fi
 }
 
 pkg_postinst() {

Reply via email to