Special case another LINGUAS combination until we have a better
authorAndreas Proschofsky <suka@gentoo.org>
Tue, 23 Feb 2010 16:25:50 +0000 (16:25 +0000)
committerAndreas Proschofsky <suka@gentoo.org>
Tue, 23 Feb 2010 16:25:50 +0000 (16:25 +0000)
solution, bug #306221
Package-Manager: portage-2.2_rc63/cvs/Linux i686

app-office/openoffice/ChangeLog
app-office/openoffice/Manifest
app-office/openoffice/openoffice-3.2.0.ebuild

index 0bd5921712644620f9602eec929a0606b1688ad4..07faf3d857177c1dfa3ee95431db3301ba94174f 100644 (file)
@@ -1,6 +1,11 @@
 # 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.515 2010/02/22 22:20:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.516 2010/02/23 16:25:50 suka Exp $
+
+  23 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.2.0.ebuild:
+  Special case another LINGUAS combination until we have a better 
+  solution, bug #306221
 
   22 Feb 2010; Andreas Proschofsky <suka@gentoo.org>
   openoffice-3.2.0.ebuild:
index b2a9fa62c20e876cb0618bb07e1c36f907e2ebf6..c926ff4424d70d5e25c9911d5303462e37f76e80 100644 (file)
@@ -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 12615 RMD160 58748e32eab1ce04f0158406de36340ff723e1a1 SHA1 695e739a5eda1bd4aec5b26758a55af52ed10d12 SHA256 580100e4315627d347e6defde8fa7e4d963c69a32b90855396bf64084036094e
-MISC ChangeLog 106148 RMD160 289b16b2b12589bc7d7196dd8f85a2687bfa9c3d SHA1 3ea2e5434bea721fdb1d68b0fc01a67cace774ab SHA256 fb4ac48464948f0b3e85b8a0c1ab51ec0bbc7a82e678218f9d92f7239dc3f091
+EBUILD openoffice-3.2.0.ebuild 12652 RMD160 fc32b1e06a41bc8d69059c6ccad3d87ca89adce5 SHA1 3175a2c921bbef728a0fe39d7a3aefc67c08551a SHA256 5e0ab72d4a09a829577823069ccb3ec6d256059ec64d654f118a31ff3f0c8a3f
+MISC ChangeLog 106320 RMD160 9e8051c3afc054f22b401c8400105b68db57adfe SHA1 c75f08aefe439fe182769023d76c7b72dcc98376 SHA256 4f5ee80c17da45e97b75c5a39f51e64fe738d05e23ee04a354c719b0fed27d87
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
index 31829e11ad54ba034be4847c8ad3815dfbcd23ba..4f2da29e2433a3b91b4fd095b54c493eae2389b3 100644 (file)
@@ -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.9 2010/02/22 22:20:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.10 2010/02/23 16:25:50 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -156,7 +156,7 @@ pkg_setup() {
 
        strip-linguas ${LANGS}
 
-       if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]] || [[ "${LINGUAS}" == en_US ]] || [[ "${LINGUAS}" == "en en_US" ]]; then
+       if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]] || [[ "${LINGUAS}" == en_US ]] || [[ "${LINGUAS}" == "en en_US" ]] || [[ "${LINGUAS}" == "en_US en" ]]; then
                export LINGUAS_OOO=""
        elif [[ ${LINGUAS} =~ en([^_]|$) ]]; then
                export LINGUAS_OOO="$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')"