commit:     107f717e339ac8a4a50391e6d6e99703a8c83bf9
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Mon Jan  8 12:57:31 2024 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Mon Jan  8 13:03:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=107f717e

sys-firmware/lenovolegionlinux: update gui depedency to PyQT6
* change useflag for gui and acpi

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 .../lenovolegionlinux-9999.ebuild                  | 27 ++++++++++++++--------
 sys-firmware/lenovolegionlinux/metadata.xml        |  4 ++--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild 
b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
index c096ae9ccf..404ae862a1 100644
--- a/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
+++ b/sys-firmware/lenovolegionlinux/lenovolegionlinux-9999.ebuild
@@ -28,9 +28,14 @@ BDEPEND="sys-kernel/linux-headers
 "
 
 RDEPEND="
-       legion-tools? ( dev-python/PyQt5 dev-python/pyyaml 
dev-python/argcomplete dev-python/darkdetect )
+       gui? (
+               dev-python/PyQt6[gui,widgets]
+               dev-python/pyyaml
+               dev-python/argcomplete
+               dev-python/darkdetect
+       )
        downgrade-nvidia? ( <=x11-drivers/nvidia-drivers-525 )
-       legion-acpi? ( sys-power/acpid )
+       acpi? ( sys-power/acpid )
        radeon-dgpu? ( dev-util/rocm-smi )
        ryzenadj? ( sys-power/RyzenAdj )
        undervolt-intel? ( dev-python/undervolt )
@@ -40,8 +45,8 @@ DEPEND="${RDEPEND}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="legion-tools legion-acpi systemd radeon-dgpu downgrade-nvidia ryzenadj 
undervolt-intel"
-REQUIRED_USE="|| ( systemd legion-acpi radeon-dgpu downgrade-nvidia ryzenadj 
legion-tools undervolt-intel ) legion-acpi? ( legion-tools ) radeon-dgpu? ( 
!downgrade-nvidia legion-tools ) downgrade-nvidia? ( !radeon-dgpu legion-tools 
) undervolt-intel? ( !ryzenadj legion-tools ) ryzenadj? ( !undervolt-intel 
legion-tools )"
+IUSE="gui acpi systemd radeon-dgpu downgrade-nvidia ryzenadj undervolt-intel"
+REQUIRED_USE="|| ( systemd acpi radeon-dgpu downgrade-nvidia ryzenadj gui 
undervolt-intel ) acpi? ( gui ) radeon-dgpu? ( !downgrade-nvidia gui ) 
downgrade-nvidia? ( !radeon-dgpu gui ) undervolt-intel? ( !ryzenadj gui ) 
ryzenadj? ( !undervolt-intel gui )"
 
 MODULES_KERNEL_MIN=5.10
 
@@ -51,7 +56,7 @@ src_compile() {
        )
        export KERNELVERSION=${KV_FULL}
        linux-mod-r1_src_compile
-       if use legion-tools; then
+       if use gui; then
                if [[ ${PV} == "9999" ]]; then
                        #fix python package version
                        sed -i "s/version = _VERSION/version = 9999/g" 
"${WORKDIR}/${P}/python/legion_linux/setup.cfg"
@@ -71,7 +76,7 @@ src_install() {
        pushd python/legion_linux/ || die
        make forcereloadmodule
        popd || die
-       if use legion-tools; then
+       if use gui; then
                #Define build dir (fix sandboxed)
                cd "${WORKDIR}/${P}/python/legion_linux/"
                distutils-r1_src_install --build-dir 
"${WORKDIR}/${P}/python/legion_linux/build"
@@ -82,9 +87,11 @@ src_install() {
                        systemd_dounit service/legion-linux.service 
service/legion-linux.path
                fi
 
-               if use legion-acpi; then
-                       insinto /usr/share/legion_linux/acpi/events && doins 
acpi/events/{ac_adapter_legion-fancurve,novo-button,PrtSc-button,fn-r-refrate}
-                       insinto /usr/share/legion_linux/acpi/actions  && doins 
acpi/actions/{battery-legion-quiet.sh,snipping-tool.sh,fn-r-refresh-rate.sh}
+               if use acpi; then
+                       insinto /usr/share/legion_linux/acpi/events
+                       doins 
acpi/events/{ac_adapter_legion-fancurve,novo-button,PrtSc-button,fn-r-refrate}
+                       insinto /usr/share/legion_linux/acpi/actions
+                       doins 
acpi/actions/{battery-legion-quiet.sh,snipping-tool.sh,fn-r-refresh-rate.sh}
                fi
        fi
 }
@@ -102,7 +109,7 @@ pkg_postinst() {
                        ewarn "Note: Edit /etc/legion_linux/.env to enable 
nvidia TDP control\n"
                fi
        fi
-       use legion-acpi && ewarn "Acpi exemples are included in 
/usr/share/legion_linux/acpi\n"
+       use acpi && ewarn "Acpi exemples are included in 
/usr/share/legion_linux/acpi\n"
        ewarn "Note for 2023-2023 Legion user: It need help for testing the 
features"
        ewarn "Pls test the feature how is decribe in the README of the 
project!"
        ewarn "and also go to this issue in github: 
https://github.com/johnfanv2/LenovoLegionLinux/issues/46";

diff --git a/sys-firmware/lenovolegionlinux/metadata.xml 
b/sys-firmware/lenovolegionlinux/metadata.xml
index 262a2a0256..0bf12c93d9 100644
--- a/sys-firmware/lenovolegionlinux/metadata.xml
+++ b/sys-firmware/lenovolegionlinux/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <use>
-               <flag name="legion-tools">Build and install legion_gui and 
legion_cli</flag>
-               <flag name="legion-acpi">Provide acpi exemple 
/usr/share/legion_linux/acpi </flag>
+               <flag name="gui">Build and install legion_gui and 
legion_cli</flag>
+               <flag name="acpi">Provide acpi exemple 
/usr/share/legion_linux/acpi </flag>
                <flag name="radeon-dgpu">Enable AMD GPU TDP control 
(systemd-service)</flag>
                <flag name="downgrade-nvidia">Downgrade nvidia for 525 to 
enable TDP control (systemd-service)</flag>
                <flag name="ryzenadj">[AMD] CPU and APU control using ryzenadj 
(systemd-service)</flag>

Reply via email to