Drop the templates from here and move them to app-officeext/sun-templates.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 23 insertions, 55 deletions

diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index 79f97bef16d0..77770aee5742 100644
--- a/app-office/libreoffice-l10n/ChangeLog
+++ b/app-office/libreoffice-l10n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice-l10n
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.44 2012/05/31 09:41:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.45 2012/05/31 09:59:26 scarabeus Exp $
+
+  31 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-l10n-3.5.4.ebuild:
+  Drop the templates from here and move them to app-officeext/sun-templates.
 
 *libreoffice-l10n-3.5.4 (31 May 2012)
 
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index 0177ec40274f..bb0eb3dc7850 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -333,23 +333,23 @@ DIST LibO_3.5.4_Linux_x86_langpack-rpm_zu.tar.gz 1668099 RMD160 22b351f5a312e38e
 DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859
 DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4
 EBUILD libreoffice-l10n-3.5.2.ebuild 4938 RMD160 38109ac0640225c0ebbf291d193be91ff7e86124 SHA1 54bb456a86be4c423f70b5849caa92af3d51ed11 SHA256 abde4bd8bba1d085242e0db46edfa1c6b461cad9b20a5a2ad61996171708a7d0
-EBUILD libreoffice-l10n-3.5.4.ebuild 4941 RMD160 56498b60a2500d7917251f0c1fdfd10e4dd78a9f SHA1 86ac4b574c58d9da2c1cda08409501f4e3441734 SHA256 813ce534b01f45fd42986c62f88d68f64056199e21b61df92cb36e14e0724e45
-MISC ChangeLog 8185 RMD160 92a3685afe26ed5f9747e653535a41910e91d75d SHA1 742312db3e3cba23e487bfcf0a18d280bc0a2e13 SHA256 b140ee4d1697369d6b527c0b640ad93851c863c49a02318eb1d61c823ee2753d
+EBUILD libreoffice-l10n-3.5.4.ebuild 3721 RMD160 b5606bb882a32111694a94fa7f0f7e3df0735829 SHA1 35be6f196ca8b8d0868ce37b336cbc9164a8ccaa SHA256 7eff35f0781ed06b9995f17e6daeefc4b715a225377aa6b299de169fe638e99c
+MISC ChangeLog 8351 RMD160 0b9b5affe802ec2a6498b7bc94aa2625bc1ac572 SHA1 5f33dd03ed7f7d9cd507b9d7a1419027e5fdb5f7 SHA256 96cab9512395cee77be69a56f4af0c8ef05f76bfd79298bebeb5324e6c28b67d
 MISC metadata.xml 347 RMD160 9f877917cd81032044930b5585910cacd590ea41 SHA1 71e2840a19fab2cf3a6f1c32e305e457cdb29ba3 SHA256 8b80b71771e14ffebe84e2537b6207a459d1160b4d0880773657ce2f082eae0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPxzzWAAoJEOSiRoyO7jvozYEP/RBxNIPTmo4PT9bTZ6v0KCg4
