Bump to ooo-build 2.4.0.5, also add dependency on imagemagick

Package-Manager: portage-2.1.4.4

3 files changed, 11 insertions, 13 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/Manifest b/app-office/openoffice/Manifest
index f76ba1ecc56e..80fce9d9fc4f 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -23,13 +23,13 @@ DIST libwps-0.1.0.tar.gz 555470 RMD160 aabc3b7938baa50c866f769317476893e5cba231
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 DIST ooo-build-2.3.1.2.tar.gz 8919121 RMD160 bbf48c05b9bfbd4633bc798b2e92c45c464b40dd SHA1 10c444bbe42a061350551b6d6ee7d65fb3aeb876 SHA256 9b0f77291d48e1fe2a7a6de766f7fc60fae17e1010aacafeb9c42c0d193740bf
-DIST ooo-build-2.4.0.3.2.tar.gz 8178773 RMD160 966e929516f86bdea80a8ada09470118a087f9cf SHA1 376201e9e4c43720b4665f39688dcb318d701489 SHA256 7d12e294022ba200e23fe5c163a770b6a8467383c7ec83533764065be9fd532d
+DIST ooo-build-2.4.0.5.tar.gz 8383540 RMD160 67846ccf99ddcd71ab1ca4af32df141bbb934fcd SHA1 afe95f8cae79dd2a7783d42a2267f1fa7a45bbf4 SHA256 a74b565d06bc656708dfff0fc7e58ec334ec0d17e9ff9dd7daa17aba3601e229
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
 EBUILD openoffice-2.3.1-r1.ebuild 12385 RMD160 15cc21255d3cedf5b16019faf8dcd7d52055b8a9 SHA1 f74bec8f21572caa6eded91662b6c977f2223539 SHA256 e3b877db697ac97d8e1dc12291deab4b25c97343ed8041a30b1b4f8bb322da92
-EBUILD openoffice-2.4.0.ebuild 12396 RMD160 795287e0d312380817b7b6fec8613f55491edab6 SHA1 3bbdbee7ab36c884e98e45af7cc170116d14c308 SHA256 06587e54dfde019064413646e7788167281ebdc8220c23d75fcffb5a6223ccfc
-MISC ChangeLog 79464 RMD160 d6cca28da3bc3207691efe5b565aa909bef83f61 SHA1 783e71879d2e8238597c874c9b9bdce32447c8f4 SHA256 e47b093ff0e2c59a7b15409b511f7093db9ce2c565ebbd9c9ed6cf5ef0d1c184
+EBUILD openoffice-2.4.0.ebuild 12131 RMD160 6604acadb1861f73bcdb6e5a6c7cf4c4543bf8d5 SHA1 e7290f69c3d1f14a81bdaec88e2cb9489db1bd17 SHA256 2f649442ffe17161d57168385059d3e585bf793410ecf2466e6501b74400a50a
+MISC ChangeLog 79609 RMD160 6febcc0192948ef098c5cb60e3c6add4f2e707f4 SHA1 418ee5d2be655fdd3dc9e57de3a77fc168764258 SHA256 1699c20c8bcc2dc53e4a56c8f8a5686ae74946e60e67592fcd6f241c38deee3a
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
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}