Add binaries for x86 too.

Package-Manager: portage-2.2.0_alpha70/cvs/Linux x86_64

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index f88cfe5471be1780740ff90fb021605364303425..65fdc5257745d9f7512b0b6de8c625dbb279e9af 100644 (file)
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.38 2011/10/22 12:26:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.39 2011/10/23 09:39:44 scarabeus Exp $
+
+  23 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-bin-3.4.3.2-r1.ebuild:
+  Add binaries for x86 too.
 
   22 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-bin-3.4.3.2-r1.ebuild:

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index fcba8498e6cf6360a7f4e25b08eebf17a84966bc..b4000f94174586dff268d9c78e678c85fa14fc66 100644 (file)
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -421,31 +421,37 @@ DIST LibO_3.3.4_Linux_x86_langpack-rpm_zh-TW.tar.gz 1969168 RMD160 056f5f75703df
 DIST LibO_3.3.4_Linux_x86_langpack-rpm_zu.tar.gz 1915795 RMD160 8cca07c2b4fd0c7a3d961573e814a4cf3454ae80 SHA1 cf5a527107146db679a355c5e572fdfb755e6e80 SHA256 f8a07db55ec78fb605823680cde2cc2dead4243fca8581dbb94541cb324419fb
 DIST LibO_3.4.3_Linux_x86-64_install-rpm_en-US.tar.gz 168465443 RMD160 dbc898954190027dfb63bd18d061a497fca03f74 SHA1 228f951a8503100ec94c49def8b4f1cf7f82f893 SHA256 0d9003225816e2d130e9454aad186ce851233abc5a027bc84057420211429db1
 DIST LibO_3.4.3_Linux_x86_install-rpm_en-US.tar.gz 153607902 RMD160 9997288695e57281b518bce94f84b4483c71a07b SHA1 afb281927057b8b3a708291c12013512b816fcdc SHA256 69db7f815ca396fcbeb7d4c37a3f582ea4d150215019a976aad0c6feff14da3d