-aRowLi5pvW1xR7Vdlq9bfP+dyQwEakbBjuDv+OXV2JxHI5EFIbbon6WGCZkOyxzZ
-yTb7YQh38R1hjsDVmmByfZ3H++G42alrDRVLlX5FaX7BaGxFZDJxxOT3GkWBBWkv
-91zDQasjE7qUmyPMR75Hobz3nai3MGWJ2+NhUehcsqNTKiUaJE0m8wsdLPM093dC
-BxG+osB4Ob1CRnub17nceSyrdrJ+TaVF5+U93BXrMJuDJTi3/co60Tp29W+wpJPM
-ciz0ud0aSkOmLcyRyPa7vavyMbODf+WkTrNqFZo87Sqy06HGoydLURBymctmFnvH
-c1KLmRXXAmx9gh3VTbUWiDEHTiVxYU2gF+builD/6jINwF5fpmOigTD3rHbZFV7Z
-QQYMJE9jMGht02hL/U6ZYRlzuXDW5bm3tyEja1xvkuJ3JcK9K/OvvfBtQX68v599
-3el3vMprmpk73RNtbbwwB29DBGQnbnL1LGTzKqVZzy/lHCEsXjLGitQVZgMJKbpR
-kzj/i59MVQ2wyz31QnL1DFbBFKLIyYKqy0Zdm4MUGPv5XUF71uWNQ6Oke/Eq/5bU
-pLCnT5DXRAI8rN2PIjedgf9WxbCnVsbdsIFCj0aGj8c5fDwMkgqwYE7aJUm0rHgJ
-j55vOtlMw9NZp7XdI7kk
-=05kQ
+iQIcBAEBAgAGBQJPx0EPAAoJEOSiRoyO7jvoq3MP/Rst+N+P7ZcNppj1i63vQJys
+b2AOE2mD5Wwyh6aZ06/Qrp/dghoFFyA7m8Gwy0SYCt61vDahnFzpB5SuZZoZJnfA
+z+oX4ZtI9h89uwfPmbh2tFVxZyetYWlStwCrmw3OvcDFKMCtpSOgNtr2MoWiI96Q
+QSVYeG8vXVlQJ1t5FD4AgV2GdQIQ+2fdlYFKLCgSQfwbxyQd+5XJGqnMH8GQ+VA4
+aM3kdfkiX6aNesUgFTLhjpvH8oZ/PhsPkCwNm8aTFD+SZsZeORhjpzsIckaMr1kI
+GCoLezzkFICEEFQuDQ5l1WMrpJXBHGr/Lcm48GKbTcnwteXtI7GhNIDYIlyeFBRE
+SC6Gro0d119XqaVgFpAOo6tlnVdXwJq59nIbHQB3MKWi6druE34hHQzTnmZ66Q3I
+WiXxYMn0vOS1XAFuA9I5+p9ABricTrnM7En+0YVoOYkccTIU2s846DVX+rNqnlF6
+LIJhUPaKbffqBG8++HfNH5j0HStNQtSuKMp4WPsidOD2QfJCOfNNboQ2vUIxMySs
+pITLeuP7mqUQWQo7mvVG+rPbCVTm7rjJSVWiAlbtpKDiWgQs52N9Vuo53Sd973XK
+HcnAKz8a/GOpibWd88TP7rRrBBvlHBIlMiZv82BIkCOGyoG/E1l5t+L1gr+rUUax
+kbUZ5YDzETzxAsvp8QG0
+=4vUs
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
index 772bb1e60475..3f31bfd1ba60 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.1 2012/05/31 09:41:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.5.4.ebuild,v 1.2 2012/05/31 09:59:26 scarabeus Exp $
 
 EAPI=4
 
@@ -9,15 +9,7 @@ MY_PV="3.5.4"
 RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
 BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
 
-OO_EXTENSIONS=(
-	"472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
-	"53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt"
-	"4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt"
-	"a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt"
-	"09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt"
-	"b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt"
-)
-inherit rpm eutils versionator office-ext
+inherit rpm eutils versionator
 
 DESCRIPTION="Translations for the Libreoffice suite."
 HOMEPAGE="http://www.libreoffice.org"
@@ -25,7 +17,7 @@ HOMEPAGE="http://www.libreoffice.org"
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp templates"
+IUSE="offlinehelp"
 
 LANGUAGES_HELP="bg bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo es et eu
 fi fr gl gu he hi hr hu id is it ja ka km ko lb mk nb ne nl nn om pl pt_BR pt ru
@@ -60,22 +52,6 @@ done
 RDEPEND="${SPELL_DICTS_DEPEND}"
 unset X SPELL_DICTS SPELL_DICTS_DEPEND
 
-# no need for iuse here as this needs to be written out and is subset
-# of lignuas anyway
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
-TDEPEND=""
-for i in ${OO_EXTENSIONS[@]}; do
-	lingua=${i/_*.oxt/}
-	lingua=${lingua/*Pack-/}
-	if [[ ${lingua} == en-US ]]; then
-		TDEPEND+=" ${EXT_URI}/${i}"
-	else
-		TDEPEND+=" linguas_${lingua}? ( ${EXT_URI}/${i} )"
-	fi
-done
-SRC_URI+=" templates? ( ${TDEPEND} )"
-unset i lingua TDEPEND EXT_URI
-
 # blockers for old libreoffice with bundled linguas
 RDEPEND+="
 	!=app-office/libreoffice-3.4.9999-r1
@@ -116,18 +92,6 @@ src_unpack() {
 			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
 			rpm_unpack ./"${rpmdir}/"*.rpm
 		fi
-		if use templates; then
-			for i in ${OO_EXTENSIONS[@]}; do
-				lingua=${i/_*.oxt/}
-				lingua=${lingua/*Pack-/}
-				if [[ ${lang} == ${lingua} || ${lingua} == en-US ]]; then
-					if [[ ! -f "${S}/${i}" ]]; then
-						cp -v "${DISTDIR}/${i}" "${S}"
-						ooextused+=( "${i}" )
-					fi
-				fi
-			done
-		fi
 	done
 	OO_EXTENSIONS=()
 	for i in ${ooextused[@]}; do