diff options
| author | Chris <xchrisx@uber.space> | 2020-01-09 19:27:13 +0100 |
|---|---|---|
| committer | TDE Gitea <gitea@mirror.git.trinitydesktop.org> | 2020-01-18 16:34:05 +0000 |
| commit | 83310ab2e1e23459df24e5fab68d3b969e301450 (patch) | |
| tree | 1af33a73c2a27a050aa12457cfae322ed75a4a91 /trinity-base | |
| parent | 42dffbf8d67de8a9b0ff4f312cfc4f0b85ad8083 (diff) | |
| download | tde-packaging-gentoo-83310ab2e1e23459df24e5fab68d3b969e301450.tar.gz tde-packaging-gentoo-83310ab2e1e23459df24e5fab68d3b969e301450.zip | |
Live ebuilds: Port to EAPI7 and cleanup - Round 5.
This time: ark, kamera, kcoloredit, kdvi, kedit, kfax,
kfloppy, kgamma, kghostview, khexedit, kjots,
klaptopdaemon, kmilo, kmrml, kolourpaint,
kooka, kpdf, kpovmodeler, kregexpeditor,
kruler, ksim, ksnapshot, ksvg, ktimer,
kuickshow, kview, kviewshell, libkscan,
tdefilereplace, superkaramba,
tdegraphics-doc, tdegraphics-meta,
tdegraphics-tdefile-plugins,
tdeiconedit, tdelirc, tdeutils-doc,
tdeutils-meta and tdewallet
Signed-off-by: Chris <xchrisx@uber.space>
Diffstat (limited to 'trinity-base')
38 files changed, 220 insertions, 237 deletions
diff --git a/trinity-base/ark/ark-9999.ebuild b/trinity-base/ark/ark-9999.ebuild index d4a29b1f..95ea2448 100644 --- a/trinity-base/ark/ark-9999.ebuild +++ b/trinity-base/ark/ark-9999.ebuild @@ -1,14 +1,13 @@ # 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 Archiving tool" -KEYWORDS="" -IUSE="" pkg_postinst(){ elog "You may want to install app-arch/lha, app-arch/p7zip, app-arch/rar," diff --git a/trinity-base/kamera/kamera-9999.ebuild b/trinity-base/kamera/kamera-9999.ebuild index 10688535..c4ee27ed 100644 --- a/trinity-base/kamera/kamera-9999.ebuild +++ b/trinity-base/kamera/kamera-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity digital camera manager" -KEYWORDS= -IUSE="" DEPEND="media-libs/libgphoto2" RDEPEND="$DEPEND" diff --git a/trinity-base/kcoloredit/kcoloredit-9999.ebuild b/trinity-base/kcoloredit/kcoloredit-9999.ebuild index 80d7102a..44eb2da2 100644 --- a/trinity-base/kcoloredit/kcoloredit-9999.ebuild +++ b/trinity-base/kcoloredit/kcoloredit-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity color selector/editor" -KEYWORDS= -IUSE="" diff --git a/trinity-base/kdvi/kdvi-9999.ebuild b/trinity-base/kdvi/kdvi-9999.ebuild index 4d005d9e..9bc32669 100644 --- a/trinity-base/kdvi/kdvi-9999.ebuild +++ b/trinity-base/kdvi/kdvi-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity DVI viewer" -KEYWORDS= -IUSE="" -DEPEND="media-libs/freetype:2 - >=trinity-base/kviewshell-${PV}:${SLOT}" +DEPEND="media-libs/freetype + =trinity-base/kviewshell-${PV}" RDEPEND="$DEPEND" TSM_EXTRACT_ALSO="kviewshell" diff --git a/trinity-base/kedit/kedit-9999.ebuild b/trinity-base/kedit/kedit-9999.ebuild index 86d80ad5..f70f4f35 100644 --- a/trinity-base/kedit/kedit-9999.ebuild +++ b/trinity-base/kedit/kedit-9999.ebuild @@ -1,11 +1,10 @@ # 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="Very simple text editor for Trinity" -KEYWORDS="" -IUSE="" diff --git a/trinity-base/kfax/kfax-9999.ebuild b/trinity-base/kfax/kfax-9999.ebuild index e7b052b7..138fdbfd 100644 --- a/trinity-base/kfax/kfax-9999.ebuild +++ b/trinity-base/kfax/kfax-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="tdegraphics" TRINITY_SUBMODULE="kfax kfaxview" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity G3/G4 fax viewer" -KEYWORDS= -IUSE="" -DEPEND=">=trinity-base/kviewshell-${PV}:${SLOT}" -RDEPEND="$DEPEND" +DEPEND="=trinity-base/kviewshell-${PV}" +RDEPEND="${DEPEND}" TSM_EXTRACT_ALSO="kviewshell" diff --git a/trinity-base/kfloppy/kfloppy-9999.ebuild b/trinity-base/kfloppy/kfloppy-9999.ebuild index dbc85784..88b00a8f 100644 --- a/trinity-base/kfloppy/kfloppy-9999.ebuild +++ b/trinity-base/kfloppy/kfloppy-9999.ebuild @@ -1,11 +1,10 @@ # 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="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them." -KEYWORDS="" -IUSE="" diff --git a/trinity-base/kgamma/kgamma-9999.ebuild b/trinity-base/kgamma/kgamma-9999.ebuild index 8489cadd..85650f9a 100644 --- a/trinity-base/kgamma/kgamma-9999.ebuild +++ b/trinity-base/kgamma/kgamma-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity screen gamma values kcontrol module" -KEYWORDS= -IUSE="" -DEPEND=">=trinity-base/kcontrol-${PV}:${SLOT}" +DEPEND="=trinity-base/kcontrol-${PV}" RDEPEND="${DEPEND}" diff --git a/trinity-base/kghostview/kghostview-9999.ebuild b/trinity-base/kghostview/kghostview-9999.ebuild index 49c41a7b..7234f984 100644 --- a/trinity-base/kghostview/kghostview-9999.ebuild +++ b/trinity-base/kghostview/kghostview-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="A Trinity Viewer for PostScript (.ps, .eps) and PDF (.pdf) files" -KEYWORDS= -IUSE="" DEPEND="x11-libs/libXft" RDEPEND="${DEPEND}" diff --git a/trinity-base/khexedit/khexedit-9999.ebuild b/trinity-base/khexedit/khexedit-9999.ebuild index b41ff837..0898d173 100644 --- a/trinity-base/khexedit/khexedit-9999.ebuild +++ b/trinity-base/khexedit/khexedit-9999.ebuild @@ -1,11 +1,10 @@ # 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 hex editor" -KEYWORDS="" -IUSE="" diff --git a/trinity-base/kjots/kjots-9999.ebuild b/trinity-base/kjots/kjots-9999.ebuild index 04db9213..e3a668a3 100644 --- a/trinity-base/kjots/kjots-9999.ebuild +++ b/trinity-base/kjots/kjots-9999.ebuild @@ -1,11 +1,10 @@ # 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 note taking utility" -KEYWORDS="" -IUSE="" diff --git a/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild b/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild index fc6ee6bf..1f8a2096 100644 --- a/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild +++ b/trinity-base/klaptopdaemon/klaptopdaemon-9999.ebuild @@ -1,13 +1,14 @@ # 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="KLaptopdaemon - Trinity battery monitoring and management for laptops." -KEYWORDS="" + IUSE="xscreensaver" DEPEND="x11-libs/libXtst @@ -17,9 +18,9 @@ RDEPEND="${DEPEND}" src_configure() { mycmakeargs=( - "-DWITH_DPMS=ON" - $(cmake-utils_use_with xscreensaver XSCREENSAVER) + -DWITH_DPMS=ON + -DWITH_XSCREENSAVER="$(usex xscreensaver)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/kmilo/kmilo-9999.ebuild b/trinity-base/kmilo/kmilo-9999.ebuild index 284fc536..9a3b2772 100644 --- a/trinity-base/kmilo/kmilo-9999.ebuild +++ b/trinity-base/kmilo/kmilo-9999.ebuild @@ -1,13 +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="tdeutils" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="kded module supports some hardware input devices, such as special keys" -KEYWORDS="" + IUSE="asus-laptop dell-laptop powerbook-laptop thinkpad-laptop vaio-laptop lm_sensors" DEPEND="powerbook-laptop? ( app-laptop/pbbuttonsd )" @@ -16,13 +17,13 @@ RDEPEND="${DEPEND} src_configure() { mycmakeargs=( - $(cmake-utils_use_with asus-laptop ASUS) - $(cmake-utils_use_with dell-laptop I8K) - $(cmake-utils_use_with powerbook-laptop POWERBOOK2) - $(cmake-utils_use_with thinkpad-laptop THINKPAD) - $(cmake-utils_use_with vaio-laptop VAIO) - $(cmake-utils_use_with lm_sensors SENSORS) + -DWITH_ASUS="$(usex asus-laptop)" + -DWITH_I8K="$(usex dell-laptop)" + -DWITH_POWERBOOK2="$(usex powerbook-laptop)" + -DWITH_THINKPAD="$(usex thinkpad-laptop)" + -DWITH_VAIO="$(usex vaio-laptop)" + -DWITH_SENSORS="$(usex lm_sensors)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/kmrml/kmrml-9999.ebuild b/trinity-base/kmrml/kmrml-9999.ebuild index ea7c47f3..400a4c72 100644 --- a/trinity-base/kmrml/kmrml-9999.ebuild +++ b/trinity-base/kmrml/kmrml-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="KIO and konqueror plugins for MRML - an image indexing service" -KEYWORDS= -IUSE="" +DESCRIPTION="TDEIO and konqueror plugins for MRML - an image indexing service" diff --git a/trinity-base/kolourpaint/kolourpaint-9999.ebuild b/trinity-base/kolourpaint/kolourpaint-9999.ebuild index 6e275e78..be37e535 100644 --- a/trinity-base/kolourpaint/kolourpaint-9999.ebuild +++ b/trinity-base/kolourpaint/kolourpaint-9999.ebuild @@ -1,12 +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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Paint Program for Trinity" -KEYWORDS= -IUSE="" -LICENSE="BSD" diff --git a/trinity-base/kooka/kooka-9999.ebuild b/trinity-base/kooka/kooka-9999.ebuild index 4d582bb7..8a2bcb38 100644 --- a/trinity-base/kooka/kooka-9999.ebuild +++ b/trinity-base/kooka/kooka-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Kooka is a Trinity application which provides access to scanner hardware" -KEYWORDS= -IUSE="" DEPEND=" - >=trinity-base/libkscan-${PV}:${SLOT} + =trinity-base/libkscan-${PV} media-libs/tiff:=" RDEPEND="${DEPEND}" diff --git a/trinity-base/kpdf/kpdf-9999.ebuild b/trinity-base/kpdf/kpdf-9999.ebuild index 74582958..2b96c1af 100644 --- a/trinity-base/kpdf/kpdf-9999.ebuild +++ b/trinity-base/kpdf/kpdf-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="kpdf, a Trinity pdf viewer based on xpdf" -KEYWORDS= -IUSE="" +DESCRIPTION="KPDF, a Trinity PDF viewer based on XPDF" -DEPEND="media-libs/freetype:2" -RDEPEND="$DEPEND" +DEPEND="media-libs/freetype" +RDEPEND="${DEPEND}" diff --git a/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild b/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild index ca258ad7..401bb574 100644 --- a/trinity-base/kpovmodeler/kpovmodeler-9999.ebuild +++ b/trinity-base/kpovmodeler/kpovmodeler-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity: Modeler for POV-Ray Scenes." -KEYWORDS= -IUSE="" DEPEND="virtual/opengl - >=media-libs/freetype-2.3" + media-libs/freetype" RDEPEND="${DEPEND} media-gfx/povray" diff --git a/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild b/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild index b082a356..4eafc832 100644 --- a/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild +++ b/trinity-base/kregexpeditor/kregexpeditor-9999.ebuild @@ -1,11 +1,10 @@ # 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: Editor for Regular Expressions" -KEYWORDS="" -IUSE="" diff --git a/trinity-base/kruler/kruler-9999.ebuild b/trinity-base/kruler/kruler-9999.ebuild index 63e11564..5259b368 100644 --- a/trinity-base/kruler/kruler-9999.ebuild +++ b/trinity-base/kruler/kruler-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="A screen ruler for Trinity" -KEYWORDS= -IUSE="" diff --git a/trinity-base/ksim/ksim-9999.ebuild b/trinity-base/ksim/ksim-9999.ebuild index ade987e1..b6afd82e 100644 --- a/trinity-base/ksim/ksim-9999.ebuild +++ b/trinity-base/ksim/ksim-9999.ebuild @@ -1,26 +1,27 @@ # 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 system monitoring applets." -KEYWORDS="" + IUSE="snmp lm_sensors dell-laptop" DEPEND="lm_sensors? ( x11-libs/libXext ) snmp? ( net-analyzer/net-snmp )" RDEPEND="${DEPEND} - lm_sensors? ( sys-apps/lm_sensors )" + lm_sensors? ( sys-apps/lm-sensors )" src_configure() { mycmakeargs=( - $(cmake-utils_use_with dell-laptop I8K) - $(cmake-utils_use_with snmp SNMP) - $(cmake-utils_use_with lm_sensors SENSORS) + -DWITH_I8K="$(usex dell-laptop)" + -DWITH_SNMP="$(usex snmp)" + -DWITH_SENSORS="$(usex lm_sensors)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/ksnapshot/ksnapshot-9999.ebuild b/trinity-base/ksnapshot/ksnapshot-9999.ebuild index ac828fa3..018ee5aa 100644 --- a/trinity-base/ksnapshot/ksnapshot-9999.ebuild +++ b/trinity-base/ksnapshot/ksnapshot-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity Screenshot Utility" -KEYWORDS= -IUSE="" DEPEND="x11-libs/libXext" -RDEPEND="$DEPEND" +RDEPEND="${DEPEND}" diff --git a/trinity-base/ksvg/ksvg-9999.ebuild b/trinity-base/ksvg/ksvg-9999.ebuild index 78ab3801..35a2b977 100644 --- a/trinity-base/ksvg/ksvg-9999.ebuild +++ b/trinity-base/ksvg/ksvg-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="SVG viewer library and embeddable kpart" -KEYWORDS= -IUSE="" -DEPEND=">=media-libs/freetype-2.2 +DEPEND="media-libs/freetype media-libs/fontconfig media-libs/libart_lgpl media-libs/lcms:0 diff --git a/trinity-base/ktimer/ktimer-9999.ebuild b/trinity-base/ktimer/ktimer-9999.ebuild index a0d68fca..26d9a6fb 100644 --- a/trinity-base/ktimer/ktimer-9999.ebuild +++ b/trinity-base/ktimer/ktimer-9999.ebuild @@ -1,11 +1,10 @@ # 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 Timer" -KEYWORDS="" -IUSE="" diff --git a/trinity-base/kuickshow/kuickshow-9999.ebuild b/trinity-base/kuickshow/kuickshow-9999.ebuild index b726d5d8..e7d24e75 100644 --- a/trinity-base/kuickshow/kuickshow-9999.ebuild +++ b/trinity-base/kuickshow/kuickshow-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="A fast and versatile image viewer for Trinity" -KEYWORDS= -IUSE="" DEPEND="x11-libs/libXext media-libs/imlib" diff --git a/trinity-base/kview/kview-9999.ebuild b/trinity-base/kview/kview-9999.ebuild index 610d0ecc..79b5ddfe 100644 --- a/trinity-base/kview/kview-9999.ebuild +++ b/trinity-base/kview/kview-9999.ebuild @@ -1,12 +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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity image viewer" - -KEYWORDS= -IUSE="" diff --git a/trinity-base/kviewshell/kviewshell-9999.ebuild b/trinity-base/kviewshell/kviewshell-9999.ebuild index 09099360..2ef38191 100644 --- a/trinity-base/kviewshell/kviewshell-9999.ebuild +++ b/trinity-base/kviewshell/kviewshell-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity: Generic framework for viewer applications" -KEYWORDS= -IUSE="" diff --git a/trinity-base/libkscan/libkscan-9999.ebuild b/trinity-base/libkscan/libkscan-9999.ebuild index 9a1d2f4b..c618f10c 100644 --- a/trinity-base/libkscan/libkscan-9999.ebuild +++ b/trinity-base/libkscan/libkscan-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity scanner library" -KEYWORDS= -IUSE="" DEPEND="media-gfx/sane-backends" RDEPEND="${DEPEND}" diff --git a/trinity-base/superkaramba/superkaramba-9999.ebuild b/trinity-base/superkaramba/superkaramba-9999.ebuild index 2ae86f9a..82fc9465 100644 --- a/trinity-base/superkaramba/superkaramba-9999.ebuild +++ b/trinity-base/superkaramba/superkaramba-9999.ebuild @@ -1,13 +1,13 @@ # 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="A tool to create interactive applets for the Trinity desktop." -KEYWORDS="" #FIXME: add xmms use IUSE="" @@ -15,10 +15,10 @@ IUSE="" src_configure() { mycmakeargs=( +# -DWITH_XMMS="$(usex xmms)" # $(cmake-utils_use_with xmms XMMS ) - "-DWITH_XMMS=ON" - "-DWITH_KNEWSTUFF=ON" + -DWITH_KNEWSTUFF=ON ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild b/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild index 7aa57c30..0698a9b5 100644 --- a/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild +++ b/trinity-base/tdefilereplace/tdefilereplace-9999.ebuild @@ -1,9 +1,9 @@ # 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="A batch search and replace tool for TDE" diff --git a/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild b/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild index 847974ef..fd7f54d1 100644 --- a/trinity-base/tdegraphics-doc/tdegraphics-doc-9999.ebuild +++ b/trinity-base/tdegraphics-doc/tdegraphics-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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 + +DESCRIPTION="Documentaion for tdegraphics-derived packages" -DESCRIPTION="Documentaion for kdegraphics-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/tdegraphics-meta/tdegraphics-meta-9999.ebuild b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild index 565190d3..83798b42 100644 --- a/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild +++ b/trinity-base/tdegraphics-meta/tdegraphics-meta-9999.ebuild @@ -1,40 +1,38 @@ # 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="kdegraphics metapackage - merge this to pull in all kdegraphics-derived packages" +DESCRIPTION="tdegraphics metapackage - merge this to pull in all tdegraphics-derived packages" HOMEPAGE="http://www.trinitydesktop.org/" -LICENSE="GPL-2 LGPL-2" +LICENSE="|| ( GPL-2 GPL-3 )" SLOT="${TRINITY_VER}" -IUSE="" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~x86" RDEPEND=" - >=trinity-base/kamera-${PV}:${SLOT} - >=trinity-base/kcoloredit-${PV}:${SLOT} - >=trinity-base/kdvi-${PV}:${SLOT} - >=trinity-base/kfax-${PV}:${SLOT} - >=trinity-base/tdegraphics-tdefile-plugins-${PV}:${SLOT} - >=trinity-base/tdegraphics-doc-${PV}:${SLOT} - >=trinity-base/kgamma-${PV}:${SLOT} - >=trinity-base/kghostview-${PV}:${SLOT} - >=trinity-base/tdeiconedit-${PV}:${SLOT} - >=trinity-base/kmrml-${PV}:${SLOT} - >=trinity-base/kolourpaint-${PV}:${SLOT} - >=trinity-base/kooka-${PV}:${SLOT} - >=trinity-base/kpdf-${PV}:${SLOT} - >=trinity-base/kpovmodeler-${PV}:${SLOT} - >=trinity-base/kruler-${PV}:${SLOT} - >=trinity-base/ksnapshot-${PV}:${SLOT} - >=trinity-base/ksvg-${PV}:${SLOT} - >=trinity-base/kuickshow-${PV}:${SLOT} - >=trinity-base/kview-${PV}:${SLOT} - >=trinity-base/kviewshell-${PV}:${SLOT} - >=trinity-base/libkscan-${PV}:${SLOT}" + =trinity-base/kamera-${PV} + =trinity-base/kcoloredit-${PV} + =trinity-base/kdvi-${PV} + =trinity-base/kfax-${PV} + =trinity-base/tdegraphics-tdefile-plugins-${PV} + =trinity-base/tdegraphics-doc-${PV} + =trinity-base/kgamma-${PV} + =trinity-base/kghostview-${PV} + =trinity-base/tdeiconedit-${PV} + =trinity-base/kmrml-${PV} + =trinity-base/kolourpaint-${PV} + =trinity-base/kooka-${PV} + =trinity-base/kpdf-${PV} + =trinity-base/kpovmodeler-${PV} + =trinity-base/kruler-${PV} + =trinity-base/ksnapshot-${PV} + =trinity-base/ksvg-${PV} + =trinity-base/kuickshow-${PV} + =trinity-base/kview-${PV} + =trinity-base/kviewshell-${PV} + =trinity-base/libkscan-${PV}" diff --git a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild index 3655a562..3880ff1a 100644 --- a/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild +++ b/trinity-base/tdegraphics-tdefile-plugins/tdegraphics-tdefile-plugins-9999.ebuild @@ -1,29 +1,30 @@ # 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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 + +DESCRIPTION="tdefile plugins from tdegraphics" -DESCRIPTION="kfile plugins from kdegraphics" -KEYWORDS= IUSE="tiff openexr pdf" DEPEND=" tiff? ( media-libs/tiff:= ) - openexr? ( >=media-libs/openexr-1.2.2-r2 ) + openexr? ( media-libs/openexr ) pdf? ( app-text/poppler )" -RDEPEND="$DEPEND" +RDEPEND="${DEPEND}" TSM_EXTRACT_ALSO="kghostview/dscparse/" src_configure() { mycmakeargs=( - $(cmake-utils_use_with tiff TIFF) - $(cmake-utils_use_with openexr OPENEXR) - $(cmake-utils_use_with pdf PDF) + -DWITH_TIFF="$(usex tiff)" + -DWITH_OPENEXR="$(usex openexr)" + -DWITH_PDF="$(usex pdf)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild b/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild index cac6795e..a481ab0d 100644 --- a/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild +++ b/trinity-base/tdeiconedit/tdeiconedit-9999.ebuild @@ -1,11 +1,10 @@ # 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="tdegraphics" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity Icon Editor" -KEYWORDS= -IUSE="" diff --git a/trinity-base/tdelirc/tdelirc-9999.ebuild b/trinity-base/tdelirc/tdelirc-9999.ebuild index d3cca361..4e44a759 100644 --- a/trinity-base/tdelirc/tdelirc-9999.ebuild +++ b/trinity-base/tdelirc/tdelirc-9999.ebuild @@ -1,11 +1,10 @@ # 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="TDElirc - Trinity Frontend to lirc" -KEYWORDS="" -IUSE="" diff --git a/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild b/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild index f4b8ef5e..e4ed4729 100644 --- a/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild +++ b/trinity-base/tdeutils-doc/tdeutils-doc-9999.ebuild @@ -1,13 +1,26 @@ # 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="Documentaion for tdeutils-derived packages" -DESCRIPTION="Documentaion for kdeutils-derived packages" -KEYWORDS="" -IUSE="" RDEPEND=" - >=trinity-base/khelpcenter-${PV}:${SLOT}" + =trinity-base/khelpcenter-${PV}" + +pkg_setup() { + # 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 + + ewarn "This ebuild needs huge amoumt 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-2_pkg_setup +}
\ No newline at end of file diff --git a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild index 6fe37918..18efe220 100644 --- a/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild +++ b/trinity-base/tdeutils-meta/tdeutils-meta-9999.ebuild @@ -1,37 +1,36 @@ # 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="tdeutils metapackage - merge this to pull in all tdeutils-derived packages" HOMEPAGE="http://www.trinitydesktop.org/" -LICENSE="GPL-2 LGPL-2" +LICENSE="|| ( GPL-2 GPL-3 )" SLOT="$TRINITY_VER" -IUSE="" -KEYWORDS="" RDEPEND=" - >=trinity-base/ark-${PV}:${SLOT} - >=trinity-base/tdeutils-doc-${PV}:${SLOT} - >=trinity-base/kcalc-${PV}:${SLOT} - >=trinity-base/kcharselect-${PV}:${SLOT} - >=trinity-base/tdelirc-${PV}:${SLOT} - >=trinity-base/kdf-${PV}:${SLOT} - >=trinity-base/kedit-${PV}:${SLOT} - >=trinity-base/kfloppy-${PV}:${SLOT} - >=trinity-base/kgpg-${PV}:${SLOT} - >=trinity-base/khexedit-${PV}:${SLOT} - >=trinity-base/kjots-${PV}:${SLOT} - >=trinity-base/klaptopdaemon-${PV}:${SLOT} - >=trinity-base/kmilo-${PV}:${SLOT} - >=trinity-base/kregexpeditor-${PV}:${SLOT} - >=trinity-base/ksim-${PV}:${SLOT} - >=trinity-base/ktimer-${PV}:${SLOT} - >=trinity-base/tdewallet-${PV}:${SLOT} - >=trinity-base/superkaramba-${PV}:${SLOT} - >=trinity-base/tdefilereplace-${PV}:${SLOT}" + =trinity-base/ark-${PV} + =trinity-base/tdeutils-doc-${PV} + =trinity-base/kcalc-${PV} + =trinity-base/kcharselect-${PV} + =trinity-base/tdelirc-${PV} + =trinity-base/kdf-${PV} + =trinity-base/kedit-${PV} + =trinity-base/kfloppy-${PV} + =trinity-base/kgpg-${PV} + =trinity-base/khexedit-${PV} + =trinity-base/kjots-${PV} + =trinity-base/klaptopdaemon-${PV} + =trinity-base/kmilo-${PV} + =trinity-base/kregexpeditor-${PV} + =trinity-base/ksim-${PV} + =trinity-base/ktimer-${PV} + =trinity-base/tdewallet-${PV} + =trinity-base/superkaramba-${PV} + =trinity-base/tdefilereplace-${PV}" diff --git a/trinity-base/tdewallet/tdewallet-9999.ebuild b/trinity-base/tdewallet/tdewallet-9999.ebuild index fe372f0c..a0e32845 100644 --- a/trinity-base/tdewallet/tdewallet-9999.ebuild +++ b/trinity-base/tdewallet/tdewallet-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="tdeutils" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity Wallet Management Tool" -KEYWORDS="" -IUSE="" |