diff options
21 files changed, 121 insertions, 143 deletions
diff --git a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild index ff68e820..b03231c6 100644 --- a/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild +++ b/trinity-base/atlantikdesigner/atlantikdesigner-9999.ebuild @@ -1,12 +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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Atlantik gameboard designer" -KEYWORDS="" -IUSE+="" -DEPEND=">=trinity-base/atlantik-${PV}:${SLOT}" + +DEPEND="=trinity-base/atlantik-${PV}" diff --git a/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild b/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild index 5bf621c2..467a0364 100644 --- a/trinity-base/kaddressbook-plugins/kaddressbook-plugins-9999.ebuild +++ b/trinity-base/kaddressbook-plugins/kaddressbook-plugins-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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Plugins for Trinity Addressbook" -KEYWORDS="" -IUSE+="" -DEPEND=">=trinity-base/kaddressbook-${PV}:${SLOT}" +DEPEND="=trinity-base/kaddressbook-${PV}" RDEPEND="${DEPEND}" diff --git a/trinity-base/kate-plugins/kate-plugins-9999.ebuild b/trinity-base/kate-plugins/kate-plugins-9999.ebuild index 13c292e8..fa6faa4d 100644 --- a/trinity-base/kate-plugins/kate-plugins-9999.ebuild +++ b/trinity-base/kate-plugins/kate-plugins-9999.ebuild @@ -1,14 +1,14 @@ # 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="tdeaddons" TSM_EXTRACT="kate" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="kate plugins and docs" -KEYWORDS="" -IUSE+="" -DEPEND=">=trinity-base/kate-${PV}:${SLOT}" +DESCRIPTION="Kate plugins and docs" + +DEPEND="=trinity-base/kate-${PV}" RDEPEND="${DEPEND}" diff --git a/trinity-base/kicker-applets/kicker-applets-9999.ebuild b/trinity-base/kicker-applets/kicker-applets-9999.ebuild index 38bd968f..1a49a9ce 100644 --- a/trinity-base/kicker-applets/kicker-applets-9999.ebuild +++ b/trinity-base/kicker-applets/kicker-applets-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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="kicker applets" -KEYWORDS="" -IUSE+="" -DEPEND=">=trinity-base/kicker-${PV}:${SLOT}" +DEPEND="=trinity-base/kicker-${PV}" RDEPEND="${DEPEND}" # no xmms support diff --git a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild b/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild index c3bf4f73..662eac29 100644 --- a/trinity-base/knewsticker-scripts/knewsticker-scripts-9999.ebuild +++ b/trinity-base/knewsticker-scripts/knewsticker-scripts-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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Kicker applet - RSS news ticker" -KEYWORDS="" -IUSE+="" -DEPEND=">=trinity-base/knewsticker-${PV}:${SLOT}" + +DEPEND="=trinity-base/knewsticker-${PV}" RDEPEND="${DEPEND}" diff --git a/trinity-base/konq-plugins/konq-plugins-9999.ebuild b/trinity-base/konq-plugins/konq-plugins-9999.ebuild index 6477b288..0dc8f73b 100644 --- a/trinity-base/konq-plugins/konq-plugins-9999.ebuild +++ b/trinity-base/konq-plugins/konq-plugins-9999.ebuild @@ -1,23 +1,24 @@ # 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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Various plugins for Konqueror." -KEYWORDS="" + IUSE+="arts" -DEPEND=">=trinity-base/konqueror-${PV}:${SLOT} - arts? ( >=trinity-base/arts-${PV}:${SLOT} ) -" + +DEPEND="=trinity-base/konqueror-${PV} + arts? ( =trinity-base/arts-${PV} )" RDEPEND="${DEPEND}" src_configure() { mycmakeargs=( - "-DWITH_ARTS=$(usex arts)" + -DWITH_ARTS="$(usex arts)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/ksig/ksig-9999.ebuild b/trinity-base/ksig/ksig-9999.ebuild index e5dc8daa..6b8d2e4c 100644 --- a/trinity-base/ksig/ksig-9999.ebuild +++ b/trinity-base/ksig/ksig-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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity email signature manager" -KEYWORDS="" -IUSE+="" diff --git a/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild b/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild index 561b36aa..ebeba7aa 100644 --- a/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild +++ b/trinity-base/renamedlg-plugins/renamedlg-plugins-9999.ebuild @@ -1,12 +1,11 @@ # 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="tdeaddons" TSM_EXTRACT="renamedlgplugins" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="renamedlg plugins for image and audio files" -KEYWORDS="" -IUSE+="" +DESCRIPTION="Renamedlg plugins for image and audio files" diff --git a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild index adf21c3f..2f890696 100644 --- a/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild +++ b/trinity-base/tdeaddons-doc/tdeaddons-doc-9999.ebuild @@ -1,27 +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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Documentaion for tdeaddons-derived packages" -KEYWORDS="" -IUSE+="" + RDEPEND=" - >=trinity-base/khelpcenter-${PV}:${SLOT}" + =trinity-base/khelpcenter-${PV}" 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 "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/tdeaddons-meta/tdeaddons-meta-9999.ebuild b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild index b620da55..7f8d86ae 100644 --- a/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild +++ b/trinity-base/tdeaddons-meta/tdeaddons-meta-9999.ebuild @@ -1,30 +1,30 @@ # 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" -inherit trinity-functions +inherit trinity-functions-2 set-trinityver DESCRIPTION="tdeaddons metapackage - merge this to pull in all tdeaddons-derived packages" HOMEPAGE="http://www.trinitydesktop.org/" -LICENSE="GPL-2 LGPL-2" +LICENSE="|| ( GPL-2 GPL-3 )" SLOT="${TRINITY_VER}" -IUSE="" -KEYWORDS= RDEPEND=" - >=trinity-apps/atlantikdesigner-${PV}:${SLOT} - >=trinity-base/tdeaddons-doc-${PV}:${SLOT} - >=trinity-base/kaddressbook-plugins-${PV}:${SLOT} - >=trinity-base/kate-plugins-${PV}:${SLOT} - >=trinity-base/kicker-applets-${PV}:${SLOT} - >=trinity-base/knewsticker-scripts-${PV}:${SLOT} - >=trinity-base/konq-plugins-${PV}:${SLOT} - >=trinity-base/ksig-${PV}:${SLOT} - >=trinity-base/renamedlg-plugins-${PV}:${SLOT} - >=trinity-base/tdeaddons-tdefile-plugins-${PV}:${SLOT} -" + =trinity-apps/atlantikdesigner-${PV} + =trinity-base/tdeaddons-doc-${PV} + =trinity-base/kaddressbook-plugins-${PV} + =trinity-base/kate-plugins-${PV} + =trinity-base/kicker-applets-${PV} + =trinity-base/knewsticker-scripts-${PV} + =trinity-base/konq-plugins-${PV} + =trinity-base/ksig-${PV} + =trinity-base/renamedlg-plugins-${PV} + =trinity-base/tdeaddons-tdefile-plugins-${PV}" + # trinity-base/noatun-plugins masked due to missing dependency: noatun +# But not long anymore.. :-)
\ No newline at end of file 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 832e752e..a8bc35e5 100644 --- a/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-9999.ebuild +++ b/trinity-base/tdeaddons-tdefile-plugins/tdeaddons-tdefile-plugins-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="tdeaddons" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Various basic tdefile plugins provided by tdeaddons" -KEYWORDS="" -IUSE+="" diff --git a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild index bc7735cf..455047a5 100644 --- a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-9999.ebuild +++ b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="EmotIcons (icons for things like smilies :-) for Trinity" -KEYWORDS= -IUSE="" 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 92d019ba..ffeab894 100644 --- a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild +++ b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-9999.ebuild @@ -1,17 +1,16 @@ # 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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="Themes for IceWM from the Trinityartwork package." -KEYWORDS= -IUSE="" +DESCRIPTION="Themes for IceWM from the tdeartwork package." -RDEPEND="$DEPEND - >=trinity-base/tdeartwork-twin-styles-${PV}:${SLOT}" +RDEPEND=" + =trinity-base/tdeartwork-twin-styles-${PV}" pkg_postinst() { elog "More IceWM themes are available installing x11-themes/icewm-themes" 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 d95d9852..8ead2abd 100644 --- a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild +++ b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild @@ -1,23 +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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 KMMODULE="IconThemes" DESCRIPTION="Icon themes for Trinity" -KEYWORDS= -IUSE="" TSM_EXTRACT="IconThemes/" - -src_prepare() { - trinity-meta_src_prepare - - # file collision with trinity-base/kicker-applets - # see: https://bugs.trinitydesktop.org/show_bug.cgi?id=1282 - rm -f IconThemes/locolor/16x16/apps/ktimemon.png - rm -f IconThemes/locolor/32x32/apps/ktimemon.png -} diff --git a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild index b7ccdee1..f4bda85f 100644 --- a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-9999.ebuild +++ b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="kworldclock from kdeartwork" -KEYWORDS= -IUSE="" +DESCRIPTION="kworldclock from tdeartwork" -RDEPEND="$DEPEND - >=trinity-base/kworldclock-${PV}:${SLOT}" +RDEPEND=" + =trinity-base/kworldclock-${PV}" diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild index 6f272104..7f36891b 100644 --- a/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild +++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-9999.ebuild @@ -1,27 +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" -inherit trinity-functions +inherit trinity-functions-2 set-trinityver DESCRIPTION="tdeartwork meta package - merge this to pull in all tdeartwork-derived packages" HOMEPAGE="http://www.trinitydesktop.org/" -LICENSE="GPL-2 LGPL-2" +LICENSE="|| ( GPL-2 GPL-3 )" SLOT="$TRINITY_VER" -KEYWORDS= -IUSE="" RDEPEND=" - >=trinity-base/tdeartwork-emoticons-${PV}:${SLOT} - >=trinity-base/tdeartwork-icon-themes-${PV}:${SLOT} - >=trinity-base/tdeartwork-icewm-themes-${PV}:${SLOT} - >=trinity-base/tdeartwork-tdescreensaver-${PV}:${SLOT} - >=trinity-base/tdeartwork-twin-styles-${PV}:${SLOT} - >=trinity-base/tdeartwork-kworldclock-${PV}:${SLOT} - >=trinity-base/tdeartwork-sounds-${PV}:${SLOT} - >=trinity-base/tdeartwork-styles-${PV}:${SLOT} - >=trinity-base/tdeartwork-wallpapers-${PV}:${SLOT}" + =trinity-base/tdeartwork-emoticons-${PV} + =trinity-base/tdeartwork-icon-themes-${PV} + =trinity-base/tdeartwork-icewm-themes-${PV} + =trinity-base/tdeartwork-tdescreensaver-${PV} + =trinity-base/tdeartwork-twin-styles-${PV} + =trinity-base/tdeartwork-kworldclock-${PV} + =trinity-base/tdeartwork-sounds-${PV} + =trinity-base/tdeartwork-styles-${PV} + =trinity-base/tdeartwork-wallpapers-${PV}" diff --git a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild index 6d1e0cfd..69c7b7a5 100644 --- a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-9999.ebuild +++ b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Extra sound themes for Trinity" -KEYWORDS= -IUSE="" diff --git a/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild b/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild index 5e7c6de9..846a7f8d 100644 --- a/trinity-base/tdeartwork-styles/tdeartwork-styles-9999.ebuild +++ b/trinity-base/tdeartwork-styles/tdeartwork-styles-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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Extra styles for Trinity" -KEYWORDS= -IUSE="" diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild index 9afe27ef..b1d591b3 100644 --- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild +++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild @@ -1,18 +1,19 @@ # 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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Extra screensavers for Trinity" -KEYWORDS="" + IUSE="opengl xscreensaver arts" DEPEND=" - >=trinity-base/tdescreensaver-${PV}:${SLOT} - >=trinity-base/krootbacking-${PV}:${SLOT} + =trinity-base/tdescreensaver-${PV} + =trinity-base/krootbacking-${PV} media-libs/libart_lgpl opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver ) @@ -24,10 +25,10 @@ TSM_EXTRACT_ALSO="FindXscreensaver.cmake" src_configure() { mycmakeargs=( -DWITH_LIBART=ON - $(cmake-utils_use_with opengl OPENGL) - $(cmake-utils_use_with xscreensaver XSCREENSAVER) - $(cmake-utils_use_with arts ARTS) + -DWITH_OPENGL="$(usex opengl)" + -DWITH_XSCREENSAVER="$(usex xscreensaver)" + -DWITH_ARTS="$(usex arts)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } 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 cca8c1a5..cef42fdd 100644 --- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-9999.ebuild +++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Window styles for Trinity" -KEYWORDS= -IUSE="" -DEPEND=">=trinity-base/twin-${PV}:${SLOT}" +DEPEND="=trinity-base/twin-${PV}" RDEPEND="$DEPEND" diff --git a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild index 6de05f9c..60f5d438 100644 --- a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-9999.ebuild +++ b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-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="tdeartwork" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Wallpapers from Trinity" -KEYWORDS= -IUSE="" |