Live ebuilds: Port to EAPI7 and cleanup - Round 6.

This time: tdeartwork-meta, tdeartwork-emoticons,
           tdeartwork-icon-themes, tdeartwork-icewm-themes,
           tdeartwork-tdescreensaver, tdeartwork-twin-styles,
           tdeartwork-kworldclock, tdeartwork-sounds,
           tdeartwork-styles, tdeartwork-wallpapers,
           atlantikdesigner, tdeaddons-doc,
           kaddressbook-plugins, kate-plugins,
           kicker-applets, knewsticker-scripts,
           konq-plugins, ksig, renamedlg-plugins,
           tdeaddons-tdefile-plugins,
           and tdeaddons-meta

Signed-off-by: Chris <xchrisx@uber.space>
pull/22/head
Chris 5 years ago committed by TDE Gitea
parent 83310ab2e1
commit 59a5a64b42

@ -1,12 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Atlantik gameboard designer" DESCRIPTION="Atlantik gameboard designer"
KEYWORDS=""
IUSE+="" DEPEND="=trinity-base/atlantik-${PV}"
DEPEND=">=trinity-base/atlantik-${PV}:${SLOT}"

@ -1,14 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Plugins for Trinity Addressbook" DESCRIPTION="Plugins for Trinity Addressbook"
KEYWORDS=""
IUSE+=""
DEPEND=">=trinity-base/kaddressbook-${PV}:${SLOT}"
DEPEND="=trinity-base/kaddressbook-${PV}"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"

@ -1,14 +1,14 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
TSM_EXTRACT="kate" TSM_EXTRACT="kate"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="kate plugins and docs" DESCRIPTION="Kate plugins and docs"
KEYWORDS=""
IUSE+="" DEPEND="=trinity-base/kate-${PV}"
DEPEND=">=trinity-base/kate-${PV}:${SLOT}"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"

@ -1,16 +1,15 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="kicker applets" DESCRIPTION="kicker applets"
KEYWORDS=""
IUSE+=""
DEPEND=">=trinity-base/kicker-${PV}:${SLOT}"
DEPEND="=trinity-base/kicker-${PV}"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"
# no xmms support # no xmms support

@ -1,13 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Kicker applet - RSS news ticker" DESCRIPTION="Kicker applet - RSS news ticker"
KEYWORDS=""
IUSE+="" DEPEND="=trinity-base/knewsticker-${PV}"
DEPEND=">=trinity-base/knewsticker-${PV}:${SLOT}"
RDEPEND="${DEPEND}" RDEPEND="${DEPEND}"

@ -1,23 +1,24 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Various plugins for Konqueror." DESCRIPTION="Various plugins for Konqueror."
KEYWORDS=""
IUSE+="arts" 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}" RDEPEND="${DEPEND}"
src_configure() { src_configure() {
mycmakeargs=( mycmakeargs=(
"-DWITH_ARTS=$(usex arts)" -DWITH_ARTS="$(usex arts)"
) )
trinity-meta_src_configure trinity-meta-2_src_configure
} }

@ -1,11 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Trinity email signature manager" DESCRIPTION="Trinity email signature manager"
KEYWORDS=""
IUSE+=""

@ -1,12 +1,11 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
TSM_EXTRACT="renamedlgplugins" TSM_EXTRACT="renamedlgplugins"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="renamedlg plugins for image and audio files" DESCRIPTION="Renamedlg plugins for image and audio files"
KEYWORDS=""
IUSE+=""

@ -1,27 +1,26 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Documentaion for tdeaddons-derived packages" DESCRIPTION="Documentaion for tdeaddons-derived packages"
KEYWORDS=""
IUSE+=""
RDEPEND=" RDEPEND="
>=trinity-base/khelpcenter-${PV}:${SLOT}" =trinity-base/khelpcenter-${PV}"
pkg_setup() { 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 local makeopts_j
makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')" makeopts_j="$(echo "$MAKEOPTS" | sed -n 's/\(^\|.*\s\)\(-j\s*[0-9]\+\)\(\s.*\|$\)/\2/p')"
if [ -n "$makeopts_j" -a "$makeopts_j" > 4 ]; then 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 "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 fi
trinity-meta_pkg_setup trinity-meta-2_pkg_setup
} }