-DIST libreoffice-base-3.4.3.2-r1.tbz2 108281243 RMD160 e73c469aa0c2cbc14c65f3d94f549fe106698391 SHA1 1805fcf184ef99e829ef1a0cfb76219f546fad4b SHA256 ecf4ad17cf54efde693070a7a1b16f661777a5fff3acd813866ac7e77f782679
-DIST libreoffice-base-java-3.4.3.2-r1.tbz2 112050899 RMD160 3ea971397f8dce56c20aa7805c0d8bf6170f5f61 SHA1 e4a374f8893337b21bd11901ebccb58b4daa4f8b SHA256 f7750ce68bdc60309e0e9070d0ff0811781c542ceb16b3a33c43da338bf2fe8b
-DIST libreoffice-gnome-3.4.3.2-r1.tbz2 108529941 RMD160 dfbffd5ee1a89541b3f77ae7bccdd7b2d8af3785 SHA1 2f4c49833439d821640db3a49ad22988dfe4847a SHA256 383f387217efe118c679fe2c8a11acde5867364d3b5c94f870721a74939048cd
-DIST libreoffice-gnome-java-3.4.3.2-r1.tbz2 112394479 RMD160 70554d3af1a92562da896386f25b361492e5a3fe SHA1 cf2580ab095c2efb2ac67eebcaa6acf86dfcb271 SHA256 08cc180a48f3d83474aa7583d57bb57b81e01a0de848d093df859e0e249a5652
-DIST libreoffice-kde-3.4.3.2-r1.tbz2 108344861 RMD160 9d40ba4ed8b755a5035baed0c31e732f8baede07 SHA1 6eae58d351f6d22d5977f80c4aa50f3627416fc9 SHA256 cf53f573fc07ab354a6ebf2da3f22bc6193c683f126df087dbf430946736ec41
-DIST libreoffice-kde-java-3.4.3.2-r1.tbz2 112102862 RMD160 83a0e9685a0cd63fd2a66748172ffb5854a05fe0 SHA1 71e4dcfeab65912692efdba88d5054833ed410d0 SHA256 9f6fdd5b0764d180df488fd37472a8ee00ba212423d0e73c23794dcfabf2049e
+DIST libreoffice-base-amd64-3.4.3.2-r1.tbz2 108281243 RMD160 e73c469aa0c2cbc14c65f3d94f549fe106698391 SHA1 1805fcf184ef99e829ef1a0cfb76219f546fad4b SHA256 ecf4ad17cf54efde693070a7a1b16f661777a5fff3acd813866ac7e77f782679
+DIST libreoffice-base-java-amd64-3.4.3.2-r1.tbz2 112050899 RMD160 3ea971397f8dce56c20aa7805c0d8bf6170f5f61 SHA1 e4a374f8893337b21bd11901ebccb58b4daa4f8b SHA256 f7750ce68bdc60309e0e9070d0ff0811781c542ceb16b3a33c43da338bf2fe8b
+DIST libreoffice-base-java-x86-3.4.3.2-r1.tbz2 106601034 RMD160 13f3a48a4e2a78962a62ffe81b2a182def8029a7 SHA1 0c143a178c25da11083c63a64163110f987eb3d1 SHA256 1f2892633665bd19333afadce6bb6d858d26a05f6fea278e24fe68f0823c5cc8
+DIST libreoffice-base-x86-3.4.3.2-r1.tbz2 102704844 RMD160 be5c6eaa69b1508ed963d7c0279e325efc37c8db SHA1 fcc7e487ef10a0adf56f13348dce88a5b0eed593 SHA256 07858588be63b497c935b61d5085ea5825d4fcff659a86b43cae1ad6bf7117a1
+DIST libreoffice-gnome-amd64-3.4.3.2-r1.tbz2 108529941 RMD160 dfbffd5ee1a89541b3f77ae7bccdd7b2d8af3785 SHA1 2f4c49833439d821640db3a49ad22988dfe4847a SHA256 383f387217efe118c679fe2c8a11acde5867364d3b5c94f870721a74939048cd
+DIST libreoffice-gnome-java-amd64-3.4.3.2-r1.tbz2 112394479 RMD160 70554d3af1a92562da896386f25b361492e5a3fe SHA1 cf2580ab095c2efb2ac67eebcaa6acf86dfcb271 SHA256 08cc180a48f3d83474aa7583d57bb57b81e01a0de848d093df859e0e249a5652
+DIST libreoffice-gnome-java-x86-3.4.3.2-r1.tbz2 106886292 RMD160 71080576f44235361862f9887d0c83b41697156c SHA1 360bbcbaf524f01118e8481316cc9a0a8cf2c0ae SHA256 3e16f34ba5f5c938368f5e8f2f3a77b6d5e6005420eacd2b4928dbdd6fffefbc
+DIST libreoffice-gnome-x86-3.4.3.2-r1.tbz2 102925303 RMD160 2c7b5888ad3e3f4cbb4588dcb502195686b8df96 SHA1 18ad343470e3b7b9e62171d62607ccc94777dc1a SHA256 1c739c9d347baa0b2e79fa849963cbf6bb63d6026a5721d7f7afce13907b1dcf
+DIST libreoffice-kde-amd64-3.4.3.2-r1.tbz2 108344861 RMD160 9d40ba4ed8b755a5035baed0c31e732f8baede07 SHA1 6eae58d351f6d22d5977f80c4aa50f3627416fc9 SHA256 cf53f573fc07ab354a6ebf2da3f22bc6193c683f126df087dbf430946736ec41
+DIST libreoffice-kde-java-amd64-3.4.3.2-r1.tbz2 112102862 RMD160 83a0e9685a0cd63fd2a66748172ffb5854a05fe0 SHA1 71e4dcfeab65912692efdba88d5054833ed410d0 SHA256 9f6fdd5b0764d180df488fd37472a8ee00ba212423d0e73c23794dcfabf2049e
+DIST libreoffice-kde-java-x86-3.4.3.2-r1.tbz2 106678671 RMD160 9d9345e48ff3520d51256b646edd7bf1f9214bed SHA1 cd88d9964518579bef0c9a9101a404e0a675c8a2 SHA256 9067a0c488b20f395e227ae32ee3f3f6a1c6fbff38ac3431687fbfb6c0528b88
+DIST libreoffice-kde-x86-3.4.3.2-r1.tbz2 102709911 RMD160 cf191f49ea52a8bcd7726975a7a67f26aa345a8d SHA1 03dd60a770e178ad06353f74423b857ecf5557d3 SHA256 33d0a959382bd080b2929da15161921e65f8252075223d889f0e34212e735137
 EBUILD libreoffice-bin-3.3.4.ebuild 6973 RMD160 77e5b05e09157fa15b075ff26005dc79f40857ee SHA1 d0f295697dcfbc94cd4562a722370c0bd15de04e SHA256 f1a82b62e0cdccb061df37923f9cf2fe7045cb5f5d7bf82d274510a640d00f85
 EBUILD libreoffice-bin-3.4.3-r2.ebuild 4850 RMD160 65a4136b47fd6ed94eed5c1931cf5ded11914163 SHA1 56dc479112ee5b5c0035dfb99eab31e7cdeded0b SHA256 b33aa8dcf00cd6124ecc7dafc564de20404dc3b1f0d7ed748772e19b93564539
