diff options
Diffstat (limited to 'dev-tqt')
| -rw-r--r-- | dev-tqt/tqt/tqt-14.0.6.ebuild | 12 | ||||
| -rw-r--r-- | dev-tqt/tqt/tqt-9999.ebuild | 10 | ||||
| -rw-r--r-- | dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild | 7 | ||||
| -rw-r--r-- | dev-tqt/tqtinterface/tqtinterface-9999.ebuild | 5 |
4 files changed, 18 insertions, 16 deletions
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 } |