@ -1,30 +1,30 @@
# Copyright 1999-2016 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
inherit trinity-functions inherit trinity-functions-2
set-trinityver set-trinityver
DESCRIPTION="tdeaddons metapackage - merge this to pull in all tdeaddons-derived packages" DESCRIPTION="tdeaddons metapackage - merge this to pull in all tdeaddons-derived packages"
HOMEPAGE="http://www.trinitydesktop.org/" HOMEPAGE="http://www.trinitydesktop.org/"
LICENSE="GPL-2 LGPL-2" LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="${TRINITY_VER}" SLOT="${TRINITY_VER}"
IUSE=""
KEYWORDS=
RDEPEND=" RDEPEND="
>=trinity-apps/atlantikdesigner-${PV}:${SLOT} =trinity-apps/atlantikdesigner-${PV}
>=trinity-base/tdeaddons-doc-${PV}:${SLOT} =trinity-base/tdeaddons-doc-${PV}
>=trinity-base/kaddressbook-plugins-${PV}:${SLOT} =trinity-base/kaddressbook-plugins-${PV}
>=trinity-base/kate-plugins-${PV}:${SLOT} =trinity-base/kate-plugins-${PV}
>=trinity-base/kicker-applets-${PV}:${SLOT} =trinity-base/kicker-applets-${PV}
>=trinity-base/knewsticker-scripts-${PV}:${SLOT} =trinity-base/knewsticker-scripts-${PV}
>=trinity-base/konq-plugins-${PV}:${SLOT} =trinity-base/konq-plugins-${PV}
>=trinity-base/ksig-${PV}:${SLOT} =trinity-base/ksig-${PV}
>=trinity-base/renamedlg-plugins-${PV}:${SLOT} =trinity-base/renamedlg-plugins-${PV}
>=trinity-base/tdeaddons-tdefile-plugins-${PV}:${SLOT} =trinity-base/tdeaddons-tdefile-plugins-${PV}"
"
# trinity-base/noatun-plugins masked due to missing dependency: noatun # trinity-base/noatun-plugins masked due to missing dependency: noatun
# But not long anymore.. :-)

@ -1,11 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeaddons" TRINITY_MODULE_NAME="tdeaddons"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Various basic tdefile plugins provided by tdeaddons" DESCRIPTION="Various basic tdefile plugins provided by tdeaddons"
KEYWORDS=""
IUSE+=""

@ -1,11 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="EmotIcons (icons for things like smilies :-) for Trinity" DESCRIPTION="EmotIcons (icons for things like smilies :-) for Trinity"
KEYWORDS=
IUSE=""

