diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-03 14:12:24 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-12-07 01:49:57 +0100 |
| commit | 1ebc9f7807db09eb53d7f304c4d4126700c6b297 (patch) | |
| tree | 42fd1e502522a40d2c2f002399515048b235405c | |
| parent | 5732f27c0e26d2fba84055858043018f5b458718 (diff) | |
| download | tde-packaging-gentoo-1ebc9f78.tar.gz tde-packaging-gentoo-1ebc9f78.zip | |
*/*: 9999: Sanitise eclass/ebuild vars, drop set-trinityver and need-trinity
Uniform ebuild variable blocks according to skel.ebuild and by devmanual example
Sort some DEPENDs, fix some DESCRIPTIONs
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
258 files changed, 755 insertions, 990 deletions
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild index 06b09bca..549225fb 100644 --- a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild +++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild @@ -3,13 +3,14 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" + TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="dbus-1-tqt" - inherit trinity-base-2 DESCRIPTION="D-BUS TQt bindings" HOMEPAGE="https://trinitydesktop.org/" + LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" diff --git a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild index c3998da2..eb10ff9d 100644 --- a/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild +++ b/dev-libs/dbus-tqt/dbus-tqt-9999.ebuild @@ -3,13 +3,14 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" + TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="dbus-tqt" - inherit trinity-base-2 DESCRIPTION="D-BUS TQt bindings" HOMEPAGE="https://trinitydesktop.org/" + LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" diff --git a/trinity-apps/abakus/abakus-9999.ebuild b/trinity-apps/abakus/abakus-9999.ebuild index b4808d73..5d7260da 100644 --- a/trinity-apps/abakus/abakus-9999.ebuild +++ b/trinity-apps/abakus/abakus-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs de it nl pt sk" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A complex calculator for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/amarok/amarok-9999.ebuild b/trinity-apps/amarok/amarok-9999.ebuild index 86a807b2..a154cde6 100644 --- a/trinity-apps/amarok/amarok-9999.ebuild +++ b/trinity-apps/amarok/amarok-9999.ebuild @@ -4,8 +4,6 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -15,15 +13,14 @@ TRINITY_LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es ss sv ta tg th tr uk uz uz@cyrillic zh_CN zh_TW" TRINITY_DOC_LANGS="da de es et fr it nl pl pt pt_BR ru sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Advanced music player for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" # Notes about the ebuild: # @@ -44,7 +41,7 @@ opengl postgres visualization +xine" REQUIRED_USE="|| ( xine akode )" -DEPEND+=" +DEPEND=" dev-db/sqlite dev-lang/ruby:* media-libs/taglib @@ -63,7 +60,7 @@ DEPEND+=" ) xine? ( <media-libs/xine-lib-1.2.10 ) " -RDEPEND+=" ${DEPEND}" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/basket/basket-9999.ebuild b/trinity-apps/basket/basket-9999.ebuild index a64009d1..06dfe33b 100644 --- a/trinity-apps/basket/basket-9999.ebuild +++ b/trinity-apps/basket/basket-9999.ebuild @@ -4,20 +4,19 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs da de es fr it ja nl nn pl_PL pt ru sk tr zh_CN zh_TW" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Multi-purpose note-taking application for TDE" HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" IUSE="crypt kontact +svg" DEPEND=" diff --git a/trinity-apps/dolphin/dolphin-9999.ebuild b/trinity-apps/dolphin/dolphin-9999.ebuild index 57614a33..194a9874 100644 --- a/trinity-apps/dolphin/dolphin-9999.ebuild +++ b/trinity-apps/dolphin/dolphin-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de el es et fr he it nl pl ru sk" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="File manager for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/filelight/filelight-9999.ebuild b/trinity-apps/filelight/filelight-9999.ebuild index 2b6ef26d..b1342c08 100644 --- a/trinity-apps/filelight/filelight-9999.ebuild +++ b/trinity-apps/filelight/filelight-9999.ebuild @@ -3,7 +3,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -14,12 +13,11 @@ TRINITY_LANGS="az bg br ca cs cy da de el en_GB es TRINITY_DOC_LANGS="da es et it pt ru sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" diff --git a/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild b/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild index 7fc83447..8e063176 100644 --- a/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild +++ b/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild @@ -1,22 +1,21 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="bg de es fr it nl nn ru sv tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Theme engine using TQt for GTK+2" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" RDEPEND="x11-libs/gtk+:2" - -SLOT="${TRINITY_VER}" diff --git a/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild b/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild index ecaae30b..ae91cc68 100644 --- a/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild +++ b/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild @@ -4,28 +4,24 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" +TEG_PO_DIR=${S} + +TRINITY_LANGS="ar br cy el et fo he is ka ms nl pl ro sk sv th ve zh_CN + az ca da en_GB fa fr hi it ko nb nso pt ru sr ta tr vi zh_TW + bg cs de es fi gl hu ja lt nds pa pt_BR rw sr@Latn uk xh zu" + TRINITY_EXTRAGEAR_PACKAGING="yes" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 -set-trinityver - DESCRIPTION="Internationalization support for Gwenview [Trinity]" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - -TRINITY_LANGS="ar br cy el et fo he is ka ms nl pl ro sk sv th ve zh_CN - az ca da en_GB fa fr hi it ko nb nso pt ru sr ta tr vi zh_TW - bg cs de es fi gl hu ja lt nds pa pt_BR rw sr@Latn uk xh zu" - LICENSE="FDL-1.2" -SLOT="${TRINITY_VER}" - +SLOT="14" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi - for X in ${TRINITY_LANGS} ; do IUSE="${IUSE} l10n_${X}" done @@ -35,8 +31,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -TEG_PO_DIR=${S} - src_configure() { local mycmakeargs=( -DBUILD_TRANSLATIONS=ON diff --git a/trinity-apps/gwenview/gwenview-9999.ebuild b/trinity-apps/gwenview/gwenview-9999.ebuild index 5b93dbfc..f8644336 100644 --- a/trinity-apps/gwenview/gwenview-9999.ebuild +++ b/trinity-apps/gwenview/gwenview-9999.ebuild @@ -4,27 +4,23 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_BUILD_ADMIN="yes" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 -set-trinityver - DESCRIPTION="Image viewer for TDE" HOMEPAGE="https://trinitydesktop.org/" LICENSE="GPL-2+" -SLOT="${TRINITY_VER}" +SLOT="14" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi IUSE="" DEPEND=" - ~trinity-base/tdelibs-${PV} - ~trinity-apps/gwenview-i18n-${PV} media-gfx/exiv2 + ~trinity-apps/gwenview-i18n-${PV} + ~trinity-base/tdelibs-${PV} " RDEPEND="${DEPEND}" - -need-trinity diff --git a/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild b/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild index d873617f..0ab88508 100644 --- a/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild +++ b/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild @@ -1,26 +1,23 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="K3b - internationalization translations" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" - -need-trinity -SLOT="${TRINITY_VER}" - -IUSE+=" +handbook" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" +IUSE="+handbook" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_MESSAGES=ON -DBUILD_DOC="$(usex handbook)" ) - trinity-base-2_src_configure } diff --git a/trinity-apps/k3b/k3b-9999.ebuild b/trinity-apps/k3b/k3b-9999.ebuild index cebbf448..695fdcfe 100644 --- a/trinity-apps/k3b/k3b-9999.ebuild +++ b/trinity-apps/k3b/k3b-9999.ebuild @@ -4,15 +4,15 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A CD/DVD burning application for Trinity" HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" IUSE="alsa css dvd dvdr emovix encode debug ffmpeg ffmpeg-all-codecs flac +handbook mp3 sndfile taglib vcd vorbis" diff --git a/trinity-apps/kaffeine/kaffeine-9999.ebuild b/trinity-apps/kaffeine/kaffeine-9999.ebuild index 83067446..d1be78f8 100644 --- a/trinity-apps/kaffeine/kaffeine-9999.ebuild +++ b/trinity-apps/kaffeine/kaffeine-9999.ebuild @@ -4,29 +4,26 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ar bg bn br ca cs da de el es et fi fr ga gl he hu it ja ka km lt mk nb nl nn pa pl pt pt_BR ru se sk sr sr@Latn sv tg tr uk uz zh_CN zh_TW" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Media player for TDE using Xine and GStreamer backends." HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" dpms dvb encode gstreamer vorbis xcb xinerama" +SLOT="14" +IUSE="dpms dvb encode gstreamer vorbis xcb xinerama" # As of April 2020 Kaffeine can be only build with xinerama support. # Once that is fixed, the build option will be optional again. -RDEPEND+=" +RDEPEND=" dev-libs/libcdio media-libs/xine-lib x11-base/xorg-proto @@ -40,7 +37,7 @@ RDEPEND+=" xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) " -DEPEND+=" ${RDEPEND} +DEPEND="${RDEPEND} dvb? ( virtual/linuxtv-dvb-headers ) " diff --git a/trinity-apps/kasablanca/kasablanca-9999.ebuild b/trinity-apps/kasablanca/kasablanca-9999.ebuild index 00f3b9f1..eceec1e2 100644 --- a/trinity-apps/kasablanca/kasablanca-9999.ebuild +++ b/trinity-apps/kasablanca/kasablanca-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de pl" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="FTP client for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/katapult/katapult-9999.ebuild b/trinity-apps/katapult/katapult-9999.ebuild index b4cf16b0..8829ae55 100644 --- a/trinity-apps/katapult/katapult-9999.ebuild +++ b/trinity-apps/katapult/katapult-9999.ebuild @@ -4,19 +4,16 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ar bg br ca cs de el es et fr ga gl hu it ja nb nl pl pt pt_BR ru sk sv tr uk" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A general purpose launcher for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" diff --git a/trinity-apps/kbarcode/kbarcode-9999.ebuild b/trinity-apps/kbarcode/kbarcode-9999.ebuild index 8472e168..3729b00a 100644 --- a/trinity-apps/kbarcode/kbarcode-9999.ebuild +++ b/trinity-apps/kbarcode/kbarcode-9999.ebuild @@ -4,27 +4,24 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de el es fi fr hu it nl pl sv tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Barcode and label printing application for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" # Native GNU Barcode support seems to be broken right now. # The GNU Barcode binary is needed anyway. -IUSE+=" javascript native-gnu-barcode" +IUSE="javascript native-gnu-barcode" -RDEPEND+=" +RDEPEND=" app-text/barcode || ( media-gfx/imagemagick diff --git a/trinity-apps/kbfx/kbfx-9999.ebuild b/trinity-apps/kbfx/kbfx-9999.ebuild index 5129adea..adf4b52f 100644 --- a/trinity-apps/kbfx/kbfx-9999.ebuild +++ b/trinity-apps/kbfx/kbfx-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="bg de hu it nl" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="An alternative to the TDE-Menu" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kbibtex/kbibtex-9999.ebuild b/trinity-apps/kbibtex/kbibtex-9999.ebuild index 4d97a704..706d6ec1 100644 --- a/trinity-apps/kbibtex/kbibtex-9999.ebuild +++ b/trinity-apps/kbibtex/kbibtex-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de fr it pl ru" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Bibliography editor for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" DEPEND=" dev-libs/libxslt diff --git a/trinity-apps/kbiff/kbiff-9999.ebuild b/trinity-apps/kbiff/kbiff-9999.ebuild index b9fa4933..677bf1f6 100644 --- a/trinity-apps/kbiff/kbiff-9999.ebuild +++ b/trinity-apps/kbiff/kbiff-9999.ebuild @@ -4,23 +4,20 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="br cs da de el es et fi fr he hr hu is it ja nb nl nn pl pt pt_BR ro ru sk sl sv tr uk zh_TW" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Email notification utility for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" asus +ssl" +SLOT="14" +IUSE="asus +ssl" # SSL support might need tdelibs build with +ssl USE. diff --git a/trinity-apps/kbookreader/kbookreader-9999.ebuild b/trinity-apps/kbookreader/kbookreader-9999.ebuild index 5a0e7a8e..a6610fc8 100644 --- a/trinity-apps/kbookreader/kbookreader-9999.ebuild +++ b/trinity-apps/kbookreader/kbookreader-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs de nl" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="eBook reader for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kcmautostart/kcmautostart-9999.ebuild b/trinity-apps/kcmautostart/kcmautostart-9999.ebuild index 71d8bc5a..032489c8 100644 --- a/trinity-apps/kcmautostart/kcmautostart-9999.ebuild +++ b/trinity-apps/kcmautostart/kcmautostart-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ca de es fr nl tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Autostart module for KControl " HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kcpuload/kcpuload-9999.ebuild b/trinity-apps/kcpuload/kcpuload-9999.ebuild index c6b1f629..af6d1d10 100644 --- a/trinity-apps/kcpuload/kcpuload-9999.ebuild +++ b/trinity-apps/kcpuload/kcpuload-9999.ebuild @@ -1,26 +1,25 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A small CPU meter for Kicker" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) trinity-base-2_src_configure diff --git a/trinity-apps/kdiff3/kdiff3-9999.ebuild b/trinity-apps/kdiff3/kdiff3-9999.ebuild index 42eaeed8..2823ef58 100644 --- a/trinity-apps/kdiff3/kdiff3-9999.ebuild +++ b/trinity-apps/kdiff3/kdiff3-9999.ebuild @@ -3,22 +3,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ar az bg br ca cs cy da de el es et fr ga gl hi hu is it ja ka lt nb nl pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tg tr uk zh_CN" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A diff and merge program for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kdirstat/kdirstat-9999.ebuild b/trinity-apps/kdirstat/kdirstat-9999.ebuild index a5030444..a6d8756b 100644 --- a/trinity-apps/kdirstat/kdirstat-9999.ebuild +++ b/trinity-apps/kdirstat/kdirstat-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de fr hu it ja" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Graphical disk usage utility for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/keep/keep-9999.ebuild b/trinity-apps/keep/keep-9999.ebuild index 54624c31..152a4b4c 100644 --- a/trinity-apps/keep/keep-9999.ebuild +++ b/trinity-apps/keep/keep-9999.ebuild @@ -1,8 +1,8 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -10,17 +10,16 @@ TRINITY_HANDBOOK="optional" TRINITY_LANGS="bg br cs da de el es ga gl it ja ka lt nl pl pt ru sk sr sr@Latn sv tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A simple backup system for TDE." HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -RDEPEND+=" ~trinity-base/kcontrol-${PV} +RDEPEND="~trinity-base/kcontrol-${PV} app-backup/rdiff-backup" pkg_postinst () { @@ -28,4 +27,4 @@ pkg_postinst () { einfo "After initial install the Keep daemon needs to be started via KControl." einfo "The Keep daemon will be loaded automatically at the next TDE startup." echo -}
\ No newline at end of file +} diff --git a/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild b/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild index ed16a5b6..38160e96 100644 --- a/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild +++ b/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild @@ -4,28 +4,25 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs de es en_GB fr nl pl pt_BR ru zh_CN" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="TDE dialogs in GTK 2.x applications" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" gtk tde tqt" +SLOT="14" +IUSE="gtk tde tqt" -DEPEND+=" +DEPEND=" gtk? ( x11-libs/gtk+:2 ) tqt? ( ~dev-tqt/tqtinterface-${PV} ) " -RDEPEND+=" ${DEPEND}" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kima/kima-9999.ebuild b/trinity-apps/kima/kima-9999.ebuild index ced28929..e8589e0f 100644 --- a/trinity-apps/kima/kima-9999.ebuild +++ b/trinity-apps/kima/kima-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de es et hu id nl sv tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A Kicker monitoring applet" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" # NVControl support needs the nvidia-settings package, # which isn't in the Portage tree anymore. So if there diff --git a/trinity-apps/kiosktool/kiosktool-9999.ebuild b/trinity-apps/kiosktool/kiosktool-9999.ebuild index 169abe76..fbf6082d 100644 --- a/trinity-apps/kiosktool/kiosktool-9999.ebuild +++ b/trinity-apps/kiosktool/kiosktool-9999.ebuild @@ -4,23 +4,20 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="bg br ca cs cy da de en_GB es et fr ga is it lt mt nl pt pt_BR ro ru sr sr@Latn sv ta tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Tool to configure the TDE kiosk framework " HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" kcmautostart" +SLOT="14" +IUSE="kcmautostart" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/klcddimmer/klcddimmer-9999.ebuild b/trinity-apps/klcddimmer/klcddimmer-9999.ebuild index c6b9e945..637f27de 100644 --- a/trinity-apps/klcddimmer/klcddimmer-9999.ebuild +++ b/trinity-apps/klcddimmer/klcddimmer-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de nl" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Applet to adjust LCD brightness" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" # There might be a dependency on smartdimmer needed. diff --git a/trinity-apps/knemo/knemo-9999.ebuild b/trinity-apps/knemo/knemo-9999.ebuild index 39d46bfd..c3b0c354 100644 --- a/trinity-apps/knemo/knemo-9999.ebuild +++ b/trinity-apps/knemo/knemo-9999.ebuild @@ -4,25 +4,22 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ar bg cs cy da de el es et fr ga gl hu it ja ka lt nl pl pt pt_BR ru rw sk sr sr@Latn sv tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Network interfaces monitor for the TDE systray" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" wifi kernel_linux" +SLOT="14" +IUSE="wifi kernel_linux" -RDEPEND+=" kernel_linux? ( sys-apps/net-tools ) +RDEPEND="kernel_linux? ( sys-apps/net-tools ) wifi? ( net-wireless/wireless-tools )" pkg_postinst() { diff --git a/trinity-apps/knetload/knetload-9999.ebuild b/trinity-apps/knetload/knetload-9999.ebuild index 7831b9ca..122202a7 100644 --- a/trinity-apps/knetload/knetload-9999.ebuild +++ b/trinity-apps/knetload/knetload-9999.ebuild @@ -1,22 +1,20 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" -TRINITY_LANGS="ar bs ca cs da de en_GB es et fr - is it ja nb nl pt pt_BR ro sr sv ta tr - zh_CN zh_TW" +TRINITY_LANGS="ar bs ca cs da de en_GB es et fr is it ja nb nl pt pt_BR + ro sr sv ta tr zh_CN zh_TW" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A network meter for Kicker" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" diff --git a/trinity-apps/knetstats/knetstats-9999.ebuild b/trinity-apps/knetstats/knetstats-9999.ebuild index 86c73a07..0c186d1b 100644 --- a/trinity-apps/knetstats/knetstats-9999.ebuild +++ b/trinity-apps/knetstats/knetstats-9999.ebuild @@ -1,8 +1,8 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -10,12 +10,11 @@ TRINITY_HANDBOOK="optional" TRINITY_LANGS="bg br cs da de el es et fr ga gl it ja ka nl pl pt pt_BR ru sk sv tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Network interfaces monitor for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" diff --git a/trinity-apps/knmap/knmap-9999.ebuild b/trinity-apps/knmap/knmap-9999.ebuild index 172455f9..c2b95f64 100644 --- a/trinity-apps/knmap/knmap-9999.ebuild +++ b/trinity-apps/knmap/knmap-9999.ebuild @@ -4,23 +4,20 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Nmap graphical interface for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" -RDEPEND+=" net-analyzer/nmap" +RDEPEND="net-analyzer/nmap" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/knowit/knowit-9999.ebuild b/trinity-apps/knowit/knowit-9999.ebuild index d64556ce..6f1729f3 100644 --- a/trinity-apps/knowit/knowit-9999.ebuild +++ b/trinity-apps/knowit/knowit-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de es fr hu nl pl ru sk zh_CN" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Tool for managing notes" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/knutclient/knutclient-9999.ebuild b/trinity-apps/knutclient/knutclient-9999.ebuild index fcc8c551..202576bf 100644 --- a/trinity-apps/knutclient/knutclient-9999.ebuild +++ b/trinity-apps/knutclient/knutclient-9999.ebuild @@ -1,30 +1,27 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs de es fr it pl pt_BR ru uk" - TRINITY_DOC_LANGS="cs" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A TDE GUI client for UPS system NUT" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/konversation/konversation-9999.ebuild b/trinity-apps/konversation/konversation-9999.ebuild index 37b29965..389b17e3 100644 --- a/trinity-apps/konversation/konversation-9999.ebuild +++ b/trinity-apps/konversation/konversation-9999.ebuild @@ -3,7 +3,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -13,25 +12,22 @@ TRINITY_LANGS="ar bg ca da de el en_GB es et fi fr gl he TRINITY_DOC_LANGS="da es et it pt ru sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A user friendly IRC Client for Trinity" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" - -need-trinity -SLOT="${TRINITY_VER}" - -IUSE+=" xscreensaver" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" +IUSE="xscreensaver" -DEPEND+=" xscreensaver? ( x11-libs/libXScrnSaver )" -RDEPEND+=" ${DEPEND}" +DEPEND="xscreensaver? ( x11-libs/libXScrnSaver )" +RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XSCREENSAVER="$(usex xscreensaver)" ) - trinity-base-2_src_configure } diff --git a/trinity-apps/kooldock/kooldock-9999.ebuild b/trinity-apps/kooldock/kooldock-9999.ebuild index 9e2fa1d2..00b71909 100644 --- a/trinity-apps/kooldock/kooldock-9999.ebuild +++ b/trinity-apps/kooldock/kooldock-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs de es fr it nl pl sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A dock for TDE, which attemps to resemble the Mac OSX dock" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kpicosim/kpicosim-9999.ebuild b/trinity-apps/kpicosim/kpicosim-9999.ebuild index b3f586ca..45625636 100644 --- a/trinity-apps/kpicosim/kpicosim-9999.ebuild +++ b/trinity-apps/kpicosim/kpicosim-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="IDE and simulator for the Xilinx PicoBlaze-3" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kplayer/kplayer-9999.ebuild b/trinity-apps/kplayer/kplayer-9999.ebuild index 8b93cbbe..745807c9 100644 --- a/trinity-apps/kplayer/kplayer-9999.ebuild +++ b/trinity-apps/kplayer/kplayer-9999.ebuild @@ -1,8 +1,8 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -13,23 +13,21 @@ TRINITY_LANGS="be br ca cs cy da de el en_GB es et fi TRINITY_DOC_LANGS="da es it pt sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="KPlayer is a TDE media player based on mplayer." HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -DEPEND+=" media-video/mplayer" -RDEPEND+=" ${DEPEND}" +DEPEND="media-video/mplayer" +RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/krename/krename-9999.ebuild b/trinity-apps/krename/krename-9999.ebuild index 54e63e03..ffe0e5ea 100644 --- a/trinity-apps/krename/krename-9999.ebuild +++ b/trinity-apps/krename/krename-9999.ebuild @@ -1,8 +1,8 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -10,21 +10,19 @@ TRINITY_HANDBOOK="optional" TRINITY_LANGS="bs de es fr hu it ja nl pl pt_BR ru sl sv tr zh_CN zh_TW" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A powerful batch file renamer for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" - -need-trinity -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } @@ -37,4 +35,4 @@ pkg_postinst () { einfo "tdegraphics-tdefile-plugins, tdemultimedia-tdefile-plugins," einfo "tdenetwork-tdefile-plugins, tdesdk-tdefile-plugins." echo -}
\ No newline at end of file +} diff --git a/trinity-apps/kscope/kscope-9999.ebuild b/trinity-apps/kscope/kscope-9999.ebuild index 75cd6196..1ba34e96 100644 --- a/trinity-apps/kscope/kscope-9999.ebuild +++ b/trinity-apps/kscope/kscope-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de zh_CN" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="TDE front-end to Cscope" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" RDEPEND=" media-gfx/graphviz diff --git a/trinity-apps/ksensors/ksensors-9999.ebuild b/trinity-apps/ksensors/ksensors-9999.ebuild index 54ab913f..715b7adc 100644 --- a/trinity-apps/ksensors/ksensors-9999.ebuild +++ b/trinity-apps/ksensors/ksensors-9999.ebuild @@ -1,31 +1,29 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs de es fr nb nl pl sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A TDE GUI frontend to LM-Sensors" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -DEPEND+=" sys-apps/lm-sensors" -RDEPEND+=" ${DEPEND}" +DEPEND="sys-apps/lm-sensors" +RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/kshowmail/kshowmail-9999.ebuild b/trinity-apps/kshowmail/kshowmail-9999.ebuild index 55a2de04..227c2523 100644 --- a/trinity-apps/kshowmail/kshowmail-9999.ebuild +++ b/trinity-apps/kshowmail/kshowmail-9999.ebuild @@ -4,24 +4,21 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="cs de es fr hu it ru sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Show mails on a POP3 server " HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" -DEPEND+=" ~trinity-base/mimelib-${PV}" -RDEPEND+=" ${DEPEND}" +DEPEND="~trinity-base/mimelib-${PV}" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kshutdown/kshutdown-9999.ebuild b/trinity-apps/kshutdown/kshutdown-9999.ebuild index 7ecd92d2..27b88b26 100644 --- a/trinity-apps/kshutdown/kshutdown-9999.ebuild +++ b/trinity-apps/kshutdown/kshutdown-9999.ebuild @@ -4,26 +4,23 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ar bg cs de es fr hu it nl pl pt_BR ru sk sv tr zh_CN" TRINITY_DOC_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A graphical shutdown utility for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" extras" +SLOT="14" +IUSE="extras" -RDEPEND+=" +RDEPEND=" ~trinity-base/kcontrol-${PV} ~trinity-base/kdialog-${PV} ~trinity-base/tdesu-${PV} diff --git a/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild b/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild index 63289d60..9c67e771 100644 --- a/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild +++ b/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild @@ -10,7 +10,5 @@ inherit trinity-base-2 DESCRIPTION="KSplash engine Moodin" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" diff --git a/trinity-apps/kstreamripper/kstreamripper-9999.ebuild b/trinity-apps/kstreamripper/kstreamripper-9999.ebuild index 66993c37..85e4e36a 100644 --- a/trinity-apps/kstreamripper/kstreamripper-9999.ebuild +++ b/trinity-apps/kstreamripper/kstreamripper-9999.ebuild @@ -1,30 +1,28 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="TDE frontend for streamripper" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -RDEPEND+=" media-sound/streamripper" +RDEPEND="media-sound/streamripper" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure -}
\ No newline at end of file +} diff --git a/trinity-apps/kvkbd/kvkbd-9999.ebuild b/trinity-apps/kvkbd/kvkbd-9999.ebuild index 0cf9789b..2d7c6e4d 100644 --- a/trinity-apps/kvkbd/kvkbd-9999.ebuild +++ b/trinity-apps/kvkbd/kvkbd-9999.ebuild @@ -4,24 +4,21 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A virtual keyboard for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" -DEPEND+=" x11-libs/libXtst" -RDEPEND+=" ${DEPEND}" +DEPEND="x11-libs/libXtst" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/kvpnc/kvpnc-9999.ebuild b/trinity-apps/kvpnc/kvpnc-9999.ebuild index 2e9b99d9..58dbac2e 100644 --- a/trinity-apps/kvpnc/kvpnc-9999.ebuild +++ b/trinity-apps/kvpnc/kvpnc-9999.ebuild @@ -4,30 +4,27 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="bg ca da de es fr hu it ja nl pl pt_BR ru sk sv tr zh_CN" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="VPN clients frontend for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" cisco libreswan +openvpn pptpd smartcard strongswan" +SLOT="14" +IUSE="cisco libreswan +openvpn pptpd smartcard strongswan" # Other VPN clients will be added by request, controlled over USE. # If you miss any, please let us know! -DEPEND+=" +DEPEND=" dev-libs/libgcrypt sys-apps/net-tools" -RDEPEND+=" ${DEPEND} +RDEPEND="${DEPEND} cisco? ( net-vpn/vpnc ) libreswan? ( net-vpn/libreswan ) openvpn? ( net-vpn/openvpn ) diff --git a/trinity-apps/kxmleditor/kxmleditor-9999.ebuild b/trinity-apps/kxmleditor/kxmleditor-9999.ebuild index 80cb0cbf..7b5695ff 100644 --- a/trinity-apps/kxmleditor/kxmleditor-9999.ebuild +++ b/trinity-apps/kxmleditor/kxmleditor-9999.ebuild @@ -1,28 +1,26 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de fr pl" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="XML editor for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild b/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild index 2c02f8b4..c142a202 100644 --- a/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild +++ b/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild @@ -4,24 +4,21 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="MPlayer based thumbnail generator for TDE" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" -IUSE+=" +strips" +SLOT="14" +IUSE="+strips" -RDEPEND+=" media-video/mplayer" +RDEPEND="media-video/mplayer" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/potracegui/potracegui-9999.ebuild b/trinity-apps/potracegui/potracegui-9999.ebuild index f1bc8a6d..c4ebd5e7 100644 --- a/trinity-apps/potracegui/potracegui-9999.ebuild +++ b/trinity-apps/potracegui/potracegui-9999.ebuild @@ -1,30 +1,28 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="TDE frontend for potrace" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -RDEPEND+=" media-gfx/potrace" +RDEPEND="media-gfx/potrace" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure -}
\ No newline at end of file +} diff --git a/trinity-apps/smartcardauth/smartcardauth-9999.ebuild b/trinity-apps/smartcardauth/smartcardauth-9999.ebuild index 71ba6a12..9b42162b 100644 --- a/trinity-apps/smartcardauth/smartcardauth-9999.ebuild +++ b/trinity-apps/smartcardauth/smartcardauth-9999.ebuild @@ -1,25 +1,23 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="SmartCard login and LUKS decrypt" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" - -need-trinity -SLOT="${TRINITY_VER}" - -IUSE+=" libressl" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" +IUSE="libressl" -DEPEND+=" - net-libs/gnutls +DEPEND=" dev-libs/pkcs11-helper + net-libs/gnutls !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) " -RDEPEND+=" ${DEPEND}" +RDEPEND="${DEPEND}" diff --git a/trinity-apps/tastymenu/tastymenu-9999.ebuild b/trinity-apps/tastymenu/tastymenu-9999.ebuild index a6085b28..4259e2cf 100644 --- a/trinity-apps/tastymenu/tastymenu-9999.ebuild +++ b/trinity-apps/tastymenu/tastymenu-9999.ebuild @@ -1,28 +1,26 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de es fi fr it nl pl pt_BR ru sl uk" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 -DESCRIPTION="TDE-Menu replacement " +DESCRIPTION="TDE-Menu replacement" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild b/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild index 5560415f..3116a4d3 100644 --- a/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild +++ b/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild @@ -1,17 +1,16 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="no" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Ia Ora widget style for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" diff --git a/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild b/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild index d1430081..707c8bf5 100644 --- a/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild +++ b/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild @@ -1,28 +1,26 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="never" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Lipstik widget style for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild b/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild index bf8c7812..34e7f12f 100644 --- a/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild +++ b/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild @@ -1,28 +1,26 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="never" TRINITY_LANGS="de tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="QtCurve widget style for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tdedocker/tdedocker-9999.ebuild b/trinity-apps/tdedocker/tdedocker-9999.ebuild index d03b3541..9738c1e3 100644 --- a/trinity-apps/tdedocker/tdedocker-9999.ebuild +++ b/trinity-apps/tdedocker/tdedocker-9999.ebuild @@ -1,28 +1,26 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="bg cs de es fr hu id it ja nl pl pt_BR ru sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Minimize applications to the TDE system tray" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure -}
\ No newline at end of file +} diff --git a/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild b/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild index d88919a1..62629234 100644 --- a/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild +++ b/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild @@ -1,28 +1,26 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 -DESCRIPTION="TDEIO slave for FTPS protocol " +DESCRIPTION="TDEIO slave for FTPS protocol" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild b/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild index 8af94b37..ec6b0d3e 100644 --- a/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild +++ b/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild @@ -1,8 +1,8 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -11,12 +11,11 @@ TRINITY_LANGS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo es et fi fr ga gl hr hu is it ja ka km lt lv ms nb nds nl nn pa pl pt pt_BR ro ru rw sk sv ta tr ug uk zh_CN zh_TW" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="TDEIO slave for gopher protocol" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" diff --git a/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild b/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild index 3140d190..57a408f1 100644 --- a/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild +++ b/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild @@ -1,22 +1,21 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de fr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Locate TDEIO plugin" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -RDEPEND+=" sys-apps/mlocate" +RDEPEND="sys-apps/mlocate" diff --git a/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild b/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild index 6576b984..f6f35163 100644 --- a/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild +++ b/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild @@ -1,32 +1,30 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Sword TDEIO plugin" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -DEPEND+=" app-text/sword" -RDEPEND+=" ${DEPEND}" +DEPEND="app-text/sword" +RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild b/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild index b37e4062..6bb82617 100644 --- a/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild +++ b/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild @@ -4,21 +4,18 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="never" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Progress dialog for safely removing devices" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" src_configure() { local mycmakeargs=( diff --git a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild index 446f49b6..73800b32 100644 --- a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild +++ b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild @@ -1,8 +1,8 @@ +# Copyright 2020 Gentoo Authors # Copyright 2019-2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" @@ -12,26 +12,26 @@ TRINITY_LANGS="ar bg cs da de el es fi fr hi hu it ja km lt TRINITY_DOC_LANGS="cs de fi hu nb" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A TDE frontend for power management" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -DEPEND+=" x11-libs/libXScrnSaver +DEPEND=" + ~dev-libs/dbus-1-tqt-${PV} x11-libs/libXext + x11-libs/libXScrnSaver x11-libs/libXtst - ~dev-libs/dbus-1-tqt-${PV}" -RDEPEND+=" ${DEPEND}" +" +RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tdesudo/tdesudo-9999.ebuild b/trinity-apps/tdesudo/tdesudo-9999.ebuild index d808bae0..fe54dec8 100644 --- a/trinity-apps/tdesudo/tdesudo-9999.ebuild +++ b/trinity-apps/tdesudo/tdesudo-9999.ebuild @@ -1,30 +1,28 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de fr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Sudo frontend for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -RDEPEND+=" app-admin/sudo" +RDEPEND="app-admin/sudo" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tdesvn/tdesvn-9999.ebuild b/trinity-apps/tdesvn/tdesvn-9999.ebuild index 4af2cc77..35df355b 100644 --- a/trinity-apps/tdesvn/tdesvn-9999.ebuild +++ b/trinity-apps/tdesvn/tdesvn-9999.ebuild @@ -4,32 +4,28 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ca cs de es fr gl it ja lt nl pa ru sv" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="Subversion client with tight TDE integration" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" +IUSE="test" -IUSE+=" test" RESTRICT+=" !test? ( test )" -DEPEND+=" dev-vcs/subversion" -RDEPEND+=" ${DEPEND}" +DEPEND="dev-vcs/subversion" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( -DBUILD_TESTS="$(usex test)" ) - trinity-base-2_src_configure } diff --git a/trinity-apps/tdmtheme/tdmtheme-9999.ebuild b/trinity-apps/tdmtheme/tdmtheme-9999.ebuild index cffa6e40..dbe2e4e7 100644 --- a/trinity-apps/tdmtheme/tdmtheme-9999.ebuild +++ b/trinity-apps/tdmtheme/tdmtheme-9999.ebuild @@ -1,30 +1,28 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="de" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A theme manager for TDM" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -RDEPEND+=" ~trinity-base/tdm-${PV}" +RDEPEND="~trinity-base/tdm-${PV}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DBUILD_TRANSLATIONS=ON ) - trinity-base-2_src_configure -}
\ No newline at end of file +} diff --git a/trinity-apps/wlassistant/wlassistant-9999.ebuild b/trinity-apps/wlassistant/wlassistant-9999.ebuild index 9063aaac..8ef0574b 100644 --- a/trinity-apps/wlassistant/wlassistant-9999.ebuild +++ b/trinity-apps/wlassistant/wlassistant-9999.ebuild @@ -4,23 +4,20 @@ EAPI="7" -TRINITY_MODULE_TYPE="applications" - TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" TRINITY_LANGS="ar ca de es fr nb pl pt_BR sv zh_CN zh_TW" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="User friendly TDE frontend for wireless network connection" HOMEPAGE="https://trinitydesktop.org/" -need-trinity - LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" +SLOT="14" -RDEPEND+=" +RDEPEND=" net-wireless/wireless-tools || ( net-misc/dhcp diff --git a/trinity-apps/yakuake/yakuake-9999.ebuild b/trinity-apps/yakuake/yakuake-9999.ebuild index 6aa4b1a5..6b33297b 100644 --- a/trinity-apps/yakuake/yakuake-9999.ebuild +++ b/trinity-apps/yakuake/yakuake-9999.ebuild @@ -1,24 +1,22 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_TYPE="applications" TRINITY_EXTRAGEAR_PACKAGING="yes" TRINITY_HANDBOOK="optional" -TRINITY_LANGS="de el es et fr hu it - ja nl pl pt pt_BR ru sv tr" +TRINITY_LANGS="de el es et fr hu it ja nl pl pt pt_BR ru sv tr" +TRINITY_MODULE_TYPE="applications" inherit trinity-base-2 DESCRIPTION="A Quake-style terminal emulator for TDE" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" -need-trinity - -SLOT="${TRINITY_VER}" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" -DEPEND+=" ~trinity-base/konsole-${PV}" -RDEPEND+=" ${DEPEND}" +DEPEND="~trinity-base/konsole-${PV}" +RDEPEND="${DEPEND}" diff --git a/trinity-base/akregator/akregator-9999.ebuild b/trinity-base/akregator/akregator-9999.ebuild index 3faf1bf6..4237c9ba 100644 --- a/trinity-base/akregator/akregator-9999.ebuild +++ b/trinity-base/akregator/akregator-9999.ebuild @@ -3,17 +3,17 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 -DESCRIPTION="Trinity news feed aggregator." +DESCRIPTION="Trinity news feed aggregator" DEPEND=" ~trinity-base/ktnef-${PV} + ~trinity-base/libkcal-${PV} ~trinity-base/libkmime-${PV} ~trinity-base/libtdepim-${PV} - ~trinity-base/libkcal-${PV}" +" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdepim/" diff --git a/trinity-base/amor/amor-9999.ebuild b/trinity-base/amor/amor-9999.ebuild index f42d44f7..e56f6a25 100644 --- a/trinity-base/amor/amor-9999.ebuild +++ b/trinity-base/amor/amor-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Trinity: Amusing Misuse Of Resources - desktop-dwelling creature" diff --git a/trinity-base/ark/ark-9999.ebuild b/trinity-base/ark/ark-9999.ebuild index 11900115..b0a0831c 100644 --- a/trinity-base/ark/ark-9999.ebuild +++ b/trinity-base/ark/ark-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity Archiving tool" diff --git a/trinity-base/arts/arts-9999.ebuild b/trinity-base/arts/arts-9999.ebuild index 847348f5..7ac9d826 100644 --- a/trinity-base/arts/arts-9999.ebuild +++ b/trinity-base/arts/arts-9999.ebuild @@ -6,17 +6,15 @@ EAPI="7" TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="arts" - inherit trinity-base-2 -set-trinityver - DESCRIPTION="aRts, the Trinity sound (and all-around multimedia) server/output manager" HOMEPAGE="https://trinitydesktop.org/" + LICENSE="|| ( GPL-2 GPL-3 )" IUSE="alsa -artswrappersuid jack mp3 vorbis" -SLOT="${TRINITY_VER}" +SLOT="14" DEPEND="~dev-tqt/tqtinterface-${PV} dev-libs/glib @@ -28,7 +26,7 @@ DEPEND="~dev-tqt/tqtinterface-${PV} RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_AUDIOFILE=ON -DWITH_MAD="$(usex mp3)" -DWITH_ALSA="$(usex alsa)" diff --git a/trinity-base/atlantik/atlantik-9999.ebuild b/trinity-base/atlantik/atlantik-9999.ebuild index 9155d13d..c4e7681b 100644 --- a/trinity-base/atlantik/atlantik-9999.ebuild +++ b/trinity-base/atlantik/atlantik-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" inherit trinity-meta-2 DESCRIPTION="The Atlantic board game" diff --git a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild index 23ccc563..358042fd 100644 --- a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild +++ b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Atlantik gameboard designer" diff --git a/trinity-base/certmanager/certmanager-9999.ebuild b/trinity-base/certmanager/certmanager-9999.ebuild index 52ed5883..32e299cd 100644 --- a/trinity-base/certmanager/certmanager-9999.ebuild +++ b/trinity-base/certmanager/certmanager-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/ libkpgp/ libtdenetwork/" inherit trinity-meta-2 DESCRIPTION="Trinity certificate manager gui" @@ -12,10 +13,8 @@ DESCRIPTION="Trinity certificate manager gui" COMMON_DEPEND="~trinity-base/libtdenetwork-${PV} app-crypt/gpgme app-crypt/gnupg" -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND}" - -TSM_EXTRACT_ALSO="libtdepim/ libkpgp/ libtdenetwork/" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" pkg_postinst() { trinity-meta-2_pkg_postinst diff --git a/trinity-base/dcoprss/dcoprss-9999.ebuild b/trinity-base/dcoprss/dcoprss-9999.ebuild index b92b2a77..e50417d6 100644 --- a/trinity-base/dcoprss/dcoprss-9999.ebuild +++ b/trinity-base/dcoprss/dcoprss-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" +TSM_EXTRACT_ALSO="librss/" inherit trinity-meta-2 DESCRIPTION="Trinity RSS server and client for DCOP" DEPEND="~trinity-base/librss-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="librss/" diff --git a/trinity-base/drkonqi/drkonqi-9999.ebuild b/trinity-base/drkonqi/drkonqi-9999.ebuild index dc3e966a..afe8a008 100644 --- a/trinity-base/drkonqi/drkonqi-9999.ebuild +++ b/trinity-base/drkonqi/drkonqi-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed" @@ -14,11 +15,8 @@ IUSE="+hwlib" RDEPEND="sys-devel/gdb" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_TDEHWLIB="$(usex hwlib)" ) - trinity-meta-2_src_configure } - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/eyesapplet/eyesapplet-9999.ebuild b/trinity-base/eyesapplet/eyesapplet-9999.ebuild index 05e01ec3..4b189007 100644 --- a/trinity-base/eyesapplet/eyesapplet-9999.ebuild +++ b/trinity-base/eyesapplet/eyesapplet-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="kicker applet: eyes following the movement of the mouse pointer" diff --git a/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild b/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild index 859a16e3..5b3e150b 100644 --- a/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild +++ b/trinity-base/fifteenapplet/fifteenapplet-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Kicker plugin for the 15-game" diff --git a/trinity-base/juk/juk-9999.ebuild b/trinity-base/juk/juk-9999.ebuild index 5dfb3101..071238f4 100644 --- a/trinity-base/juk/juk-9999.ebuild +++ b/trinity-base/juk/juk-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_MODULE_NAME="tdemultimedia" inherit trinity-meta-2 DESCRIPTION="Jukebox and music manager for TDE" @@ -19,7 +20,7 @@ DEPEND="${RDEPEND}" PDEPEND="gstreamer? ( media-plugins/gst-plugins-meta )" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_GSTREAMER="$(usex gstreamer)" -DWITH_MUSICBRAINZ="$(usex musicbrainz)" -DWITH_TAGLIB="$(usex taglib)" diff --git a/trinity-base/kaboodle/kaboodle-9999.ebuild b/trinity-base/kaboodle/kaboodle-9999.ebuild index d15ccd0a..d917ae44 100644 --- a/trinity-base/kaboodle/kaboodle-9999.ebuild +++ b/trinity-base/kaboodle/kaboodle-9999.ebuild @@ -1,11 +1,12 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_MODULE_NAME="tdemultimedia" inherit trinity-meta-2 DESCRIPTION="The Lean TDE Media Player" -RDEPEND="~trinity-base/tdemultimedia-arts-${PV}"
\ No newline at end of file +RDEPEND="~trinity-base/tdemultimedia-arts-${PV}" diff --git a/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild b/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild index 01545fd2..19577aed 100644 --- a/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild +++ b/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Plugins for Trinity Addressbook" diff --git a/trinity-base/kaddressbook/kaddressbook-9999.ebuild b/trinity-base/kaddressbook/kaddressbook-9999.ebuild index e29fe84c..ea91a03f 100644 --- a/trinity-base/kaddressbook/kaddressbook-9999.ebuild +++ b/trinity-base/kaddressbook/kaddressbook-9999.ebuild @@ -3,30 +3,30 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="certmanager/lib/ + libtdepim/ + libtdenetwork/ + libkcal/ + libemailfunctions/" inherit trinity-meta-2 DESCRIPTION="The Trinity Address Book" -IUSE+=" gnokii" -COMMON_DEPEND="~trinity-base/libtdepim-${PV} - ~trinity-base/libkcal-${PV} +IUSE="gnokii" + +DEPEND=" ~trinity-base/certmanager-${PV} + ~trinity-base/libkcal-${PV} ~trinity-base/libtdenetwork-${PV} - gnokii? ( app-mobilephone/gnokii )" - -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND}" - -TSM_EXTRACT_ALSO="certmanager/lib/ - libtdepim/ - libtdenetwork/ - libkcal/ - libemailfunctions/" + ~trinity-base/libtdepim-${PV} + gnokii? ( app-mobilephone/gnokii ) +" +RDEPEND="${DEPEND}" -src_configure () { - mycmakeargs=( +src_configure() { + local mycmakeargs=( -DWITH_GNOKII="$(usex gnokii)" ) trinity-meta-2_src_configure diff --git a/trinity-base/kamera/kamera-9999.ebuild b/trinity-base/kamera/kamera-9999.ebuild index 6060875c..cd4770dc 100644 --- a/trinity-base/kamera/kamera-9999.ebuild +++ b/trinity-base/kamera/kamera-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity digital camera manager" diff --git a/trinity-base/kappfinder/kappfinder-9999.ebuild b/trinity-base/kappfinder/kappfinder-9999.ebuild index 58fb36d8..bc730aeb 100644 --- a/trinity-base/kappfinder/kappfinder-9999.ebuild +++ b/trinity-base/kappfinder/kappfinder-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity tool that generates *.desktop files for well known apps" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/kasteroids/kasteroids-9999.ebuild b/trinity-base/kasteroids/kasteroids-9999.ebuild index faffcd5d..2f79cee0 100644 --- a/trinity-base/kasteroids/kasteroids-9999.ebuild +++ b/trinity-base/kasteroids/kasteroids-9999.ebuild @@ -4,13 +4,12 @@ EAPI="7" -TRINITY_MODULE_NAME="tdegames" TRINITY_NEED_ARTS="yes" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity Space Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kate-plugins/kate-plugins-9999.ebuild b/trinity-base/kate-plugins/kate-plugins-9999.ebuild index 5867daf6..1d3ce92d 100644 --- a/trinity-base/kate-plugins/kate-plugins-9999.ebuild +++ b/trinity-base/kate-plugins/kate-plugins-9999.ebuild @@ -3,9 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" TSM_EXTRACT="kate" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Kate plugins and docs" diff --git a/trinity-base/kate/kate-9999.ebuild b/trinity-base/kate/kate-9999.ebuild index efe0b432..ae62db19 100644 --- a/trinity-base/kate/kate-9999.ebuild +++ b/trinity-base/kate/kate-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 -DESCRIPTION="Kate is an MDI texteditor." - -TSM_EXTRACT_ALSO="translations/" +DESCRIPTION="Kate is an MDI texteditor" diff --git a/trinity-base/katomic/katomic-9999.ebuild b/trinity-base/katomic/katomic-9999.ebuild index 89c5829c..dcd8f6ef 100644 --- a/trinity-base/katomic/katomic-9999.ebuild +++ b/trinity-base/katomic/katomic-9999.ebuild @@ -5,11 +5,10 @@ EAPI="7" TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity Atomic Entertainment Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kbackgammon/kbackgammon-9999.ebuild b/trinity-base/kbackgammon/kbackgammon-9999.ebuild index 75ee7011..37a43f30 100644 --- a/trinity-base/kbackgammon/kbackgammon-9999.ebuild +++ b/trinity-base/kbackgammon/kbackgammon-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="A Backgammon program for Trinity" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kbattleship/kbattleship-9999.ebuild b/trinity-base/kbattleship/kbattleship-9999.ebuild index 0efb6427..02064806 100644 --- a/trinity-base/kbattleship/kbattleship-9999.ebuild +++ b/trinity-base/kbattleship/kbattleship-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="The Trinity Battleship clone" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kblackbox/kblackbox-9999.ebuild b/trinity-base/kblackbox/kblackbox-9999.ebuild index 16f6eeb6..d61c7fd8 100644 --- a/trinity-base/kblackbox/kblackbox-9999.ebuild +++ b/trinity-base/kblackbox/kblackbox-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity Blackbox Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kbounce/kbounce-9999.ebuild b/trinity-base/kbounce/kbounce-9999.ebuild index 269c1d11..ed6b5109 100644 --- a/trinity-base/kbounce/kbounce-9999.ebuild +++ b/trinity-base/kbounce/kbounce-9999.ebuild @@ -4,8 +4,9 @@ EAPI="7" -TRINITY_MODULE_NAME="tdegames" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 # Needs some dependency to play "au" sounds. @@ -14,5 +15,3 @@ DESCRIPTION="Trinity Bounce Ball Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kcalc/kcalc-9999.ebuild b/trinity-base/kcalc/kcalc-9999.ebuild index b5fcb5f6..0f2fcc72 100644 --- a/trinity-base/kcalc/kcalc-9999.ebuild +++ b/trinity-base/kcalc/kcalc-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity calculator" diff --git a/trinity-base/kcharselect/kcharselect-9999.ebuild b/trinity-base/kcharselect/kcharselect-9999.ebuild index f3a27d3a..fcfd21ea 100644 --- a/trinity-base/kcharselect/kcharselect-9999.ebuild +++ b/trinity-base/kcharselect/kcharselect-9999.ebuild @@ -3,9 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" TRINITY_SUBMODULE="kcharselect charselectapplet" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity character selection utility and panel applet" diff --git a/trinity-base/kcheckpass/kcheckpass-9999.ebuild b/trinity-base/kcheckpass/kcheckpass-9999.ebuild index dc5d3881..8e163fc8 100644 --- a/trinity-base/kcheckpass/kcheckpass-9999.ebuild +++ b/trinity-base/kcheckpass/kcheckpass-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="A simple password checker, used by any software in need of user authentication." @@ -14,7 +14,7 @@ RDEPEND="pam? ( trinity-base/tdebase-pam )" DEPEND="${RDEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_SHADOW=ON -DWITH_PAM="$(usex pam)" -DKCHECKPASS_PAM_SERVICE=tde diff --git a/trinity-base/kcminit/kcminit-9999.ebuild b/trinity-base/kcminit/kcminit-9999.ebuild index 43f8f1e1..1ca81c24 100644 --- a/trinity-base/kcminit/kcminit-9999.ebuild +++ b/trinity-base/kcminit/kcminit-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="KCMInit - initializes Control Modules during startup." diff --git a/trinity-base/kcoloredit/kcoloredit-9999.ebuild b/trinity-base/kcoloredit/kcoloredit-9999.ebuild index f3aa3634..4498a3b2 100644 --- a/trinity-base/kcoloredit/kcoloredit-9999.ebuild +++ b/trinity-base/kcoloredit/kcoloredit-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity color selector/editor" diff --git a/trinity-base/kcontrol/kcontrol-9999.ebuild b/trinity-base/kcontrol/kcontrol-9999.ebuild index ff76e6e1..22fa7b31 100644 --- a/trinity-base/kcontrol/kcontrol-9999.ebuild +++ b/trinity-base/kcontrol/kcontrol-9999.ebuild @@ -5,6 +5,7 @@ EAPI="7" TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/ translations/" inherit trinity-meta-2 DESCRIPTION="The Trinity Control Center" @@ -30,8 +31,6 @@ RDEPEND="${DEPEND} ~trinity-base/khotkeys-${PV} svg? ( media-libs/libart_lgpl )" -TSM_EXTRACT_ALSO="kicker/ twin/ kdesktop/ klipper/ kxkb/ translations/" - src_configure() { local mycmakeargs=( -DWITH_XCURSOR=ON diff --git a/trinity-base/kdcop/kdcop-9999.ebuild b/trinity-base/kdcop/kdcop-9999.ebuild index 9dff797f..18718fcf 100644 --- a/trinity-base/kdcop/kdcop-9999.ebuild +++ b/trinity-base/kdcop/kdcop-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity: graphical DCOP browser/client" diff --git a/trinity-base/kdesktop/kdesktop-9999.ebuild b/trinity-base/kdesktop/kdesktop-9999.ebuild index 9e1a156d..9bbb1927 100644 --- a/trinity-base/kdesktop/kdesktop-9999.ebuild +++ b/trinity-base/kdesktop/kdesktop-9999.ebuild @@ -3,18 +3,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="kcheckpass/ translations/" inherit trinity-meta-2 DESCRIPTION="The part of TDE UI that handles icons, desktop, screensaver etc" IUSE="pam xscreensaver" -COMMON_DEPEND="x11-libs/libXrender - x11-libs/libXcursor +COMMON_DEPEND=" ~dev-libs/dbus-1-tqt-${PV} - ~trinity-base/libkonq-${PV} ~trinity-base/kcontrol-${PV} + ~trinity-base/libkonq-${PV} + x11-libs/libXrender + x11-libs/libXcursor xscreensaver? ( x11-libs/libXScrnSaver )" # Requires the desktop background settings module, # so until we separate the kcontrol modules into separate ebuilds :-), @@ -27,16 +29,13 @@ RDEPEND="${COMMON_DEPEND} ~trinity-base/konqueror-${PV} pam? ( trinity-base/tdebase-pam )" -TSM_EXTRACT_ALSO="kcheckpass/ translations/" - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XCURSOR=ON -DWITH_XRENDER=ON -DWITH_PAM="$(usex pam)" -DWITH_XSCREENSAVER="$(usex xscreensaver)" -DTDESCREENSAVER_PAM_SERVICE=tde ) - trinity-meta-2_src_configure } diff --git a/trinity-base/kdf/kdf-9999.ebuild b/trinity-base/kdf/kdf-9999.ebuild index f97000f8..cfd6c4a3 100644 --- a/trinity-base/kdf/kdf-9999.ebuild +++ b/trinity-base/kdf/kdf-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity free disk space utility" diff --git a/trinity-base/kdialog/kdialog-9999.ebuild b/trinity-base/kdialog/kdialog-9999.ebuild index b9471d8f..2f7295a6 100644 --- a/trinity-base/kdialog/kdialog-9999.ebuild +++ b/trinity-base/kdialog/kdialog-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts" diff --git a/trinity-base/kdict/kdict-9999.ebuild b/trinity-base/kdict/kdict-9999.ebuild index 1fcac38b..f006dc04 100644 --- a/trinity-base/kdict/kdict-9999.ebuild +++ b/trinity-base/kdict/kdict-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Trinity dict client (for dict.org-like servers)" diff --git a/trinity-base/kdvi/kdvi-9999.ebuild b/trinity-base/kdvi/kdvi-9999.ebuild index dfdfaf51..09a435ba 100644 --- a/trinity-base/kdvi/kdvi-9999.ebuild +++ b/trinity-base/kdvi/kdvi-9999.ebuild @@ -3,14 +3,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" +TSM_EXTRACT_ALSO="kviewshell" inherit trinity-meta-2 DESCRIPTION="Trinity DVI viewer" -DEPEND="media-libs/freetype - ~trinity-base/kviewshell-${PV}" +DEPEND=" + media-libs/freetype + ~trinity-base/kviewshell-${PV} +" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="kviewshell" diff --git a/trinity-base/kedit/kedit-9999.ebuild b/trinity-base/kedit/kedit-9999.ebuild index 34253645..8c24fa51 100644 --- a/trinity-base/kedit/kedit-9999.ebuild +++ b/trinity-base/kedit/kedit-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Very simple text editor for Trinity" diff --git a/trinity-base/kenolaba/kenolaba-9999.ebuild b/trinity-base/kenolaba/kenolaba-9999.ebuild index e4a01824..14109883 100644 --- a/trinity-base/kenolaba/kenolaba-9999.ebuild +++ b/trinity-base/kenolaba/kenolaba-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity: Board game inspired by Abalone" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kfax/kfax-9999.ebuild b/trinity-base/kfax/kfax-9999.ebuild index 67435105..37caf389 100644 --- a/trinity-base/kfax/kfax-9999.ebuild +++ b/trinity-base/kfax/kfax-9999.ebuild @@ -3,14 +3,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" + TRINITY_MODULE_NAME="tdegraphics" TRINITY_SUBMODULE="kfax kfaxview" - +TSM_EXTRACT_ALSO="kviewshell" inherit trinity-meta-2 DESCRIPTION="Trinity G3/G4 fax viewer" DEPEND="~trinity-base/kviewshell-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="kviewshell" diff --git a/trinity-base/kfind/kfind-9999.ebuild b/trinity-base/kfind/kfind-9999.ebuild index 85bb4a78..12d5f6a2 100644 --- a/trinity-base/kfind/kfind-9999.ebuild +++ b/trinity-base/kfind/kfind-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity file find utility" DEPEND="~trinity-base/libkonq-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/kfloppy/kfloppy-9999.ebuild b/trinity-base/kfloppy/kfloppy-9999.ebuild index 092f38a9..ff8fa44e 100644 --- a/trinity-base/kfloppy/kfloppy-9999.ebuild +++ b/trinity-base/kfloppy/kfloppy-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them." diff --git a/trinity-base/kfouleggs/kfouleggs-9999.ebuild b/trinity-base/kfouleggs/kfouleggs-9999.ebuild index d4956f33..389bc031 100644 --- a/trinity-base/kfouleggs/kfouleggs-9999.ebuild +++ b/trinity-base/kfouleggs/kfouleggs-9999.ebuild @@ -3,14 +3,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TRINITY_SUBMODULE="kfouleggs libksirtet" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TRINITY_SUBMODULE="kfouleggs libksirtet" -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kgamma/kgamma-9999.ebuild b/trinity-base/kgamma/kgamma-9999.ebuild index c331605f..92bcaa50 100644 --- a/trinity-base/kgamma/kgamma-9999.ebuild +++ b/trinity-base/kgamma/kgamma-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity screen gamma values kcontrol module" diff --git a/trinity-base/kgantt/kgantt-9999.ebuild b/trinity-base/kgantt/kgantt-9999.ebuild index ccfd3751..dc64a505 100644 --- a/trinity-base/kgantt/kgantt-9999.ebuild +++ b/trinity-base/kgantt/kgantt-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 DESCRIPTION="A Trinity library for drawing and editing gantt-diagramms" - -TSM_EXTRACT_ALSO="libtdepim/" diff --git a/trinity-base/kget/kget-9999.ebuild b/trinity-base/kget/kget-9999.ebuild index dc13e152..4305d676 100644 --- a/trinity-base/kget/kget-9999.ebuild +++ b/trinity-base/kget/kget-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="An advanced download manager for Trinity" diff --git a/trinity-base/kghostview/kghostview-9999.ebuild b/trinity-base/kghostview/kghostview-9999.ebuild index 282f7f28..11268366 100644 --- a/trinity-base/kghostview/kghostview-9999.ebuild +++ b/trinity-base/kghostview/kghostview-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="A Trinity Viewer for PostScript (.ps, .eps) and PDF (.pdf) files" diff --git a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild index 5fdfb7b7..b73b5791 100644 --- a/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild +++ b/trinity-base/kgoldrunner/kgoldrunner-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity: KGoldrunner is a game of action and puzzle solving" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/khelpcenter/khelpcenter-9999.ebuild b/trinity-base/khelpcenter/khelpcenter-9999.ebuild index 8c747951..c7dd9f2a 100644 --- a/trinity-base/khelpcenter/khelpcenter-9999.ebuild +++ b/trinity-base/khelpcenter/khelpcenter-9999.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundatio +# Copyright 1999-2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta-2 +TRINITY_MODULE_NAME="tdebase" TRINITY_SUBMODULE="khelpcenter doc" +TSM_EXTRACT_ALSO="translations/" +inherit trinity-meta-2 -DESCRIPTION="The Trinity help center." +DESCRIPTION="The Trinity help center" RDEPEND=" ~trinity-base/tdebase-tdeioslaves-${PV} - || ( www-misc/htdig www-misc/hldig )" - -TSM_EXTRACT_ALSO="translations/" - + || ( + www-misc/htdig + www-misc/hldig + ) +" diff --git a/trinity-base/khexedit/khexedit-9999.ebuild b/trinity-base/khexedit/khexedit-9999.ebuild index 4410904c..211b44b3 100644 --- a/trinity-base/khexedit/khexedit-9999.ebuild +++ b/trinity-base/khexedit/khexedit-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity hex editor" diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild index f05f220c..6bb6ce64 100644 --- a/trinity-base/khotkeys/khotkeys-9999.ebuild +++ b/trinity-base/khotkeys/khotkeys-9999.ebuild @@ -4,8 +4,9 @@ EAPI="7" -TRINITY_MODULE_NAME="tdebase" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity hotkey daemon" @@ -13,8 +14,6 @@ DESCRIPTION="Trinity hotkey daemon" DEPEND="x11-libs/libXtst" RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="translations/" - src_configure() { local mycmakeargs=( -DWITH_XTEST=ON diff --git a/trinity-base/kicker-applets/kicker-applets-9999.ebuild b/trinity-base/kicker-applets/kicker-applets-9999.ebuild index c120a03f..db8115e1 100644 --- a/trinity-base/kicker-applets/kicker-applets-9999.ebuild +++ b/trinity-base/kicker-applets/kicker-applets-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="kicker applets" diff --git a/trinity-base/kicker/kicker-9999.ebuild b/trinity-base/kicker/kicker-9999.ebuild index 81ccba2e..77196a01 100644 --- a/trinity-base/kicker/kicker-9999.ebuild +++ b/trinity-base/kicker/kicker-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="The Trinity application starter panel, capable of applets and extensions" @@ -20,10 +21,8 @@ DEPEND="~trinity-base/libkonq-${PV} RDEPEND="${DEPEND} ~trinity-base/kmenuedit-${PV}" -TSM_EXTRACT_ALSO="translations/" - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XFIXES="$(usex xcomposite)" -DWITH_XRENDER="$(usex xcomposite)" -DWITH_XCOMPOSITE="$(usex xcomposite)" diff --git a/trinity-base/kjots/kjots-9999.ebuild b/trinity-base/kjots/kjots-9999.ebuild index 7da82422..f1a58b34 100644 --- a/trinity-base/kjots/kjots-9999.ebuild +++ b/trinity-base/kjots/kjots-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity note taking utility" diff --git a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild index 4aa0976b..e551a7a0 100644 --- a/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild +++ b/trinity-base/kjumpingcube/kjumpingcube-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity: Tactical one or two player game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/klickety/klickety-9999.ebuild b/trinity-base/klickety/klickety-9999.ebuild index 4007308c..a92a5a69 100644 --- a/trinity-base/klickety/klickety-9999.ebuild +++ b/trinity-base/klickety/klickety-9999.ebuild @@ -3,14 +3,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TRINITY_SUBMODULE="klickety libksirtet" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity: Klickety is an adaptation of the clickomania game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TRINITY_SUBMODULE="klickety libksirtet" -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/klines/klines-9999.ebuild b/trinity-base/klines/klines-9999.ebuild index 3dd1477f..4c9b80dc 100644 --- a/trinity-base/klines/klines-9999.ebuild +++ b/trinity-base/klines/klines-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity: Kolor Lines - a little game about balls and how to get rid of them" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/klipper/klipper-9999.ebuild b/trinity-base/klipper/klipper-9999.ebuild index 6bb6e6e9..68977738 100644 --- a/trinity-base/klipper/klipper-9999.ebuild +++ b/trinity-base/klipper/klipper-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="kicker applet for Trinity and X clipboard management" @@ -13,7 +13,7 @@ DEPEND="x11-libs/libXfixes" RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XFIXES=ON ) diff --git a/trinity-base/kmahjongg/kmahjongg-9999.ebuild b/trinity-base/kmahjongg/kmahjongg-9999.ebuild index 855c7198..0111cabd 100644 --- a/trinity-base/kmahjongg/kmahjongg-9999.ebuild +++ b/trinity-base/kmahjongg/kmahjongg-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Mahjongg for Trinity" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kmail/kmail-9999.ebuild b/trinity-base/kmail/kmail-9999.ebuild index 24a02113..a983a6b2 100644 --- a/trinity-base/kmail/kmail-9999.ebuild +++ b/trinity-base/kmail/kmail-9999.ebuild @@ -1,9 +1,24 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO=" + ktnef/ + libemailfunctions/ + mimelib/ + libtdenetwork/ + certmanager/lib/ + libtdepim/ + korganizer/kcalendariface.h + korganizer/korganizeriface.h + libkpimidentities/ + libkpgp/ + libkmime/ + libksieve/ + kmail/" inherit trinity-meta-2 DESCRIPTION="The email client for Trinity" @@ -13,40 +28,25 @@ IUSE="crypt imap mbox sasl" # The magic of KMail, is fully done by individual TDEIOSlaves, # so we trigger them to be build, depending on USE flags. -COMMON_DEPEND=" - ~trinity-base/libtdepim-${PV} - ~trinity-base/mimelib-${PV} - ~trinity-base/libtdenetwork-${PV} +DEPEND=" + ~trinity-base/certmanager-${PV} ~trinity-base/ktnef-${PV} ~trinity-base/libkcal-${PV} ~trinity-base/libkmime-${PV} ~trinity-base/libkpgp-${PV} - ~trinity-base/certmanager-${PV} ~trinity-base/libkpimidentities-${PV} - ~trinity-base/libksieve-${PV}" - -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - crypt? ( app-crypt/pinentry ) + ~trinity-base/libksieve-${PV} + ~trinity-base/libtdenetwork-${PV} + ~trinity-base/libtdepim-${PV} + ~trinity-base/mimelib-${PV} +" +RDEPEND="${DEPEND} ~trinity-base/tdebase-tdeioslaves-${PV} - mbox? ( ~trinity-base/tdepim-tdeioslaves-${PV} ) + crypt? ( app-crypt/pinentry ) imap? ( ~trinity-base/tdepim-tdeioslaves-${PV}[sasl=] ) - sasl? ( ~trinity-base/tdebase-tdeioslaves-${PV}[sasl=] )" - -TSM_EXTRACT_ALSO=" - ktnef/ - libemailfunctions/ - mimelib/ - libtdenetwork/ - certmanager/lib/ - libtdepim/ - korganizer/kcalendariface.h - korganizer/korganizeriface.h - libkpimidentities/ - libkpgp/ - libkmime/ - libksieve/ - kmail/" + mbox? ( ~trinity-base/tdepim-tdeioslaves-${PV} ) + sasl? ( ~trinity-base/tdebase-tdeioslaves-${PV}[sasl=] ) +" pkg_postinst () { if use crypt; then diff --git a/trinity-base/kmenuedit/kmenuedit-9999.ebuild b/trinity-base/kmenuedit/kmenuedit-9999.ebuild index a4492f99..57a18714 100644 --- a/trinity-base/kmenuedit/kmenuedit-9999.ebuild +++ b/trinity-base/kmenuedit/kmenuedit-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity menu editor" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/kmines/kmines-9999.ebuild b/trinity-base/kmines/kmines-9999.ebuild index 57cd03c4..dc859136 100644 --- a/trinity-base/kmines/kmines-9999.ebuild +++ b/trinity-base/kmines/kmines-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="KMines is a classic mine sweeper game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kmix/kmix-9999.ebuild b/trinity-base/kmix/kmix-9999.ebuild index 35f5e126..78ab5deb 100644 --- a/trinity-base/kmix/kmix-9999.ebuild +++ b/trinity-base/kmix/kmix-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_MODULE_NAME="tdemultimedia" inherit trinity-meta-2 DESCRIPTION="Trinity mixer GUI" @@ -15,7 +15,7 @@ DEPEND="alsa? ( media-libs/alsa-lib )" RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_ALSA="$(usex alsa)" ) diff --git a/trinity-base/kmobile/kmobile-9999.ebuild b/trinity-base/kmobile/kmobile-9999.ebuild index 97af3b4b..960f85c0 100644 --- a/trinity-base/kmobile/kmobile-9999.ebuild +++ b/trinity-base/kmobile/kmobile-9999.ebuild @@ -1,11 +1,11 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 DESCRIPTION="A TDE Mobile Devices Manager" - -TSM_EXTRACT_ALSO="libtdepim/" diff --git a/trinity-base/kmoon/kmoon-9999.ebuild b/trinity-base/kmoon/kmoon-9999.ebuild index 4de22c70..27afdae2 100644 --- a/trinity-base/kmoon/kmoon-9999.ebuild +++ b/trinity-base/kmoon/kmoon-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Trinity moon phase display" diff --git a/trinity-base/kmrml/kmrml-9999.ebuild b/trinity-base/kmrml/kmrml-9999.ebuild index 38434da6..667b355a 100644 --- a/trinity-base/kmrml/kmrml-9999.ebuild +++ b/trinity-base/kmrml/kmrml-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="TDEIO and konqueror plugins for MRML - an image indexing service" diff --git a/trinity-base/knetattach/knetattach-9999.ebuild b/trinity-base/knetattach/knetattach-9999.ebuild index 7cea733e..e372bbe7 100644 --- a/trinity-base/knetattach/knetattach-9999.ebuild +++ b/trinity-base/knetattach/knetattach-9999.ebuild @@ -5,8 +5,7 @@ EAPI="7" TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity network wizard" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/knetwalk/knetwalk-9999.ebuild b/trinity-base/knetwalk/knetwalk-9999.ebuild index 0ee054ca..2653c39b 100644 --- a/trinity-base/knetwalk/knetwalk-9999.ebuild +++ b/trinity-base/knetwalk/knetwalk-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity tron game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild b/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild index d3ce24f0..357678e4 100644 --- a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild +++ b/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Kicker applet - RSS news ticker" diff --git a/trinity-base/knewsticker/knewsticker-9999.ebuild b/trinity-base/knewsticker/knewsticker-9999.ebuild index 6fd381f8..558dcf48 100644 --- a/trinity-base/knewsticker/knewsticker-9999.ebuild +++ b/trinity-base/knewsticker/knewsticker-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" +TSM_EXTRACT_ALSO="librss" inherit trinity-meta-2 DESCRIPTION="kicker plugin: rss news ticker" DEPEND="~trinity-base/librss-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="librss" diff --git a/trinity-base/knode/knode-9999.ebuild b/trinity-base/knode/knode-9999.ebuild index 63656dd9..52bf9701 100644 --- a/trinity-base/knode/knode-9999.ebuild +++ b/trinity-base/knode/knode-9999.ebuild @@ -1,18 +1,19 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/ libemailfunctions/ libkpgp/ libkmime/" inherit trinity-meta-2 DESCRIPTION="A newsreader for TDE" DEPEND=" ~trinity-base/ktnef-${PV} + ~trinity-base/libkcal-${PV} ~trinity-base/libkmime-${PV} ~trinity-base/libtdepim-${PV} - ~trinity-base/libkcal-${PV}" +" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdepim/ libemailfunctions/ libkpgp/ libkmime/" diff --git a/trinity-base/knotes/knotes-9999.ebuild b/trinity-base/knotes/knotes-9999.ebuild index 860697b0..d85c5c3c 100644 --- a/trinity-base/knotes/knotes-9999.ebuild +++ b/trinity-base/knotes/knotes-9999.ebuild @@ -3,15 +3,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 DESCRIPTION="Trinity Notes application" -COMMON_DEPEND="~trinity-base/libkcal-${PV} - ~trinity-base/libtdepim-${PV}" -DEPEND+=" $COMMON_DEPEND" -RDEPEND+=" $COMMON_DEPEND" - -TSM_EXTRACT_ALSO="libtdepim/" +DEPEND=" + ~trinity-base/libkcal-${PV} + ~trinity-base/libtdepim-${PV} +" +RDEPEND="${DEPEND}" diff --git a/trinity-base/kodo/kodo-9999.ebuild b/trinity-base/kodo/kodo-9999.ebuild index 3c68c93c..2faec021 100644 --- a/trinity-base/kodo/kodo-9999.ebuild +++ b/trinity-base/kodo/kodo-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Trinity: measure the desktop mileage of your mouse pointer" diff --git a/trinity-base/kolf/kolf-9999.ebuild b/trinity-base/kolf/kolf-9999.ebuild index 1bbb4ddc..7a5359a5 100644 --- a/trinity-base/kolf/kolf-9999.ebuild +++ b/trinity-base/kolf/kolf-9999.ebuild @@ -4,13 +4,12 @@ EAPI="7" -TRINITY_MODULE_NAME="tdegames" TRINITY_NEED_ARTS="yes" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Minigolf Game by Trinity" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kolourpaint/kolourpaint-9999.ebuild b/trinity-base/kolourpaint/kolourpaint-9999.ebuild index e0e036ef..750617db 100644 --- a/trinity-base/kolourpaint/kolourpaint-9999.ebuild +++ b/trinity-base/kolourpaint/kolourpaint-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Paint Program for Trinity" diff --git a/trinity-base/konq-plugins/konq-plugins-9999.ebuild b/trinity-base/konq-plugins/konq-plugins-9999.ebuild index f779776d..e2735ce7 100644 --- a/trinity-base/konq-plugins/konq-plugins-9999.ebuild +++ b/trinity-base/konq-plugins/konq-plugins-9999.ebuild @@ -4,8 +4,8 @@ EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Various plugins for Konqueror" diff --git a/trinity-base/konqueror/konqueror-9999.ebuild b/trinity-base/konqueror/konqueror-9999.ebuild index 80c20b14..ed12a642 100644 --- a/trinity-base/konqueror/konqueror-9999.ebuild +++ b/trinity-base/konqueror/konqueror-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="kdesktop translations/" inherit trinity-meta-2 DESCRIPTION="Trinity: Web browser, file manager, ..." @@ -13,12 +14,11 @@ IUSE="java" # FIXME: support branding USE flag DEPEND=" - ~trinity-base/libkonq-${PV}" - + ~trinity-base/libkonq-${PV} +" RDEPEND="${DEPEND} ~trinity-base/kcontrol-${PV} - ~trinity-base/tdebase-tdeioslaves-${PV} ~trinity-base/kfind-${PV} - java? ( virtual/jre )" - -TSM_EXTRACT_ALSO="kdesktop translations/" + ~trinity-base/tdebase-tdeioslaves-${PV} + java? ( virtual/jre ) +" diff --git a/trinity-base/konquest/konquest-9999.ebuild b/trinity-base/konquest/konquest-9999.ebuild index d258ee6b..67589743 100644 --- a/trinity-base/konquest/konquest-9999.ebuild +++ b/trinity-base/konquest/konquest-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Galactic Strategy Trinity Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/konsole/konsole-9999.ebuild b/trinity-base/konsole/konsole-9999.ebuild index 76861317..bec88333 100644 --- a/trinity-base/konsole/konsole-9999.ebuild +++ b/trinity-base/konsole/konsole-9999.ebuild @@ -5,6 +5,7 @@ EAPI="7" TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="X terminal for use with Trinity" @@ -20,8 +21,6 @@ RDEPEND="${DEPEND} x11-apps/bdftopcf sudo? ( app-admin/sudo )" -TSM_EXTRACT_ALSO="translations/" - src_configure() { local mycmakeargs=( -DWITH_XRENDER=ON diff --git a/trinity-base/kontact/kontact-9999.ebuild b/trinity-base/kontact/kontact-9999.ebuild index 346e16f8..058c3be2 100644 --- a/trinity-base/kontact/kontact-9999.ebuild +++ b/trinity-base/kontact/kontact-9999.ebuild @@ -3,23 +3,22 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/ libtdenetwork/ plugins/ korganizer/ kaddressbook/ + kmail/ knotes/ knode/ akregator/ karm/ libemailfunctions/ libkpimidentities/" inherit trinity-meta-2 DESCRIPTION="Trinity personal information manager" -COMMON_DEPEND="~trinity-base/libtdepim-${PV} +DEPEND=" + ~trinity-base/libtdepim-${PV} ~trinity-base/libkpimidentities-${PV} ~trinity-base/libkholidays-${PV} ~trinity-base/knotes-${PV} - =trinity-base/korganizer-${PV}" - -DEPEND+=" $COMMON_DEPEND" -RDEPEND+=" $COMMON_DEPEND" - -TSM_EXTRACT_ALSO="libtdepim/ libtdenetwork/ plugins/ korganizer/ kaddressbook/ \ - kmail/ knotes/ knode/ akregator/ karm/ libemailfunctions/ libkpimidentities/" + ~trinity-base/korganizer-${PV} +" +RDEPEND="${DEPEND}" src_prepare() { sed -i '/kmail/d' kontact/plugins/CMakeLists.txt || die diff --git a/trinity-base/kooka/kooka-9999.ebuild b/trinity-base/kooka/kooka-9999.ebuild index dce9c4b7..73ccd63e 100644 --- a/trinity-base/kooka/kooka-9999.ebuild +++ b/trinity-base/kooka/kooka-9999.ebuild @@ -3,15 +3,15 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" +TSM_EXTRACT_ALSO="libkscan" inherit trinity-meta-2 DESCRIPTION="Kooka is a Trinity application which provides access to scanner hardware" DEPEND=" + media-libs/tiff:= ~trinity-base/libkscan-${PV} - media-libs/tiff:=" +" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libkscan" diff --git a/trinity-base/korganizer/korganizer-9999.ebuild b/trinity-base/korganizer/korganizer-9999.ebuild index b3fc0185..d5df3177 100644 --- a/trinity-base/korganizer/korganizer-9999.ebuild +++ b/trinity-base/korganizer/korganizer-9999.ebuild @@ -3,45 +3,46 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="certmanager/lib/ + libemailfunctions/ + libkcal/ + libkholidays/ + libkpimidentities/ + libtdepim/ + libkmime/ + kdgantt/ + kmail/" +TRINITY_MODULE_NAME="tdepim" inherit trinity-meta-2 DESCRIPTION="A Personal Organizer for Trinity" -IUSE+=" exchange" +IUSE="exchange" -COMMON_DEPEND=" +DEPEND=" + ~trinity-base/certmanager-${PV} + ~trinity-base/kaddressbook-${PV} ~trinity-base/kgantt-${PV} - ~trinity-base/libtdepim-${PV} - ~trinity-base/libtdenetwork-${PV} - ~trinity-base/libkcal-${PV} ~trinity-base/ktnef-${PV} - ~trinity-base/libkmime-${PV} + ~trinity-base/libkcal-${PV} ~trinity-base/libkholidays-${PV} - ~trinity-base/certmanager-${PV} + ~trinity-base/libkmime-${PV} ~trinity-base/libkpimidentities-${PV} - ~trinity-base/kaddressbook-${PV} - exchange? ( ~trinity-base/libkpimexchange-${PV} )" + ~trinity-base/libtdenetwork-${PV} + ~trinity-base/libtdepim-${PV} + exchange? ( ~trinity-base/libkpimexchange-${PV} ) +" # ~trinity-base/tdepim-tderesources-${PV}:${SLOT} +RDEPEND="${DEPEND}" -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND}" - -TSM_EXTRACT_ALSO="certmanager/lib/ - libemailfunctions/ - libkcal/ - libkholidays/ - libkpimidentities/ - libtdepim/ - libkmime/ - kdgantt/ - kmail/" - -TSM_EXTRACT_ALSO+=" libkpimexchange/core/" # required for USE=exchange +pkg_setup() { + trinity-meta-2_pkg_setup + use exchange && TSM_EXTRACT_ALSO+=" libkpimexchange/core/" +} src_configure () { - mycmakeargs=( + local mycmakeargs=( -DWITH_EXCHANGE="$(usex exchange)" ) trinity-meta-2_src_configure diff --git a/trinity-base/kpager/kpager-9999.ebuild b/trinity-base/kpager/kpager-9999.ebuild index 1dcaded6..03aab229 100644 --- a/trinity-base/kpager/kpager-9999.ebuild +++ b/trinity-base/kpager/kpager-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity Virtual Desktop Overview" diff --git a/trinity-base/kpat/kpat-9999.ebuild b/trinity-base/kpat/kpat-9999.ebuild index 023f33db..21bf56f3 100644 --- a/trinity-base/kpat/kpat-9999.ebuild +++ b/trinity-base/kpat/kpat-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity patience game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kpdf/kpdf-9999.ebuild b/trinity-base/kpdf/kpdf-9999.ebuild index dc48552f..cee0ba4f 100644 --- a/trinity-base/kpdf/kpdf-9999.ebuild +++ b/trinity-base/kpdf/kpdf-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="KPDF, a Trinity PDF viewer based on XPDF" diff --git a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild index 684b5697..44ee15bd 100644 --- a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild +++ b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="libkonq/ translations/" inherit trinity-meta-2 -DESCRIPTION="Trinity user settings wizard." - -TSM_EXTRACT_ALSO="libkonq/ translations/" +DESCRIPTION="Trinity user settings wizard" diff --git a/trinity-base/kpf/kpf-9999.ebuild b/trinity-base/kpf/kpf-9999.ebuild index d77073bf..2056d2c7 100644 --- a/trinity-base/kpf/kpf-9999.ebuild +++ b/trinity-base/kpf/kpf-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Kicker file server (http) applet" diff --git a/trinity-base/kpoker/kpoker-9999.ebuild b/trinity-base/kpoker/kpoker-9999.ebuild index ce721daa..c016afc8 100644 --- a/trinity-base/kpoker/kpoker-9999.ebuild +++ b/trinity-base/kpoker/kpoker-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity poker game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild b/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild index 6eb923f6..435c177f 100644 --- a/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild +++ b/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity: Modeler for POV-Ray Scenes." diff --git a/trinity-base/kppp/kppp-9999.ebuild b/trinity-base/kppp/kppp-9999.ebuild index 67f27d6b..5905a4e4 100644 --- a/trinity-base/kppp/kppp-9999.ebuild +++ b/trinity-base/kppp/kppp-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Trinity: A dialer and front-end to pppd." diff --git a/trinity-base/kreadconfig/kreadconfig-9999.ebuild b/trinity-base/kreadconfig/kreadconfig-9999.ebuild index fde6d5ec..fea27dff 100644 --- a/trinity-base/kreadconfig/kreadconfig-9999.ebuild +++ b/trinity-base/kreadconfig/kreadconfig-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="A Trinity tool to read KConfig entries - for use in shell scripts" diff --git a/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild b/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild index 5ac05c32..82126d61 100644 --- a/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild +++ b/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity: Editor for Regular Expressions" diff --git a/trinity-base/kreversi/kreversi-9999.ebuild b/trinity-base/kreversi/kreversi-9999.ebuild index fd0f0504..51aad368 100644 --- a/trinity-base/kreversi/kreversi-9999.ebuild +++ b/trinity-base/kreversi/kreversi-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity Board Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/krootbacking/krootbacking-9999.ebuild b/trinity-base/krootbacking/krootbacking-9999.ebuild index 86bf447f..34bf6684 100644 --- a/trinity-base/krootbacking/krootbacking-9999.ebuild +++ b/trinity-base/krootbacking/krootbacking-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="A program to grab the current TDE desktop background for xscreensaver." diff --git a/trinity-base/kruler/kruler-9999.ebuild b/trinity-base/kruler/kruler-9999.ebuild index 33437fb5..14dada39 100644 --- a/trinity-base/kruler/kruler-9999.ebuild +++ b/trinity-base/kruler/kruler-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="A screen ruler for Trinity" diff --git a/trinity-base/ksame/ksame-9999.ebuild b/trinity-base/ksame/ksame-9999.ebuild index 97d2d18e..7f723bf3 100644 --- a/trinity-base/ksame/ksame-9999.ebuild +++ b/trinity-base/ksame/ksame-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity: Same Game - a little game about balls and how to get rid of them" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kshisen/kshisen-9999.ebuild b/trinity-base/kshisen/kshisen-9999.ebuild index 54aad206..531ecc0e 100644 --- a/trinity-base/kshisen/kshisen-9999.ebuild +++ b/trinity-base/kshisen/kshisen-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="A Trinity game similiar to Mahjongg" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksig/ksig-9999.ebuild b/trinity-base/ksig/ksig-9999.ebuild index 194e8ba8..0ab298ed 100644 --- a/trinity-base/ksig/ksig-9999.ebuild +++ b/trinity-base/ksig/ksig-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Trinity email signature manager" diff --git a/trinity-base/ksirc/ksirc-9999.ebuild b/trinity-base/ksirc/ksirc-9999.ebuild index 3d97f16f..2e131c24 100644 --- a/trinity-base/ksirc/ksirc-9999.ebuild +++ b/trinity-base/ksirc/ksirc-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Trinity irc client" diff --git a/trinity-base/ksirtet/ksirtet-9999.ebuild b/trinity-base/ksirtet/ksirtet-9999.ebuild index 9a419c0c..a664cd49 100644 --- a/trinity-base/ksirtet/ksirtet-9999.ebuild +++ b/trinity-base/ksirtet/ksirtet-9999.ebuild @@ -3,14 +3,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TRINITY_SUBMODULE="ksirtet libksirtet" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TRINITY_SUBMODULE="ksirtet libksirtet" -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksmiletris/ksmiletris-9999.ebuild b/trinity-base/ksmiletris/ksmiletris-9999.ebuild index 83c28e8a..07e683f3 100644 --- a/trinity-base/ksmiletris/ksmiletris-9999.ebuild +++ b/trinity-base/ksmiletris/ksmiletris-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity SmileTris" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksmserver/ksmserver-9999.ebuild b/trinity-base/ksmserver/ksmserver-9999.ebuild index db9cd002..cf46c428 100644 --- a/trinity-base/ksmserver/ksmserver-9999.ebuild +++ b/trinity-base/ksmserver/ksmserver-9999.ebuild @@ -3,17 +3,17 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="The reliable Trinity session manager that talks the standard X11R6" + IUSE="+hwlib" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_TDEHWLIB="$(usex hwlib)" ) - trinity-meta-2_src_configure } diff --git a/trinity-base/ksnake/ksnake-9999.ebuild b/trinity-base/ksnake/ksnake-9999.ebuild index 92152b7f..c5428e03 100644 --- a/trinity-base/ksnake/ksnake-9999.ebuild +++ b/trinity-base/ksnake/ksnake-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity Tron game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksnapshot/ksnapshot-9999.ebuild b/trinity-base/ksnapshot/ksnapshot-9999.ebuild index bf9a22f1..75f992d6 100644 --- a/trinity-base/ksnapshot/ksnapshot-9999.ebuild +++ b/trinity-base/ksnapshot/ksnapshot-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity Screenshot Utility" diff --git a/trinity-base/ksokoban/ksokoban-9999.ebuild b/trinity-base/ksokoban/ksokoban-9999.ebuild index 0fa388bf..e40d913b 100644 --- a/trinity-base/ksokoban/ksokoban-9999.ebuild +++ b/trinity-base/ksokoban/ksokoban-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="The japanese warehouse keeper game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/kspaceduel/kspaceduel-9999.ebuild b/trinity-base/kspaceduel/kspaceduel-9999.ebuild index 987a5906..88892aa5 100644 --- a/trinity-base/kspaceduel/kspaceduel-9999.ebuild +++ b/trinity-base/kspaceduel/kspaceduel-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity Space Game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ksplashml/ksplashml-9999.ebuild b/trinity-base/ksplashml/ksplashml-9999.ebuild index d8042e1e..9846b251 100644 --- a/trinity-base/ksplashml/ksplashml-9999.ebuild +++ b/trinity-base/ksplashml/ksplashml-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity splashscreen framework (of Trinity itself, not of individual apps)" @@ -14,10 +15,8 @@ IUSE="xinerama" DEPEND="xinerama? ( x11-base/xorg-proto )" RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="translations/" - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XINERAMA="$(usex xinerama)" ) diff --git a/trinity-base/kstart/kstart-9999.ebuild b/trinity-base/kstart/kstart-9999.ebuild index 503fd94a..97888d06 100644 --- a/trinity-base/kstart/kstart-9999.ebuild +++ b/trinity-base/kstart/kstart-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity utility to launch applications with special window properties" diff --git a/trinity-base/ksysguard/ksysguard-9999.ebuild b/trinity-base/ksysguard/ksysguard-9999.ebuild index f420376b..875fc99b 100644 --- a/trinity-base/ksysguard/ksysguard-9999.ebuild +++ b/trinity-base/ksysguard/ksysguard-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="A network enabled task manager/system monitor" @@ -14,10 +15,8 @@ IUSE="dell-laptop lm-sensors" DEPEND="lm-sensors? ( sys-apps/lm-sensors )" RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="translations/" - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_I8K="$(usex dell-laptop)" -DWITH_SENSORS="$(usex lm-sensors)" ) diff --git a/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild b/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild index ce2a273f..a1d4b3e1 100644 --- a/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild +++ b/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray." diff --git a/trinity-base/kteatime/kteatime-9999.ebuild b/trinity-base/kteatime/kteatime-9999.ebuild index 97333d99..cc5d74a8 100644 --- a/trinity-base/kteatime/kteatime-9999.ebuild +++ b/trinity-base/kteatime/kteatime-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Trinity utility for making a fine cup of tea" diff --git a/trinity-base/ktimer/ktimer-9999.ebuild b/trinity-base/ktimer/ktimer-9999.ebuild index fda9a5d4..ec308289 100644 --- a/trinity-base/ktimer/ktimer-9999.ebuild +++ b/trinity-base/ktimer/ktimer-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity Timer" diff --git a/trinity-base/ktip/ktip-9999.ebuild b/trinity-base/ktip/ktip-9999.ebuild index b6d43ad1..e27959c7 100644 --- a/trinity-base/ktip/ktip-9999.ebuild +++ b/trinity-base/ktip/ktip-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity tip-of-the-day displayer" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/ktnef/ktnef-9999.ebuild b/trinity-base/ktnef/ktnef-9999.ebuild index d057a20e..f8d86aef 100644 --- a/trinity-base/ktnef/ktnef-9999.ebuild +++ b/trinity-base/ktnef/ktnef-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 DESCRIPTION="Trinity Viewer for mail attachments using TNEF format" - -TSM_EXTRACT_ALSO="libtdepim/" diff --git a/trinity-base/ktron/ktron-9999.ebuild b/trinity-base/ktron/ktron-9999.ebuild index 0ee054ca..2653c39b 100644 --- a/trinity-base/ktron/ktron-9999.ebuild +++ b/trinity-base/ktron/ktron-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity tron game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ktuberling/ktuberling-9999.ebuild b/trinity-base/ktuberling/ktuberling-9999.ebuild index 4656176d..02e96f00 100644 --- a/trinity-base/ktuberling/ktuberling-9999.ebuild +++ b/trinity-base/ktuberling/ktuberling-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="A Trinity potato game for kids" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/ktux/ktux-9999.ebuild b/trinity-base/ktux/ktux-9999.ebuild index f01efd74..2db65a13 100644 --- a/trinity-base/ktux/ktux-9999.ebuild +++ b/trinity-base/ktux/ktux-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Trinity: screensaver featuring the Space-Faring Tux" diff --git a/trinity-base/kuickshow/kuickshow-9999.ebuild b/trinity-base/kuickshow/kuickshow-9999.ebuild index 876f1b9b..0c3e1b8e 100644 --- a/trinity-base/kuickshow/kuickshow-9999.ebuild +++ b/trinity-base/kuickshow/kuickshow-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="A fast and versatile image viewer for Trinity" diff --git a/trinity-base/kview/kview-9999.ebuild b/trinity-base/kview/kview-9999.ebuild index b61c2c1c..397fc3f8 100644 --- a/trinity-base/kview/kview-9999.ebuild +++ b/trinity-base/kview/kview-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity image viewer" diff --git a/trinity-base/kviewshell/kviewshell-9999.ebuild b/trinity-base/kviewshell/kviewshell-9999.ebuild index 6d9f64a1..6a874c1f 100644 --- a/trinity-base/kviewshell/kviewshell-9999.ebuild +++ b/trinity-base/kviewshell/kviewshell-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity: Generic framework for viewer applications" diff --git a/trinity-base/kweather/kweather-9999.ebuild b/trinity-base/kweather/kweather-9999.ebuild index af1c6505..28a9eb6b 100644 --- a/trinity-base/kweather/kweather-9999.ebuild +++ b/trinity-base/kweather/kweather-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Trinity weather status display" diff --git a/trinity-base/kwifimanager/kwifimanager-9999.ebuild b/trinity-base/kwifimanager/kwifimanager-9999.ebuild index 724e1c37..51739569 100644 --- a/trinity-base/kwifimanager/kwifimanager-9999.ebuild +++ b/trinity-base/kwifimanager/kwifimanager-9999.ebuild @@ -4,9 +4,9 @@ EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" TRINITY_SUBMODULE="wifi" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Trinity wifi (wireless network) gui" diff --git a/trinity-base/kworldclock/kworldclock-9999.ebuild b/trinity-base/kworldclock/kworldclock-9999.ebuild index aedfbec5..08597f3e 100644 --- a/trinity-base/kworldclock/kworldclock-9999.ebuild +++ b/trinity-base/kworldclock/kworldclock-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" TRINITY_SUBMODULE="kworldwatch" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 DESCRIPTION="Trinity program that displays the part of the Earth lit up by the Sun" diff --git a/trinity-base/kxkb/kxkb-9999.ebuild b/trinity-base/kxkb/kxkb-9999.ebuild index 258917f2..d6b25352 100644 --- a/trinity-base/kxkb/kxkb-9999.ebuild +++ b/trinity-base/kxkb/kxkb-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="KControl module to configure and switch keyboard layouts" @@ -14,10 +15,8 @@ RDEPEND="${DEPEND} x11-misc/xkeyboard-config x11-apps/setxkbmap" -TSM_EXTRACT_ALSO="translations/" - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XTEST=ON ) diff --git a/trinity-base/libkcal/libkcal-9999.ebuild b/trinity-base/libkcal/libkcal-9999.ebuild index 3799a012..34006295 100644 --- a/trinity-base/libkcal/libkcal-9999.ebuild +++ b/trinity-base/libkcal/libkcal-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libemailfunctions/ libtdepim/ libkmime/ ktnef/" inherit trinity-meta-2 DESCRIPTION="Trinity kcal library for KOrganizer etc" @@ -14,5 +15,3 @@ DEPEND=" ~trinity-base/ktnef-${PV} ~trinity-base/libkmime-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libemailfunctions/ libtdepim/ libkmime/ ktnef/" diff --git a/trinity-base/libkholidays/libkholidays-9999.ebuild b/trinity-base/libkholidays/libkholidays-9999.ebuild index ce3111cd..bb6f26c7 100644 --- a/trinity-base/libkholidays/libkholidays-9999.ebuild +++ b/trinity-base/libkholidays/libkholidays-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 -DESCRIPTION="Trinity library to compute holidays." - -TSM_EXTRACT_ALSO="libtdepim/" +DESCRIPTION="Trinity library to compute holidays" diff --git a/trinity-base/libkmime/libkmime-9999.ebuild b/trinity-base/libkmime/libkmime-9999.ebuild index 0105c2b4..5d9f8ba4 100644 --- a/trinity-base/libkmime/libkmime-9999.ebuild +++ b/trinity-base/libkmime/libkmime-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 DESCRIPTION="Trinity kmime library for Message Handling" - -TSM_EXTRACT_ALSO="libtdepim/" diff --git a/trinity-base/libkonq/libkonq-9999.ebuild b/trinity-base/libkonq/libkonq-9999.ebuild index db184537..4a2e4e78 100644 --- a/trinity-base/libkonq/libkonq-9999.ebuild +++ b/trinity-base/libkonq/libkonq-9999.ebuild @@ -4,10 +4,9 @@ EAPI="7" -TRINITY_MODULE_NAME="tdebase" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="The embeddable part of konqueror" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/libkpgp/libkpgp-9999.ebuild b/trinity-base/libkpgp/libkpgp-9999.ebuild index edf9c1bf..3d6b683f 100644 --- a/trinity-base/libkpgp/libkpgp-9999.ebuild +++ b/trinity-base/libkpgp/libkpgp-9999.ebuild @@ -1,9 +1,11 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 DESCRIPTION="Trinity PGP library" @@ -13,5 +15,3 @@ DEPEND=" ~trinity-base/ktnef-${PV} ~trinity-base/libkmime-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdepim/"
\ No newline at end of file diff --git a/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild b/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild index afc6a20b..f95bbd68 100644 --- a/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild +++ b/trinity-base/libkpimexchange/libkpimexchange-9999.ebuild @@ -3,17 +3,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/ libkcal/" inherit trinity-meta-2 DESCRIPTION="Trinity PIM exchange library" -COMMON_DEPEND="~trinity-base/libkcal-${PV} +DEPEND=" ~trinity-base/ktnef-${PV} - ~trinity-base/libkmime-${PV}" - -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND}" - -TSM_EXTRACT_ALSO="libtdepim/ libkcal/" + ~trinity-base/libkcal-${PV} + ~trinity-base/libkmime-${PV} +" +RDEPEND="${DEPEND}" diff --git a/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild b/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild index 96e671e8..c82ffec7 100644 --- a/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild +++ b/trinity-base/libkpimidentities/libkpimidentities-9999.ebuild @@ -3,16 +3,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/ libemailfunctions/ libkmime/" inherit trinity-meta-2 DESCRIPTION="Trinity PIM identities library" -COMMON_DEPEND="~trinity-base/certmanager-${PV} +DEPEND=" + ~trinity-base/certmanager-${PV} + ~trinity-base/libkmime-${PV} ~trinity-base/libtdepim-${PV} - ~trinity-base/libkmime-${PV}" -DEPEND+=" $COMMON_DEPEND" -RDEPEND+=" $COMMON_DEPEND" - -TSM_EXTRACT_ALSO="libtdepim/ libemailfunctions/ libkmime/" +" +RDEPEND="${DEPEND}" diff --git a/trinity-base/libkscan/libkscan-9999.ebuild b/trinity-base/libkscan/libkscan-9999.ebuild index 2f3e03b2..05b22801 100644 --- a/trinity-base/libkscan/libkscan-9999.ebuild +++ b/trinity-base/libkscan/libkscan-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity scanner library" diff --git a/trinity-base/libksieve/libksieve-9999.ebuild b/trinity-base/libksieve/libksieve-9999.ebuild index 9cba0b52..524c0998 100644 --- a/trinity-base/libksieve/libksieve-9999.ebuild +++ b/trinity-base/libksieve/libksieve-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" inherit trinity-meta-2 -DESCRIPTION="TDE library to enable support for sieve, used by KMail"
\ No newline at end of file +DESCRIPTION="TDE library to enable support for sieve, used by KMail" diff --git a/trinity-base/librss/librss-9999.ebuild b/trinity-base/librss/librss-9999.ebuild index f1147e53..2ff8bfd5 100644 --- a/trinity-base/librss/librss-9999.ebuild +++ b/trinity-base/librss/librss-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Trinity rss library" diff --git a/trinity-base/libtdegames/libtdegames-9999.ebuild b/trinity-base/libtdegames/libtdegames-9999.ebuild index 0bb41583..ea5c5c0a 100644 --- a/trinity-base/libtdegames/libtdegames-9999.ebuild +++ b/trinity-base/libtdegames/libtdegames-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Base library common to many Trinity games" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild b/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild index a097e4c7..23d1816c 100644 --- a/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild +++ b/trinity-base/libtdenetwork/libtdenetwork-9999.ebuild @@ -3,14 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libtdepim/" inherit trinity-meta-2 -DESCRIPTION="library common to many tdepim apps interacting to network" +DESCRIPTION="Library common to many tdepim apps interacting to network" -COMMON_DEPEND="app-crypt/gpgme" -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND}" - -TSM_EXTRACT_ALSO="libtdepim/" +DEPEND="app-crypt/gpgme" +RDEPEND="${DEPEND}" diff --git a/trinity-base/libtdepim/libtdepim-9999.ebuild b/trinity-base/libtdepim/libtdepim-9999.ebuild index f87678fb..eac29bb3 100644 --- a/trinity-base/libtdepim/libtdepim-9999.ebuild +++ b/trinity-base/libtdepim/libtdepim-9999.ebuild @@ -3,26 +3,26 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" +TSM_EXTRACT_ALSO="libemailfunctions/ + pixmaps/ + libkmime/kmime_util.h + libkcal/" inherit trinity-meta-2 -DESCRIPTION="Common library for Trinity PIM applications." +DESCRIPTION="Common library for Trinity PIM applications" -COMMON_DEPEND=" +DEPEND=" ~trinity-base/ktnef-${PV} + ~trinity-base/libkcal-${PV} ~trinity-base/libkmime-${PV} - ~trinity-base/libkcal-${PV}" -DEPEND+=" ${COMMON_DEPEND}" -RDEPEND+=" ${COMMON_DEPEND}" - -TSM_EXTRACT_ALSO="libemailfunctions/ - pixmaps/ - libkmime/kmime_util.h - libkcal/" +" +RDEPEND="${DEPEND}" src_prepare() { trinity-meta-2_src_prepare # Call TQt designer - sed -i -e "s:\"designer\":\"${TQTDIR}/bin/designer\":g" "${S}/libtdepim/kcmdesignerfields.cpp" || die "sed failed" + sed -e "s:\"designer\":\"${TQTDIR}/bin/designer\":g" \ + -i "libtdepim/kcmdesignerfields.cpp" || die } diff --git a/trinity-base/lisa/lisa-9999.ebuild b/trinity-base/lisa/lisa-9999.ebuild index cd29fcd8..24474e81 100644 --- a/trinity-base/lisa/lisa-9999.ebuild +++ b/trinity-base/lisa/lisa-9999.ebuild @@ -3,9 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" TRINITY_SUBMODULE="lanbrowsing" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Trinity Lan Information Server - allows to share information over a network." diff --git a/trinity-base/lskat/lskat-9999.ebuild b/trinity-base/lskat/lskat-9999.ebuild index 60723aa6..28d50952 100644 --- a/trinity-base/lskat/lskat-9999.ebuild +++ b/trinity-base/lskat/lskat-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity card game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" diff --git a/trinity-base/mimelib/mimelib-9999.ebuild b/trinity-base/mimelib/mimelib-9999.ebuild index 2ad7d9af..1219b556 100644 --- a/trinity-base/mimelib/mimelib-9999.ebuild +++ b/trinity-base/mimelib/mimelib-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdepim" +TRINITY_MODULE_NAME="tdepim" inherit trinity-meta-2 -DESCRIPTION="TDE library for processing messages in MIME format"
\ No newline at end of file +DESCRIPTION="TDE library for processing messages in MIME format" diff --git a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild index 16558023..67edc994 100644 --- a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild +++ b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild @@ -4,8 +4,8 @@ EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 db-use DESCRIPTION="Various plugins for Noatun" @@ -29,13 +29,13 @@ src_configure() { ) if use berkdb; then - mycmakeargs+=( + local mycmakeargs+=( -DWITH_BERKELEY_DB=ON -DBERKELEY_DB_LIBS="$(db_libname)" -DBERKELEY_DB_INCLUDE_DIRS="${ROOT}$(db_includedir)" ) else - mycmakeargs+=( + local mycmakeargs+=( -DWITH_BERKELEY_DB=OFF ) fi diff --git a/trinity-base/noatun/noatun-9999.ebuild b/trinity-base/noatun/noatun-9999.ebuild index b77c3f5a..f3162a5b 100644 --- a/trinity-base/noatun/noatun-9999.ebuild +++ b/trinity-base/noatun/noatun-9999.ebuild @@ -5,6 +5,7 @@ EAPI="7" TRINITY_MODULE_NAME="tdemultimedia" +TSM_EXTRACT_ALSO="arts mpeglib" inherit trinity-meta-2 DESCRIPTION="Media player featuring audio effects, graphic equalizer and network transparency" @@ -15,8 +16,6 @@ DEPEND="${RDEPEND} x11-libs/libXext " -TSM_EXTRACT_ALSO="arts mpeglib" - src_configure() { local mycmakeargs=( -DBUILD_ARTS=ON diff --git a/trinity-base/nsplugins/nsplugins-9999.ebuild b/trinity-base/nsplugins/nsplugins-9999.ebuild index 399e4f1b..f75c529b 100644 --- a/trinity-base/nsplugins/nsplugins-9999.ebuild +++ b/trinity-base/nsplugins/nsplugins-9999.ebuild @@ -3,14 +3,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 -DESCRIPTION="Netscape plugins support for Konqueror." +DESCRIPTION="Netscape plugins support for Konqueror" DEPEND="x11-libs/libXt dev-libs/glib" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild b/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild index 0a49ea87..7b22c3bc 100644 --- a/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild +++ b/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild @@ -3,9 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" + TRINITY_MODULE_NAME="tdeaddons" TSM_EXTRACT="renamedlgplugins" - inherit trinity-meta-2 DESCRIPTION="Renamedlg plugins for image and audio files" diff --git a/trinity-base/superkaramba/superkaramba-9999.ebuild b/trinity-base/superkaramba/superkaramba-9999.ebuild index 4ad34e70..b6d66768 100644 --- a/trinity-base/superkaramba/superkaramba-9999.ebuild +++ b/trinity-base/superkaramba/superkaramba-9999.ebuild @@ -3,22 +3,22 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 -DESCRIPTION="A tool to create interactive applets for the Trinity desktop." +DESCRIPTION="A tool to create interactive applets for the Trinity desktop" + #FIXME: add xmms use IUSE="" # RDEPEND="xmms? (media-sound/xmms2)" src_configure() { - mycmakeargs=( + local mycmakeargs=( # -DWITH_XMMS="$(usex xmms)" # $(cmake-utils_use_with xmms XMMS ) -DWITH_KNEWSTUFF=ON ) - trinity-meta-2_src_configure } diff --git a/trinity-base/tde-i18n/tde-i18n-9999.ebuild b/trinity-base/tde-i18n/tde-i18n-9999.ebuild index d6122aa0..dfcd88df 100644 --- a/trinity-base/tde-i18n/tde-i18n-9999.ebuild +++ b/trinity-base/tde-i18n/tde-i18n-9999.ebuild @@ -3,24 +3,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tde-i18n" -inherit trinity-base-2 +TRINITY_LANGS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et + eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms + nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te + tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW" -set-trinityver +TRINITY_MODULE_NAME="tde-i18n" +inherit trinity-base-2 DESCRIPTION="Trinity internationalization package" HOMEPAGE="https://trinitydesktop.org/" -LICENSE="|| ( GPL-2 GPL-3 )" - -SLOT="${TRINITY_VER}" -need-trinity - -TRINITY_LANGS="af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et - eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms - nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te - tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW" +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="14" for X in ${TRINITY_LANGS} ; do IUSE="${IUSE} l10n_${X}" @@ -36,7 +32,7 @@ run_phase() { CMAKE_USE_DIR="${S}/${dir}" BUILD_DIR="${WORKDIR}/${dir}-build" trinity-base-2_${phase} - popd + popd || die } src_prepare() { @@ -45,7 +41,7 @@ src_prepare() { } src_configure() { - mycmakeargs=( -DBUILD_ALL=ON ) + local mycmakeargs=( -DBUILD_ALL=ON ) trinity_l10n_for_each_locale_do run_phase src_configure } diff --git a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild index aebcb641..20646f61 100644 --- a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild +++ b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Documentaion for tdeaddons-derived packages" diff --git a/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild b/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild index dbb6c664..da57989a 100644 --- a/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild +++ b/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeaddons" +TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 DESCRIPTION="Various basic tdefile plugins provided by tdeaddons" diff --git a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild index fed81839..24bb1576 100644 --- a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild +++ b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" +TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 DESCRIPTION="EmotIcons (icons for things like smilies :-) for Trinity" diff --git a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild index eef1ff68..22955bed 100644 --- a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild +++ b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" +TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 DESCRIPTION="Themes for IceWM from the tdeartwork package." diff --git a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild index d2d8841c..2217bd54 100644 --- a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild +++ b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" +TRINITY_MODULE_NAME="tdeartwork" +TSM_EXTRACT="IconThemes/" inherit trinity-meta-2 DESCRIPTION="Icon themes for Trinity" - -TSM_EXTRACT="IconThemes/" diff --git a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild index 0c8cb8fc..a7f92a57 100644 --- a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild +++ b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" +TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 DESCRIPTION="Extra sound themes for Trinity" diff --git a/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild b/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild index a333eb35..f34024d4 100644 --- a/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild +++ b/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" +TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 DESCRIPTION="Extra styles for Trinity" diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild index 30e0380f..d06792a8 100644 --- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild +++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild @@ -4,8 +4,9 @@ EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" TRINITY_NEED_ARTS="optional" +TRINITY_MODULE_NAME="tdeartwork" +TSM_EXTRACT_ALSO="FindXscreensaver.cmake" inherit trinity-meta-2 DESCRIPTION="Extra screensavers for Trinity" @@ -21,8 +22,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="FindXscreensaver.cmake" - src_configure() { local mycmakeargs=( -DWITH_LIBART="$(usex kclock)" diff --git a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild index cd2237d8..8c0f46b3 100644 --- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild +++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" +TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 DESCRIPTION="Window styles for Trinity" diff --git a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild index 06e17376..9b09c0f0 100644 --- a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild +++ b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeartwork" +TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 DESCRIPTION="Wallpapers from Trinity" diff --git a/trinity-base/tdebase-data/tdebase-data-9999.ebuild b/trinity-base/tdebase-data/tdebase-data-9999.ebuild index a9e7d64b..40affb67 100644 --- a/trinity-base/tdebase-data/tdebase-data-9999.ebuild +++ b/trinity-base/tdebase-data/tdebase-data-9999.ebuild @@ -3,12 +3,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" - -inherit trinity-meta-2 +TRINITY_MODULE_NAME="tdebase" TRINITY_SUBMODULE="l10n pics applnk" - -DESCRIPTION="Icons, localization data and .desktop files from tdebase." - TSM_EXTRACT_ALSO="translations/" +inherit trinity-meta-2 + +DESCRIPTION="Icons, localization data and .desktop files from tdebase" diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild index 8eb4d6f8..58ed2600 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm r14-xdg-update migratekde3" inherit trinity-meta-2 DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts" @@ -24,8 +25,6 @@ RDEPEND="x11-apps/xmessage ~trinity-base/ksplashml-${PV} ~trinity-base/tdeinit-${PV}" -TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm r14-xdg-update migratekde3" - src_prepare() { trinity-base-2_src_prepare } diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild index fd45cbec..c7dbc9c0 100644 --- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild +++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-9999.ebuild @@ -5,10 +5,9 @@ EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta-2 - -TSM_EXTRACT="tdeioslave" TSM_EXTRACT_ALSO="translations/" +TSM_EXTRACT="tdeioslave" +inherit trinity-meta-2 DESCRIPTION="Generic Trinity TDEIOslaves" diff --git a/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild b/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild index 6f09d091..8c8504d3 100644 --- a/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild +++ b/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 -DESCRIPTION="A Trinity dialog box for setting preferences for debug output."
\ No newline at end of file +DESCRIPTION="A Trinity dialog box for setting preferences for debug output" diff --git a/trinity-base/tdednssd/tdednssd-9999.ebuild b/trinity-base/tdednssd/tdednssd-9999.ebuild index faecca99..92c6585c 100644 --- a/trinity-base/tdednssd/tdednssd-9999.ebuild +++ b/trinity-base/tdednssd/tdednssd-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module" diff --git a/trinity-base/tdeeject/tdeeject-9999.ebuild b/trinity-base/tdeeject/tdeeject-9999.ebuild index af1233f1..c76d0c37 100644 --- a/trinity-base/tdeeject/tdeeject-9999.ebuild +++ b/trinity-base/tdeeject/tdeeject-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity eject frontend" diff --git a/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild b/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild index 137b638e..f72b6cbc 100644 --- a/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild +++ b/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="A batch search and replace tool for TDE" diff --git a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild index 88c2bf97..0f3e5f5d 100644 --- a/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild +++ b/trinity-base/tdegames-doc/tdegames-doc-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" inherit trinity-meta-2 DESCRIPTION="Documentaion for tdegames-derived packages" diff --git a/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild b/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild index 026655ab..fcfbeeed 100644 --- a/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild +++ b/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Documentaion for tdegraphics-derived packages" diff --git a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild index bfcdb823..b45a8d68 100644 --- a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild +++ b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" +TSM_EXTRACT_ALSO="kghostview/dscparse/" inherit trinity-meta-2 DESCRIPTION="tdefile plugins from tdegraphics" @@ -17,10 +18,8 @@ DEPEND=" pdf? ( app-text/poppler )" RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="kghostview/dscparse/" - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_TIFF="$(usex tiff)" -DWITH_OPENEXR="$(usex openexr)" -DWITH_PDF="$(usex pdf)" diff --git a/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild b/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild index 53fb7720..b91a182b 100644 --- a/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild +++ b/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegraphics" +TRINITY_MODULE_NAME="tdegraphics" inherit trinity-meta-2 DESCRIPTION="Trinity Icon Editor" diff --git a/trinity-base/tdeinit/tdeinit-9999.ebuild b/trinity-base/tdeinit/tdeinit-9999.ebuild index 72b5191c..516a5835 100644 --- a/trinity-base/tdeinit/tdeinit-9999.ebuild +++ b/trinity-base/tdeinit/tdeinit-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity init binary replacing some functions of the starttde script" diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild index fa2d9fcf..81decd60 100644 --- a/trinity-base/tdelibs/tdelibs-9999.ebuild +++ b/trinity-base/tdelibs/tdelibs-9999.ebuild @@ -11,14 +11,13 @@ DESCRIPTION="Trinity libraries needed by all TDE programs" HOMEPAGE="https://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="${TRINITY_VER}" - +SLOT="14" if [[ ${PV} != *9999* ]] ; then KEYWORDS="~amd64 ~x86" fi # NOTE: Building without tdehwlib segfaults, but you can try and report. -IUSE+=" alsa arts cryptsetup cups debug elficons elogind fam +hwlib +idn jpeg2k +IUSE="alsa arts cryptsetup cups debug elficons elogind fam +hwlib +idn jpeg2k kernel_linux libressl lua lzma malloc networkmanager openexr +pcre pcsc-lite pkcs11 +shm spell +ssl sudo +svg systemd tiff udevil udisks upower utempter xcomposite +xrandr zeroconf" diff --git a/trinity-base/tdelirc/tdelirc-9999.ebuild b/trinity-base/tdelirc/tdelirc-9999.ebuild index eab94693..69980301 100644 --- a/trinity-base/tdelirc/tdelirc-9999.ebuild +++ b/trinity-base/tdelirc/tdelirc-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="TDElirc - Trinity Frontend to lirc" diff --git a/trinity-base/tdemid/tdemid-9999.ebuild b/trinity-base/tdemid/tdemid-9999.ebuild index e0dbbfce..5cb4ba1d 100644 --- a/trinity-base/tdemid/tdemid-9999.ebuild +++ b/trinity-base/tdemid/tdemid-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_MODULE_NAME="tdemultimedia" inherit trinity-meta-2 -DESCRIPTION="TDE MIDI and karaoke player"
\ No newline at end of file +DESCRIPTION="TDE MIDI and karaoke player" diff --git a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild index 82d882ec..c54a1c11 100644 --- a/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild +++ b/trinity-base/tdemultimedia-arts/tdemultimedia-arts-9999.ebuild @@ -5,6 +5,7 @@ EAPI="7" TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_SUBMODULE="arts mpeglib mpeglib_artsplug" inherit trinity-meta-2 DESCRIPTION="The aRts pipeline builder and other tools" @@ -21,8 +22,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -TRINITY_SUBMODULE="arts mpeglib mpeglib_artsplug" - src_configure() { local mycmakeargs=( -DWITH_ALSA="$(usex alsa)" diff --git a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild b/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild index 725d70ae..df220f29 100644 --- a/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild +++ b/trinity-base/tdemultimedia-doc/tdemultimedia-doc-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_MODULE_NAME="tdemultimedia" inherit trinity-meta-2 DESCRIPTION="Documentaion for tdemultimedia-derived packages" diff --git a/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild b/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild index ccf34714..0cc00254 100644 --- a/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild +++ b/trinity-base/tdemultimedia-kappfinder-data/tdemultimedia-kappfinder-data-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_MODULE_NAME="tdemultimedia" inherit trinity-meta-2 DESCRIPTION="Kappfinder data from tdemultimedia" diff --git a/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild b/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild index cde45ca7..e748af9c 100644 --- a/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild +++ b/trinity-base/tdemultimedia-tdefile-plugins/tdemultimedia-tdefile-plugins-9999.ebuild @@ -1,9 +1,10 @@ +# Copyright 2020 Gentoo Authors # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdemultimedia" +TRINITY_MODULE_NAME="tdemultimedia" inherit trinity-meta-2 DESCRIPTION="tdefile plugins from tdemultimedia" @@ -17,7 +18,7 @@ DEPEND=" RDEPEND="${DEPEND}" src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_TAGLIB="$(usex taglib)" -DWITH_THEORA="$(usex theora)" -DWITH_VORBIS="$(usex vorbis)" diff --git a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild index ca1c731d..2f17aed9 100644 --- a/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild +++ b/trinity-base/tdemultimedia-tdeioslaves/tdemultimedia-tdeioslaves-9999.ebuild @@ -5,10 +5,9 @@ EAPI="7" TRINITY_MODULE_NAME="tdemultimedia" -inherit trinity-meta-2 - -TSM_EXTRACT="tdeioslave" TRINITY_SUBMODULE="tdeioslave" +TSM_EXTRACT="tdeioslave" +inherit trinity-meta-2 DESCRIPTION="Multimedia Trinity TDEIOslaves" diff --git a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild index 0d2b9eca..15c1adcd 100644 --- a/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild +++ b/trinity-base/tdenetwork-doc/tdenetwork-doc-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="Documentaion for tdenetwork-derived packages" diff --git a/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild b/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild index 1d4400bc..3977b49d 100644 --- a/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild +++ b/trinity-base/tdenetwork-filesharing/tdenetwork-filesharing-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc" diff --git a/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild b/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild index 065ba912..9e5031ef 100644 --- a/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild +++ b/trinity-base/tdenetwork-tdefile-plugins/tdenetwork-tdefile-plugins-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdenetwork" +TRINITY_MODULE_NAME="tdenetwork" inherit trinity-meta-2 DESCRIPTION="tdefile plugins from the tdenetwork provides a torrent file support." diff --git a/trinity-base/tdepasswd/tdepasswd-9999.ebuild b/trinity-base/tdepasswd/tdepasswd-9999.ebuild index 3c288041..d2eecd1a 100644 --- a/trinity-base/tdepasswd/tdepasswd-9999.ebuild +++ b/trinity-base/tdepasswd/tdepasswd-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity GUI for passwd" DEPEND="~trinity-base/libkonq-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="translations/" diff --git a/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild b/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild index 4ce1f3d3..5bdca8d6 100644 --- a/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild +++ b/trinity-base/tdepim-tdeioslaves/tdepim-tdeioslaves-9999.ebuild @@ -5,9 +5,9 @@ EAPI="7" TRINITY_MODULE_NAME="tdepim" -inherit trinity-meta-2 - TRINITY_SUBMODULE="tdeioslave" +TSM_EXTRACT_ALSO="libemailfunctions/ libkmime/" +inherit trinity-meta-2 DESCRIPTION="PIM Trinity TDEIOslaves" @@ -33,8 +33,5 @@ src_configure() { local mycmakeargs=( -DWITH_SASL=$(usex sieve) ) - trinity-meta-2_src_configure } - -TSM_EXTRACT_ALSO="libemailfunctions/ libkmime/" diff --git a/trinity-base/tdeprint/tdeprint-9999.ebuild b/trinity-base/tdeprint/tdeprint-9999.ebuild index 552d7e34..5a9032c6 100644 --- a/trinity-base/tdeprint/tdeprint-9999.ebuild +++ b/trinity-base/tdeprint/tdeprint-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity printer queue/device manager" @@ -14,6 +15,5 @@ IUSE="cups" DEPEND="cups? ( net-print/cups )" RDEPEND="${DEPEND} app-text/enscript - app-text/psutils" - -TSM_EXTRACT_ALSO="translations/" + app-text/psutils +" diff --git a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild index 3d312b98..2ee1fc48 100644 --- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild +++ b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity screensaver framework" @@ -16,10 +17,8 @@ DEPEND="x11-libs/libXt krootbacking? ( ~trinity-base/krootbacking-${PV} )" RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="translations/" - src_configure () { - mycmakeargs=( + local mycmakeargs=( -DWITH_OPENGL="$(usex opengl)" ) diff --git a/trinity-base/tdesu/tdesu-9999.ebuild b/trinity-base/tdesu/tdesu-9999.ebuild index 0eb9dd42..0b3d522d 100644 --- a/trinity-base/tdesu/tdesu-9999.ebuild +++ b/trinity-base/tdesu/tdesu-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" inherit trinity-meta-2 DESCRIPTION="Trinity gui for su(1) or sudo" @@ -14,7 +14,7 @@ DEPEND="sudo? ( app-admin/sudo )" RDEPEND="${DEPEND}" src_configure () { - mycmakeargs=( + local mycmakeargs=( -DWITH_SUDO_TDESU_BACKEND="$(usex sudo)" -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)" ) diff --git a/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild b/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild index c042926a..1b2c249e 100644 --- a/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild +++ b/trinity-base/tdetoys-doc/tdetoys-doc-9999.ebuild @@ -3,12 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdetoys" +TRINITY_MODULE_NAME="tdetoys" inherit trinity-meta-2 -DESCRIPTION="Documentaion for tdetoys-derived packages" +DESCRIPTION="Documentation for tdetoys-derived packages" RDEPEND=" - ~trinity-base/khelpcenter-${PV}" - + ~trinity-base/khelpcenter-${PV} +" diff --git a/trinity-base/tdewallet/tdewallet-9999.ebuild b/trinity-base/tdewallet/tdewallet-9999.ebuild index 12cbb016..37bfc406 100644 --- a/trinity-base/tdewallet/tdewallet-9999.ebuild +++ b/trinity-base/tdewallet/tdewallet-9999.ebuild @@ -3,8 +3,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdeutils" +TRINITY_MODULE_NAME="tdeutils" inherit trinity-meta-2 DESCRIPTION="Trinity Wallet Management Tool" diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild index 43eb45df..a95b41ad 100644 --- a/trinity-base/tdm/tdm-9999.ebuild +++ b/trinity-base/tdm/tdm-9999.ebuild @@ -5,6 +5,7 @@ EAPI="7" TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 DESCRIPTION="Trinity login manager, similar to XDM and GDM" @@ -26,8 +27,6 @@ RDEPEND="${DEPEND} x11-apps/xinit x11-apps/xmessage" -TSM_EXTRACT_ALSO="translations/" - pkg_setup() { trinity-meta-2_pkg_setup use sak && TRINITY_SUBMODULE+=" tsak" diff --git a/trinity-base/tqt3integration/tqt3integration-9999.ebuild b/trinity-base/tqt3integration/tqt3integration-9999.ebuild index de120f63..46e38bd6 100644 --- a/trinity-base/tqt3integration/tqt3integration-9999.ebuild +++ b/trinity-base/tqt3integration/tqt3integration-9999.ebuild @@ -3,10 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 -DESCRIPTION="Makes TQt-only apps use several TDE dialogs." - -TSM_EXTRACT_ALSO="translations/" +DESCRIPTION="Makes TQt-only apps use several TDE dialogs" diff --git a/trinity-base/twin/twin-9999.ebuild b/trinity-base/twin/twin-9999.ebuild index e22a53f3..a6111d66 100644 --- a/trinity-base/twin/twin-9999.ebuild +++ b/trinity-base/twin/twin-9999.ebuild @@ -3,8 +3,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdebase" +TRINITY_MODULE_NAME="tdebase" +TSM_EXTRACT_ALSO="translations/" inherit trinity-meta-2 eutils DESCRIPTION="Trinity window manager" @@ -22,10 +23,8 @@ DEPEND="x11-libs/libXext pcre? ( dev-libs/libpcre[jit] )" RDEPEND="${DEPEND}" -TSM_EXTRACT_ALSO="translations/" - src_configure() { - mycmakeargs=( + local mycmakeargs=( -DWITH_XCOMPOSITE="$(usex xcomposite)" -DWITH_XFIXES="$(usex xcomposite)" -DWITH_XRENDER="$(usex xcomposite)" diff --git a/trinity-base/twin4/twin4-9999.ebuild b/trinity-base/twin4/twin4-9999.ebuild index 787deea2..6debceab 100644 --- a/trinity-base/twin4/twin4-9999.ebuild +++ b/trinity-base/twin4/twin4-9999.ebuild @@ -3,13 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -TRINITY_MODULE_NAME="tdegames" +TRINITY_MODULE_NAME="tdegames" +TSM_EXTRACT_ALSO="libtdegames/" inherit trinity-meta-2 DESCRIPTION="Trinity four-in-a-row game" DEPEND="~trinity-base/libtdegames-${PV}" RDEPEND="${DEPEND}" - -TSM_EXTRACT_ALSO="libtdegames/" |