From: Andreas Proschofsky Date: Mon, 22 Feb 2010 22:20:50 +0000 (+0000) Subject: quick fix for some build problems with en_US linguas, see bug #306221 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=676745cb0113678344c929ea13df69b2ce02185d;p=gentoo.git quick fix for some build problems with en_US linguas, see bug #306221 Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 3d5e0a12c7c1..0bd592171264 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.514 2010/02/22 17:22:37 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.515 2010/02/22 22:20:50 suka Exp $ + + 22 Feb 2010; Andreas Proschofsky + openoffice-3.2.0.ebuild: + quick fix for some build problems with en_US linguas, see bug #306221 22 Feb 2010; Andreas Proschofsky openoffice-3.2.0.ebuild, +files/npwrap-fix-nogtk.diff: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index afa2f63d1c9a..b2a9fa62c20e 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -50,6 +50,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c -EBUILD openoffice-3.2.0.ebuild 12548 RMD160 cbcaa733cbc6bab3252e55f4bf86974e8d1429fa SHA1 eae1dc4379e29b9c3bf259c1eb5c9c99805a0c14 SHA256 901be656926fa85780c593c45cd97d63b8d7b9e3533fcf58a80291fdb85d8560 -MISC ChangeLog 105995 RMD160 ce7e2921d804491b744e216ca002e2967004ee0f SHA1 b5d6c188edee3a47eba8c33bec67ba5ee811d62a SHA256 f1925ba1759b935708d32b507a3560803b288eaafc9725116c6b4c09a6c9105a +EBUILD openoffice-3.2.0.ebuild 12615 RMD160 58748e32eab1ce04f0158406de36340ff723e1a1 SHA1 695e739a5eda1bd4aec5b26758a55af52ed10d12 SHA256 580100e4315627d347e6defde8fa7e4d963c69a32b90855396bf64084036094e +MISC ChangeLog 106148 RMD160 289b16b2b12589bc7d7196dd8f85a2687bfa9c3d SHA1 3ea2e5434bea721fdb1d68b0fc01a67cace774ab SHA256 fb4ac48464948f0b3e85b8a0c1ab51ec0bbc7a82e678218f9d92f7239dc3f091 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index f4917ec9a047..31829e11ad54 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.8 2010/02/22 17:22:37 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.9 2010/02/22 22:20:50 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -156,7 +156,7 @@ pkg_setup() { strip-linguas ${LANGS} - if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]]; then + if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]] || [[ "${LINGUAS}" == en_US ]] || [[ "${LINGUAS}" == "en en_US" ]]; then export LINGUAS_OOO="" elif [[ ${LINGUAS} =~ en([^_]|$) ]]; then export LINGUAS_OOO="$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')"