From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QzoqU-00057m-7Q for garchives@archives.gentoo.org; Sat, 03 Sep 2011 11:57:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59A3221C05E; Sat, 3 Sep 2011 11:57:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B2C921C05E for ; Sat, 3 Sep 2011 11:57:02 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 177F164210 for ; Sat, 3 Sep 2011 11:57:00 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id DB77120051; Sat, 3 Sep 2011 11:56:58 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-bin: ChangeLog libreoffice-bin-3.4.3-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog libreoffice-bin-3.4.3-r1.ebuild X-VCS-Directories: app-office/libreoffice-bin X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20110903115658.DB77120051@flycatcher.gentoo.org> Date: Sat, 3 Sep 2011 11:56:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3d30a69cc9ab1356fe8e1c6915a341c6 scarabeus 11/09/03 11:56:58 Modified: ChangeLog libreoffice-bin-3.4.3-r1.ebuild Log: Depend on split libreoffice-l10n package instead of installing the lang= uages here. =20 (Portage version: 2.2.0_alpha52/cvs/Linux x86_64) Revision Changes Path 1.33 app-office/libreoffice-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-bin/ChangeLog?rev=3D1.33&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-bin/ChangeLog?rev=3D1.33&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-bin/ChangeLog?r1=3D1.32&r2=3D1.33 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- ChangeLog 2 Sep 2011 10:53:52 -0000 1.32 +++ ChangeLog 3 Sep 2011 11:56:58 -0000 1.33 @@ -1,6 +1,11 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,= v 1.32 2011/09/02 10:53:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,= v 1.33 2011/09/03 11:56:58 scarabeus Exp $ + + 03 Sep 2011; Tom=C3=A1=C5=A1 Chv=C3=A1tal + libreoffice-bin-3.4.3-r1.ebuild: + Depend on split libreoffice-l10n package instead of installing the lan= guages + here. =20 *libreoffice-bin-3.4.3-r1 (02 Sep 2011) =20 1.2 app-office/libreoffice-bin/libreoffice-bin-3.4.3-r1.= ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-bin/libreoffice-bin-3.4.3-r1.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-bin/libreoffice-bin-3.4.3-r1.ebuild?rev=3D1.2&content-type=3Dtext/pl= ain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-bin/libreoffice-bin-3.4.3-r1.ebuild?r1=3D1.1&r2=3D1.2 Index: libreoffice-bin-3.4.3-r1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-= bin-3.4.3-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libreoffice-bin-3.4.3-r1.ebuild 2 Sep 2011 10:53:52 -0000 1.1 +++ libreoffice-bin-3.4.3-r1.ebuild 3 Sep 2011 11:56:58 -0000 1.2 @@ -1,12 +1,12 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffic= e-bin-3.4.3-r1.ebuild,v 1.1 2011/09/02 10:53:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffic= e-bin-3.4.3-r1.ebuild,v 1.2 2011/09/03 11:56:58 scarabeus Exp $ =20 EAPI=3D"3" =20 inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib =20 -IUSE=3D"gnome java offlinehelp" +IUSE=3D"gnome java" =20 MY_PV=3D"${PV/_/-}" MY_PV2=3D"${PV}rc2" @@ -29,27 +29,8 @@ =20 DESCRIPTION=3D"LibreOffice productivity suite." HOMEPAGE=3D"http://www.libreoffice.org" -SRC_URI=3D"amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-r= pm_en-US.tar.gz - offlinehelp? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm= _en-US.tar.gz ) ) - x86? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_install-rpm_en-US.tar.gz - offlinehelp? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_helppack-rpm_en-US= .tar.gz ) )" - -LANGS=3D"af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz = el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja k= a kk km kn ko kok ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr ns= o oc om or pa_IN pl pt pt_BR ro ru rw sa_IN sat sd sh si sk sl sq sr ss s= t sv sw_TZ ta te tg th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu" - -LANGS2=3D"bg bn bo bs ca ca_XV cs da de dz el en en_GB 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 pt_= BR ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW" - -for X in ${LANGS} ; do - [[ ${X} !=3D "en" ]] && SRC_URI=3D"${SRC_URI} linguas_${X}? ( - amd64? ( "${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_langpack-rpm_${X= /_/-}.tar.gz ) - x86? ( "${FILEPATH}"/x86/LibO_${PV}_Linux_x86_langpack-rpm_${X/_/-}.ta= r.gz ) )" - IUSE=3D"${IUSE} linguas_${X}" -done - -for Y in ${LANGS2} ; do - [[ ${Y} !=3D "en" ]] && SRC_URI=3D"${SRC_URI} linguas_${Y}? ( - amd64? ( offlinehelp? ( "${FILEPATH}"/x86_64/LibO_${PV}_Linux_x86-64_h= elppack-rpm_${Y/_/-}.tar.gz ) ) - x86? ( offlinehelp? ( "${FILEPATH}"/x86/LibO_${PV}_Linux_x86_helppack-= rpm_${Y/_/-}.tar.gz ) ) )" -done +SRC_URI=3D"amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-r= pm_en-US.tar.gz ) + x86? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_install-rpm_en-US.tar.gz )" =20 LICENSE=3D"LGPL-3" SLOT=3D"0" @@ -59,6 +40,7 @@ !app-office/openoffice !app-office/openoffice-bin !prefix? ( sys-libs/glibc ) + >=3Dapp-office/libreoffice-l10n-${PV} app-arch/unzip app-arch/zip >=3Ddev-lang/perl-5.0 @@ -116,39 +98,10 @@ rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm" rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm" rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm" - use offlinehelp && rpm_unpack "./${PACKED}_helppack-rpm_en-US/RPMS//${B= ASIS}-en-US-help-${BVER}.${XARCH}.rpm" for s in base binfilter calc math res writer ; do rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm" done =20 - # Localization - strip-linguas ${LANGS} - for l in ${LINGUAS}; do - m=3D"${l/_/-}" - if [[ ${m} !=3D "en" ]] ; then - LANGDIR=3D"${PACKED}_langpack-rpm_${m}/RPMS/" - rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm" - rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm" - for n in base binfilter calc math res writer; do - rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${XARCH}.rpm" - done - - for DICT_FILE in `find "./${LANGDIR}" -name "${NM2}-dict-*-${BVER}.${= XARCH}.rpm"`; do - DICT_REGEX=3D"s/${NM2}-dict-(.*?)-${BVER}.${XARCH}.rpm/\1/" - DICT_LOCALE=3D`basename "$DICT_FILE" | sed -E "${DICT_REGEX}"` - if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/${NM1}/share/exten= sions/dict-${DICT_LOCALE}" ]] ; then - rpm_unpack "${DICT_FILE}" - fi - done - - # Help files - if use offlinehelp; then - LANGDIR2=3D"${PACKED}_helppack-rpm_${m}/RPMS/" - rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${XARCH}.rpm" - fi - fi - done - } =20 src_install () {