From d55ba647926b122143bc5728a9fa50eb922ee034 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 14 Nov 2020 22:59:17 +0100 Subject: trinity-base: 9999 metapackages: set SLOT="14", set LICENSE="metapackage" This is in preparation of cleaning up some bits of trinity-functions-2.eclass. trinity-functions-2.eclass and set-trinityver do not really serve a purpose here. The eclass is not meant to be inherited from individual ebuilds, and if there ever will be a new SLOT it is going to be trivial to bump it. SLOT usage should be revisited however, and possibly reverted to "0". Also sort dependencies. Signed-off-by: Andreas Sturmlechner --- trinity-base/tdebase-meta/tdebase-meta-9999.ebuild | 36 ++++++++++------------ 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'trinity-base/tdebase-meta/tdebase-meta-9999.ebuild') diff --git a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild index 85874299..90b52904 100644 --- a/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild +++ b/trinity-base/tdebase-meta/tdebase-meta-9999.ebuild @@ -4,17 +4,13 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdebase metapackage - merge this to pull in all tdebase-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" -RDEPEND="~trinity-base/tdeinit-${PV} +RDEPEND=" ~trinity-base/drkonqi-${PV} ~trinity-base/kappfinder-${PV} ~trinity-base/kate-${PV} @@ -22,39 +18,41 @@ RDEPEND="~trinity-base/tdeinit-${PV} ~trinity-base/kcminit-${PV} ~trinity-base/kcontrol-${PV} ~trinity-base/kdcop-${PV} - ~trinity-base/tdedebugdialog-${PV} - ~trinity-base/tdepasswd-${PV} - ~trinity-base/tdeprint-${PV} - ~trinity-base/tdeeject-${PV} ~trinity-base/kdesktop-${PV} - ~trinity-base/tdesu-${PV} ~trinity-base/kdialog-${PV} - ~trinity-base/tdm-${PV} ~trinity-base/kfind-${PV} ~trinity-base/khelpcenter-${PV} ~trinity-base/khotkeys-${PV} ~trinity-base/kicker-${PV} - ~trinity-base/tdebase-tdeioslaves-${PV} ~trinity-base/klipper-${PV} ~trinity-base/kmenuedit-${PV} + ~trinity-base/knetattach-${PV} ~trinity-base/konqueror-${PV} ~trinity-base/konsole-${PV} ~trinity-base/kpager-${PV} ~trinity-base/kpersonalizer-${PV} ~trinity-base/kreadconfig-${PV} - ~trinity-base/tdescreensaver-${PV} + ~trinity-base/krootbacking-${PV} ~trinity-base/ksmserver-${PV} ~trinity-base/ksplashml-${PV} ~trinity-base/kstart-${PV} ~trinity-base/ksysguard-${PV} ~trinity-base/ksystraycmd-${PV} ~trinity-base/ktip-${PV} - ~trinity-base/twin-${PV} ~trinity-base/kxkb-${PV} ~trinity-base/libkonq-${PV} ~trinity-base/nsplugins-${PV} - ~trinity-base/knetattach-${PV} ~trinity-base/tdebase-data-${PV} ~trinity-base/tdebase-starttde-${PV} - ~trinity-base/krootbacking-${PV} - ~trinity-base/tqt3integration-${PV}" + ~trinity-base/tdebase-tdeioslaves-${PV} + ~trinity-base/tdedebugdialog-${PV} + ~trinity-base/tdeeject-${PV} + ~trinity-base/tdeinit-${PV} + ~trinity-base/tdepasswd-${PV} + ~trinity-base/tdeprint-${PV} + ~trinity-base/tdescreensaver-${PV} + ~trinity-base/tdesu-${PV} + ~trinity-base/tdm-${PV} + ~trinity-base/tqt3integration-${PV} + ~trinity-base/twin-${PV} +" -- cgit v1.2.1