Fix problem with locale variants, bug 365365

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 136 insertions, 15 deletions

diff --git a/kde-base/kdepim-l10n/ChangeLog b/kde-base/kdepim-l10n/ChangeLog
index 9d4af1e31f41..c86ab2623b63 100644
--- a/kde-base/kdepim-l10n/ChangeLog
+++ b/kde-base/kdepim-l10n/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-l10n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/ChangeLog,v 1.6 2011/04/21 22:10:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/ChangeLog,v 1.7 2011/05/01 13:33:18 dilfridge Exp $
+
+*kdepim-l10n-4.4.11.1-r1 (01 May 2011)
+
+  01 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdepim-l10n-4.4.11.1-r1.ebuild:
+  Fix problem with locale variants, bug 365365
 
 *kdepim-l10n-4.4.11.1 (21 Apr 2011)
 
diff --git a/kde-base/kdepim-l10n/Manifest b/kde-base/kdepim-l10n/Manifest
index 790469484ba1..afb981e1a353 100644
--- a/kde-base/kdepim-l10n/Manifest
+++ b/kde-base/kdepim-l10n/Manifest
@@ -60,23 +60,24 @@ DIST kde-l10n-wa-4.4.5.tar.bz2 1823756 RMD160 bdbb66c51046763e101c7f72900223009f
 DIST kde-l10n-zh_CN-4.4.5.tar.bz2 3609788 RMD160 da11015ab8280ff2fe9fadfd6f594d13d04b2d26 SHA1 0f4671cb2a24fc2161f12e98079df7bc2054ad9b SHA256 4040bed19a37560c8a7407137f81e9bb9db550a363beaa9131e843cb9be98270
 DIST kde-l10n-zh_TW-4.4.5.tar.bz2 2659802 RMD160 76df1678c654aebd59c8ce5cf2b071bf097892fe SHA1 d5c5a37d0f46d7a7b47846c63d74de0dc6aec84c SHA256 91d1c414ca6ab54d8554a3aceef21036a933622fdc7809835f779ea14f611ba6
 EBUILD kdepim-l10n-4.4.10.ebuild 2282 RMD160 765248da51c457c7c28557716d7ab571d7077df4 SHA1 91a2ec2b4806028d6582196e2b0d489b15d3ec95 SHA256 4cee79337d6bbdcd8ad5373d792f275117b6d6fc1fc11ffa58829a1793adda81
+EBUILD kdepim-l10n-4.4.11.1-r1.ebuild 3003 RMD160 ba88ba154588746b36e9277300693f1941d66ece SHA1 e512f01a460b1ff3fe478677329663d9f8617b4b SHA256 9abbf44a407425fd3eedf5bbc10586292a2094e6b7927ffb87c3a24117bb18f6
 EBUILD kdepim-l10n-4.4.11.1.ebuild 2302 RMD160 198fef8d1098382850bc524ef47616cd1378c15f SHA1 fdd98d06e70a498c11b3af8b8b22464ea107a99e SHA256 6fb7eee843572daa870a27dfb91d6ac12db3a076a386782220544f149f9295db
