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 1Q0jJp-0002OJ-Ei for garchives@archives.gentoo.org; Fri, 18 Mar 2011 23:42:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB591E051C; Fri, 18 Mar 2011 23:42:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 94B1DE051C for ; Fri, 18 Mar 2011 23:42:50 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E66841B40EE for ; Fri, 18 Mar 2011 23:42:48 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 763) id 916CE20054; Fri, 18 Mar 2011 23:42:47 +0000 (UTC) From: "Andreas Proschofsky (suka)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, suka@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice-bin: ChangeLog openoffice-bin-3.3.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog openoffice-bin-3.3.0.ebuild X-VCS-Directories: app-office/openoffice-bin X-VCS-Committer: suka X-VCS-Committer-Name: Andreas Proschofsky Content-Type: text/plain; charset=utf8 Message-Id: <20110318234247.916CE20054@flycatcher.gentoo.org> Date: Fri, 18 Mar 2011 23:42:47 +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: edac6272f3fc761190f5b4acd1fa48b5 suka 11/03/18 23:42:47 Modified: ChangeLog openoffice-bin-3.3.0.ebuild Log: Install all the available dictionaries by default =20 (Portage version: 2.2.0_alpha27/cvs/Linux x86_64) Revision Changes Path 1.244 app-office/openoffice-bin/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/ChangeLog?rev=3D1.244&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/ChangeLog?rev=3D1.244&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/ChangeLog?r1=3D1.243&r2=3D1.244 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/openoffice-bin/ChangeLog,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- ChangeLog 18 Mar 2011 22:58:10 -0000 1.243 +++ ChangeLog 18 Mar 2011 23:42:47 -0000 1.244 @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v= 1.243 2011/03/18 22:58:10 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v= 1.244 2011/03/18 23:42:47 suka Exp $ + + 18 Mar 2011; Andreas Proschofsky + openoffice-bin-3.3.0.ebuild: + Install all the available dictionaries by default =20 18 Mar 2011; Andreas Proschofsky openoffice-bin-3.3.0.ebuild: 1.8 app-office/openoffice-bin/openoffice-bin-3.3.0.ebuil= d file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?rev=3D1.8&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?rev=3D1.8&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoff= ice-bin/openoffice-bin-3.3.0.ebuild?r1=3D1.7&r2=3D1.8 Index: openoffice-bin-3.3.0.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/openoffice-bin/openoffice-bi= n-3.3.0.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- openoffice-bin-3.3.0.ebuild 18 Mar 2011 22:58:10 -0000 1.7 +++ openoffice-bin-3.3.0.ebuild 18 Mar 2011 23:42:47 -0000 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-= bin-3.3.0.ebuild,v 1.7 2011/03/18 22:58:10 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-= bin-3.3.0.ebuild,v 1.8 2011/03/18 23:42:47 suka Exp $ =20 EAPI=3D"3" =20 @@ -104,30 +104,35 @@ use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${X= ARCH}.rpm" use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rp= m" =20 - # Unpack provided dictionaries, unless there is a better solution... + # English support installed by default + 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" - rpm_unpack "./${UP}/${NM2}-dict-es-${BVER}.${XARCH}.rpm" - rpm_unpack "./${UP}/${NM2}-dict-fr-${BVER}.${XARCH}.rpm" + for s in base binfilter calc draw help impress math res writer ; do + rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm" + done =20 # Localization strip-linguas ${LANGS} - if [[ -z "${LINGUAS}" ]]; then - export LINGUAS=3D"en" - fi - - for k in ${LINGUAS}; do - i=3D"${k/_/-}" - if [[ ${i} =3D "en" ]] ; then - i=3D"en-US" - LANGDIR=3D"${PACKED}_${i}.${BUILDID}/RPMS/" - else - LANGDIR=3D"${PACKED2}_${i}.${BUILDID}/RPMS/" + for l in ${LINGUAS}; do + m=3D"${l/_/-}" + if [[ ${m} !=3D "en" ]] ; then + LANGDIR=3D"${PACKED2}_${m}.${BUILDID}/RPMS/" + rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm" + rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm" + for n in base binfilter calc draw help impress 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 + fi - rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${BVER}.${XARCH}.rpm" - rpm_unpack "./${LANGDIR}/${NM2}-${i}-${BVER}.${XARCH}.rpm" - for j in base binfilter calc draw help impress math res writer; do - rpm_unpack "./${LANGDIR}/${BASIS}-${i}-${j}-${BVER}.${XARCH}.rpm" - done done =20 } @@ -196,16 +201,6 @@ =20 pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin =20 - elog " openoffice-bin does not provide integration with system spell " - elog " dictionaries. Please install them manually through the Extension= s " - elog " Manager (Tools > Extensions Manager) or use the source based " - elog " package instead. " - elog - elog " Dictionaries for English, French and Spanish are provided in " - elog " ${EPREFIX}/usr/$(get_libdir)/openoffice/share/extension/install = " - elog " Other dictionaries can be found at Suns extension site. " - elog - } =20 pkg_postrm() {