Starting with 3.5 branch it uses uniform location so no need for live version when we can use 3.5.0 and later

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

3 files changed, 20 insertions, 176 deletions

diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index ec252e49458b..1b1964bd0285 100644
--- a/app-office/libreoffice-l10n/ChangeLog
+++ b/app-office/libreoffice-l10n/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice-l10n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.21 2011/11/30 10:15:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.22 2011/12/06 16:02:08 scarabeus Exp $
+
+  06 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-l10n-9999-r1.ebuild:
+  Starting with 3.5 branch it uses uniform location so no need for live version
+  when we can use 3.5.0 and later
 
 *libreoffice-l10n-3.5.0 (30 Nov 2011)
 
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index f53a82f5c5fd..8cabf4d6b652 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -324,23 +324,22 @@ EBUILD libreoffice-l10n-3.4.3-r3.ebuild 3892 RMD160 d35706fb4d9ddb13c38655a0a464
 EBUILD libreoffice-l10n-3.4.4-r1.ebuild 5055 RMD160 43f0c3be4a2bf0b2df06eeb5f85a4df3e3988085 SHA1 d15e89b4f4f204bd266fe71139f44a71a0590a6a SHA256 7044f79be17e178f3a601d752a62ea881e54758d81401f2ea06a244e9dbf3bc9
 EBUILD libreoffice-l10n-3.4.4.ebuild 3635 RMD160 b207749e1391029a74e6f5f82b73e31534d7c201 SHA1 eff7c9b5c559418a4eb983deeec2af1a9e2b4da2 SHA256 166b6c5a00c5589c44b08d6466c8e0e0215b989d68a5e35f44b8c011469ef1aa
 EBUILD libreoffice-l10n-3.5.0.ebuild 4919 RMD160 544c963c1c5e1152c7f6dc0296978755fde3309d SHA1 fe77d2b630bc4d01a252d431f8f2b18079bfc847 SHA256 ef13f1bf25ee5643c2f7dcb835c0a8aa90def6ff5fb09e6522550e6df23443ee
-EBUILD libreoffice-l10n-9999-r1.ebuild 4921 RMD160 715b41f4773786360de044cec471df976d3802db SHA1 1e78f967e9ef6ac545ec9ab4084e8fcbc6d9a05b SHA256 4d1081aed28236853e7775db8f81f7f9171df4d10c3a908651f61b1112195f90
-MISC ChangeLog 4158 RMD160 c518ec1186e58798179dcda38a5f59bf15694869 SHA1 2bb1992c335177f33445b96190cf3d37a4a20e7a SHA256 2bc75870f427f9f0cc5ed551a31f3fa110d0f1036e6bf103b2f4531712dfe212
+MISC ChangeLog 4364 RMD160 fd2f217cfad94b86458d3e69058284aa078f232f SHA1 64b565a9de635bcbfaeab0b3daf4b86844d6b5e4 SHA256 e577779416f4f539d11ff208dc3f36a3121ec9bc7495e8c8a4a353938cde70e3
 MISC metadata.xml 347 RMD160 9f877917cd81032044930b5585910cacd590ea41 SHA1 71e2840a19fab2cf3a6f1c32e305e457cdb29ba3 SHA256 8b80b71771e14ffebe84e2537b6207a459d1160b4d0880773657ce2f082eae0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO1gKVAAoJEOSiRoyO7jvoz2oP/RmAxtgctlT82w3YCI1GbPl1
