summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2008-03-28 13:02:05 +0000
committerAndreas Proschofsky <suka@gentoo.org>2008-03-28 13:02:05 +0000
commitec5ba642e0357021470286cc347344a4810d3485 (patch)
treede65f57400f174e28f8084450e3fd6ede3abd1a7
parentAdded ~ppc64 (diff)
downloadgentoo-2-ec5ba642e0357021470286cc347344a4810d3485.tar.gz
gentoo-2-ec5ba642e0357021470286cc347344a4810d3485.tar.bz2
gentoo-2-ec5ba642e0357021470286cc347344a4810d3485.zip
Bump to ooo-build 2.4.0.5, also add dependency on imagemagick
(Portage version: 2.1.4.4)
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/openoffice-2.4.0.ebuild12
2 files changed, 8 insertions, 10 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c47a4550ba9d..2667a50acd85 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.382 2008/03/28 12:12:15 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.383 2008/03/28 13:02:05 suka Exp $
+
+ 28 Mar 2008; Andreas Proschofsky <suka@gentoo.org>
+ openoffice-2.4.0.ebuild:
+ Bump to ooo-build 2.4.0.5, also add dependency on imagemagick
28 Mar 2008; Andreas Proschofsky <suka@gentoo.org>
openoffice-2.4.0.ebuild:
diff --git a/app-office/openoffice/openoffice-2.4.0.ebuild b/app-office/openoffice/openoffice-2.4.0.ebuild
index a4250b199afe..5a9f8f983a50 100644
--- a/app-office/openoffice/openoffice-2.4.0.ebuild
+++ b/app-office/openoffice/openoffice-2.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.5 2008/03/28 12:12:15 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.6 2008/03/28 13:02:05 suka Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.9"
@@ -9,7 +9,7 @@ inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2
IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk pam seamonkey webdav xulrunner"
-MY_PV="2.4.0.3.2"
+MY_PV="2.4.0.5"
PATCHLEVEL="OOH680"
SRC="OOo_${PV}_src"
S="${WORKDIR}/ooo"
@@ -127,6 +127,7 @@ DEPEND="${COMMON_DEPEND}
>=net-misc/curl-7.9.8
sys-libs/zlib
sys-apps/coreutils
+ media-gfx/imagemagick
pam? ( sys-libs/pam )
!dev-util/dmake
>=dev-lang/python-2.3.4
@@ -210,13 +211,6 @@ src_unpack() {
epatch "${FILESDIR}/${PV}/gentoo-${PV}.diff"
epatch "${FILESDIR}/${PV}/ooo-env_log.diff"
- # Hope we can get rid of this finally...
-# if use ppc ; then
-# cp -f "${FILESDIR}/${PV}/disable-regcomp-java.diff" "${S}/patches/src680" || die
-# cp -f "${FILESDIR}/${PV}/disable-regcomp-python.diff" "${S}/patches/src680" || die
-# epatch "${FILESDIR}/${PV}/regcompapply.diff"
-# fi
-
#Use flag checks
if use java ; then
echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}