diff options
23 files changed, 101 insertions, 121 deletions
diff --git a/trinity-base/certmanager/certmanager-9999.ebuild b/trinity-base/certmanager/certmanager-9999.ebuild index 6b91e244..37c9334b 100644 --- a/trinity-base/certmanager/certmanager-9999.ebuild +++ b/trinity-base/certmanager/certmanager-9999.ebuild @@ -1,26 +1,23 @@ # Copyright 1999-2016 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdepim" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity certificate manager gui" -KEYWORDS="" -IUSE+="" -COMMON_DEPEND=">=trinity-base/libtdenetwork-${PV}:${SLOT} - >=app-crypt/gpgme-1.1.2-r1 - || ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 )" - #CHECKME: this is an old kde3-times assertion - # We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises. +COMMON_DEPEND="=trinity-base/libtdenetwork-${PV} + app-crypt/gpgme + app-crypt/gnupg" DEPEND+=" ${COMMON_DEPEND}" RDEPEND+=" ${COMMON_DEPEND}" TSM_EXTRACT_ALSO="libtdepim/ libkpgp/ libtdenetwork/" pkg_postinst() { - trinity-meta_pkg_postinst + trinity-meta-2_pkg_postinst elog "For X.509 CRL and OCSP support, install app-crypt/dirmngr, please." } diff --git a/trinity-base/dcoprss/dcoprss-9999.ebuild b/trinity-base/dcoprss/dcoprss-9999.ebuild index f085b330..d0c311aa 100644 --- a/trinity-base/dcoprss/dcoprss-9999.ebuild +++ b/trinity-base/dcoprss/dcoprss-9999.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdenetwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity RSS server and client for DCOP" -KEYWORDS= -IUSE="" -DEPEND=">=trinity-base/librss-${PV}:${SLOT}" +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 8d7d6b04..728396a5 100644 --- a/trinity-base/drkonqi/drkonqi-9999.ebuild +++ b/trinity-base/drkonqi/drkonqi-9999.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity crash handler gives the user feedback if a program crashed" -KEYWORDS= -IUSE="" RDEPEND="sys-devel/gdb" diff --git a/trinity-base/kappfinder/kappfinder-9999.ebuild b/trinity-base/kappfinder/kappfinder-9999.ebuild index 1282b2c4..791ffee1 100644 --- a/trinity-base/kappfinder/kappfinder-9999.ebuild +++ b/trinity-base/kappfinder/kappfinder-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity tool that generates *.desktop files for well known apps" -KEYWORDS= -IUSE="" diff --git a/trinity-base/kate/kate-9999.ebuild b/trinity-base/kate/kate-9999.ebuild index c183eec1..e7fb46d1 100644 --- a/trinity-base/kate/kate-9999.ebuild +++ b/trinity-base/kate/kate-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Kate is an MDI texteditor." -KEYWORDS= -IUSE="" diff --git a/trinity-base/kcalc/kcalc-9999.ebuild b/trinity-base/kcalc/kcalc-9999.ebuild index e48e1774..2a334371 100644 --- a/trinity-base/kcalc/kcalc-9999.ebuild +++ b/trinity-base/kcalc/kcalc-9999.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdeutils" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity calculator" -KEYWORDS="" -IUSE="" DEPEND="dev-libs/gmp:*" RDEPEND="${DEPEND}" diff --git a/trinity-base/kcharselect/kcharselect-9999.ebuild b/trinity-base/kcharselect/kcharselect-9999.ebuild index 7904ab2f..9832590f 100644 --- a/trinity-base/kcharselect/kcharselect-9999.ebuild +++ b/trinity-base/kcharselect/kcharselect-9999.ebuild @@ -1,12 +1,11 @@ # Copyright 1999-2016 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdeutils" -TRINITY_SUBMODULE="${PN} charselectapplet" +TRINITY_SUBMODULE="kcharselect charselectapplet" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity character selection utility and panel applet" -KEYWORDS="" -IUSE="" diff --git a/trinity-base/kcheckpass/kcheckpass-9999.ebuild b/trinity-base/kcheckpass/kcheckpass-9999.ebuild index ce4b8640..977be3ab 100644 --- a/trinity-base/kcheckpass/kcheckpass-9999.ebuild +++ b/trinity-base/kcheckpass/kcheckpass-9999.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="A simple password checker, used by any software in need of user authentication." -KEYWORDS= IUSE="pam" RDEPEND=" @@ -16,8 +16,8 @@ DEPEND="${RDEPEND}" src_configure() { mycmakeargs=( - $(cmake-utils_use_with pam PAM) + -DWITH_PAM="$(usex pam)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/kdialog/kdialog-9999.ebuild b/trinity-base/kdialog/kdialog-9999.ebuild index 73646f6c..5f07c4d8 100644 --- a/trinity-base/kdialog/kdialog-9999.ebuild +++ b/trinity-base/kdialog/kdialog-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts" -KEYWORDS= -IUSE="" diff --git a/trinity-base/kfind/kfind-9999.ebuild b/trinity-base/kfind/kfind-9999.ebuild index 16797daf..0055560e 100644 --- a/trinity-base/kfind/kfind-9999.ebuild +++ b/trinity-base/kfind/kfind-9999.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity file find utility" -KEYWORDS= -IUSE="" -DEPEND=">=trinity-base/libkonq-${PV}:${SLOT}" +DEPEND="=trinity-base/libkonq-${PV}" RDEPEND="${DEPEND}" diff --git a/trinity-base/kgpg/kgpg-9999.ebuild b/trinity-base/kgpg/kgpg-9999.ebuild index 2af07758..f0743b77 100644 --- a/trinity-base/kgpg/kgpg-9999.ebuild +++ b/trinity-base/kgpg/kgpg-9999.ebuild @@ -1,16 +1,16 @@ # Copyright 1999-2016 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdeutils" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity gpg keyring manager" -KEYWORDS="" -IUSE="" RDEPEND="app-crypt/gnupg - || ( app-crypt/pinentry[qt4] + || ( app-crypt/pinentry[ncurses] + app-crypt/pinentry[qt5] app-crypt/pinentry[gtk] app-crypt/pinentry[tqt] )" diff --git a/trinity-base/khelpcenter/khelpcenter-9999.ebuild b/trinity-base/khelpcenter/khelpcenter-9999.ebuild index a2273cb4..49d1eb39 100644 --- a/trinity-base/khelpcenter/khelpcenter-9999.ebuild +++ b/trinity-base/khelpcenter/khelpcenter-9999.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundatio +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 TRINITY_SUBMODULE="khelpcenter doc" DESCRIPTION="The Trinity help center." -KEYWORDS= RDEPEND=" - >=trinity-base/tdebase-tdeioslaves-${PV}:${SLOT} - >=www-misc/htdig-3.2.0_beta6-r1" -IUSE="" + =trinity-base/tdebase-tdeioslaves-${PV} + www-misc/htdig" pkg_setup() { - # we should reduce MAKEOPTS -j parametr to no more than 4 + # Issue some warning if MAKEOPTS -j parameter is higher than 4 local makeopts_j makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')" if [ -n "$makeopts_j" -a "$makeopts_j" > 4 ]; then - export MAKEOPTS="${MAKEOPTS//"${makeopts_j}"/-j4}" - ewarn "This ebuild needs huge amoumt of memmory to compile in highly parallel" - ewarn "mode so it can chew it all. MAKEOPTS are reduced to \"$MAKEOPTS\"." + ewarn "This ebuild needs huge amount of memmory to compile in highly parallel" + ewarn "mode so it can chew it all. Please change your MAKEOPTS if building fails." fi - trinity-meta_pkg_setup + trinity-meta-2_pkg_setup } diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild index 2bb16525..a85d0651 100644 --- a/trinity-base/khotkeys/khotkeys-9999.ebuild +++ b/trinity-base/khotkeys/khotkeys-9999.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 need-arts optional DESCRIPTION="Trinity hotkey daemon" -KEYWORDS="" DEPEND+=" x11-libs/libXtst" RDEPEND+=" x11-libs/libXtst" @@ -19,5 +19,5 @@ src_configure() { -D_WITH_XTEST=ON ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/klipper/klipper-9999.ebuild b/trinity-base/klipper/klipper-9999.ebuild index 7540af8c..669b4fa5 100644 --- a/trinity-base/klipper/klipper-9999.ebuild +++ b/trinity-base/klipper/klipper-9999.ebuild @@ -1,14 +1,13 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="kicker applet for Trinity and X clipboard management" -KEYWORDS= -IUSE="" DEPEND="x11-libs/libXfixes" RDEPEND="${RDEPEND}" @@ -18,5 +17,5 @@ src_configure() { -DWITH_XFIXES=ON ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/kmenuedit/kmenuedit-9999.ebuild b/trinity-base/kmenuedit/kmenuedit-9999.ebuild index 075d4ced..32d7d1c3 100644 --- a/trinity-base/kmenuedit/kmenuedit-9999.ebuild +++ b/trinity-base/kmenuedit/kmenuedit-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity menu editor" -KEYWORDS= -IUSE="" diff --git a/trinity-base/knetattach/knetattach-9999.ebuild b/trinity-base/knetattach/knetattach-9999.ebuild index e5885898..4593d8b7 100644 --- a/trinity-base/knetattach/knetattach-9999.ebuild +++ b/trinity-base/knetattach/knetattach-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity network wizard" -KEYWORDS= -IUSE="" diff --git a/trinity-base/konsole/konsole-9999.ebuild b/trinity-base/konsole/konsole-9999.ebuild index d85c92c8..a5acc6f0 100644 --- a/trinity-base/konsole/konsole-9999.ebuild +++ b/trinity-base/konsole/konsole-9999.ebuild @@ -1,26 +1,25 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="X terminal for use with Trinity." -KEYWORDS= -IUSE="" DEPEND="x11-libs/libX11 x11-libs/libXrender" RDEPEND="${DEPEND} x11-apps/bdftopcf - >=trinity-base/kcontrol-${PV}:${SLOT}" + =trinity-base/kcontrol-${PV}" src_configure() { mycmakeargs=( -DWITH_XRENDER=ON ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild index bf413ef6..b58879f6 100644 --- a/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild +++ b/trinity-base/kpersonalizer/kpersonalizer-9999.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity user settings wizard." -KEYWORDS= -IUSE="" TSM_EXTRACT_ALSO="libkonq/" diff --git a/trinity-base/kreadconfig/kreadconfig-9999.ebuild b/trinity-base/kreadconfig/kreadconfig-9999.ebuild index 5ebaad70..93eba847 100644 --- a/trinity-base/kreadconfig/kreadconfig-9999.ebuild +++ b/trinity-base/kreadconfig/kreadconfig-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="A Trinity tool to read KConfig entries - for use in shell scripts" -KEYWORDS= -IUSE="" diff --git a/trinity-base/ksmserver/ksmserver-9999.ebuild b/trinity-base/ksmserver/ksmserver-9999.ebuild index 8a0104a2..deff4082 100644 --- a/trinity-base/ksmserver/ksmserver-9999.ebuild +++ b/trinity-base/ksmserver/ksmserver-9999.ebuild @@ -1,26 +1,26 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="The reliable Trinity session manager that talks the standard X11R6" -KEYWORDS= IUSE="upower" DEPEND=" - dev-libs/dbus-tqt - upower? ( dev-libs/dbus-1-tqt ) " + =dev-libs/dbus-tqt-${PV} + upower? ( =dev-libs/dbus-1-tqt-${PV} ) " -RDEPEND="${RDEPEND} +RDEPEND="${DEPEND} upower? ( sys-power/upower ) " src_configure() { mycmakeargs=( - $(cmake-utils_use_with upower UPOWER ) + -DWITH_UPOWER="$(usex upower)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/ksysguard/ksysguard-9999.ebuild b/trinity-base/ksysguard/ksysguard-9999.ebuild index a6deac40..cd538bd6 100644 --- a/trinity-base/ksysguard/ksysguard-9999.ebuild +++ b/trinity-base/ksysguard/ksysguard-9999.ebuild @@ -1,20 +1,21 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="A network enabled task manager/system monitor" -KEYWORDS= -IUSE=" dell-laptop" -# TODO: make support for sensors when it will be supported by cmake scripts + +IUSE=" dell-laptop lm_sensors" src_configure() { mycmakeargs=( - $(cmake-utils_use_with dell-laptop I8K) + -DWITH_I8K="$(usex dell-laptop)" + -DWITH_SENSORS="$(usex lm_sensors)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/ktip/ktip-9999.ebuild b/trinity-base/ktip/ktip-9999.ebuild index 65eccee5..be9e49ab 100644 --- a/trinity-base/ktip/ktip-9999.ebuild +++ b/trinity-base/ktip/ktip-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity tip-of-the-day displayer" -KEYWORDS= -IUSE="" diff --git a/trinity-base/librss/librss-9999.ebuild b/trinity-base/librss/librss-9999.ebuild index 8ef1314b..6d5888bb 100644 --- a/trinity-base/librss/librss-9999.ebuild +++ b/trinity-base/librss/librss-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="7" TRINITY_MODULE_NAME="tdenetwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity rss library" -KEYWORDS= -IUSE="" |