-EBUILD libreoffice-bin-3.4.3.2-r1.ebuild 3072 RMD160 642a31e38a870df2d619504144f00d8a06773976 SHA1 ad453fb7da268cf679903d27f24fa6ed57caed32 SHA256 7af324c7730e28aeb70b2655a5125c2f4b7f9488df182b4129a797b82ddbee3f
-MISC ChangeLog 6972 RMD160 2cbecd5ae93c077236f43d3f6110404b4b50298a SHA1 b7504f0282171a27fdc9742058facabb909c44fe SHA256 9dff7bde4ed8ca373cdcaf13233d149340ca9749da3767ac55e72d9167294ab5
+EBUILD libreoffice-bin-3.4.3.2-r1.ebuild 4061 RMD160 12d03431056ae2844e040d01b03f1f90e3937328 SHA1 75539eca78d68956ed44e3203e8a6a42f001daa1 SHA256 3666dc6b25e27c5ee0e126d46ec525dcc2bbcc3126368bb5489fc19fa93ba6f3
+MISC ChangeLog 7093 RMD160 d9e7ead35875b4d831cf921c088a664ab7996598 SHA1 112be8364834ac0dd6e587970ce02c218acf7228 SHA256 6fc87cddb42d2ced4927bed00e1dab7a4af4f07100f27ac5924362094b2fe877
 MISC metadata.xml 474 RMD160 7104bf15d70449529df6259b71620443392a14e9 SHA1 a4055e99444213fea16f282b2fa7c25ec0b21be6 SHA256 b92b55b2aec0028aaac8afdb01f4b9ea416c8e00a2207dd8d0db317e4fad48b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOorY9AAoJEOSiRoyO7jvoMrYP/0YsudYymxvH0J8BA5/tyXvY
-b0Cx9ULf2vwBUj0DrrfhNTPicAN2LGHJ7Ci5KZVwaWMBlONoYlQTaoLik/2c1M5d
-6B5u/RSwtUFkSM5fGUVnxzHoh0w3B0k7yJ/r5cgjxaVJo7pZZedBQbZENFIpSF/L
-faeNqFgvCcoYe+jc5SnuxTqOFgsA5P+V4Cm63g8Mx2BSQesgUGaWcKTOenruSaO5
-vAj0c+R8Bc23Jp2buo9OoZveoTtW8Ebglo4Bo9DgavmhpCECEbB9UzVqgQrxtAy+
-Sr9bGf09K8hOGN7WnIS0UbaTR1aY3o/h795HcUaXvSpXNKNL1kUo03sa0qsH93sZ
-FzJkQm+RGxakiqSzhs/EMgNVrvEKAGUnc4UqRFZExHabsGGHt2WEGqkQ6v/z42I1
-vWD3HVQ9yfYi/Ry2gRZUwFlXkOLdFNUkszXda2qG6jZKgl2pgZyfI2xk3DVcP2z1
-UWJxjgorxCUqdIWk9X4nax6CrasVTzJNc/cnbbDjzxHV1+obPNxcmdn5OdsoRBdd
-d2yPKLY3SYHwzsACtfAxhjqzi3aAQ/BwslhdFakeNnhY+m4OVT9SX8tvMoUr3gkS
-j0R4FG8DyIthmkleUxGqy6tAvMxid6JCvPcQ8/CmDYsWedCD84MQ5lb2S3W97+LZ
-+5IJTGGJ1uYHZKzwc5fh
-=afDG
+iQIcBAEBAgAGBQJOo+CRAAoJEOSiRoyO7jvorUAQAIrEFbQjjwrXEwJIXD3ogeJo
+I2yHyHGLV6N5g6E2S8TLRhrzi6Oa9l51QEk74D1lDGskTQxRknrCE1OrORskElpi
+BHl4sAMFT///caI3yltaGG3MHOZqaWrLXg4EGuMUJPyw10xxYm2eEQ/JIdB+d/KL
+trk8Tg9pYMU00zip9CMmdZBWYQkntPXxQQ4FuyAzbpWGCVFdgcR8yiFbmWi8DsJq
+/6Lya0Emnga1iHLLKPruvL+XXRkVWx//BkM170+zA9gNqJz+23HWArW9HRZfq5A1
+Hfw/SnVDuzfVkBBwmc1EX3S3ncAC3wiyWPy5CWZQt1JjAd/9sbDR79K+bt6ohydF
+XNnU1Tg2OWqZ/l2Cx/sCEb75u+kR2sJ9exxFeENy6wMk05tB2bCg5zf7ELfJreKi
+wcueIYJApEqPzuEZEDl2UKVe0BYuPqPnrrBFKsinF2w0a/UggnbkEIwM/WvFSf5e
+QTC1z3J5/hOGip2+pXYEwpxCCYdyjQHl8fiwVXkz4rHj7XNVedA6fdaSEC/c5tyM
+E3zUQuOUh/snpieM7NvJ26od+Y3vZ50lOvOZynw35CfOHjiKcgU+lBOU2qqVHiqN
+bvZGCB5GVTnU0+3gP+px6OFXw+XszFgHxzJG+V9iNiTxiwLYyiA9wrz8VExfGX7P
+3c0DuAni/22qYlemyBh+
+=aecr
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
index 13b9e743703df9392fd507ec135f9bcf7ec9a75d..51c8271811230d43b32317887c8b52476ed5ebe5 100644 (file)
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild
@@ -1,37 +1,57 @@
 # 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/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.4 2011/10/22 12:26:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.2-r1.ebuild,v 1.5 2011/10/23 09:39:44 scarabeus Exp $
 
 EAPI=4
 
 KDE_REQUIRED="optional"
 CMAKE_REQUIRED="never"
 
