From 13f3b6432f125802f4fee3827d2b0e882a0a8dfe Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 8 Jan 2020 19:09:38 +0100 Subject: Live ebuilds: Port to EAPI7 and cleanup - Round 3. This time: kpager, krootbacking, ksplashml, kstart, ksystraycmd, kxkb, nsplugins, tdebase-starttde, tdedebugdialog, tdeeject, tdepasswd, tdeprint, tdescreensaver, tdesu and tqt3integration Signed-off-by: Chris --- trinity-base/kpager/kpager-9999.ebuild | 7 ++--- trinity-base/krootbacking/krootbacking-9999.ebuild | 7 ++--- trinity-base/ksplashml/ksplashml-9999.ebuild | 11 ++++--- trinity-base/kstart/kstart-9999.ebuild | 7 ++--- trinity-base/ksystraycmd/ksystraycmd-9999.ebuild | 9 +++--- trinity-base/kxkb/kxkb-9999.ebuild | 9 +++--- trinity-base/nsplugins/nsplugins-9999.ebuild | 10 +++--- .../tdebase-starttde/tdebase-starttde-9999.ebuild | 36 ++++++++-------------- .../tdedebugdialog/tdedebugdialog-9999.ebuild | 10 +++--- trinity-base/tdeeject/tdeeject-9999.ebuild | 9 +++--- trinity-base/tdepasswd/tdepasswd-9999.ebuild | 9 +++--- trinity-base/tdeprint/tdeprint-9999.ebuild | 7 +++-- .../tdescreensaver/tdescreensaver-9999.ebuild | 20 +++++------- trinity-base/tdesu/tdesu-9999.ebuild | 19 ++++++------ .../tqt3integration/tqt3integration-9999.ebuild | 7 ++--- trinity-base/twin/twin-9999.ebuild | 23 +++++++------- 16 files changed, 89 insertions(+), 111 deletions(-) diff --git a/trinity-base/kpager/kpager-9999.ebuild b/trinity-base/kpager/kpager-9999.ebuild index 2d222322..396086ba 100644 --- a/trinity-base/kpager/kpager-9999.ebuild +++ b/trinity-base/kpager/kpager-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity Virtual Desktop Overview" -KEYWORDS= -IUSE="" diff --git a/trinity-base/krootbacking/krootbacking-9999.ebuild b/trinity-base/krootbacking/krootbacking-9999.ebuild index d0b1a593..3727f292 100644 --- a/trinity-base/krootbacking/krootbacking-9999.ebuild +++ b/trinity-base/krootbacking/krootbacking-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="A program to grab the current TDE desktop backrounds for xscreensaver." -KEYWORDS= -IUSE="" diff --git a/trinity-base/ksplashml/ksplashml-9999.ebuild b/trinity-base/ksplashml/ksplashml-9999.ebuild index ea3bd4e3..9aa49363 100644 --- a/trinity-base/ksplashml/ksplashml-9999.ebuild +++ b/trinity-base/ksplashml/ksplashml-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity splashscreen framework (of Trinity itself, not of individual apps)" -KEYWORDS= + IUSE="xinerama" DEPEND="x11-libs/libXcursor @@ -16,8 +17,8 @@ RDEPEND="$DEPEND" src_configure() { mycmakeargs=( - $(cmake-utils_use_with xinerama XINERAMA) + -DWITH_XINERAMA="$(usex xinerama)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/kstart/kstart-9999.ebuild b/trinity-base/kstart/kstart-9999.ebuild index bf45fc45..34786a06 100644 --- a/trinity-base/kstart/kstart-9999.ebuild +++ b/trinity-base/kstart/kstart-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity utility to launch applications with special window properties" -KEYWORDS= -IUSE="" diff --git a/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild b/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild index 2e77b123..f43bc306 100644 --- a/trinity-base/ksystraycmd/ksystraycmd-9999.ebuild +++ b/trinity-base/ksystraycmd/ksystraycmd-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="ksystraycmd embeds applications given as argument into the system tray." -KEYWORDS= -IUSE="" +DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray." diff --git a/trinity-base/kxkb/kxkb-9999.ebuild b/trinity-base/kxkb/kxkb-9999.ebuild index e30ed33a..7f4fcf2e 100644 --- a/trinity-base/kxkb/kxkb-9999.ebuild +++ b/trinity-base/kxkb/kxkb-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="KControl module for the X11 to configure and switch keyboard layouts" -KEYWORDS= -IUSE="" DEPEND="x11-libs/libXtst" RDEPEND="${DEPEND} @@ -20,5 +19,5 @@ src_configure() { -DWITH_XTEST=ON ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/nsplugins/nsplugins-9999.ebuild b/trinity-base/nsplugins/nsplugins-9999.ebuild index 32508289..322f65db 100644 --- a/trinity-base/nsplugins/nsplugins-9999.ebuild +++ b/trinity-base/nsplugins/nsplugins-9999.ebuild @@ -1,16 +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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Netscape plugins support for Konqueror." -KEYWORDS= -IUSE="" -# CHECKME: dependencies DEPEND="x11-libs/libXt - =dev-libs/glib-2*" + dev-libs/glib" RDEPEND="${DEPEND}" diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild index 9d18c31e..5e125dac 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-9999.ebuild @@ -1,12 +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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="starttde script, which starts a complete Trinity session, and associated scripts" +DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts" RDEPEND="x11-apps/xmessage x11-apps/xsetroot @@ -14,21 +15,19 @@ RDEPEND="x11-apps/xmessage x11-apps/xrandr x11-apps/mkfontdir x11-apps/xprop - >=trinity-base/kdesktop-${PV}:${SLOT} - >=trinity-base/kcminit-${PV}:${SLOT} - >=trinity-base/ksmserver-${PV}:${SLOT} - >=trinity-base/twin-${PV}:${SLOT} - >=trinity-base/kpersonalizer-${PV}:${SLOT} - >=trinity-base/kreadconfig-${PV}:${SLOT} - >=trinity-base/ksplashml-${PV}:${SLOT} - >=trinity-base/tdeinit-${PV}:${SLOT}" + =trinity-base/kdesktop-${PV} + =trinity-base/kcminit-${PV} + =trinity-base/ksmserver-${PV} + =trinity-base/twin-${PV} + =trinity-base/kpersonalizer-${PV} + =trinity-base/kreadconfig-${PV} + =trinity-base/ksplashml-${PV} + =trinity-base/tdeinit-${PV}" TSM_EXTRACT="starttde README.pam INSTALL AUTHORS COPYING COPYING-DOCS tdm" -PATCHES=( "$FILESDIR/${PN}-14-gentoo.patch") - src_prepare() { - trinity-base_src_prepare + trinity-base-2_src_prepare } src_configure() { @@ -36,21 +35,12 @@ src_configure() { } src_compile() { - # Patch the starttde script to setup the environment for KDE 4.0 - # Add our TDEDIR - sed -i -e "s#@REPLACE_PREFIX@#${TDEDIR}#" \ - "${S}/starttde" || die "Sed for PREFIX failed." - # List all the multilib libdirs local _libdir _libdirs for _libdir in $(get_all_libdirs); do _libdirs="${_libdirs}:${PREFIX}/${_libdir}" done _libdirs=${_libdirs#:} - - # Complete LDPATH - sed -i -e "s#@REPLACE_LIBS@#${_libdirs}#" \ - "${S}/starttde" || die "Sed for LDPATH failed." } src_install() { diff --git a/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild b/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild index a7c86515..0829bca0 100644 --- a/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild +++ b/trinity-base/tdedebugdialog/tdedebugdialog-9999.ebuild @@ -1,12 +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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 -DESCRIPTION="A Trinity dialog box for setting preferences for debug output." -KEYWORDS= -IUSE="" -RDEPEND+=" !trinity-base/kdebugdialog:${SLOT}" +DESCRIPTION="A Trinity dialog box for setting preferences for debug output." \ No newline at end of file diff --git a/trinity-base/tdeeject/tdeeject-9999.ebuild b/trinity-base/tdeeject/tdeeject-9999.ebuild index 21c01ccb..4aa45028 100644 --- a/trinity-base/tdeeject/tdeeject-9999.ebuild +++ b/trinity-base/tdeeject/tdeeject-9999.ebuild @@ -1,15 +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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity eject frontend" -KEYWORDS= -IUSE="" -DEPEND="trinity-base/kdialog:${SLOT}" +DEPEND="=trinity-base/kdialog-${PV}" RDEPEND="${DEPEND} virtual/eject" diff --git a/trinity-base/tdepasswd/tdepasswd-9999.ebuild b/trinity-base/tdepasswd/tdepasswd-9999.ebuild index 4155f6a8..b3e65027 100644 --- a/trinity-base/tdepasswd/tdepasswd-9999.ebuild +++ b/trinity-base/tdepasswd/tdepasswd-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity GUI for passwd" -KEYWORDS= -IUSE="" -DEPEND=">=trinity-base/libkonq-${PV}:${SLOT}" +DEPEND="=trinity-base/libkonq-${PV}" RDEPEND="${DEPEND}" diff --git a/trinity-base/tdeprint/tdeprint-9999.ebuild b/trinity-base/tdeprint/tdeprint-9999.ebuild index e127dcb7..8c16875f 100644 --- a/trinity-base/tdeprint/tdeprint-9999.ebuild +++ b/trinity-base/tdeprint/tdeprint-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity printer queue/device manager" -KEYWORDS= + IUSE="cups" DEPEND="cups? ( net-print/cups )" diff --git a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild index f16146be..5d5b4074 100644 --- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild +++ b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild @@ -1,30 +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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity screensaver framework" -KEYWORDS= + IUSE="opengl +krootbacking" -# CHECKME: if this use needed + DEPEND="x11-libs/libXt opengl? ( virtual/opengl ) - krootbacking? ( >=trinity-base/krootbacking-${PV}:${TRINITY_VER} ) - !!trinity-base/kscreensaver:${TRINITY_VER}" + krootbacking? ( =trinity-base/krootbacking-${PV} )" RDEPEND="${DEPEND}" src_configure () { - if use opengl; then - ewarn "OpenGL is not supported by trinity build system yet." - ewarn "This use flag is here just for future/past capability" - fi mycmakeargs=( - $(cmake-utils_use_with opengl OPENGL ) + -DWITH_OPENGL="$(usex opengl)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } diff --git a/trinity-base/tdesu/tdesu-9999.ebuild b/trinity-base/tdesu/tdesu-9999.ebuild index 9238d041..8efeccc6 100644 --- a/trinity-base/tdesu/tdesu-9999.ebuild +++ b/trinity-base/tdesu/tdesu-9999.ebuild @@ -1,33 +1,34 @@ # 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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Trinity gui for su(1) or sudo" -KEYWORDS= IUSE="sudo" -DEPEND+=" sudo? ( app-admin/sudo )" -RDEPEND+=" ${DEPEND}" +DEPEND="sudo? ( app-admin/sudo )" +RDEPEND="${DEPEND}" src_configure () { mycmakeargs=( - $(cmake-utils_use_with sudo SUDO_KDESU_BACKEND) + -DWITH_SUDO_TDESU_BACKEND="$(usex sudo)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } pkg_postinst () { if use sudo; then - einfo "Remember sudo use flag sets only the defauld value" + einfo "Remember that the sudo use flag sets only the default superuser command." einfo "It can be overriden on a user-level by adding:" einfo " [super-user-command]" einfo " super-user-command=su" - einfo "To the kdeglobal config file which is should be usually" + einfo "to the kdeglobal config file which is should be usually" einfo "located in the ~/.trinity/share/config/ directory." + fi } diff --git a/trinity-base/tqt3integration/tqt3integration-9999.ebuild b/trinity-base/tqt3integration/tqt3integration-9999.ebuild index 643aec82..309d99af 100644 --- a/trinity-base/tqt3integration/tqt3integration-9999.ebuild +++ b/trinity-base/tqt3integration/tqt3integration-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="tdebase" -inherit trinity-meta +inherit trinity-meta-2 DESCRIPTION="Makes TQt-only apps use several TDE dialogs." -KEYWORDS= -IUSE="" diff --git a/trinity-base/twin/twin-9999.ebuild b/trinity-base/twin/twin-9999.ebuild index 73fc9d40..b6d143d7 100644 --- a/trinity-base/twin/twin-9999.ebuild +++ b/trinity-base/twin/twin-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="tdebase" -inherit trinity-meta eutils +inherit trinity-meta-2 eutils DESCRIPTION="Trinity window manager" -KEYWORDS= + IUSE="xcomposite xrandr xinerama +libconfig +pcre opengl" DEPEND="x11-libs/libXext @@ -23,16 +24,16 @@ RDEPEND="${DEPEND}" src_configure() { mycmakeargs=( - $(cmake-utils_use_with xcomposite XCOMPOSITE) - $(cmake-utils_use_with xcomposite XFIXES) - $(cmake-utils_use_with xcomposite XRENDER) - $(cmake-utils_use_with xrandr XRANDR) - $(cmake-utils_use_with libconfig LIBCONFIG) - $(cmake-utils_use_with pcre PCRE) - $(cmake-utils_use_with xinerama XINERAMA) + -DWITH_XCOMPOSITE="$(usex xcomposite)" + -DWITH_XFIXES="$(usex xcomposite)" + -DWITH_XRENDER="$(usex xcomposite)" + -DWITH_XRANDR="$(usex xrandr)" + -DWITH_LIBCONFIG="$(usex libconfig)" + -DWITH_PCRE="$(usex pcre)" + -DWITH_XINERAMA="$(usex xinerama)" ) - trinity-meta_src_configure + trinity-meta-2_src_configure } pkg_postinst() { -- cgit v1.2.1