summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2011-03-20 13:05:37 +0000
committerAndreas Proschofsky <suka@gentoo.org>2011-03-20 13:05:37 +0000
commitc92c314ebbf3098075e205ea4c9b03711c252b63 (patch)
tree014e7a101213bf03abf386410454684dc21d7c9c
parentAdd some more supported languages, ebuild cleanups (diff)
downloadgentoo-2-c92c314ebbf3098075e205ea4c9b03711c252b63.tar.gz
gentoo-2-c92c314ebbf3098075e205ea4c9b03711c252b63.tar.bz2
gentoo-2-c92c314ebbf3098075e205ea4c9b03711c252b63.zip
Minor ebuild cleanups
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
-rw-r--r--app-office/libreoffice-bin/ChangeLog6
-rw-r--r--app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild19
2 files changed, 13 insertions, 12 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 1454b5c7655f..212648c6d9ae 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.20 2011/03/19 15:55:44 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.21 2011/03/20 13:05:37 suka Exp $
+
+ 20 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+ libreoffice-bin-3.3.1.ebuild:
+ Minor ebuild cleanups
19 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
libreoffice-bin-3.3.1.ebuild:
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild
index 19e1ae683cdc..d5f7587d42c8 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild
@@ -1,6 +1,6 @@
# 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.3.1.ebuild,v 1.10 2011/03/19 15:55:44 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.11 2011/03/20 13:05:37 suka Exp $
EAPI="3"
@@ -20,7 +20,6 @@ NM1="${NM}"
NM2="${NM1}3"
NM3="${NM2}.3"
FILEPATH="http://download.documentfoundation.org/${NM}/stable/${PV}/rpm/"
-
if [ "${ARCH}" = "amd64" ] ; then
XARCH="x86_64"
PACKED="LibO_${MY_PV2}_Linux_x86-64"
@@ -28,10 +27,10 @@ else
XARCH="i586"
PACKED="LibO_${MY_PV2}_Linux_x86"
fi
-
UP="${PACKED}_install-rpm_en-US/RPMS"
-DESCRIPTION="LibreOffice productivity suite."
+DESCRIPTION="LibreOffice productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
SRC_URI="amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz
offlinehelp? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_helppack-rpm_en-US.tar.gz ) )
x86? ( ${FILEPATH}/x86/LibO_${PV}_Linux_x86_install-rpm_en-US.tar.gz
@@ -48,8 +47,6 @@ for X in ${LANGS} ; do
IUSE="${IUSE} linguas_${X}"
done
-HOMEPAGE="http://www.libreoffice.org"
-
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
@@ -57,13 +54,13 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="!app-office/libreoffice
!app-office/openoffice
!app-office/openoffice-bin
- x11-libs/libXaw
!prefix? ( sys-libs/glibc )
- >=dev-lang/perl-5.0
- app-arch/zip
app-arch/unzip
- x11-libs/libXinerama
- >=media-libs/freetype-2.1.10-r2"
+ app-arch/zip
+ >=dev-lang/perl-5.0
+ >=media-libs/freetype-2.1.10-r2
+ x11-libs/libXaw
+ x11-libs/libXinerama"
DEPEND="${RDEPEND}
sys-apps/findutils"