From 1422471a9d4bbafc0260e34de7cf667b81b5820e Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sat, 9 Aug 2025 20:58:40 +0300 Subject: trinity-base/kcontrol: fix config variable: XSCREENSAVER_DIR{=>S} Signed-off-by: Alexander Golubev --- trinity-base/kcontrol/kcontrol-14.1.1-r1.ebuild | 60 +++++++++++++++++++++++++ trinity-base/kcontrol/kcontrol-14.1.1.ebuild | 60 ------------------------- trinity-base/kcontrol/kcontrol-14.1.2-r1.ebuild | 55 +++++++++++++++++++++++ trinity-base/kcontrol/kcontrol-14.1.2.ebuild | 55 ----------------------- trinity-base/kcontrol/kcontrol-9999.ebuild | 2 +- 5 files changed, 116 insertions(+), 116 deletions(-) create mode 100644 trinity-base/kcontrol/kcontrol-14.1.1-r1.ebuild delete mode 100644 trinity-base/kcontrol/kcontrol-14.1.1.ebuild create mode 100644 trinity-base/kcontrol/kcontrol-14.1.2-r1.ebuild delete mode 100644 trinity-base/kcontrol/kcontrol-14.1.2.ebuild diff --git a/trinity-base/kcontrol/kcontrol-14.1.1-r1.ebuild b/trinity-base/kcontrol/kcontrol-14.1.1-r1.ebuild new file mode 100644 index 00000000..5e04048a --- /dev/null +++ b/trinity-base/kcontrol/kcontrol-14.1.1-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2023 Gentoo Authors +# Copyright 2020-2025 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_TYPE="core" +TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" +inherit trinity-meta-2 + +DESCRIPTION="The Trinity Control Center" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +IUSE="+hwlib ieee1394 logitech-mouse samba +svg +xrandr" + +DEPEND=" + ~trinity-base/kicker-${PV} + ~trinity-base/libkonq-${PV} + ~trinity-base/tdelibs-${PV}[xrandr?] + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXrender + ieee1394? ( sys-libs/libraw1394 ) + logitech-mouse? ( virtual/libusb:0 ) + samba? ( net-fs/samba ) +" +RDEPEND="${DEPEND} + sys-apps/usbutils + ~trinity-base/kcminit-${PV} + ~trinity-base/khelpcenter-${PV} + ~trinity-base/khotkeys-${PV} + ~trinity-base/tdebase-data-${PV} + ~trinity-base/tdesu-${PV} + svg? ( media-libs/libart_lgpl ) +" + +src_prepare() { + eapply "${FILESDIR}/tdebase-strlcpy.patch" + trinity-meta-2_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_XCURSOR=ON + -DWITH_XRENDER=ON + -DWITH_USBIDS=/usr/share/misc/usb.ids + -DWITH_SAMBA="$(usex samba)" + -DWITH_LIBUSB="$(usex logitech-mouse)" + -DWITH_LIBRAW1394="$(usex ieee1394)" + -DWITH_XRANDR="$(usex xrandr)" + -DWITH_TDEHWLIB="$(usex hwlib)" + -DWITH_LIBART="$(usex svg)" + -DXSCREENSAVER_DIRS="/usr/$(get_libdir)/misc/xscreensaver" + ) + + trinity-meta-2_src_configure +} diff --git a/trinity-base/kcontrol/kcontrol-14.1.1.ebuild b/trinity-base/kcontrol/kcontrol-14.1.1.ebuild deleted file mode 100644 index 207003b2..00000000 --- a/trinity-base/kcontrol/kcontrol-14.1.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Copyright 2020-2023 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -TRINITY_MODULE_NAME="tdebase" -TRINITY_MODULE_TYPE="core" -TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" -inherit trinity-meta-2 - -DESCRIPTION="The Trinity Control Center" -if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -IUSE="+hwlib ieee1394 logitech-mouse samba +svg +xrandr" - -DEPEND=" - ~trinity-base/kicker-${PV} - ~trinity-base/libkonq-${PV} - ~trinity-base/tdelibs-${PV}[xrandr?] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXrender - ieee1394? ( sys-libs/libraw1394 ) - logitech-mouse? ( virtual/libusb:0 ) - samba? ( net-fs/samba ) -" -RDEPEND="${DEPEND} - sys-apps/usbutils - ~trinity-base/kcminit-${PV} - ~trinity-base/khelpcenter-${PV} - ~trinity-base/khotkeys-${PV} - ~trinity-base/tdebase-data-${PV} - ~trinity-base/tdesu-${PV} - svg? ( media-libs/libart_lgpl ) -" - -src_prepare() { - eapply "${FILESDIR}/tdebase-strlcpy.patch" - trinity-meta-2_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DWITH_XCURSOR=ON - -DWITH_XRENDER=ON - -DWITH_USBIDS=/usr/share/misc/usb.ids - -DWITH_SAMBA="$(usex samba)" - -DWITH_LIBUSB="$(usex logitech-mouse)" - -DWITH_LIBRAW1394="$(usex ieee1394)" - -DWITH_XRANDR="$(usex xrandr)" - -DWITH_TDEHWLIB="$(usex hwlib)" - -DWITH_LIBART="$(usex svg)" - -DXSCREENSAVER_DIR="/usr/$(get_libdir)/misc/xscreensaver" - ) - - trinity-meta-2_src_configure -} diff --git a/trinity-base/kcontrol/kcontrol-14.1.2-r1.ebuild b/trinity-base/kcontrol/kcontrol-14.1.2-r1.ebuild new file mode 100644 index 00000000..df4dfdae --- /dev/null +++ b/trinity-base/kcontrol/kcontrol-14.1.2-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Copyright 2020-2025 The Trinity Desktop Project +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_TYPE="core" +TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" +inherit trinity-meta-2 + +DESCRIPTION="The Trinity Control Center" +if [[ ${PV} != *9999* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +IUSE="+hwlib ieee1394 logitech-mouse samba +svg +xrandr" + +DEPEND=" + ~trinity-base/kicker-${PV} + ~trinity-base/libkonq-${PV} + ~trinity-base/tdelibs-${PV}[xrandr?] + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXrender + ieee1394? ( sys-libs/libraw1394 ) + logitech-mouse? ( virtual/libusb:0 ) + samba? ( net-fs/samba ) +" +RDEPEND="${DEPEND} + sys-apps/usbutils + ~trinity-base/kcminit-${PV} + ~trinity-base/khelpcenter-${PV} + ~trinity-base/khotkeys-${PV} + ~trinity-base/tdebase-data-${PV} + ~trinity-base/tdesu-${PV} + svg? ( media-libs/libart_lgpl ) +" + +src_configure() { + local mycmakeargs=( + -DWITH_XCURSOR=ON + -DWITH_XRENDER=ON + -DWITH_USBIDS=/usr/share/misc/usb.ids + -DWITH_SAMBA="$(usex samba)" + -DWITH_LIBUSB="$(usex logitech-mouse)" + -DWITH_LIBRAW1394="$(usex ieee1394)" + -DWITH_XRANDR="$(usex xrandr)" + -DWITH_TDEHWLIB="$(usex hwlib)" + -DWITH_LIBART="$(usex svg)" + -DXSCREENSAVER_DIRS="/usr/$(get_libdir)/misc/xscreensaver" + ) + + trinity-meta-2_src_configure +} diff --git a/trinity-base/kcontrol/kcontrol-14.1.2.ebuild b/trinity-base/kcontrol/kcontrol-14.1.2.ebuild deleted file mode 100644 index ae4cdcbf..00000000 --- a/trinity-base/kcontrol/kcontrol-14.1.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Copyright 2020-2024 The Trinity Desktop Project -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -TRINITY_MODULE_NAME="tdebase" -TRINITY_MODULE_TYPE="core" -TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" -inherit trinity-meta-2 - -DESCRIPTION="The Trinity Control Center" -if [[ ${PV} != *9999* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -IUSE="+hwlib ieee1394 logitech-mouse samba +svg +xrandr" - -DEPEND=" - ~trinity-base/kicker-${PV} - ~trinity-base/libkonq-${PV} - ~trinity-base/tdelibs-${PV}[xrandr?] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXrender - ieee1394? ( sys-libs/libraw1394 ) - logitech-mouse? ( virtual/libusb:0 ) - samba? ( net-fs/samba ) -" -RDEPEND="${DEPEND} - sys-apps/usbutils - ~trinity-base/kcminit-${PV} - ~trinity-base/khelpcenter-${PV} - ~trinity-base/khotkeys-${PV} - ~trinity-base/tdebase-data-${PV} - ~trinity-base/tdesu-${PV} - svg? ( media-libs/libart_lgpl ) -" - -src_configure() { - local mycmakeargs=( - -DWITH_XCURSOR=ON - -DWITH_XRENDER=ON - -DWITH_USBIDS=/usr/share/misc/usb.ids - -DWITH_SAMBA="$(usex samba)" - -DWITH_LIBUSB="$(usex logitech-mouse)" - -DWITH_LIBRAW1394="$(usex ieee1394)" - -DWITH_XRANDR="$(usex xrandr)" - -DWITH_TDEHWLIB="$(usex hwlib)" - -DWITH_LIBART="$(usex svg)" - -DXSCREENSAVER_DIR="/usr/$(get_libdir)/misc/xscreensaver" - ) - - trinity-meta-2_src_configure -} diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild index a7e1edd9..2ebc4c2e 100644 --- a/trinity-base/kcontrol/kcontrol-9999.ebuild +++ b/trinity-base/kcontrol/kcontrol-9999.ebuild @@ -48,7 +48,7 @@ src_configure() { -DWITH_XRANDR="$(usex xrandr)" -DWITH_TDEHWLIB="$(usex hwlib)" -DWITH_LIBART="$(usex svg)" - -DXSCREENSAVER_DIR="/usr/$(get_libdir)/misc/xscreensaver" + -DXSCREENSAVER_DIRS="/usr/$(get_libdir)/misc/xscreensaver" ) trinity-meta-2_src_configure -- cgit v1.2.3