Tweaks and clean-up for stable ebuilds and supporting eclasses

Signed-off-by: E. Liddell <ejlddll@warpmail.net>

8 files changed, 14 insertions, 77 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 c12c34da..20de8405 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
@@ -10,12 +10,12 @@ inherit trinity-base-2
 DESCRIPTION="D-BUS TQt bindings"
 HOMEPAGE="http://trinitydesktop.org/"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS=
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE=""
 
 DEPEND="sys-apps/dbus
-	dev-tqt/tqtinterface"
+	=dev-tqt/tqtinterface-${PV}"
 RDEPEND="$DEPEND"
 
 src_configure() {
diff --git a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
index 1d7eb0fb..cb3944aa 100644
--- a/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
+++ b/dev-libs/dbus-1-tqt/dbus-1-tqt-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
-EAPI="7"
+EAPI="5"
 TRINITY_MODULE_TYPE="dependencies"
 TRINITY_MODULE_NAME="dbus-1-tqt"
 
diff --git a/dev-tqt/tqt/tqt-14.0.6.ebuild b/dev-tqt/tqt/tqt-14.0.6.ebuild
index f928b253..421fc557 100644
--- a/dev-tqt/tqt/tqt-14.0.6.ebuild
+++ b/dev-tqt/tqt/tqt-14.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.mirrorservice.org/sites/trinitydesktop.org/trinity/releases/
 LICENSE="|| ( GPL-2 GPL-3 )"
 
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="cups debug doc examples firebird ipv6 mysql nas nis opengl postgres sqlite xinerama"
 # no odbc, immtqt or immtqt-bc support anymore.
 # TODO: optional support for xrender and xrandr
@@ -69,7 +69,7 @@ pkg_setup() {
 		*-linux-*|*-linux)
 			PLATNAME="linux" ;;
 		*)
-			die "Unknown CHOST, no platform choosed."
+			die "Unknown CHOST, no platform chosen."
 	esac
 
 	if [[ "$CHOST" == *64* && "$PLATCXX" == "g++" ]]; then
diff --git a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
index 00441a0a..c348ad01 100644
--- a/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
+++ b/dev-tqt/tqtinterface/tqtinterface-14.0.6.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 EAPI="7"
 TRINITY_MODULE_TYPE="dependencies"
-TRINITY_MODULE_NAME="${PN}"
+TRINITY_MODULE_NAME="tqtinterface"
 
 inherit trinity-base-2
 
@@ -11,13 +11,10 @@ DESCRIPTION="Interface and abstraction library for TQt and Trinity"
 HOMEPAGE="http://trinitydesktop.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-#Note:  for the sake of easier maintenance, building against QT3
-#	(no T) is no longer a thing.
-DEPEND="~dev-tqt/tqt-${PV}
-	!!x11-libs/tqtinterface"
+DEPEND="~dev-tqt/tqt-${PV}"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
diff --git a/eclass/trinity-base-2.eclass b/eclass/trinity-base-2.eclass
index 3dda5f04..1d8141f6 100644
--- a/eclass/trinity-base-2.eclass
+++ b/eclass/trinity-base-2.eclass
@@ -7,7 +7,6 @@
 # Purpose: support ebuilds for the trinity project (a kde3 fork).
 #
 
-RESTRICT=network-sandbox
 inherit trinity-functions-2 cmake-utils
 
 addwrite "/usr/tqt3/etc/settings"
@@ -294,7 +293,6 @@ trinity-base-2_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 	cmake-utils_src_install
 
-#	trinity-base_fix_desktop_files
 	if [[ -z "$TRINITY_BASE_NO_INSTALL_DOC" ||
 			"$TRINITY_BASE_NO_INSTALL_DOC" == "no" ]]; then
 		trinity-base-2_create_tmp_docfiles
@@ -352,49 +350,4 @@ trinity-base-2_install_docfiles() {
 	popd >/dev/null
 }
 
