From 8c68dabfb0d4945bd06e4be912efadcaa0f4c076 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 27 Jan 2020 17:41:17 +0100 Subject: Live ebuilds: Mainstream ebuilds to use aRts eclass functions. Also: Some cosmetics. Signed-off-by: Chris --- trinity-base/kasteroids/kasteroids-9999.ebuild | 16 +++++----------- trinity-base/kbounce/kbounce-9999.ebuild | 18 ++++++------------ trinity-base/khotkeys/khotkeys-9999.ebuild | 5 +++-- trinity-base/kolf/kolf-9999.ebuild | 16 +++++----------- trinity-base/konq-plugins/konq-plugins-9999.ebuild | 18 +++++------------- trinity-base/kwifimanager/kwifimanager-9999.ebuild | 18 +++++------------- .../noatun-plugins/noatun-plugins-9999.ebuild | 20 ++++++++++---------- .../tdeartwork-tdescreensaver-9999.ebuild | 14 +++++++------- 8 files changed, 46 insertions(+), 79 deletions(-) diff --git a/trinity-base/kasteroids/kasteroids-9999.ebuild b/trinity-base/kasteroids/kasteroids-9999.ebuild index 3eddf69c..2797b464 100644 --- a/trinity-base/kasteroids/kasteroids-9999.ebuild +++ b/trinity-base/kasteroids/kasteroids-9999.ebuild @@ -7,16 +7,10 @@ TRINITY_MODULE_NAME="tdegames" inherit trinity-meta-2 -DESCRIPTION="Trinity Space Game" - -DEPEND="=trinity-base/libtdegames-${PV} - =trinity-base/arts-${PV}" -RDEPEND="${DEPEND}" +need-arts yes -src_configure() { - mycmakeargs=( - -DWITH_ARTS=ON - ) +DESCRIPTION="Trinity Space Game" - trinity-meta-2_src_configure -} +MY_DEPEND="=trinity-base/libtdegames-${PV}" +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND}" diff --git a/trinity-base/kbounce/kbounce-9999.ebuild b/trinity-base/kbounce/kbounce-9999.ebuild index 7525f28f..f87d8833 100644 --- a/trinity-base/kbounce/kbounce-9999.ebuild +++ b/trinity-base/kbounce/kbounce-9999.ebuild @@ -7,18 +7,12 @@ TRINITY_MODULE_NAME="tdegames" inherit trinity-meta-2 -DESCRIPTION="Trinity Bounce Ball Game" - -IUSE+="+arts" +need-arts optional -DEPEND="=trinity-base/libtdegames-${PV} - arts? ( >=trinity-base/arts-${PV} )" -RDEPEND="${DEPEND}" +# Needs some dependency to play "au" sounds. -src_configure() { - mycmakeargs=( - -DWITH_ARTS="$(usex arts)" - ) +DESCRIPTION="Trinity Bounce Ball Game" - trinity-meta-2_src_configure -} +MY_DEPEND="=trinity-base/libtdegames-${PV}" +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND}" diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild index e270d7e3..4d6fefb3 100644 --- a/trinity-base/khotkeys/khotkeys-9999.ebuild +++ b/trinity-base/khotkeys/khotkeys-9999.ebuild @@ -11,8 +11,9 @@ need-arts optional DESCRIPTION="Trinity hotkey daemon" -DEPEND+=" x11-libs/libXtst" -RDEPEND+=" x11-libs/libXtst" +MY_DEPEND="x11-libs/libXtst" +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND}" src_configure() { mycmakeargs=( diff --git a/trinity-base/kolf/kolf-9999.ebuild b/trinity-base/kolf/kolf-9999.ebuild index b332d41c..c009689c 100644 --- a/trinity-base/kolf/kolf-9999.ebuild +++ b/trinity-base/kolf/kolf-9999.ebuild @@ -7,16 +7,10 @@ TRINITY_MODULE_NAME="tdegames" inherit trinity-meta-2 -DESCRIPTION="Minigolf Game by Trinity" - -DEPEND="=trinity-base/libtdegames-${PV} - =trinity-base/arts-${PV}" -RDEPEND="${DEPEND}" +need-arts yes -src_configure() { - mycmakeargs=( - -DWITH_ARTS=ON - ) +DESCRIPTION="Minigolf Game by Trinity" - trinity-meta-2_src_configure -} +MY_DEPEND="=trinity-base/libtdegames-${PV}" +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND}" diff --git a/trinity-base/konq-plugins/konq-plugins-9999.ebuild b/trinity-base/konq-plugins/konq-plugins-9999.ebuild index 0dc8f73b..91fe806e 100644 --- a/trinity-base/konq-plugins/konq-plugins-9999.ebuild +++ b/trinity-base/konq-plugins/konq-plugins-9999.ebuild @@ -7,18 +7,10 @@ TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 -DESCRIPTION="Various plugins for Konqueror." - -IUSE+="arts" +need-arts optional -DEPEND="=trinity-base/konqueror-${PV} - arts? ( =trinity-base/arts-${PV} )" -RDEPEND="${DEPEND}" - -src_configure() { - mycmakeargs=( - -DWITH_ARTS="$(usex arts)" - ) +DESCRIPTION="Various plugins for Konqueror." - trinity-meta-2_src_configure -} +MY_DEPEND="=trinity-base/konqueror-${PV}" +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND}" diff --git a/trinity-base/kwifimanager/kwifimanager-9999.ebuild b/trinity-base/kwifimanager/kwifimanager-9999.ebuild index 434acc6a..f60cf746 100644 --- a/trinity-base/kwifimanager/kwifimanager-9999.ebuild +++ b/trinity-base/kwifimanager/kwifimanager-9999.ebuild @@ -8,18 +8,10 @@ TRINITY_SUBMODULE="wifi" inherit trinity-meta-2 -DESCRIPTION="Trinity wifi (wireless network) gui" -IUSE="arts" - -DEPEND=" - net-wireless/wireless-tools - arts? ( =trinity-base/arts-${PV} )" -RDEPEND="${DEPEND}" +need-arts optional -src_configure() { - mycmakeargs=( - -DWITH_ARTS="$(usex arts)" - ) +DESCRIPTION="Trinity wifi (wireless network) gui" - trinity-meta-2_src_configure -} +MY_DEPEND="net-wireless/wireless-tools" +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND}" diff --git a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild index 551242e4..81792c4b 100644 --- a/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild +++ b/trinity-base/noatun-plugins/noatun-plugins-9999.ebuild @@ -7,38 +7,38 @@ TRINITY_MODULE_NAME="tdeaddons" inherit trinity-meta-2 db-use +need-arts optional + DESCRIPTION="Various plugins for Noatun." -IUSE="arts sdl berkdb" +IUSE+=" sdl berkdb" COMMON_DEPEND=" =trinity-base/noatun-${PV} - arts? ( =trinity-base/arts-${PV} ) berkdb? ( =sys-libs/db-4*:= ) " -DEPEND="${COMMON_DEPEND} +DEPEND+=" ${COMMON_DEPEND} sdl? ( media-libs/libsdl ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND+=" ${COMMON_DEPEND} sdl? ( media-libs/libsdl[X] ) " src_compile() { mycmakeargs=( - "-DWITH_ARTS=$(usex arts)" - "-DWITH_SDL=$(usex sdl)" + -DWITH_SDL="$(usex sdl)" ) if use berkdb; then mycmakeargs=( "${mycmakeargs[@]}" - "-DWITH_BERKELEY_DB=ON" - "-DBERKELEY_DB_LIBS=$(db_libname)" - "-DBERKELEY_DB_INCLUDE_DIRS==${ROOT}$(db_includedir)" + -DWITH_BERKELEY_DB=ON + -DBERKELEY_DB_LIBS="$(db_libname)" + -DBERKELEY_DB_INCLUDE_DIRS="${ROOT}$(db_includedir)" ) else mycmakeargs=( "${mycmakeargs[@]}" - "-DWITH_BERKELEY_DB=OFF" + -DWITH_BERKELEY_DB=OFF ) fi diff --git a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild index e776662b..36a17efa 100644 --- a/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild +++ b/trinity-base/tdeartwork-tdescreensaver/tdeartwork-tdescreensaver-9999.ebuild @@ -7,18 +7,19 @@ TRINITY_MODULE_NAME="tdeartwork" inherit trinity-meta-2 +need-arts optional + DESCRIPTION="Extra screensavers for Trinity" -IUSE="opengl xscreensaver arts" +IUSE+=" opengl xscreensaver" -DEPEND=" - =trinity-base/tdescreensaver-${PV} +MY_DEPEND="=trinity-base/tdescreensaver-${PV} =trinity-base/krootbacking-${PV} =media-libs/libart_lgpl-${PV} opengl? ( virtual/opengl ) - xscreensaver? ( x11-misc/xscreensaver ) - arts? ( trinity-base/arts )" -RDEPEND="${DEPEND}" + xscreensaver? ( x11-misc/xscreensaver )" +DEPEND+=" ${MY_DEPEND}" +RDEPEND+=" ${MY_DEPEND}" TSM_EXTRACT_ALSO="FindXscreensaver.cmake" @@ -27,7 +28,6 @@ src_configure() { -DWITH_LIBART=ON -DWITH_OPENGL="$(usex opengl)" -DWITH_XSCREENSAVER="$(usex xscreensaver)" - -DWITH_ARTS="$(usex arts)" ) trinity-meta-2_src_configure -- cgit v1.2.3