From fd91a49d8ea26aeb5a5ca187018f22e07bfebb89 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 21 Sep 2020 15:11:06 +0200 Subject: [PATCH] trinity-base/*: Unrestrict media-libs/libart_lgpl version dep Depending on ~media-libs/libart_lgpl-14.0.7 in 14.0.8 ebuilds was certainly not correct. Cherry-picked from af1b333e206ee5365b1670a7593161ebca98e2a4. Signed-off-by: Andreas Sturmlechner --- trinity-base/kcontrol/kcontrol-14.0.8.ebuild | 2 +- trinity-base/tdelibs/tdelibs-14.0.8.ebuild | 4 ++-- trinity-base/tdm/tdm-14.0.8.ebuild | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/trinity-base/kcontrol/kcontrol-14.0.8.ebuild b/trinity-base/kcontrol/kcontrol-14.0.8.ebuild index b943e464..189029f3 100644 --- a/trinity-base/kcontrol/kcontrol-14.0.8.ebuild +++ b/trinity-base/kcontrol/kcontrol-14.0.8.ebuild @@ -29,7 +29,7 @@ RDEPEND="${DEPEND} ~trinity-base/tdesu-${PV} ~trinity-base/khelpcenter-${PV} ~trinity-base/khotkeys-${PV} - svg? ( ~media-libs/libart_lgpl-14.0.7 )" + svg? ( media-libs/libart_lgpl )" TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/" diff --git a/trinity-base/tdelibs/tdelibs-14.0.8.ebuild b/trinity-base/tdelibs/tdelibs-14.0.8.ebuild index f74d4b55..4d31126c 100644 --- a/trinity-base/tdelibs/tdelibs-14.0.8.ebuild +++ b/trinity-base/tdelibs/tdelibs-14.0.8.ebuild @@ -15,8 +15,8 @@ DESCRIPTION="Trinity libraries needed by all TDE programs" HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" -KEYWORDS="~amd64 ~x86" SLOT="${TRINITY_VER}" +KEYWORDS="~amd64 ~x86" # NOTE: Building without tdehwlib segfaults, but you can try and report. IUSE+=" alsa cups debug elficons elogind fam +hwlib +idn jpeg2k kernel_linux @@ -51,7 +51,7 @@ COMMON_DEPEND=" libressl? ( dev-libs/libressl:= ) ) sudo? ( app-admin/sudo ) - svg? ( ~media-libs/libart_lgpl-14.0.7 ) + svg? ( media-libs/libart_lgpl ) tiff? ( media-libs/tiff:= ) utempter? ( sys-libs/libutempter ) xcomposite? ( x11-libs/libXcomposite ) diff --git a/trinity-base/tdm/tdm-14.0.8.ebuild b/trinity-base/tdm/tdm-14.0.8.ebuild index ff644091..a63acdca 100644 --- a/trinity-base/tdm/tdm-14.0.8.ebuild +++ b/trinity-base/tdm/tdm-14.0.8.ebuild @@ -15,7 +15,7 @@ IUSE="pam xdmcp xcomposite sak +xrandr +hwlib +svg" DEPEND="pam? ( trinity-base/tdebase-pam ) xdmcp? ( x11-libs/libXdmcp ) xcomposite? ( x11-libs/libXcomposite ) - svg? ( ~media-libs/libart_lgpl-14.0.7 ) + svg? ( media-libs/libart_lgpl ) ~trinity-base/tdelibs-${PV}[xrandr?] sys-apps/dbus x11-libs/libXtst