Tweaks and clean-up for stable ebuilds and supporting eclasses

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

2 files changed, 4 insertions, 51 deletions

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 "$@"