diff options
55 files changed, 110 insertions, 90 deletions
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild index c3ed81c6..f3f0eb9f 100644 --- a/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild +++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-14.0.6.ebuild @@ -1,4 +1,5 @@ # Copyright 1999-2017 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,14 +10,13 @@ inherit trinity-base-2 DESCRIPTION="D-BUS TQt bindings" HOMEPAGE="http://trinitydesktop.org/" -LICENSE="GPL-2 LGPL-2" +LICENSE="|| ( GPL-2 GPL-3 )" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="" DEPEND="sys-apps/dbus =dev-tqt/tqtinterface-${PV}" -RDEPEND="$DEPEND" +RDEPEND="${DEPEND}" src_configure() { cmake-utils_src_configure diff --git a/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild b/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild index 4ed0d49c..638fad2a 100755 --- a/dev-libs/dbus-tqt/dbus-tqt-14.0.6.ebuild +++ b/dev-libs/dbus-tqt/dbus-tqt-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 -# $Id$ + EAPI="7" TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="dbus-tqt" @@ -9,14 +10,13 @@ inherit trinity-base-2 DESCRIPTION="D-BUS TQt bindings" HOMEPAGE="http://trinitydesktop.org/" -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64" +LICENSE="|| ( GPL-2 GPL-3 )" +KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="" DEPEND="sys-apps/dbus =dev-tqt/tqtinterface-${PV}" -RDEPEND="$DEPEND" +RDEPEND="${DEPEND}" src_configure() { cmake-utils_src_configure diff --git a/dev-tqt/tqt/tqt-14.0.6.ebuild b/dev-tqt/tqt/tqt-14.0.6.ebuild index 7157c8ff..c74133b5 100644 --- a/dev-tqt/tqt/tqt-14.0.6.ebuild +++ b/dev-tqt/tqt/tqt-14.0.6.ebuild @@ -2,9 +2,9 @@ # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="7" -inherit eutils flag-o-matic toolchain-funcs +inherit eutils toolchain-funcs SRCTYPE="free" DESCRIPTION="Trinity's Qt3 toolkit fork - a comprehensive C++ application development framework." @@ -165,21 +165,21 @@ src_configure() { src_compile() { # Compile TQt with TQmake and TQmoc - emake src-qmake src-moc sub-src || die + emake src-qmake src-moc sub-src # Compile TQt plugins (if any selected) - emake sub-plugins || die + emake sub-plugins # Point to libs for the tools to build fine too export DYLD_LIBRARY_PATH="${S}/lib:${DYLD_LIBRARY_PATH}" export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" # Compile TQDesigner (TQuic is needed by tdelibs), TQAssistant and friends (msg2tqm, qembed..) - emake sub-tools || die + emake sub-tools # Compile examples and tutorials if use examples; then - emake sub-tutorial sub-examples || die + emake sub-tutorial sub-examples fi } diff --git a/dev-tqt/tqt/tqt-9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild index 2dd27b16..ab2fce07 100644 --- a/dev-tqt/tqt/tqt-9999.ebuild +++ b/dev-tqt/tqt/tqt-9999.ebuild @@ -138,7 +138,7 @@ src_configure() { use nis && myconf+=" -nis" || myconf+=" -no-nis" use xrandr && myconf+=" -xrandr" || myconf+=" -no-xrandr" use mng && myconf+=" -qt-imgfmt -system-libmng" || myconf+=" -no-imgfmt-mng" - use cups && myconf+=" -cups" || myconf+=" -no-cups" + use cups && myconf+=" -cups" || myconf+=" -no-cups" use opengl && myconf+=" -enable-module=opengl -no-dlopen-opengl" || myconf+=" -disable-opengl" use xinerama && myconf+=" -xinerama" || myconf+=" -no-xinerama" use ipv6 && myconf+=" -ipv6" || myconf+=" -no-ipv6" @@ -147,12 +147,12 @@ src_configure() { use debug && myconf+=" -debug" || myconf+=" -release -no-g++-exceptions -no-exceptions" - use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" + use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" - use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" - use sqlite && myconf+=" -plugin-sql-sqlite -plugin-sql-sqlite3" || myconf+=" -no-sql-sqlite -no-sql-sqlite3" + use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" + use sqlite && myconf+=" -plugin-sql-sqlite -plugin-sql-sqlite3" || myconf+=" -no-sql-sqlite -no-sql-sqlite3" - use tablet && myconf+=" -tablet" || myconf+=" -no-tablet" + use tablet && myconf+=" -tablet" || myconf+=" -no-tablet" export YACC='byacc -d' tc-export CC CXX diff --git a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild index ccff086f..80bc85f5 100644 --- a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild +++ b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild @@ -1,4 +1,5 @@ # Copyright 1999-2016 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +11,7 @@ inherit trinity-base-2 DESCRIPTION="Interface and abstraction library for TQt and Trinity" HOMEPAGE="http://trinitydesktop.org/" -LICENSE="GPL-2" +LICENSE="|| ( GPL-2 GPL-3 )" KEYWORDS="~amd64 ~x86" SLOT="0" @@ -25,8 +26,8 @@ pkg_setup() { src_configure() { mycmakeargs=( -DUSE_QT3=ON - -DQT_PREFIX_DIR="$QTDIR" - ) + -DQT_PREFIX_DIR="${QTDIR}" + ) cmake-utils_src_configure } diff --git a/dev-tqt/tqtinterface/tqtinterface-9999.ebuild b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild index bb28749f..404852ec 100644 --- a/dev-tqt/tqtinterface/tqtinterface-9999.ebuild +++ b/dev-tqt/tqtinterface/tqtinterface-9999.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2016 Gentoo Foundation +# Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 EAPI="7" TRINITY_MODULE_TYPE="dependencies" -TRINITY_MODULE_NAME="${PN}" +TRINITY_MODULE_NAME="tqtinterface" inherit trinity-base-2 @@ -23,7 +24,7 @@ pkg_setup() { src_configure() { mycmakeargs=( -DQT_PREFIX_DIR="${TQTDIR}" - ) + ) cmake-utils_src_configure } diff --git a/media-libs/libart_lgpl/libart_lgpl-14.0.6.ebuild b/media-libs/libart_lgpl/libart_lgpl-14.0.6.ebuild index 06321740..5b15ea15 100644 --- a/media-libs/libart_lgpl/libart_lgpl-14.0.6.ebuild +++ b/media-libs/libart_lgpl/libart_lgpl-14.0.6.ebuild @@ -1,5 +1,6 @@ # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 + EAPI="7" TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="libart-lgpl" diff --git a/trinity-base/arts/arts-14.0.6.ebuild b/trinity-base/arts/arts-14.0.6.ebuild index 5b610638..f97d6765 100755 --- a/trinity-base/arts/arts-14.0.6.ebuild +++ b/trinity-base/arts/arts-14.0.6.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="7" +EAPI="7" TRINITY_MODULE_TYPE="dependencies" TRINITY_MODULE_NAME="arts" @@ -16,6 +15,7 @@ HOMEPAGE="http://trinitydesktop.org/" LICENSE="|| ( GPL-2 GPL-3 )" KEYWORDS="~amd64 ~x86" + IUSE="alsa -artswrappersuid jack mp3 vorbis" SLOT="${TRINITY_VER}" diff --git a/trinity-base/drkonqi/drkonqi-14.0.6.ebuild b/trinity-base/drkonqi/drkonqi-14.0.6.ebuild index 94c09eca..39d06a9e 100644 --- a/trinity-base/drkonqi/drkonqi-14.0.6.ebuild +++ b/trinity-base/drkonqi/drkonqi-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="tdebase" @@ -19,4 +20,4 @@ src_configure() { ) trinity-meta-2_src_configure -}
\ No newline at end of file +} diff --git a/trinity-base/kappfinder/kappfinder-14.0.6.ebuild b/trinity-base/kappfinder/kappfinder-14.0.6.ebuild index 19f6cbc1..388c6985 100644 --- a/trinity-base/kappfinder/kappfinder-14.0.6.ebuild +++ b/trinity-base/kappfinder/kappfinder-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/kate/kate-14.0.6.ebuild b/trinity-base/kate/kate-14.0.6.ebuild index a0c59a64..b16c9c09 100644 --- a/trinity-base/kate/kate-14.0.6.ebuild +++ b/trinity-base/kate/kate-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/kcheckpass/kcheckpass-14.0.6.ebuild b/trinity-base/kcheckpass/kcheckpass-14.0.6.ebuild index c99c9162..16954cdb 100644 --- a/trinity-base/kcheckpass/kcheckpass-14.0.6.ebuild +++ b/trinity-base/kcheckpass/kcheckpass-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="tdebase" @@ -8,6 +9,7 @@ inherit trinity-meta-2 DESCRIPTION="A simple password checker, used by any software in need of user authentication." IUSE="pam" + KEYWORDS="~amd64 ~x86" RDEPEND="pam? ( trinity-base/tdebase-pam )" diff --git a/trinity-base/kcminit/kcminit-14.0.6.ebuild b/trinity-base/kcminit/kcminit-14.0.6.ebuild index 4cde9375..d598fe3f 100644 --- a/trinity-base/kcminit/kcminit-14.0.6.ebuild +++ b/trinity-base/kcminit/kcminit-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/kcontrol/kcontrol-14.0.6.ebuild b/trinity-base/kcontrol/kcontrol-14.0.6.ebuild index 853d6919..eec5d7c5 100644 --- a/trinity-base/kcontrol/kcontrol-14.0.6.ebuild +++ b/trinity-base/kcontrol/kcontrol-14.0.6.ebuild @@ -1,14 +1,15 @@ # 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="tdebase" inherit trinity-meta-2 DESCRIPTION="The Trinity Control Center" - KEYWORDS="~amd64 ~x86" + IUSE="samba logitech-mouse ieee1394 +svg +hwlib +xrandr " DEPEND="x11-libs/libX11 diff --git a/trinity-base/kdcop/kdcop-14.0.6.ebuild b/trinity-base/kdcop/kdcop-14.0.6.ebuild index 301a72f1..8ab8dd82 100644 --- a/trinity-base/kdcop/kdcop-14.0.6.ebuild +++ b/trinity-base/kdcop/kdcop-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/kdesktop/kdesktop-14.0.6.ebuild b/trinity-base/kdesktop/kdesktop-14.0.6.ebuild index 72fd5b14..f6d7d468 100644 --- a/trinity-base/kdesktop/kdesktop-14.0.6.ebuild +++ b/trinity-base/kdesktop/kdesktop-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,7 +9,9 @@ inherit trinity-meta-2 DESCRIPTION="The part of TDE UI that handles icons, desktop, screensaver etc" IUSE="pam xscreensaver" + KEYWORDS="~amd64 ~x86" + COMMON_DEPEND="x11-libs/libXrender x11-libs/libXcursor =dev-libs/dbus-1-tqt-${PV} diff --git a/trinity-base/kdialog/kdialog-14.0.6.ebuild b/trinity-base/kdialog/kdialog-14.0.6.ebuild index 0cadadf3..cbe78f11 100644 --- a/trinity-base/kdialog/kdialog-14.0.6.ebuild +++ b/trinity-base/kdialog/kdialog-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/kfind/kfind-14.0.6.ebuild b/trinity-base/kfind/kfind-14.0.6.ebuild index 2ac3298a..61225b6e 100644 --- a/trinity-base/kfind/kfind-14.0.6.ebuild +++ b/trinity-base/kfind/kfind-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild b/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild index 08df7a50..c8938919 100644 --- a/trinity-base/khelpcenter/khelpcenter-14.0.6.ebuild +++ b/trinity-base/khelpcenter/khelpcenter-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="tdebase" @@ -13,4 +14,3 @@ KEYWORDS="~amd64 ~x86" RDEPEND=" =trinity-base/tdebase-tdeioslaves-${PV} || ( www-misc/htdig www-misc/hldig )" - diff --git a/trinity-base/khotkeys/khotkeys-14.0.6.ebuild b/trinity-base/khotkeys/khotkeys-14.0.6.ebuild index 59aeda3c..d0183d29 100644 --- a/trinity-base/khotkeys/khotkeys-14.0.6.ebuild +++ b/trinity-base/khotkeys/khotkeys-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 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -11,8 +12,8 @@ need-arts optional DESCRIPTION="Trinity hotkey daemon" KEYWORDS="~amd64 ~x86" -DEPEND+=" x11-libs/libXtst" -RDEPEND+=" x11-libs/libXtst" +DEPEND="x11-libs/libXtst" +RDEPEND="${DEPEND}" src_configure() { mycmakeargs=( diff --git a/trinity-base/khotkeys/khotkeys-9999.ebuild b/trinity-base/khotkeys/khotkeys-9999.ebuild index e524362a..896a4c9d 100644 --- a/trinity-base/khotkeys/khotkeys-9999.ebuild +++ b/trinity-base/khotkeys/khotkeys-9999.ebuild @@ -11,9 +11,8 @@ need-arts optional DESCRIPTION="Trinity hotkey daemon" -MY_DEPEND="x11-libs/libXtst" -DEPEND+=" ${MY_DEPEND}" -RDEPEND+=" ${MY_DEPEND}" +DEPEND="x11-libs/libXtst" +RDEPEND="${DEPEND}" src_configure() { mycmakeargs=( diff --git a/trinity-base/kicker/kicker-14.0.6.ebuild b/trinity-base/kicker/kicker-14.0.6.ebuild index fa1c7522..4ed93945 100644 --- a/trinity-base/kicker/kicker-14.0.6.ebuild +++ b/trinity-base/kicker/kicker-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 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/klipper/klipper-14.0.6.ebuild b/trinity-base/klipper/klipper-14.0.6.ebuild index c389612f..9283290d 100644 --- a/trinity-base/klipper/klipper-14.0.6.ebuild +++ b/trinity-base/klipper/klipper-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="tdebase" @@ -8,6 +9,7 @@ inherit trinity-meta-2 DESCRIPTION="kicker applet for Trinity and X clipboard management" KEYWORDS="~amd64 ~x86" + DEPEND="x11-libs/libXfixes" RDEPEND="${DEPEND}" diff --git a/trinity-base/kmenuedit/kmenuedit-14.0.6.ebuild b/trinity-base/kmenuedit/kmenuedit-14.0.6.ebuild index d29e6438..e3f6d88b 100644 --- a/trinity-base/kmenuedit/kmenuedit-14.0.6.ebuild +++ b/trinity-base/kmenuedit/kmenuedit-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/knetattach/knetattach-14.0.6.ebuild b/trinity-base/knetattach/knetattach-14.0.6.ebuild index 0be1fb02..afe2cb1d 100644 --- a/trinity-base/knetattach/knetattach-14.0.6.ebuild +++ b/trinity-base/knetattach/knetattach-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/konqueror/konqueror-14.0.6.ebuild b/trinity-base/konqueror/konqueror-14.0.6.ebuild index 0d94d35d..e0fcaed1 100644 --- a/trinity-base/konqueror/konqueror-14.0.6.ebuild +++ b/trinity-base/konqueror/konqueror-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 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -8,16 +9,17 @@ inherit trinity-meta-2 DESCRIPTION="Trinity: Web browser, file manager, ..." KEYWORDS="~amd64 ~x86" + IUSE="java" # FIXME: support branding USE flag DEPEND=" - >=trinity-base/libkonq-${PV}" + =trinity-base/libkonq-${PV}" RDEPEND="${DEPEND} - >=trinity-base/kcontrol-${PV} - >=trinity-base/tdebase-tdeioslaves-${PV} - >=trinity-base/kfind-${PV} - java? ( >=virtual/jre-1.4 )" + =trinity-base/kcontrol-${PV} + =trinity-base/tdebase-tdeioslaves-${PV} + =trinity-base/kfind-${PV} + java? ( virtual/jre )" TSM_EXTRACT_ALSO="kdesktop" diff --git a/trinity-base/konsole/konsole-14.0.6.ebuild b/trinity-base/konsole/konsole-14.0.6.ebuild index 1dfc8209..1eb7ce0e 100644 --- a/trinity-base/konsole/konsole-14.0.6.ebuild +++ b/trinity-base/konsole/konsole-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -10,16 +10,20 @@ inherit trinity-meta-2 DESCRIPTION="X terminal for use with Trinity." KEYWORDS="~amd64 ~x86" +IUSE="sudo" + DEPEND="x11-libs/libX11 x11-libs/libXrender" RDEPEND="${DEPEND} + sudo? ( app-admin/sudo ) x11-apps/bdftopcf =trinity-base/kcontrol-${PV}" src_configure() { mycmakeargs=( -DWITH_XRENDER=ON + -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="$(usex sudo)" ) trinity-meta-2_src_configure diff --git a/trinity-base/kpager/kpager-14.0.6.ebuild b/trinity-base/kpager/kpager-14.0.6.ebuild index d8a4814e..51ca2dbe 100644 --- a/trinity-base/kpager/kpager-14.0.6.ebuild +++ b/trinity-base/kpager/kpager-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,4 +9,3 @@ inherit trinity-meta-2 DESCRIPTION="Trinity Virtual Desktop Overview" KEYWORDS="~amd64 ~x86" - diff --git a/trinity-base/kpersonalizer/kpersonalizer-14.0.6.ebuild b/trinity-base/kpersonalizer/kpersonalizer-14.0.6.ebuild index b01aa05f..bcadce97 100644 --- a/trinity-base/kpersonalizer/kpersonalizer-14.0.6.ebuild +++ b/trinity-base/kpersonalizer/kpersonalizer-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/kreadconfig/kreadconfig-14.0.6.ebuild b/trinity-base/kreadconfig/kreadconfig-14.0.6.ebuild index d7cba6f1..13abd1de 100644 --- a/trinity-base/kreadconfig/kreadconfig-14.0.6.ebuild +++ b/trinity-base/kreadconfig/kreadconfig-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,4 +9,3 @@ inherit trinity-meta-2 DESCRIPTION="A Trinity tool to read KConfig entries - for use in shell scripts" KEYWORDS="~amd64 ~x86" - diff --git a/trinity-base/krootbacking/krootbacking-14.0.6.ebuild b/trinity-base/krootbacking/krootbacking-14.0.6.ebuild index 3550c50d..1eb15036 100644 --- a/trinity-base/krootbacking/krootbacking-14.0.6.ebuild +++ b/trinity-base/krootbacking/krootbacking-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/ksmserver/ksmserver-14.0.6.ebuild b/trinity-base/ksmserver/ksmserver-14.0.6.ebuild index dcdfd057..91427875 100644 --- a/trinity-base/ksmserver/ksmserver-14.0.6.ebuild +++ b/trinity-base/ksmserver/ksmserver-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,10 +9,9 @@ inherit trinity-meta-2 DESCRIPTION="The reliable Trinity session manager that talks the standard X11R6" KEYWORDS="~amd64 ~x86" -IUSE="upower" +IUSE="upower +hwlib" DEPEND=" - =dev-libs/dbus-tqt-${PV} upower? ( =dev-libs/dbus-1-tqt-${PV} ) " RDEPEND="${DEPEND} @@ -21,6 +20,7 @@ RDEPEND="${DEPEND} src_configure() { mycmakeargs=( -DWITH_UPOWER="$(usex upower)" + -DWITH_TDEHWLIB="$(usex hwlib)" ) trinity-meta-2_src_configure diff --git a/trinity-base/ksplashml/ksplashml-14.0.6.ebuild b/trinity-base/ksplashml/ksplashml-14.0.6.ebuild index 529b35db..17f59bdd 100644 --- a/trinity-base/ksplashml/ksplashml-14.0.6.ebuild +++ b/trinity-base/ksplashml/ksplashml-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,11 +9,11 @@ inherit trinity-meta-2 DESCRIPTION="Trinity splashscreen framework (of Trinity itself, not of individual apps)" KEYWORDS="~amd64 ~x86" + IUSE="xinerama" -DEPEND="x11-libs/libXcursor - xinerama? ( x11-base/xorg-proto )" -RDEPEND="$DEPEND" +DEPEND="xinerama? ( x11-base/xorg-proto )" +RDEPEND="${DEPEND}" src_configure() { mycmakeargs=( diff --git a/trinity-base/kstart/kstart-14.0.6.ebuild b/trinity-base/kstart/kstart-14.0.6.ebuild index 953b1090..3a5cea46 100644 --- a/trinity-base/kstart/kstart-14.0.6.ebuild +++ b/trinity-base/kstart/kstart-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/ksysguard/ksysguard-14.0.6.ebuild b/trinity-base/ksysguard/ksysguard-14.0.6.ebuild index 943cf02f..539c68bc 100644 --- a/trinity-base/ksysguard/ksysguard-14.0.6.ebuild +++ b/trinity-base/ksysguard/ksysguard-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="tdebase" @@ -9,15 +10,15 @@ inherit trinity-meta-2 DESCRIPTION="A network enabled task manager/system monitor" KEYWORDS="~amd64 ~x86" -IUSE="dell-laptop lm_sensors" +IUSE="dell-laptop lm-sensors" -DEPEND="lm_sensors? ( sys-apps/lm-sensors )" +DEPEND="lm-sensors? ( sys-apps/lm-sensors )" RDEPEND="${DEPEND}" src_configure() { mycmakeargs=( -DWITH_I8K="$(usex dell-laptop)" - -DWITH_SENSORS="$(usex lm_sensors)" + -DWITH_SENSORS="$(usex lm-sensors)" ) trinity-meta-2_src_configure diff --git a/trinity-base/ksystraycmd/ksystraycmd-14.0.6.ebuild b/trinity-base/ksystraycmd/ksystraycmd-14.0.6.ebuild index e02a5e39..ca6195b1 100644 --- a/trinity-base/ksystraycmd/ksystraycmd-14.0.6.ebuild +++ b/trinity-base/ksystraycmd/ksystraycmd-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,4 +9,3 @@ inherit trinity-meta-2 DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray." KEYWORDS="~amd64 ~x86" - diff --git a/trinity-base/ktip/ktip-14.0.6.ebuild b/trinity-base/ktip/ktip-14.0.6.ebuild index 0a878c5d..588214fb 100644 --- a/trinity-base/ktip/ktip-14.0.6.ebuild +++ b/trinity-base/ktip/ktip-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,4 +9,3 @@ inherit trinity-meta-2 DESCRIPTION="Trinity tip-of-the-day displayer" KEYWORDS="~amd64 ~x86" - diff --git a/trinity-base/kxkb/kxkb-14.0.6.ebuild b/trinity-base/kxkb/kxkb-14.0.6.ebuild index cb58df05..f239dceb 100644 --- a/trinity-base/kxkb/kxkb-14.0.6.ebuild +++ b/trinity-base/kxkb/kxkb-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/libkonq/libkonq-14.0.6.ebuild b/trinity-base/libkonq/libkonq-14.0.6.ebuild index 40f7becf..e3e03be0 100644 --- a/trinity-base/libkonq/libkonq-14.0.6.ebuild +++ b/trinity-base/libkonq/libkonq-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 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/nsplugins/nsplugins-14.0.6.ebuild b/trinity-base/nsplugins/nsplugins-14.0.6.ebuild index 718ada95..0f9a1498 100644 --- a/trinity-base/nsplugins/nsplugins-14.0.6.ebuild +++ b/trinity-base/nsplugins/nsplugins-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,6 +9,7 @@ inherit trinity-meta-2 DESCRIPTION="Netscape plugins support for Konqueror." KEYWORDS="~amd64 ~x86" + DEPEND="x11-libs/libXt dev-libs/glib" RDEPEND="${DEPEND}" diff --git a/trinity-base/tdebase-data/tdebase-data-14.0.6.ebuild b/trinity-base/tdebase-data/tdebase-data-14.0.6.ebuild index fdbf0e5b..6430f9f4 100644 --- a/trinity-base/tdebase-data/tdebase-data-14.0.6.ebuild +++ b/trinity-base/tdebase-data/tdebase-data-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild b/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild index 1d6d1b3d..20e6ff2a 100644 --- a/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild +++ b/trinity-base/tdebase-meta/tdebase-meta-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2016 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" inherit trinity-functions-2 diff --git a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild b/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild index ae582ded..9519541e 100644 --- a/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild +++ b/trinity-base/tdebase-starttde/tdebase-starttde-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,6 +9,7 @@ inherit trinity-meta-2 DESCRIPTION="Starttde script, which starts a complete Trinity session, and associated scripts" KEYWORDS="~amd64 ~x86" + RDEPEND="x11-apps/xmessage x11-apps/xsetroot x11-apps/xset diff --git a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild index 6169d2d3..78b1c937 100644 --- a/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-14.0.6.ebuild +++ b/trinity-base/tdebase-tdeioslaves/tdebase-tdeioslaves-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="tdebase" diff --git a/trinity-base/tdedebugdialog/tdedebugdialog-14.0.6.ebuild b/trinity-base/tdedebugdialog/tdedebugdialog-14.0.6.ebuild index 6a53d889..d39f2c3a 100644 --- a/trinity-base/tdedebugdialog/tdedebugdialog-14.0.6.ebuild +++ b/trinity-base/tdedebugdialog/tdedebugdialog-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2016 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/tdeeject/tdeeject-14.0.6.ebuild b/trinity-base/tdeeject/tdeeject-14.0.6.ebuild index 31bebc7a..6178a316 100644 --- a/trinity-base/tdeeject/tdeeject-14.0.6.ebuild +++ b/trinity-base/tdeeject/tdeeject-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/tdeinit/tdeinit-14.0.6.ebuild b/trinity-base/tdeinit/tdeinit-14.0.6.ebuild index 090688db..47a562f7 100755 --- a/trinity-base/tdeinit/tdeinit-14.0.6.ebuild +++ b/trinity-base/tdeinit/tdeinit-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild b/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild index b6252330..b4ac4b07 100644 --- a/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild +++ b/trinity-base/tdepasswd/tdepasswd-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/tdeprint/tdeprint-14.0.6.ebuild b/trinity-base/tdeprint/tdeprint-14.0.6.ebuild index 743b8f6c..1a1df454 100644 --- a/trinity-base/tdeprint/tdeprint-14.0.6.ebuild +++ b/trinity-base/tdeprint/tdeprint-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 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" diff --git a/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild b/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild index 908e096a..24ab71ca 100644 --- a/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild +++ b/trinity-base/tdescreensaver/tdescreensaver-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -17,7 +17,6 @@ DEPEND="x11-libs/libXt RDEPEND="${DEPEND}" src_configure () { - mycmakeargs=( -DWITH_OPENGL="$(usex opengl)" ) diff --git a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild index 45753aee..296aa491 100644 --- a/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild +++ b/trinity-base/tdescreensaver/tdescreensaver-9999.ebuild @@ -17,7 +17,6 @@ DEPEND="x11-libs/libXt RDEPEND="${DEPEND}" src_configure () { - mycmakeargs=( -DWITH_OPENGL="$(usex opengl)" ) diff --git a/trinity-base/tdm/tdm-14.0.6.ebuild b/trinity-base/tdm/tdm-14.0.6.ebuild index 495c2981..0bdf7455 100644 --- a/trinity-base/tdm/tdm-14.0.6.ebuild +++ b/trinity-base/tdm/tdm-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="tdebase" diff --git a/trinity-base/tdm/tdm-9999.ebuild b/trinity-base/tdm/tdm-9999.ebuild index 92034de1..737a27c6 100644 --- a/trinity-base/tdm/tdm-9999.ebuild +++ b/trinity-base/tdm/tdm-9999.ebuild @@ -16,6 +16,7 @@ DEPEND="pam? ( trinity-base/tdebase-pam ) xcomposite? ( x11-libs/libXcomposite ) svg? ( =media-libs/libart_lgpl-${PV} ) =trinity-base/tdelibs-${PV}[xrandr?] + sys-apps/dbus x11-libs/libXtst =trinity-base/kcontrol-${PV}" diff --git a/trinity-base/tqt3integration/tqt3integration-14.0.6.ebuild b/trinity-base/tqt3integration/tqt3integration-14.0.6.ebuild index cd1ceb77..37804cda 100644 --- a/trinity-base/tqt3integration/tqt3integration-14.0.6.ebuild +++ b/trinity-base/tqt3integration/tqt3integration-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -9,4 +9,3 @@ inherit trinity-meta-2 DESCRIPTION="Makes TQt-only apps use several TDE dialogs." KEYWORDS="~amd64 ~x86" - diff --git a/trinity-base/twin/twin-14.0.6.ebuild b/trinity-base/twin/twin-14.0.6.ebuild index e12174ce..99a5e4bc 100644 --- a/trinity-base/twin/twin-14.0.6.ebuild +++ b/trinity-base/twin/twin-14.0.6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2016 Gentoo Foundation # Copyright 2020 The Trinity Desktop Project # Distributed under the terms of the GNU General Public License v2 -# $Id$ + EAPI="7" TRINITY_MODULE_NAME="tdebase" @@ -27,6 +27,7 @@ src_configure() { -DWITH_XCOMPOSITE="$(usex xcomposite)" -DWITH_XFIXES="$(usex xcomposite)" -DWITH_XRENDER="$(usex xcomposite)" + -DWITH_OPENGL="$(usex opengl)" -DWITH_XRANDR="$(usex xrandr)" -DWITH_LIBCONFIG="$(usex libconfig)" -DWITH_PCRE="$(usex pcre)" |