@ -1,17 +1,16 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Themes for IceWM from the Trinityartwork package." DESCRIPTION="Themes for IceWM from the tdeartwork package."
KEYWORDS=
IUSE=""
RDEPEND="$DEPEND RDEPEND="
>=trinity-base/tdeartwork-twin-styles-${PV}:${SLOT}" =trinity-base/tdeartwork-twin-styles-${PV}"
pkg_postinst() { pkg_postinst() {
elog "More IceWM themes are available installing x11-themes/icewm-themes" elog "More IceWM themes are available installing x11-themes/icewm-themes"

@ -1,23 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
KMMODULE="IconThemes" KMMODULE="IconThemes"
DESCRIPTION="Icon themes for Trinity" DESCRIPTION="Icon themes for Trinity"
KEYWORDS=
IUSE=""
TSM_EXTRACT="IconThemes/" 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
}

@ -1,14 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="kworldclock from kdeartwork" DESCRIPTION="kworldclock from tdeartwork"
KEYWORDS=
IUSE=""
RDEPEND="$DEPEND RDEPEND="
>=trinity-base/kworldclock-${PV}:${SLOT}" =trinity-base/kworldclock-${PV}"

@ -1,27 +1,26 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
inherit trinity-functions inherit trinity-functions-2
set-trinityver set-trinityver
DESCRIPTION="tdeartwork meta package - merge this to pull in all tdeartwork-derived packages" DESCRIPTION="tdeartwork meta package - merge this to pull in all tdeartwork-derived packages"
HOMEPAGE="http://www.trinitydesktop.org/" HOMEPAGE="http://www.trinitydesktop.org/"
LICENSE="GPL-2 LGPL-2" LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="$TRINITY_VER" SLOT="$TRINITY_VER"
KEYWORDS=
IUSE=""
RDEPEND=" RDEPEND="
>=trinity-base/tdeartwork-emoticons-${PV}:${SLOT} =trinity-base/tdeartwork-emoticons-${PV}
>=trinity-base/tdeartwork-icon-themes-${PV}:${SLOT} =trinity-base/tdeartwork-icon-themes-${PV}
>=trinity-base/tdeartwork-icewm-themes-${PV}:${SLOT} =trinity-base/tdeartwork-icewm-themes-${PV}
>=trinity-base/tdeartwork-tdescreensaver-${PV}:${SLOT} =trinity-base/tdeartwork-tdescreensaver-${PV}
>=trinity-base/tdeartwork-twin-styles-${PV}:${SLOT} =trinity-base/tdeartwork-twin-styles-${PV}
>=trinity-base/tdeartwork-kworldclock-${PV}:${SLOT} =trinity-base/tdeartwork-kworldclock-${PV}
>=trinity-base/tdeartwork-sounds-${PV}:${SLOT} =trinity-base/tdeartwork-sounds-${PV}
>=trinity-base/tdeartwork-styles-${PV}:${SLOT} =trinity-base/tdeartwork-styles-${PV}
>=trinity-base/tdeartwork-wallpapers-${PV}:${SLOT}" =trinity-base/tdeartwork-wallpapers-${PV}"

@ -1,11 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Extra sound themes for Trinity" DESCRIPTION="Extra sound themes for Trinity"
KEYWORDS=
IUSE=""

@ -1,11 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Extra styles for Trinity" DESCRIPTION="Extra styles for Trinity"
KEYWORDS=
IUSE=""

@ -1,18 +1,19 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Extra screensavers for Trinity" DESCRIPTION="Extra screensavers for Trinity"
KEYWORDS=""
IUSE="opengl xscreensaver arts" IUSE="opengl xscreensaver arts"
DEPEND=" DEPEND="
>=trinity-base/tdescreensaver-${PV}:${SLOT} =trinity-base/tdescreensaver-${PV}
>=trinity-base/krootbacking-${PV}:${SLOT} =trinity-base/krootbacking-${PV}
media-libs/libart_lgpl media-libs/libart_lgpl
opengl? ( virtual/opengl ) opengl? ( virtual/opengl )
xscreensaver? ( x11-misc/xscreensaver ) xscreensaver? ( x11-misc/xscreensaver )
@ -24,10 +25,10 @@ TSM_EXTRACT_ALSO="FindXscreensaver.cmake"
src_configure() { src_configure() {
mycmakeargs=( mycmakeargs=(
-DWITH_LIBART=ON -DWITH_LIBART=ON
$(cmake-utils_use_with opengl OPENGL) -DWITH_OPENGL="$(usex opengl)"
$(cmake-utils_use_with xscreensaver XSCREENSAVER) -DWITH_XSCREENSAVER="$(usex xscreensaver)"
$(cmake-utils_use_with arts ARTS) -DWITH_ARTS="$(usex arts)"
) )
trinity-meta_src_configure trinity-meta-2_src_configure
} }

@ -1,13 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Window styles for Trinity" DESCRIPTION="Window styles for Trinity"
KEYWORDS=
IUSE=""
DEPEND=">=trinity-base/twin-${PV}:${SLOT}" DEPEND="=trinity-base/twin-${PV}"
RDEPEND="$DEPEND" RDEPEND="$DEPEND"

@ -1,11 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Copyright 2020 The Trinity Desktop Project
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
EAPI="5" EAPI="7"
TRINITY_MODULE_NAME="tdeartwork" TRINITY_MODULE_NAME="tdeartwork"
inherit trinity-meta inherit trinity-meta-2
DESCRIPTION="Wallpapers from Trinity" DESCRIPTION="Wallpapers from Trinity"
KEYWORDS=
IUSE=""

Loading…
Cancel
Save