summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2012-04-27 20:25:10 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2012-04-27 20:25:10 +0000
commit489ea7455d61a9d97fe6315c998029178568f303 (patch)
tree602ef1320af1e42afe0a130133f60a1386204a0b /app-office
parentUnmask net-misc/bfgminer, dependency problem fixed (diff)
downloadgentoo-2-489ea7455d61a9d97fe6315c998029178568f303.tar.gz
gentoo-2-489ea7455d61a9d97fe6315c998029178568f303.tar.bz2
gentoo-2-489ea7455d61a9d97fe6315c998029178568f303.zip
Fresh amd64 binpackages...
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice-bin/ChangeLog6
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.5.2.2.ebuild35
2 files changed, 23 insertions, 18 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index f3ebf8532e24..e8b4a0a904ce 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.61 2012/04/26 06:59:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.62 2012/04/27 20:25:10 dilfridge Exp $
+
+ 27 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ libreoffice-bin-3.5.2.2.ebuild:
+ Fresh amd64 binpackages...
*libreoffice-bin-3.5.2.2 (25 Apr 2012)
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.5.2.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.5.2.2.ebuild
index 22d776094db6..ea17db72589c 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.5.2.2.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.5.2.2.ebuild
@@ -1,33 +1,33 @@
# 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.5.2.2.ebuild,v 1.1 2012/04/26 06:59:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.5.2.2.ebuild,v 1.2 2012/04/27 20:25:10 dilfridge Exp $
EAPI=4
KDE_REQUIRED="optional"
CMAKE_REQUIRED="never"
-#BASE_AMD64_URI="mirror://gentoo/amd64-bin-"
+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."
HOMEPAGE="http://www.libreoffice.org"
-#SRC_URI_AMD64="
-# kde? (
-# !java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-${PVR}.tar.xz )
-# java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
-# )
-# gnome? (
-# !java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
-# java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
-# )
-# !kde? ( !gnome? (
-# !java? ( ${BASE_AMD64_URI}${PN/-bin}-base-${PVR}.tar.xz )
-# java? ( ${BASE_AMD64_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
-# ) )
-#"
+SRC_URI_AMD64="
+ kde? (
+ !java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-${PVR}.tar.xz )
+ java? ( ${BASE_AMD64_URI}${PN/-bin}-kde-java-${PVR}.tar.xz )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-${PVR}.tar.xz )
+ java? ( ${BASE_AMD64_URI}${PN/-bin}-gnome-java-${PVR}.tar.xz )
+ )
+ !kde? ( !gnome? (
+ !java? ( ${BASE_AMD64_URI}${PN/-bin}-base-${PVR}.tar.xz )
+ java? ( ${BASE_AMD64_URI}${PN/-bin}-base-java-${PVR}.tar.xz )
+ ) )
+"
SRC_URI_X86="
kde? (
!java? ( ${BASE_X86_URI}${PN/-bin}-kde-${PVR}.tar.xz )
@@ -44,13 +44,14 @@ SRC_URI_X86="
"
SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
x86? ( ${SRC_URI_X86} )
"
IUSE="+cups debug gnome java kde"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* ~amd64 ~x86"
BIN_COMMON_DEPEND="
>=sys-libs/glibc-2.14.1-r3