Corrected lots of localisation issues. Fixes bug 172192.

Package-Manager: portage-2.1.2.4

3 files changed, 88 insertions, 38 deletions

diff --git a/app-text/bibletime/ChangeLog b/app-text/bibletime/ChangeLog
index 77b99bbae943..37a05f24bdc2 100644
--- a/app-text/bibletime/ChangeLog
+++ b/app-text/bibletime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/bibletime
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.40 2007/04/07 13:27:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/ChangeLog,v 1.41 2007/04/26 22:07:28 philantrop Exp $
+
+  26 Apr 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  bibletime-1.6.3.ebuild:
+  Corrected lots of localisation issues. Fixes bug 172192.
 
 *bibletime-1.6.3 (20 Mar 2007)
 
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index de535083324e..923c7c3c7341 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST bibletime-1.5.3.tar.bz2 1172436 RMD160 3effb93a81bf6773deff8b11afb5eca6d0192fcb SHA1 580093c6d7968f668b04a78a477f21cb01e0a252 SHA256 95a868a18b85ffb9f52671c3e2cb386ef09a0ca9651a78e929cb88a35b0b6aa5
 DIST bibletime-1.6.3.tar.bz2 1228751 RMD160 e483354320aca303bbe04f46c49d3be4d3fe34bf SHA1 52e462695f3c92c593744f16a5e86858475fac97 SHA256 3b4ed2ccffe77f13510d2b56aaf47d71caab502652ac6cde83bda0fe054282de
 DIST bibletime-1.6.tar.bz2 1228793 RMD160 6a38ffa80d2ee44cc543f17ebe213d786b5b8c5c SHA1 914f74f2635ed175759e7f6bc9bc4d860eb89baf SHA256 ef3e83a27bfafb0a73141c417628b27692161b5dbde2cafdca1af31751d5b886
@@ -8,18 +11,18 @@ EBUILD bibletime-1.5.3.ebuild 2159 RMD160 99952362233d5b0dc5c45c2f71fd32091012f6
 MD5 b42bec9e64815c12c0119190a3d1a75d bibletime-1.5.3.ebuild 2159
 RMD160 99952362233d5b0dc5c45c2f71fd32091012f6ea bibletime-1.5.3.ebuild 2159
 SHA256 a72bc6f90960cd92aaf1945e9d9c85f25d2ca1226f93abeee6c326ebd0961e8d bibletime-1.5.3.ebuild 2159
-EBUILD bibletime-1.6.3.ebuild 2200 RMD160 458968eadbdff067964e909fb3e1d5ace2ebe231 SHA1 2c9c4f2d0defa18e969913cd0e5a4e80fdf57f35 SHA256 bf9c4a6ca34733e6e4d4cd6e0e69e420a876d98aec3ee86c8e5b226feb8b3f7e
-MD5 9ad19f4b7b50cdc3eb89fd4c91c72b9a bibletime-1.6.3.ebuild 2200
-RMD160 458968eadbdff067964e909fb3e1d5ace2ebe231 bibletime-1.6.3.ebuild 2200
-SHA256 bf9c4a6ca34733e6e4d4cd6e0e69e420a876d98aec3ee86c8e5b226feb8b3f7e bibletime-1.6.3.ebuild 2200
+EBUILD bibletime-1.6.3.ebuild 3815 RMD160 e141b00d0086034de0ac8c1c53e6c5b8ed43b1a8 SHA1 0ef22c0befa67c1348400c512a6c9453ed76102a SHA256 df354d4360d261eb4a2359e2a5ffbc5a74689d5d6ea1866627fb239fb5e036a2
+MD5 e0e7665c6442aef64387af80c5553eea bibletime-1.6.3.ebuild 3815
+RMD160 e141b00d0086034de0ac8c1c53e6c5b8ed43b1a8 bibletime-1.6.3.ebuild 3815
+SHA256 df354d4360d261eb4a2359e2a5ffbc5a74689d5d6ea1866627fb239fb5e036a2 bibletime-1.6.3.ebuild 3815
 EBUILD bibletime-1.6.ebuild 2198 RMD160 ebbe741572116cb920e995b224fa4c34828ee096 SHA1 987188ceaef3ed9e4e9a5053df6d47daae60ce28 SHA256 9b1326a7efcd4b34d755a4491fdd2e810728fd1bd7cebf4b9561b516dcca1eed
 MD5 9df1f966ce6e6415b6bf7fb24f086a6e bibletime-1.6.ebuild 2198
 RMD160 ebbe741572116cb920e995b224fa4c34828ee096 bibletime-1.6.ebuild 2198
 SHA256 9b1326a7efcd4b34d755a4491fdd2e810728fd1bd7cebf4b9561b516dcca1eed bibletime-1.6.ebuild 2198
