diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-06-05 21:32:16 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-06-05 21:32:16 +0000 |
| commit | d5b5f09d5635b2ee1f6f9d93c52079ad333dd4cb (patch) | |
| tree | cee71561ceb7ff4cb11e2a203e2a1a6970c2ee54 /app-office | |
| parent | Fixed bug where .ui files didn't get compiled on some systems. (diff) | |
| download | historical-d5b5f09d5635b2ee1f6f9d93c52079ad333dd4cb.tar.gz historical-d5b5f09d5635b2ee1f6f9d93c52079ad333dd4cb.tar.bz2 historical-d5b5f09d5635b2ee1f6f9d93c52079ad333dd4cb.zip | |
better fix for the LINGUAS-bug
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-bin/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/openoffice-bin/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice-bin/openoffice-bin-1.9.104.ebuild | 24 |
3 files changed, 20 insertions, 15 deletions
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog index d45a9e7f7a6a..215c7891debe 100644 --- a/app-office/openoffice-bin/ChangeLog +++ b/app-office/openoffice-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/openoffice-bin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.80 2005/05/21 07:24:06 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.81 2005/06/05 21:32:16 suka Exp $ + + 05 Jun 2005; Andreas Proschofsky <suka@gentoo.org> + openoffice-bin-1.9.104.ebuild: + Make the LINGUAS-stuff a little bit smarter to not break en_GB, closes bug + #93826 21 May 2005; Andreas Proschofsky <suka@gentoo.org> openoffice-bin-1.9.104.ebuild: diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest index 82fcba104049..44e428bda75f 100644 --- a/app-office/openoffice-bin/Manifest +++ b/app-office/openoffice-bin/Manifest @@ -1,7 +1,7 @@ -MD5 c89385e8b68f9213c1664146ebd22368 openoffice-bin-1.9.104.ebuild 5609 +MD5 506e205d7acdff08907fdca2b8f80332 openoffice-bin-1.9.104.ebuild 5610 MD5 1a091dd047f09cc05d99f025c6a65fff openoffice-bin-1.1.1.ebuild 5855 MD5 bb1e8ee689e1a90b8794c71ac421825e openoffice-bin-1.1.4-r1.ebuild 5004 -MD5 114bd4e4236ce67a04aa70c10f904b06 ChangeLog 13941 +MD5 06c9fee8dad0f86da652ed94689e3e9a ChangeLog 14114 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460 MD5 753fd14ec632a7fe71ab9abef357f93f files/digest-openoffice-bin-1.1.4-r1 141 MD5 2b70af485f57d1db6983b006f16a0587 files/digest-openoffice-bin-1.1.1 171 diff --git a/app-office/openoffice-bin/openoffice-bin-1.9.104.ebuild b/app-office/openoffice-bin/openoffice-bin-1.9.104.ebuild index 7de1d8fb9f44..45a93d5571f2 100644 --- a/app-office/openoffice-bin/openoffice-bin-1.9.104.ebuild +++ b/app-office/openoffice-bin/openoffice-bin-1.9.104.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.9.104.ebuild,v 1.4 2005/06/05 21:03:32 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.9.104.ebuild,v 1.5 2005/06/05 21:32:16 suka Exp $ inherit eutils fdo-mime rpm versionator @@ -86,19 +86,19 @@ src_unpack() { strip-linguas en af bg cs cy da de en_GB es et fi fr hu it ja km ko nb nl nn ns pt_BR sk sl sv tn xh zh_CN zh_TW zu - export LINGUAS_OOO="${LINGUAS/en }" - - for i in ${LINGUAS_OOO}; do + for i in ${LINGUAS}; do i="${i/_/-}" - if [ -e ${DISTDIR}/${LANGPACK}_${i}.sh ] ; then - tail -n +159 ${DISTDIR}/${LANGPACK}_${i}.sh > ${S}/${LANGPACK}_${i}.tar.gz || die - tar -xvf ${S}/${LANGPACK}_${i}.tar.gz || die - else - unpack openofficeorg-${i}-${LANGSUFFIX} + if [ ${i} != "en" ] ; then + if [ -e ${DISTDIR}/${LANGPACK}_${i}.sh ] ; then + tail -n +159 ${DISTDIR}/${LANGPACK}_${i}.sh > ${S}/${LANGPACK}_${i}.tar.gz || die + tar -xvf ${S}/${LANGPACK}_${i}.tar.gz || die + else + unpack openofficeorg-${i}-${LANGSUFFIX} + fi + rpm_unpack openofficeorg-${i}-1.9.${SNV}-1.i586.rpm + rpm_unpack openofficeorg-${i}-help-1.9.${SNV}-1.i586.rpm + rpm_unpack openofficeorg-${i}-res-1.9.${SNV}-1.i586.rpm fi - rpm_unpack openofficeorg-${i}-1.9.${SNV}-1.i586.rpm - rpm_unpack openofficeorg-${i}-help-1.9.${SNV}-1.i586.rpm - rpm_unpack openofficeorg-${i}-res-1.9.${SNV}-1.i586.rpm done } |