-# @FUNCTION: trinity-base_fix_desktop_files
-# @DESCRIPTION:  OBSOLETE??????
-# Perform desktop files modifications according to current version. You can pass
-# either desktop files or direcories to the parametrs. In case you'd pass a
-# directory the function will recursively search for all desktop files and
-# modify them. If no argument specified the function assume to work on the ${D};
-#trinity-base_fix_desktop_files() {
-	
-#	# Test if we have to perform any file fixing for current version
-#	case "3.5" in
-#		*${TRINITY_VER}*);;
-#		*) return 0 ;;
-#	esac
-#	
-#	local file_list dir_list f
-#	
-#	if [ "$#" != 0 ]; then
-#		# Get directories and files from arguments
-#		for f in $@; do
-#			if [ -f "$f" ]; then 
-#				file_list+=" $f"
-#			elif [ -d "$f" ]; then
-#				dir_list+=" $f"
-#			else
-#				eerror "${FUNCNAME}: bad argument type: $(stat -c %F "$f")"
-#			fi
-#		done
-#	else
-#		dir_list="${D}"
-#	fi
-#
-#	# Recursivly search for desktop files in directories
-#	for f in $dir_list; do
-#		file_list+="$(find ${f} -type f -name '*.desktop')"
-#	done
-#	
-#	# Performe the updates
-#	case "${TRINITY_VER}" in
-#	3.5)
-#		for f in $file_list; do
-#			sed -i '/^OnlyShowIn=/s/KDE/TDE/g' "$f"
-#		done;;
-#	esac
-#}
-
 EXPORT_FUNCTIONS src_configure src_compile src_install src_prepare
diff --git a/eclass/trinity-functions-2.eclass b/eclass/trinity-functions-2.eclass
index ae904157..b41c3f77 100644
--- a/eclass/trinity-functions-2.eclass
+++ b/eclass/trinity-functions-2.eclass
@@ -21,7 +21,7 @@ set-trinityver() {
 
 	# set install location:
 	# - 3rd party apps go into /usr, and have SLOT="0".
-	# - kde-base category ebuilds go into /usr/trinity/$ETRINITY_VER,
+	# - trinity-base category ebuilds go into /usr/trinity/$ETRINITY_VER,
 	# and have SLOT="$MAJORVER.$MINORVER".
 	# - This function exports $PREFIX (location to install to) and $TDEDIR
 	# (location of kdelibs to link against) for all ebuilds.
@@ -142,10 +142,10 @@ TRINITY_NEED_ARTS="no"
 # @FUNCTION: need-arts
 # @USAGE: need-arts <yes|optional>
 # @DESCRIPTION:
-# This function adds DEPENDs for aRTs support. Possible arguments are 'yes' and 'optinal'
-# 'yes' means arts is required, optional' results in USE flag arts.
+# This function adds DEPENDs for aRTs support. Possible arguments are 'yes' and 'optional'
+# 'yes' means arts is required, 'optional' results in USE flag arts.
 # NOTE: this function modifies IUSE DEPEND and RDEPEND variables, so if you call it before setting
-#       those variables don't forget to include the priviously setted value into them.
+#       those variables don't forget to include the previously set value when you set them again.
 need-arts() {
 	debug-print-function $FUNCNAME "$@"
 
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index a8f93fd9..5c6b5455 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -1,15 +1,5 @@
-# unmask this if we will support powerpc
-trinity-base/kmilo powerbook-laptop
-
-dev-qt/tqtinterface qt4
-trinity-base/kdelibs avahi
+#compiles but does nothing
 trinity-base/tdelibs avahi
 
-#doesn't really work
->dev-qt/tqtinterface-14.0.0 qt3
-
-# FIXME: FTBFS
-=trinity-base/ksmserver-9999 hal
-
 #broken but being fixed as of Jan. 2019
 trinity-base/tdelibs cryptsetup
\ No newline at end of file
diff --git a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
index 9f919b21..ee073180 100644
--- a/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
+++ b/trinity-base/tdelibs/tdelibs-14.0.6.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Trinity libraries needed by all TDE programs."
 HOMEPAGE="http://www.trinitydesktop.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="${TRINITY_VER}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE+=" alsa avahi cups consolekit fam jpeg2k lua lzma networkmanager openexr
 	spell sudo tiff utempter upower udisks old_udisks xcomposite +xrandr"
 
@@ -87,9 +87,6 @@ src_configure() {
 		-DWITH_SUDO_TDESU_BACKEND="$(usex sudo)"
 	)
 
-#		-DWITH_XCURSOR=ON
-#		-DKDE4_DEFAULT_HOME=.kde4
-
 	trinity-base-2_src_configure
 }