-MISC ChangeLog 5476 RMD160 0d36ff608c41c1d71632c6af67ef093b372c0be2 SHA1 2c1f016077b1a6d3492fd3d6eaafd7823fdd6a30 SHA256 96b10106206dfecce788eaade301a49c229e1e40963acdf093cab01bdfe8910e
-MD5 d4ddfc85a19d8d6e827218819d40c0b3 ChangeLog 5476
-RMD160 0d36ff608c41c1d71632c6af67ef093b372c0be2 ChangeLog 5476
-SHA256 96b10106206dfecce788eaade301a49c229e1e40963acdf093cab01bdfe8910e ChangeLog 5476
+MISC ChangeLog 5620 RMD160 6fe42a5d4b03b4106f4953d360b740df56d3ca4d SHA1 a2b6b232719c661d7d884662df1d43373b91d573 SHA256 a6fd65c84f2034b935e8b2f880e39182dddd47cdb5844025e94ee89ef127f5c2
+MD5 fc57a8d0bed107734df2fa095f487cde ChangeLog 5620
+RMD160 6fe42a5d4b03b4106f4953d360b740df56d3ca4d ChangeLog 5620
+SHA256 a6fd65c84f2034b935e8b2f880e39182dddd47cdb5844025e94ee89ef127f5c2 ChangeLog 5620
 MISC metadata.xml 430 RMD160 fe630e19aadea74e7b4e17ace0c9d86aebf1d053 SHA1 f5329bf1c28ede0e9573df79de57e9f8d79644e8 SHA256 7ce3252d5706b73afdcfa307f3a6d014f733389f3f530f380249b01adf19ac7a
 MD5 f7c5ba21162c3c79edaebb2431cbe757 metadata.xml 430
 RMD160 fe630e19aadea74e7b4e17ace0c9d86aebf1d053 metadata.xml 430
@@ -33,3 +36,10 @@ SHA256 beb485c6b94dac8a4ddb5cfcc862619a78c35849204ff02226847a6c7020b0c9 files/di
 MD5 c627b6962646d99ed79d5bfafd14f2de files/digest-bibletime-1.6.3 521
 RMD160 bd357eac5636614c662778559ef44f404c670109 files/digest-bibletime-1.6.3 521
 SHA256 244a2ee5a0c2496f76e2a7c8e4c9c64d46fd3baa5fbef24fece0f7af46a1e2cd files/digest-bibletime-1.6.3 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGMSKcCkvF58q80IkRAlWsAJ0aVpSEC1yMH08e7i6dGfLXbAzEswCeIC1p
+RmrFRUvFV9AMFqVjhzqSJqI=
+=M8yG
+-----END PGP SIGNATURE-----
diff --git a/app-text/bibletime/bibletime-1.6.3.ebuild b/app-text/bibletime/bibletime-1.6.3.ebuild
index 08ec9711dcda..025d5f854644 100644
--- a/app-text/bibletime/bibletime-1.6.3.ebuild
+++ b/app-text/bibletime/bibletime-1.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.6.3.ebuild,v 1.1 2007/03/20 23:19:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-1.6.3.ebuild,v 1.2 2007/04/26 22:07:28 philantrop Exp $
 
 inherit kde eutils versionator
 