-BASE_URI="http://dev.gentooexperimental.org/~scarabeus/libreo_binary/amd64/"
+BASE_URI="http://dev.gentooexperimental.org/~scarabeus/libreo_binary/"
 
 inherit kde4-base java-pkg-opt-2 pax-utils
 
 DESCRIPTION="LibreOffice, a full office productivity suite. Binary package"
 HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="
+SRC_URI_AMD64="
+       kde? (
+               !java? ( ${BASE_URI}/amd64/${PN/-bin}-kde-${PVR}.tbz2 -> ${PN/-bin}-kde-amd64-${PVR}.tbz2 )
+               java? ( ${BASE_URI}/amd64/${PN/-bin}-kde-java-${PVR}.tbz2 -> ${PN/-bin}-kde-java-amd64-${PVR}.tbz2 )
+       )
+       gnome? (
+               !java? ( ${BASE_URI}/amd64/${PN/-bin}-gnome-${PVR}.tbz2 -> ${PN/-bin}-gnome-amd64-${PVR}.tbz2 )
+               java? ( ${BASE_URI}/amd64/${PN/-bin}-gnome-java-${PVR}.tbz2 -> ${PN/-bin}-gnome-java-amd64-${PVR}.tbz2 )
+       )
+       !kde? ( !gnome? (
+               !java? ( ${BASE_URI}/amd64/${PN/-bin}-base-${PVR}.tbz2 -> ${PN/-bin}-base-amd64-${PVR}.tbz2 )
+               java? ( ${BASE_URI}/amd64/${PN/-bin}-base-java-${PVR}.tbz2 -> ${PN/-bin}-base-java-amd64-${PVR}.tbz2 )
+       ) )
+"
+
+SRC_URI_X86="
        kde? (
-               !java? ( ${BASE_URI}/${PN/-bin}-kde-${PVR}.tbz2 )
-               java? ( ${BASE_URI}/${PN/-bin}-kde-java-${PVR}.tbz2 )
+               !java? ( ${BASE_URI}/x86/${PN/-bin}-kde-${PVR}.tbz2 -> ${PN/-bin}-kde-x86-${PVR}.tbz2 )
+               java? ( ${BASE_URI}/x86/${PN/-bin}-kde-java-${PVR}.tbz2 -> ${PN/-bin}-kde-java-x86-${PVR}.tbz2 )
        )
        gnome? (
-               !java? ( ${BASE_URI}/${PN/-bin}-gnome-${PVR}.tbz2 )
-               java? ( ${BASE_URI}/${PN/-bin}-gnome-java-${PVR}.tbz2 )
+               !java? ( ${BASE_URI}/x86/${PN/-bin}-gnome-${PVR}.tbz2 -> ${PN/-bin}-gnome-x86-${PVR}.tbz2 )
+               java? ( ${BASE_URI}/x86/${PN/-bin}-gnome-java-${PVR}.tbz2 -> ${PN/-bin}-gnome-java-x86-${PVR}.tbz2 )
        )
        !kde? ( !gnome? (
-               !java? ( ${BASE_URI}/${PN/-bin}-base-${PVR}.tbz2 )
-               java? ( ${BASE_URI}/${PN/-bin}-base-java-${PVR}.tbz2 )
+               !java? ( ${BASE_URI}/x86/${PN/-bin}-base-${PVR}.tbz2 -> ${PN/-bin}-base-x86-${PVR}.tbz2 )
+               java? ( ${BASE_URI}/x86/${PN/-bin}-base-java-${PVR}.tbz2 -> ${PN/-bin}-base-java-x86-${PVR}.tbz2 )
        ) )
 "
 
+SRC_URI="
+       amd64? ( ${SRC_URI_AMD64} )
+       x86? ( ${SRC_URI_X86} )
+"
+
 IUSE="gnome java kde"
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
        app-arch/zip