From 80ee57bc7abf8263edc3be17e931896a0915a2c1 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 10 Aug 2025 00:16:08 +0300 Subject: trinity-base/tdelibs: fixup dependencies - USE=pcre now requires dev-libs/libpcre2 - move app-admin/sudo to RDEPEND - drop -DWITH_HAL=OFF Signed-off-by: Alexander Golubev --- trinity-base/tdelibs/tdelibs-14.1.1.ebuild | 9 ++++----- trinity-base/tdelibs/tdelibs-14.1.2.ebuild | 9 ++++----- trinity-base/tdelibs/tdelibs-9999.ebuild | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/trinity-base/tdelibs/tdelibs-14.1.1.ebuild b/trinity-base/tdelibs/tdelibs-14.1.1.ebuild index c8d57cc2..eff318b8 100644 --- a/trinity-base/tdelibs/tdelibs-14.1.1.ebuild +++ b/trinity-base/tdelibs/tdelibs-14.1.1.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2023 Gentoo Authors -# Copyright 2020-2023 The Trinity Desktop Project +# Copyright 2020-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -47,14 +47,13 @@ DEPEND=" lua? ( dev-lang/lua:* ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr ) - pcre? ( dev-libs/libpcre ) + pcre? ( dev-libs/libpcre2 ) shm? ( x11-libs/libxshmfence ) spell? ( app-text/aspell ) ssl? ( app-misc/ca-certificates dev-libs/openssl:= ) - sudo? ( app-admin/sudo ) svg? ( media-libs/libart_lgpl ) tiff? ( media-libs/tiff:= ) utempter? ( sys-libs/libutempter ) @@ -63,6 +62,7 @@ DEPEND=" zeroconf? ( ~dev-tqt/avahi-tqt-${PV} ) " RDEPEND="${DEPEND} + sudo? ( app-admin/sudo ) hwlib? ( acct-group/plugdev !udevil? ( !udisks? ( sys-apps/pmount ) ) @@ -89,7 +89,6 @@ src_configure() { -DTDE_MALLOC_FULL="$(usex malloc)" -DTDE_MALLOC_DEBUG="$(usex debug)" -DWITH_HSPELL=OFF - -DWITH_HAL=OFF -DWITH_DEVKITPOWER=OFF -DWITH_OLD_XDG_STD=OFF -DWITH_KDE4_MENU_SUFFIX=OFF @@ -97,7 +96,7 @@ src_configure() { -DWITH_ARTS="$(usex arts)" -DWITH_LIBIDN="$(usex idn)" -DWITH_MITSHM="$(usex shm)" - -DWITH_PCRE="$(usex pcre)" + -DWITH_PCRE2="$(usex pcre)" -DWITH_LIBART="$(usex svg)" -DWITH_SSL="$(usex ssl)" -DWITH_LIBBFD="$(usex debug)" diff --git a/trinity-base/tdelibs/tdelibs-14.1.2.ebuild b/trinity-base/tdelibs/tdelibs-14.1.2.ebuild index 6a6c4c77..079e9fcc 100644 --- a/trinity-base/tdelibs/tdelibs-14.1.2.ebuild +++ b/trinity-base/tdelibs/tdelibs-14.1.2.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2024 Gentoo Authors -# Copyright 2020-2024 The Trinity Desktop Project +# Copyright 2020-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -47,14 +47,13 @@ DEPEND=" lua? ( dev-lang/lua:* ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr ) - pcre? ( dev-libs/libpcre ) + pcre? ( dev-libs/libpcre2 ) shm? ( x11-libs/libxshmfence ) spell? ( app-text/aspell ) ssl? ( app-misc/ca-certificates dev-libs/openssl:= ) - sudo? ( app-admin/sudo ) svg? ( media-libs/libart_lgpl ) tiff? ( media-libs/tiff:= ) utempter? ( sys-libs/libutempter ) @@ -63,6 +62,7 @@ DEPEND=" zeroconf? ( ~dev-tqt/avahi-tqt-${PV} ) " RDEPEND="${DEPEND} + sudo? ( app-admin/sudo ) hwlib? ( acct-group/plugdev !udevil? ( !udisks? ( sys-apps/pmount ) ) @@ -89,7 +89,6 @@ src_configure() { -DTDE_MALLOC_FULL="$(usex malloc)" -DTDE_MALLOC_DEBUG="$(usex debug)" -DWITH_HSPELL=OFF - -DWITH_HAL=OFF -DWITH_DEVKITPOWER=OFF -DWITH_OLD_XDG_STD=OFF -DWITH_KDE4_MENU_SUFFIX=OFF @@ -97,7 +96,7 @@ src_configure() { -DWITH_ARTS="$(usex arts)" -DWITH_LIBIDN="$(usex idn)" -DWITH_MITSHM="$(usex shm)" - -DWITH_PCRE="$(usex pcre)" + -DWITH_PCRE2="$(usex pcre)" -DWITH_LIBART="$(usex svg)" -DWITH_SSL="$(usex ssl)" -DWITH_LIBBFD="$(usex debug)" diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild index 40e9f5bb..bb179292 100644 --- a/trinity-base/tdelibs/tdelibs-9999.ebuild +++ b/trinity-base/tdelibs/tdelibs-9999.ebuild @@ -1,5 +1,5 @@ # Copyright 1999-2020 Gentoo Authors -# Copyright 2020 The Trinity Desktop Project +# Copyright 2020-2025 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -47,14 +47,13 @@ DEPEND=" lua? ( dev-lang/lua:* ) lzma? ( app-arch/xz-utils ) openexr? ( media-libs/openexr ) - pcre? ( dev-libs/libpcre ) + pcre? ( dev-libs/libpcre2 ) shm? ( x11-libs/libxshmfence ) spell? ( app-text/aspell ) ssl? ( app-misc/ca-certificates dev-libs/openssl:= ) - sudo? ( app-admin/sudo ) svg? ( media-libs/libart_lgpl ) tiff? ( media-libs/tiff:= ) utempter? ( sys-libs/libutempter ) @@ -63,6 +62,7 @@ DEPEND=" zeroconf? ( ~dev-tqt/avahi-tqt-${PV} ) " RDEPEND="${DEPEND} + sudo? ( app-admin/sudo ) hwlib? ( acct-group/plugdev !udevil? ( !udisks? ( sys-apps/pmount ) ) @@ -89,7 +89,6 @@ src_configure() { -DTDE_MALLOC_FULL="$(usex malloc)" -DTDE_MALLOC_DEBUG="$(usex debug)" -DWITH_HSPELL=OFF - -DWITH_HAL=OFF -DWITH_DEVKITPOWER=OFF -DWITH_OLD_XDG_STD=OFF -DWITH_KDE4_MENU_SUFFIX=OFF @@ -97,7 +96,7 @@ src_configure() { -DWITH_ARTS="$(usex arts)" -DWITH_LIBIDN="$(usex idn)" -DWITH_MITSHM="$(usex shm)" - -DWITH_PCRE="$(usex pcre)" + -DWITH_PCRE2="$(usex pcre)" -DWITH_LIBART="$(usex svg)" -DWITH_SSL="$(usex ssl)" -DWITH_LIBBFD="$(usex debug)" -- cgit v1.2.3