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 --- .../tdeaddons-meta/tdeaddons-meta-9999.ebuild | 13 +++----- .../tdeartwork-meta/tdeartwork-meta-9999.ebuild | 17 +++++----- trinity-base/tdebase-meta/tdebase-meta-9999.ebuild | 36 ++++++++++------------ .../tdegames-meta/tdegames-meta-9999.ebuild | 13 +++----- .../tdegraphics-meta/tdegraphics-meta-9999.ebuild | 17 +++++----- .../tdenetwork-meta/tdenetwork-meta-9999.ebuild | 13 +++----- trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild | 13 +++----- .../tdeutils-meta/tdeutils-meta-9999.ebuild | 17 +++++----- 8 files changed, 58 insertions(+), 81 deletions(-) diff --git a/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild index e0099ddf..f8e2a342 100644 --- a/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild +++ b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild @@ -4,19 +4,14 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdeaddons metapackage - merge this to pull in all tdeaddons-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" RDEPEND=" ~trinity-base/atlantikdesigner-${PV} - ~trinity-base/tdeaddons-doc-${PV} ~trinity-base/kaddressbook-plugins-${PV} ~trinity-base/kate-plugins-${PV} ~trinity-base/kicker-applets-${PV} @@ -24,7 +19,9 @@ RDEPEND=" ~trinity-base/konq-plugins-${PV} ~trinity-base/ksig-${PV} ~trinity-base/renamedlg-plugins-${PV} - ~trinity-base/tdeaddons-tdefile-plugins-${PV}" + ~trinity-base/tdeaddons-doc-${PV} + ~trinity-base/tdeaddons-tdefile-plugins-${PV} +" # trinity-base/noatun-plugins masked due to missing dependency: noatun # But not long anymore.. :-) diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild index d092ea32..6735ce27 100644 --- a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild +++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild @@ -4,23 +4,20 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdeartwork meta package - merge this to pull in all tdeartwork-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" RDEPEND=" ~trinity-base/tdeartwork-emoticons-${PV} - ~trinity-base/tdeartwork-icon-themes-${PV} ~trinity-base/tdeartwork-icewm-themes-${PV} - ~trinity-base/tdeartwork-tdescreensaver-${PV} - ~trinity-base/tdeartwork-twin-styles-${PV} + ~trinity-base/tdeartwork-icon-themes-${PV} ~trinity-base/tdeartwork-kworldclock-${PV} ~trinity-base/tdeartwork-sounds-${PV} ~trinity-base/tdeartwork-styles-${PV} - ~trinity-base/tdeartwork-wallpapers-${PV}" + ~trinity-base/tdeartwork-tdescreensaver-${PV} + ~trinity-base/tdeartwork-twin-styles-${PV} + ~trinity-base/tdeartwork-wallpapers-${PV} +" 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} +" diff --git a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild index 9ac98b2d..a5ae70fb 100644 --- a/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild +++ b/trinity-base/tdegames-meta/tdegames-meta-9999.ebuild @@ -4,19 +4,14 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdegames metapackage - merge this to pull in all tdegames-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" RDEPEND=" ~trinity-base/atlantik-${PV} - ~trinity-base/tdegames-doc-${PV} ~trinity-base/kasteroids-${PV} ~trinity-base/katomic-${PV} ~trinity-base/kbackgammon-${PV} @@ -48,4 +43,6 @@ RDEPEND=" ~trinity-base/ktuberling-${PV} ~trinity-base/libtdegames-${PV} ~trinity-base/lskat-${PV} - ~trinity-base/twin4-${PV}" + ~trinity-base/tdegames-doc-${PV} + ~trinity-base/twin4-${PV} +" diff --git a/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild index 7287bd92..d8f2fb18 100644 --- a/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild +++ b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild @@ -4,26 +4,19 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdegraphics metapackage - merge this to pull in all tdegraphics-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" RDEPEND=" ~trinity-base/kamera-${PV} ~trinity-base/kcoloredit-${PV} ~trinity-base/kdvi-${PV} ~trinity-base/kfax-${PV} - ~trinity-base/tdegraphics-tdefile-plugins-${PV} - ~trinity-base/tdegraphics-doc-${PV} ~trinity-base/kgamma-${PV} ~trinity-base/kghostview-${PV} - ~trinity-base/tdeiconedit-${PV} ~trinity-base/kmrml-${PV} ~trinity-base/kolourpaint-${PV} ~trinity-base/kooka-${PV} @@ -35,4 +28,8 @@ RDEPEND=" ~trinity-base/kuickshow-${PV} ~trinity-base/kview-${PV} ~trinity-base/kviewshell-${PV} - ~trinity-base/libkscan-${PV}" + ~trinity-base/libkscan-${PV} + ~trinity-base/tdegraphics-doc-${PV} + ~trinity-base/tdegraphics-tdefile-plugins-${PV} + ~trinity-base/tdeiconedit-${PV} +" diff --git a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild index be44b690..371deb05 100644 --- a/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild +++ b/trinity-base/tdenetwork-meta/tdenetwork-meta-9999.ebuild @@ -4,20 +4,15 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdenetwork metapackage - merge this to pull in all tdenetwork-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" RDEPEND=" ~trinity-base/dcoprss-${PV} ~trinity-base/kdict-${PV} - ~trinity-base/tdednssd-${PV} ~trinity-base/kget-${PV} ~trinity-base/knewsticker-${PV} ~trinity-base/kopete-${PV} @@ -30,6 +25,8 @@ RDEPEND=" ~trinity-base/kwifimanager-${PV} ~trinity-base/librss-${PV} ~trinity-base/lisa-${PV} + ~trinity-base/tdednssd-${PV} ~trinity-base/tdenetwork-doc-${PV} ~trinity-base/tdenetwork-filesharing-${PV} - ~trinity-base/tdenetwork-tdefile-plugins-${PV}" + ~trinity-base/tdenetwork-tdefile-plugins-${PV} +" diff --git a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild index 5a0e876a..436a3e00 100644 --- a/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild +++ b/trinity-base/tdetoys-meta/tdetoys-meta-9999.ebuild @@ -4,24 +4,21 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdetoys metapackage - merge this to pull in all tdetoys-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" RDEPEND=" ~trinity-base/amor-${PV} ~trinity-base/eyesapplet-${PV} ~trinity-base/fifteenapplet-${PV} - ~trinity-base/tdetoys-doc-${PV} ~trinity-base/kmoon-${PV} ~trinity-base/kodo-${PV} ~trinity-base/kteatime-${PV} ~trinity-base/ktux-${PV} ~trinity-base/kweather-${PV} - ~trinity-base/kworldclock-${PV}" + ~trinity-base/kworldclock-${PV} + ~trinity-base/tdetoys-doc-${PV} +" diff --git a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild index 1d740d5b..79032745 100644 --- a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild +++ b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild @@ -4,22 +4,16 @@ EAPI="7" -inherit trinity-functions-2 - -set-trinityver - DESCRIPTION="tdeutils metapackage - merge this to pull in all tdeutils-derived packages" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +LICENSE="metapackage" +SLOT="14" RDEPEND=" ~trinity-base/ark-${PV} - ~trinity-base/tdeutils-doc-${PV} ~trinity-base/kcalc-${PV} ~trinity-base/kcharselect-${PV} - ~trinity-base/tdelirc-${PV} ~trinity-base/kdf-${PV} ~trinity-base/kedit-${PV} ~trinity-base/kfloppy-${PV} @@ -31,6 +25,9 @@ RDEPEND=" ~trinity-base/kregexpeditor-${PV} ~trinity-base/ksim-${PV} ~trinity-base/ktimer-${PV} - ~trinity-base/tdewallet-${PV} ~trinity-base/superkaramba-${PV} - ~trinity-base/tdefilereplace-${PV}" + ~trinity-base/tdefilereplace-${PV} + ~trinity-base/tdelirc-${PV} + ~trinity-base/tdeutils-doc-${PV} + ~trinity-base/tdewallet-${PV} +" -- cgit v1.2.1