diff options
12 files changed, 20 insertions, 14 deletions
diff --git a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-14.0.6.ebuild b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-14.0.6.ebuild index acc4d63c..a1896cf1 100644 --- a/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-14.0.6.ebuild +++ b/trinity-base/tdeartwork-emoticons/tdeartwork-emoticons-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" diff --git a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild index 76fc1a9e..ca103707 100644 --- a/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild +++ b/trinity-base/tdeartwork-icewm-themes/tdeartwork-icewm-themes-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" diff --git a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-14.0.6.ebuild b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-14.0.6.ebuild index ffea355a..3508ddb9 100644 --- a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-14.0.6.ebuild +++ b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-14.0.6.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 -KMMODULE="IconThemes" DESCRIPTION="Icon themes for Trinity" KEYWORDS="~amd64 ~x86" 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 d24a59b5..1404b63f 100644 --- a/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild +++ b/trinity-base/tdeartwork-icon-themes/tdeartwork-icon-themes-9999.ebuild @@ -6,7 +6,6 @@ EAPI="7" TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 -KMMODULE="IconThemes" DESCRIPTION="Icon themes for Trinity" diff --git a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild index 7ef94438..5461f532 100644 --- a/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild +++ b/trinity-base/tdeartwork-kworldclock/tdeartwork-kworldclock-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" diff --git a/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild b/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild index 9bf30b46..c23711f1 100644 --- a/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild +++ b/trinity-base/tdeartwork-meta/tdeartwork-meta-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" inherit trinity-functions-2 diff --git a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-14.0.6.ebuild b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-14.0.6.ebuild index 4c1698c0..52bd23db 100644 --- a/trinity-base/tdeartwork-sounds/tdeartwork-sounds-14.0.6.ebuild +++ b/trinity-base/tdeartwork-sounds/tdeartwork-sounds-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" diff --git a/trinity-base/tdeartwork-styles/tdeartwork-styles-14.0.6.ebuild b/trinity-base/tdeartwork-styles/tdeartwork-styles-14.0.6.ebuild index 8b4a16ef..650946eb 100644 --- a/trinity-base/tdeartwork-styles/tdeartwork-styles-14.0.6.ebuild +++ b/trinity-base/tdeartwork-styles/tdeartwork-styles-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild index 558f5736..2a4f591a 100644 --- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild +++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" @@ -11,21 +12,20 @@ need-arts optional DESCRIPTION="Extra screensavers for Trinity" KEYWORDS="~amd64 ~x86" -IUSE+=" opengl xscreensaver" +IUSE+=" opengl xscreensaver kclock" -MY_DEPEND="=trinity-base/tdescreensaver-${PV} +DEPEND+=" =trinity-base/tdescreensaver-${PV} =trinity-base/krootbacking-${PV} - =media-libs/libart_lgpl-${PV} + kclock? ( =media-libs/libart_lgpl-${PV} ) opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver )" -DEPEND+=" ${MY_DEPEND}" -RDEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${DEPEND}" TSM_EXTRACT_ALSO="FindXscreensaver.cmake" src_configure() { mycmakeargs=( - -DWITH_LIBART=ON + -DWITH_LIBART="$(usex kclock)" -DWITH_OPENGL="$(usex opengl)" -DWITH_XSCREENSAVER="$(usex xscreensaver)" ) diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild index 9d4a215b..29a452a6 100644 --- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild +++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild @@ -11,21 +11,20 @@ need-arts optional DESCRIPTION="Extra screensavers for Trinity" -IUSE+=" opengl xscreensaver" +IUSE+=" opengl xscreensaver kclock" -MY_DEPEND="=trinity-base/tdescreensaver-${PV} +DEPEND+=" =trinity-base/tdescreensaver-${PV} =trinity-base/krootbacking-${PV} - =media-libs/libart_lgpl-${PV} + kclock? ( =media-libs/libart_lgpl-${PV} ) opengl? ( virtual/opengl ) xscreensaver? ( x11-misc/xscreensaver )" -DEPEND+=" ${MY_DEPEND}" -RDEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${DEPEND}" TSM_EXTRACT_ALSO="FindXscreensaver.cmake" src_configure() { mycmakeargs=( - -DWITH_LIBART=ON + -DWITH_LIBART="$(usex kclock)" -DWITH_OPENGL="$(usex opengl)" -DWITH_XSCREENSAVER="$(usex xscreensaver)" ) diff --git a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild index 57202d3f..e9530d68 100644 --- a/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild +++ b/trinity-base/tdeartwork-twin-styles/tdeartwork-twin-styles-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" diff --git a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-14.0.6.ebuild b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-14.0.6.ebuild index ce5d8f4a..d34cd8a9 100644 --- a/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-14.0.6.ebuild +++ b/trinity-base/tdeartwork-wallpapers/tdeartwork-wallpapers-14.0.6.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_NAME="tdeartwork" |