-MISC ChangeLog 1259 RMD160 6fa4140a9b73f65de7b32424ce847bd2253ef780 SHA1 ec3df8d9b52e2d05a2410d0573501ff2149f8b2d SHA256 b86fa60a9207860e8581e7bb9eb6f7b2329c41dd8f8a2f0f867b2910c325436a
+MISC ChangeLog 1439 RMD160 724bf92c979682ccff6cf3a1db252c5af8fbf5a4 SHA1 d20613e5ce66f0b23e897290b020203562f00d1e SHA256 10143705aa79b236ab5cc055343dae8928cb8180f57653570695133eca505544
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNsKv7AAoJENwGBM22xffehR8P/2SnBaLNZ+c0bPRnXeNshRo+
-YcBAP8B05ouFw1uuejAHYcJ70enSsQ01JISUSiXHDqxeBVw0BysFzsqDskcCVFZo
-zRLu77Y9PYsiTRUOt5791jDf6304LEmtSzKoBDywaRw2l4AiAWfjtiPoVCY6xnq9
-GNdE16gKGuG7WFWUpDCzGoffbh01ujQd4pcyeuG0hDT1LpQ33kC6c5qDbKreYxms
-5aHjK5cnLsk299njn2nw9twVNR/WDUPT6Iuxl/K2wxmEhzw/TCDUegxAVz4BLpMU
-1i6qPlVOmrqd+T7IPwYPPIY+q+kB/G1hv3mY8mY9miehSyv19aIwv+7aQyiDJTDD
-uOrw90zuYJd2wT4I5ZGkpZWKVtO7cjLP7E0MKD0NxnNLwYnheEy8ejHa8Xv30DRK
-D0fvAA6DfYWW0v03ucYu79hJyQ1zvUg9hbDLvjVjf1F6EYlbmEeAsrSDsdclFjGj
-1B7bYnbiyNywnWikvyry//bU5dSb7csAYMV9f3a9bIUrv3pXrKKLMTx5vCUID9zQ
-X5EotCu1R/3vms78cAVd7E3Q1O8qAux8PasNIiHGtgbiyky823vltR4RDTIuxebj
-8yHRrVR1UwrmUuHzJ47R/YOfzTkAvpO1hiOXgL8wjuJJfImCROKWwPFJBH4b//lR
-I74eLFSYmqAhKrRE34Xn
-=9vXU
+iQIcBAEBCgAGBQJNvWG0AAoJENwGBM22xffeicIP/3yExpDNieFMrixkUPuEPrB5
+fEGrniYDMDsk7nP5GUdEn09y+x4o5rpu1pGTGvxgESBIGUX3VB/GfqgNTb59EjES
+j6rTadTC5ep9THr/nrm6rFce5DdleTmZQPE/Qsj8YJouVF9Pj4Vgb5t1D1KNTh2U
+wRH+zKdhZaryHz52Q4kOf+l29s9KBv2++88MNWrpA9KccxA5NtfDkSI4VNnBD7j8
+tvCzPaCoqw37wgStZpSgiqOBITsY/eRHKh/BqWpPPnMk+xzEZtSKe4JqTPU80G3e
+yFFQLSWprJ0t1p7eXI8I1qa1tiRXGOOXzt48jxry1B09YvCRz9yQ3OUTszD2+qTz
+tZgUbHua/iQZbRY53JI6KWTPPUqVM4X4foPHBWhXB3oukCuwU3YuFh2WoPMR8uqp
+k9wftHzpMeDUH0azTnvGLdMIUkaa9lORbgBDt50QYvhyZ5PIvDcWldFPhgsc/wco
+1I6Wbd1nMgCwWowPadJUiXCxPom25Ccaap82gUwT9b6AKf0SHIEIj2G5or497XT5
+uMlw1XTVtgOKYhA9hSaHCFiwX4LkS1nQ4Jw/v0EpmmUGP+xjFw0NT6F9kq6Henwx
+d1IG2wCCFuo9fXM4eeKkXmfl+HOiGs+brF7skUeRgTacyhpCtRW3bsLqAP+j4Ts0
+V8k9HFV/e0Le6/8Gu2KC
+=iV4I
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild b/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..9ebdad4bbb59
--- /dev/null
+++ b/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-l10n/kdepim-l10n-4.4.11.1-r1.ebuild,v 1.1 2011/05/01 13:33:18 dilfridge Exp $
+
+EAPI=4
+KDE_MINIMAL="4.6"
+
+inherit kde4-base
+
+DESCRIPTION="KDE PIM internationalization package"
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2"
+
+DEPEND="
+	sys-devel/gettext
+"
+RDEPEND=""
+add_blocker kde-l10n 0 :4.4
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+MY_LANGS="ar bg ca ca@valencia cs csb da de el en_GB eo es et eu
+		fi fr fy ga gl gu he hi hr hu id is it ja kk km kn ko lt lv
+		mai mk ml nb nds nl nn pa pl pt pt_BR ro ru si sk sl sr sv tg
+		tr uk wa zh_CN zh_TW"
+
+URI_BASE="${SRC_URI/-${PV}.tar.bz2/}"
+SRC_URI=""
+
+for MY_LANG in ${MY_LANGS} ; do
+	IUSE="${IUSE} linguas_${MY_LANG}"
+	SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/kde-l10n-${MY_LANG}-4.4.5.tar.bz2 )"
+done
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local LNG DIR
+	if [[ -z ${A} ]]; then
+		elog
+		elog "You either have the LINGUAS variable unset, or it only"
+		elog "contains languages not supported by ${P}."
+		elog "You won't have any additional language support."
+		elog
+		elog "${P} supports these language codes:"
+		elog "${MY_LANGS}"
+		elog
+	fi
+
+	# For EAPI >= 3, or if not using .tar.xz archives:
+	[[ -n ${A} ]] && unpack ${A}
+	cd "${S}"
+
+	# for all linguas do:
+	if [[ -n ${A} ]]; then
+		for LNG in ${LINGUAS}; do
+			einfo "Processing ${LNG} localization"
+			DIR="kde-l10n-${LNG}-4.4.5"
+
+			# add subdir to toplevel cmake file
+			if [[ -d "${DIR}" ]] ; then
+				echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
+			fi
+
+			# remove everything except kdepim
+			for SUBDIR in data docs messages scripts ; do
+				if [[ -d "${S}/${DIR}/${SUBDIR}" ]] ; then
+					einfo "   ${SUBDIR} subdirectory"
+					echo > "${S}/${DIR}/${SUBDIR}/CMakeLists.txt"
+					[[ -d "${S}/${DIR}/${SUBDIR}/kdepim" ]] && ( echo "add_subdirectory(kdepim)" >> "${S}/${DIR}/${SUBDIR}/CMakeLists.txt" )
+				fi
+			done
+
+			# in some cases we may have sub-lingua subdirs, e.g. sr :(
+			for XSUBDIR in "${S}/${DIR}/${LNG}"@* ; do
+				XLNG=$(echo ${XSUBDIR}|sed -e 's:^.*/::')
+				if [[ -d "${XSUBDIR}" ]] ; then
+					einfo "   ${XLNG} variant"
+					# remove everything except kdepim
+					for SUBDIR in data docs messages scripts ; do
+						if [[ -d "${XSUBDIR}/${SUBDIR}" ]] ; then
+							einfo "      ${SUBDIR} subdirectory"
+							echo > "${XSUBDIR}/${SUBDIR}/CMakeLists.txt"
+							[[ -d "${XSUBDIR}/${SUBDIR}/kdepim" ]] && ( echo "add_subdirectory(kdepim)" >> "${XSUBDIR}/${SUBDIR}/CMakeLists.txt" )
+						fi
+					done
+				fi
+			done
+		done
+	fi
+}
+
+src_prepare() {
+	[[ -n ${A} ]] && kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DBUILD_docs=OFF"
+	[[ -n ${A} ]] && kde4-base_src_configure
+}
+
+src_compile() {
+	[[ -n ${A} ]] && kde4-base_src_compile
+}
+
+src_test() {
+	[[ -n ${A} ]] && kde4-base_src_test
+}
+
+src_install() {
+	[[ -n ${A} ]] && kde4-base_src_install
+}