Trinity-*-2.eclass: Fix handbook and arts support.

- Handle 'en' as main docs too.
- Filter out noise from docs.
- Sync with eclass changes in working branch.
- Live ebuilds: Fix arts in tdelibs ebuild.
- Sync typo fix about sudo support.

Signed-off-by: Chris <[email protected]>

1 files changed, 10 insertions, 6 deletions

diff --git a/eclass/trinity-base-2.eclass b/eclass/trinity-base-2.eclass
index d79889f7..5b8451e3 100644
--- a/eclass/trinity-base-2.eclass
+++ b/eclass/trinity-base-2.eclass
@@ -229,8 +229,12 @@ trinity-base-2_src_prepare() {
 			for dir in $(find ${TEG_DOC_DIR} -mindepth 1 -maxdepth 1 -type d ); do
 				lang="$(basename "$dir")"
 				if [[	"$lang" == "${PN}" || \
+						"$lang" == "en" || \
+						"$lang" == "man" || \
+						"$lang" == "doxy" || \
+						"$lang" == "online" || \
 						"$lang" == "${TRINITY_MODULE_NAME}"  ]] ; then
-					echo -n; # do nothing it's main documentation
+					echo -n; # do nothing it's main documentation or not related
 				elif ! has "$lang" ${TRINITY_LANGS}; then
 					eerror "Documentation translated to language $lang seems to present in the package but is not supported by the ebuild"
 				elif ! has $lang ${LINGUAS}; then
@@ -261,12 +265,14 @@ trinity-base-2_src_configure() {
 			eg_cmakeargs=( -DBUILD_TRANSLATIONS=ON "${eg_cmakeargs[@]}" )
 		fi
 		if [[ "${TRINITY_HANDBOOK}" == optional ]]; then
-			eg_cmakeargs=( 
-					-DWITH_DOC="$(usex handbook)"
-					"${eg_cmakeargs[@]}" )
+			eg_cmakeargs=( -DBUILD_DOC="$(usex handbook)" "${eg_cmakeargs[@]}" )
 		fi
 	fi
 
+	if [[ "${TRINITY_NEED_ARTS}" == "optional" ]]; then
+		eg_cmakeargs=( -DWITH_ARTS="$(usex arts)" "${eg_cmakeargs[@]}" )
+	fi
+
 	mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${TDEDIR}"
 		-DCMAKE_INSTALL_RPATH="${EPREFIX}${TDEDIR}"
@@ -274,8 +280,6 @@ trinity-base-2_src_configure() {
 		"${mycmakeargs[@]}"
 	)
 
-#       $([[ "${TRINITY_NEED_ARTS}" == "optional" ]] && (-DWITH_ARTS="$(usex arts)"))
-
 	cmake-utils_src_configure
 }