@@ -41,47 +41,83 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	kde_src_unpack
-
-	local MAKE_LANGS MAKE_LANGS_DOC
-	for X in ${LANGS}; do
-		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X/pt_BR/pt_br}.po
-		${X/uk/ua}.po"
-	done
-	for X in ${LANGS_DOC}; do
-		use linguas_${X} && MAKE_LANGS_DOC="${MAKE_LANGS_DOC} ${X/pt_BR/pt-br}
-		${X/uk/ua}"
-	done
+src_compile() {
+	cd ${S}
 
-	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
-		cd "${WORKDIR}/${LANGS_PKG}"
-		sed -i -e "s,^POFILES.*,POFILES = ${MAKE_LANGS}," po/Makefile.am
-		sed -i -e "s,^SUBDIRS.*,SUBDIRS = ${MAKE_LANGS_DOC}," docs/Makefile.am
-		rm configure
-	fi
-}
+	# Those paths are missing a slash.
+	sed -i -e "s:\$(kde_htmldir):\$(kde_htmldir)/:g" ${KDE_S}/docs/handbook/unicode/Makefile.*
+	sed -i -e "s:\$(kde_htmldir):\$(kde_htmldir)/:g" ${KDE_S}/docs/handbook/html/Makefile.*
+	sed -i -e "s:\$(kde_htmldir):\$(kde_htmldir)/:g" ${KDE_S}/docs/howto/unicode/Makefile.*
 
-src_compile() {
 	kde_src_compile
 
-	local _S="${S}"
+	local MAKE_PO MAKE_DOC TMP
+	local _S="${KDE_S}"
 	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
-		S="${WORKDIR}/${LANGS_PKG}"
-		cd "${S}"
+		KDE_S="${WORKDIR}/${LANGS_PKG}"
+		cd "${KDE_S}"
+
+		# Adapted from kde.eclass
+		if [[ -z ${LINGUAS} ]]; then
+			einfo "You can add some of the translations of the interface and"
+			einfo "documentation by setting the \${LINGUAS} variable to the"
+			einfo "languages you want installed."
+			einfo
+			einfo "Enabling English interface and documentation only."
+		else
+			if [[ -n ${LANGS} ]]; then
+				MAKE_PO=$(echo $(echo "${LINGUAS} ${LANGS}" | tr ' ' '\n' | sort | uniq -d))
+				TMP=$(echo $(echo "${MAKE_PO/pt_BR/pt_br}" | sort | uniq))
+				TMP=$(echo $(echo "${TMP/uk/ua}" | sort | uniq))
+				TMP+=" "
+				MAKE_PO=${TMP// /.po }
+
+				einfo "Enabling translations for: ${MAKE_PO}"
+				sed -i -e "s:^POFILES =.*:POFILES = ${MAKE_PO}:" "${KDE_S}/po/Makefile.am" \
+					|| die "sed for locale failed"
+				rm -f "${KDE_S}/configure"
+			fi
+
+			TMP=""
+
+			if [[ -n ${LANGS_DOC} ]]; then
+				MAKE_DOC=$(echo $(echo "${LINGUAS} ${LANGS_DOC}" | tr ' ' '\n' | sort | uniq -d))
+				TMP=$(echo $(echo "${MAKE_DOC/pt_BR/pt-br}" | sort | uniq))
+				TMP=$(echo $(echo "${TMP/uk/ua}" | sort | uniq))
+				MAKE_DOC=${TMP}
+
+				einfo "Enabling documentation for: ${MAKE_DOC}"
+				sed -i -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_DOC}:" \
+					"${KDE_S}/docs/Makefile.am" || die "sed for locale failed"
+
+				# Those paths are missing a slash.
+				for X in ${MAKE_DOC}; do
+					[[ -f ${KDE_S}/docs/${X}/handbook/unicode/Makefile.am ]] && \
+						sed -i -e "s:\$(kde_htmldir):\$(kde_htmldir)/:g" \
+							${KDE_S}/docs/${X}/handbook/unicode/Makefile.am || die "sed for handbook failed"
+					[[ -f ${KDE_S}/docs/${X}/handbook/unicode/Makefile.am ]] && \
+						sed -i -e "s:\$(kde_htmldir):\$(kde_htmldir)/:g" \
+							${KDE_S}/docs/${X}/howto/unicode/Makefile.am || die "sed for howto failed"
+				done
+
+				rm -f "${KDE_S}/configure"
+			fi
+		fi
+
 		kde_src_compile
 	fi
-	S="${_S}"
+	KDE_S="${_S}"
 }
 
 src_install() {
 	kde_src_install
 
-	local _S="${S}"
+	local _S="${KDE_S}"
 	if [ -d "${WORKDIR}/${LANGS_PKG}" ]; then
-		S="${WORKDIR}/${LANGS_PKG}"
-		cd "${S}"
+		KDE_S="${WORKDIR}/${LANGS_PKG}"
+		cd "${KDE_S}"
+
 		kde_src_install
 	fi
-	S="${_S}"
+	KDE_S="${_S}"
 }