-nxhjZSewGi6LO8nBqnzXRrHKnMs1Tfla/wu3gHbwfW6mVOXsZzV1x7/CKXf1oLdr
-sE8FQYFps3h4YTSFSHLwsSt1+VnZ+n2Uhsi/sNgNHHg29WJrUO/ZOPeNIH7nl0u2
-8IfFVMhCiEKvqBkdftDj68toL6gin4KMPN126zsG5qTOO/yI7lHDhbW7tFLPntsR
-J3Xym6z5cnGBw1Sh9ubRKg7UcY7z73OUejI93Y4jFI9xsJYytGxtVUJUZui4yKK5
-Q3NZiZQ/Z1IYG/6n1xTsc82IDyOD2fdLAzOR1/zj79g2dBaL25y/9sZ7h4A3WPkT
-eby7WwpNQXol2nV0H40AzBAbclkLzCZHOBXc6CAlQEc+OzC5DzEm6klv/1s2COiP
-Qd0nGiILjRSXY2P76LyntL/VAB5rZrI2Eb2xon9CxsCrBLVuMpOu1Tm5OH70Y4bn
-BSp1GK1rqckkinm7OW7Y1mHQemBESo+b6KSrVsmyXACoweaqs1LKmSso6Afw/FVN
-d8ZudjGRu3dsZa+ETubfCgPYVY7nTYrStXU90XBvEiYhXaHNxGHZtw7M9n8CKzSX
-cmkWK0tb5NCbXCjvO+2ZEGJdiXqeP5/3ZXhftwOEWqoAXbgxIFszb2CYWbpDA51R
-aGtKIREHXkWDUlOAEga0
-=Cuwg
+iQIcBAEBAgAGBQJO3jx/AAoJEOSiRoyO7jvoujMP/j6hmyt18nIHOE/9ThOiw68b
+y0WKsRYUC3uDqFtaXCeYbmlNTcK9OOlS1H7Svjn52QwWB7gavpRnJ7mO01jmz1of
+R9HK6D9QD1j5Fh/9T4YYVkZT4JDLNdGgfpg5QQNiNWkq585RGXQCv9+J1hoI+NXH
+M0FJpIKnh2vrkRceqFFHZs5KTxDvu3e1WslYRYB4gbhAVOEFL5YTg4x3G87GSdo4
+7PgirQahi6W732qv9oGg0mXx9CopTHK3AVNcOE1FzR03NQVaEx60romcaJvshrjJ
+FyAo3dI6Bpycvyw2dnOrkZydvfWlKKRchDtdJVivTg4/RwIt24kYpsPu80tPPjZG
+HOGSoR14AIr5Ch200MCyrIEhfGkh8PnAkvNpXUoZP3e6jPq2Pciz2Yz/zhFmzIYJ
+cUq/hziPhwLEUGmWnDqD+eNEnfIvewur4EIr0pb1LiikguJMNiPXPlUWvTkZsEQe
+YzAZ8+hOSAzUGOGgkK3uwAB1pRLfHuyWk0WuZYhUaA4076/A/KpFwvsdxXdoNf/W
+hs21ur7UNAw82rb+2E+Fi4/3g5LNR9iHZBCBjVjP+OXo0zei6oKlt3wU8wOEf235
+dwL2zLKFmfDB+eH61spZBcOttkzyxpIYZoZFhR41cCQS0PsO5uLoGmGusK8l1wlQ
+cJdso4xfV/1IDImau4pv
+=lZ6K
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild
deleted file mode 100644
index 0f73bd2cb43d..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-9999-r1.ebuild,v 1.3 2011/11/30 10:15:28 scarabeus Exp $
-
-EAPI=4
-
-[[ ${PV} == 9999 ]] && MY_PV="3.4.4" || MY_PV="${PV}"
-
-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
-
-DESCRIPTION="Translations for the Libreoffice suite."
-HOMEPAGE="http://www.libreoffice.org"
-
-LICENSE="LGPL-3"
-SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp templates"
-
-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 mk nb ne nl nn om pl pt_BR pt ru si
-sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
-LANGUAGES="${LANGUAGES_HELP} af ar as ast be br brx cy dgo fa ga gd kk kn kok ks
-ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
-st sw_TZ ta te th tn ts uz ve xh zu"
-
-for lang in ${LANGUAGES}; do
-	helppack=""
-	langpack=""
-	if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
-		[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
-		helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
-	fi
-	[[ ${lang} == en ]] \
-		|| langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
-	SRC_URI+=" linguas_${lang}? (
-		${langpack}
-		${helppack}
-	)"
-	IUSE+=" linguas_${lang}"
-done
-unset lang helppack langpack lang2
-
-# dictionaries
-SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
-nb nl nn pl pt ru sk sl sv tn zu"
-for X in ${SPELL_DICTS} ; do
-	SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
-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
-	!=app-office/libreoffice-9999-r1
-	|| (
-		>=app-office/libreoffice-3.4.4.2-r1
-		>=app-office/libreoffice-bin-3.4.4.2-r1
-	)
-"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-
-	local lang dir rpmdir i
-	local ooextused=()
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled; paludis support
-		use_if_iuse linguas_${lang} || continue
-
-		dir=${lang/_/-}
-
-		# for english we provide just helppack, as translation is always there
-		if [[ ${lang} != en ]]; then
-			rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
-			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
-			# First remove dictionaries, we want to use system ones.
-			rm -rf "${S}/${rpmdir}/"*dict*.rpm
-			rpm_unpack "./${rpmdir}/"*.rpm
-		fi
-		if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
-			[[ ${lang} == en ]] && dir="en-US"
-			rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
-			[[ -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
-		OO_EXTENSIONS+=( ${i} )
-	done
-}
-
-src_prepare() { :; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
-	# Condition required for people that do not install anything eg no linguas
-	# or just english with no offlinehelp.
-	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/
-		doins -r "${dir}"/*
-	fi
-
-	echo "${OO_EXTENSIONS[@]}"
-	office-ext_src_install
-}
-
-pkg_postinst() {
-	office-ext_pkg_postinst
-}
-pkg_prerm() {
-	office-ext_pkg_prerm
-}