summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2012-02-24 21:38:41 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2012-02-24 21:38:41 +0000
commit454e8e8e51aa27919add8caaa0c7e65e0b6a0828 (patch)
tree4a7495976884375ea3dd1b7bbd1d475f21846534 /app-office
parentVersion bump (bug #405279 by Ian Delaney). Unrestrict pypy as it seems to wor... (diff)
downloadhistorical-454e8e8e51aa27919add8caaa0c7e65e0b6a0828.tar.gz
historical-454e8e8e51aa27919add8caaa0c7e65e0b6a0828.tar.bz2
historical-454e8e8e51aa27919add8caaa0c7e65e0b6a0828.zip
Add x86 tarballs and ebuild
Package-Manager: portage-2.1.10.48/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice-bin/ChangeLog6
-rw-r--r--app-office/libreoffice-bin/Manifest36
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild22
3 files changed, 45 insertions, 19 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index f3310c5ddb78..6fc2eaba1563 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice-bin
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.53 2012/02/22 09:43:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.54 2012/02/24 21:38:41 dilfridge Exp $
+
+ 24 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ libreoffice-bin-3.4.5.2-r1.ebuild:
+ Add x86 tarballs and ebuild
*libreoffice-bin-3.4.5.2-r1 (22 Feb 2012)
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index a9747749a0f9..55acc4342fad 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -437,25 +437,31 @@ DIST libreoffice-kde-amd64-3.4.5.2.tbz2 115699562 RMD160 3597377156710bd096e841a
DIST libreoffice-kde-java-amd64-3.4.5.2.tbz2 115706260 RMD160 84567426866bbf89399503d6c14b13e8d4ed59d0 SHA1 ea4caa0bbf7cd1002fbf61818f540f02507bff70 SHA256 b19c6b49e30a6fb6d241081f367a43477308e42f9d6990518c649981854d3bcb
DIST libreoffice-kde-java-x86-3.4.5.2.tbz2 112899911 RMD160 b45e9c0f688e5b901b8fdb3b419e3fd7df096899 SHA1 252bc81196678cd147b845e30afd7d51ea7d3286 SHA256 925af12a6d7f892e8911b67ee576a7d159d401a1a00b516946259c92bd8a3c32
DIST libreoffice-kde-x86-3.4.5.2.tbz2 109095011 RMD160 7fdc6b87078640d0263437dd01b3e6af764f0e04 SHA1 e4f9d07305b43538bd2ad2ea50a3a048a6969347 SHA256 98e4c66794d65ba1b00e0e783f28a02b04a4ab95536f53446b661e30d38993a1
+DIST x86-bin-libreoffice-base-3.4.5.2-r1.tbz2 97362324 RMD160 91a5a13f4de38206eb94c8a877892203d5239289 SHA1 dc05aff135fb48311a90f4d28c8c8eed439dcc11 SHA256 957f63359711675fb1f91a74817a461f670d7fe62ab31d8226e87ae2e015250a
+DIST x86-bin-libreoffice-base-java-3.4.5.2-r1.tbz2 101280472 RMD160 2bd99bc7d2bad27451dd06186dc33fdb8ea9360b SHA1 c737c25d8288010a7269c45ebe0564fa3c39c1a0 SHA256 00198e69042485a82e8eb924e7ce00b0c5fb10f9ef47146efcc5fd21696fe4b1
+DIST x86-bin-libreoffice-gnome-3.4.5.2-r1.tbz2 97550956 RMD160 342351343f561ec9383f407dc626855cff2ffc44 SHA1 421abe054b21ff63355e3f82104c0f74aaced0e3 SHA256 25629514182078f2958cdbde59efc897e269c9405ad7e2c5eb14d876eb72eadc
+DIST x86-bin-libreoffice-gnome-java-3.4.5.2-r1.tbz2 101384673 RMD160 05da2751acbf0628450349786312aba1d6608c37 SHA1 60768f123269faccc987611216d07b11d15ce9a8 SHA256 16d3fbde95f419373de2da93f82447b5ca161cc1a997aed398b8f096251e8f7f
+DIST x86-bin-libreoffice-kde-3.4.5.2-r1.tbz2 97438516 RMD160 51db2fe6ea09a6ddd09396f0aa39a04f29c79065 SHA1 d77eabd9163687f05373d68547828a21d162c0d5 SHA256 01ead4b6be747c8c326c260d31f2a0325c851e96eb549ec4b9e9008caafc8f19
+DIST x86-bin-libreoffice-kde-java-3.4.5.2-r1.tbz2 101239522 RMD160 ac6bbf72d61f6894f224e23c7e278759a8c99a43 SHA1 df286bb39c68f2584f23b268d71d978620c32a2a SHA256 178e1ef79534f13fd6da09f63a43fe9584d1f4ae3c550d00f458979f419422fe
EBUILD libreoffice-bin-3.3.4.ebuild 6998 RMD160 9f03719ba63b9ea10af69581eaebf72e1f5cce16 SHA1 e9cb4f7109067cb2dfcc8cb6fa1aa4e2ef6b80fa SHA256 3336a25cc2729c56fa58ecadcb5d3adf7c5e1eeca1509f708d29ac10d3a79123
-EBUILD libreoffice-bin-3.4.5.2-r1.ebuild 3277 RMD160 40b58a18712f37640eff3c7bed01862db2f0cbc8 SHA1 fbf21440c40cd212197b29132d85f27b86329c4c SHA256 12b2b48e37e0d75fa4b17a89ca51d03859d5d557a280c6a2b34f4c0ec9b70954
+EBUILD libreoffice-bin-3.4.5.2-r1.ebuild 3760 RMD160 ba05afb052e28b32c63310776209a8b0aa548a49 SHA1 23d092fc20e0d0af0fc60f45b5caf137a385d174 SHA256 b9a63544e7488f1cee85f9728da86d53659f603ac60c5422e001e22f08dbbbc3
EBUILD libreoffice-bin-3.4.5.2.ebuild 4254 RMD160 dca62db093becd58dcdae883bad72ee875ff72cd SHA1 3bd111407c96e14fe10f39d5c93ffd75d21b2246 SHA256 1d434bcb7f3b32f4c16b6777f4c3043c025c3b20c28383d1cd00ef7ad0b061e9
-MISC ChangeLog 8944 RMD160 71a0bb8650f18e41acf2747e2755963eaf19cd1d SHA1 58861edd9f494d1079ef860ea59fa967100d7b5b SHA256 2f0e51706adfc54d24e9e53dddc0b98412f178de3e939ef06ab932a0a68d6712
+MISC ChangeLog 9069 RMD160 cccee248d80525ff7cb62275d5d72eb596e82fd1 SHA1 c91dc68dc08165d7d55f32960d1d49422e6c339e SHA256 15e110ec2db00fa08e949b2cd649c58b575cedce5828d34ba1813373a0a86707
MISC metadata.xml 474 RMD160 7104bf15d70449529df6259b71620443392a14e9 SHA1 a4055e99444213fea16f282b2fa7c25ec0b21be6 SHA256 b92b55b2aec0028aaac8afdb01f4b9ea416c8e00a2207dd8d0db317e4fad48b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJPRLlEAAoJENwGBM22xffef10QAJiQel9ILwezLZLwNQ8gUh5U
-10Bo4Qqq1x4cX154x0rT0buiC77WXJN/jbMhu8p7l7thtfueD9S1anZfOgkxgJIp
-3QoGhUc5jn5OG+UOyqd0S5gqSu9xjuh1uxsBJcqNQHqn30lUZUVNeqZspdC32v8H
-c0E0BAHIqJ4SdIS/pD/Nz6cSGy9a+6yT6+TdMgPzy/BjdQy3hFeDESXxaRYIO9QL
-vlbzVYCIghSX7lTWzqD6lFn9QKpbA+nkgRpKk0rrjfRWFG5XQo94pXt4EpOK15S2
-cxiiKur2jJmPtCL1DQlt7nVmAG9MbWxIP0m6c4lTqHd+M0G3kXze1Do/w1lZHj6I
-bKOtaOBJpvCjeRpvUY5pip1Frha/rNWY8L84K4+hCqWjU/M8VaQH3S2mukiA7+TS
-9LssWIcxUGQqr2QjzJQ6w2QWA0EIs+qZSDu+CZnNYeRbfmdhRBr4iP+aAUEzORu+
-nexPfyHQI6YTv3jYmRL/rgDlv+TwlGWyogPhzAd0cIZfMS8F+P4pVk0TWFGno6dL
-DoPpQ2Ktfxfjai6GjJaAocj7azt85bNWxgRrPlz7XKqDi/Bs9uK0vhFSubG2cMoq
-z/Yt/Zagi1XEQA0zWiJpr7v9A7DuibXsTO5LHnykbfUebd7T96j4080NuoHw1jxt
-WlBRN9v9sZ7zbVTLw6e1
-=Z5TS
+iQIcBAEBCgAGBQJPSAPQAAoJENwGBM22xffeohgQAKh745B5tpb+Opb+LaFAE0rO
+MuNPQIwwYn2k0UsHoEXv4fF7NRrM34by8gtUSTfhSbi4z6RQuWgh9ZAlqHEL4Cly
+GX/1V6z3Cg91go/lTHcMtePVF6peTYweSfbdfUYEt0Lacicwn/0HVAt/tdDtNM6C
+S/SIfwzZe2Vl6IHrLWAZQSHcFaLvkTq4Xh3+Y3wB5AbRBMtxYCFLGDeP36x9N0tD
+5vbLKZ/m3vFVqizCHi0oJvf2frUYRi/saPq/7B/Ko0S/pRYEXp/kfr2SOauXk82R
+fwV4SrcG/WounvAB5s5cTTToGhj4PoJIvgBxdTy/2VAyH73OutkMc8qv7+MHUUo4
+ZGhAGJ9SVZrbgeXaKL12P3L0qfhSVxwKLanEAsmOSGd53tu75GGKiuJV+PGKmu4I
+ifO9X7hgcxNzIB8B3bs0p0fGyFlkJD+40SE0LD6AgJiFbylw0Hla28k7UgodT0/0
+q303R4OUn2Yz7/p09zYdzLXtsgLu9p8Ko6fn6CsSaVwdxv+5atY1YtV86oPUkFEo
+ZAgNEQzlVbXjAJmNppSNrvtKBwOSyP25BKEpZdPqnRuokV3t9v9SA4DqnhwwUGco
+vMZW0dMVCzUUAB9zRzE5llW9KX+4ObqSkxL4Bta0FKYBEGIrR1InGdRIa3NLSYeY
+dm7VM/Jad34iCju+kU+3
+=81QY
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
index ec062bb47c01..e6fa5dd764a5 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.5.2-r1.ebuild,v 1.1 2012/02/22 09:43:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.5.2-r1.ebuild,v 1.2 2012/02/24 21:38:41 dilfridge Exp $
EAPI=4
@@ -8,10 +8,11 @@ KDE_REQUIRED="optional"
CMAKE_REQUIRED="never"
BASE_AMD64_URI="mirror://gentoo/amd64-bin-"
+BASE_X86_URI="mirror://gentoo/x86-bin-"
inherit kde4-base java-pkg-opt-2 pax-utils prefix
-DESCRIPTION="LibreOffice, a full office productivity suite. Binary package"
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package."
HOMEPAGE="http://www.libreoffice.org"
SRC_URI_AMD64="
kde? (
@@ -27,15 +28,30 @@ SRC_URI_AMD64="
java? ( ${BASE_AMD64_URI}${PN/-bin}-base-java-${PVR}.tbz2 )
) )
"
+SRC_URI_X86="
+ kde? (
+ !java? ( ${BASE_X86_URI}${PN/-bin}-kde-${PVR}.tbz2 )
+ java? ( ${BASE_X86_URI}${PN/-bin}-kde-java-${PVR}.tbz2 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}${PN/-bin}-gnome-${PVR}.tbz2 )
+ java? ( ${BASE_X86_URI}${PN/-bin}-gnome-java-${PVR}.tbz2 )
+ )
+ !kde? ( !gnome? (
+ !java? ( ${BASE_X86_URI}${PN/-bin}-base-${PVR}.tbz2 )
+ java? ( ${BASE_X86_URI}${PN/-bin}-base-java-${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