stardict.eclass: cleanups

Signed-off-by: David Seifert <soap@gentoo.org>

1 files changed, 25 insertions, 13 deletions

diff --git a/eclass/stardict.eclass b/eclass/stardict.eclass
index e4900ba5519d..b7cffde544eb 100644
--- a/eclass/stardict.eclass
+++ b/eclass/stardict.eclass
@@ -14,42 +14,51 @@
 #      * FROM_LANG     -  From this language
 #      * TO_LANG       -  To this language
 #      * DICT_PREFIX   -  SRC_URI prefix, like "dictd_www.mova.org_"
-#	   * DICT_SUFFIX   -  SRC_URI after the prefix.
+#      * DICT_SUFFIX   -  SRC_URI after the prefix.
 
 case ${EAPI} in
 	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-EXPORT_FUNCTIONS src_compile src_install
-
 if [[ -z ${_STARDICT_ECLASS} ]] ; then
 _STARDICT_ECLASS=1
 
+inherit edo
+
 RESTRICT="strip"
 
-[ -z "${DICT_SUFFIX}" ] && DICT_SUFFIX=${PN#stardict-[[:lower:]]*-}
-[ -z "${DICT_P}" ] && DICT_P=stardict-${DICT_PREFIX}${DICT_SUFFIX}-${PV}
+# @ECLASS_VARIABLE: DICT_SUFFIX
+# @PRE_INHERIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Suffix used for dictionaries.
+: ${DICT_SUFFIX:=${PN#stardict-[[:lower:]]*-}}
+
+# @ECLASS_VARIABLE: DICT_P
+# @PRE_INHERIT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# The filestem used for downloading dictionaries from SourceForge.
+: ${DICT_P:=stardict-${DICT_PREFIX}${DICT_SUFFIX}-${PV}}
 
-if [ -n "${FROM_LANG}" -a -n "${TO_LANG}" ]; then
+: ${DESCRIPTION:="Another Stardict Dictionary"}
+if [[ -n ${FROM_LANG} && -n ${TO_LANG} ]]; then
 	DESCRIPTION="Stardict Dictionary ${FROM_LANG} to ${TO_LANG}"
-elif [ -z "${DESCRIPTION}" ]; then
-	DESCRIPTION="Another Stardict Dictionary"
 fi
 
 HOMEPAGE="http://stardict.sourceforge.net/"
 SRC_URI="mirror://sourceforge/stardict/${DICT_P}.tar.bz2"
-S="${WORKDIR}"/${DICT_P}
+S="${WORKDIR}/${DICT_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+zlib"
 
-DEPEND="
+BDEPEND="
 	|| (
 		>=app-text/stardict-2.4.2
 		app-text/sdcv
-		app-text/goldendict
 	)
 	zlib? (
 		app-arch/gzip
@@ -57,12 +66,13 @@ DEPEND="
 	)"
 
 stardict_src_compile() {
+	local file
 	if use zlib; then
 		for file in *.idx; do
-			[[ -f $file ]] && gzip ${file}
+			[[ -f ${file} ]] && edo gzip "${file}"
 		done
 		for file in *.dict; do
-			[[ -f $file ]] && dictzip ${file}
+			[[ -f ${file} ]] && edo dictzip "${file}"
 		done
 	fi
 }
@@ -75,3 +85,5 @@ stardict_src_install() {
 }
 
 fi
+
+EXPORT_FUNCTIONS src_compile src_install