From 0847328763c409a9d090f85f28962374266f8c65 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Sun, 23 Oct 2005 12:42:56 +0000 Subject: [PATCH] Disable the post-install-scripts of ooo-build which break the build for some Package-Manager: portage-2.0.53_rc6 --- app-office/openoffice/ChangeLog | 8 +++++++- app-office/openoffice/Manifest | 4 ++-- app-office/openoffice/openoffice-2.0.0.ebuild | 5 +++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 99d9d245e865..b70e589f219a 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.140 2005/10/22 18:55:11 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.141 2005/10/23 12:42:56 suka Exp $ + + 23 Oct 2005; Andreas Proschofsky + openoffice-2.0.0.ebuild: + Disable the post-install-scripts of ooo-build which actually do nothing but + updating the mime database, which we do later anyway (and which results in + sandbox-problems when called from ooo-build), see bug #110209 22 Oct 2005; Andreas Proschofsky openoffice-2.0.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 552873feabbb..7ef1e61e0003 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,4 +1,4 @@ -MD5 05554956771766941de625657670178b ChangeLog 30854 +MD5 d99c048992be4c75aa29c32264b974c2 ChangeLog 31154 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 @@ -37,4 +37,4 @@ MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 -MD5 5b7d6605d3a41fbc9fc9c4c24bfea988 openoffice-2.0.0.ebuild 6883 +MD5 803f8ad94f19403199a2ec279c30b133 openoffice-2.0.0.ebuild 6876 diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild index a3f8582bbac7..58f987502d84 100644 --- a/app-office/openoffice/openoffice-2.0.0.ebuild +++ b/app-office/openoffice/openoffice-2.0.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.4 2005/10/22 18:55:11 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.5 2005/10/23 12:42:56 suka Exp $ inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs @@ -148,7 +148,7 @@ src_compile() { # Should the build use multiprocessing? Not enabled by default, as it tends to break if [ "${WANT_DISTCC}" == "true" ]; then - export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` && [ ${JOBS} -gt 10 ] && export JOBS="10" + export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` fi # Make sure gnome-users get gtk-support @@ -170,6 +170,7 @@ src_compile() { --disable-access \ --disable-mono \ --disable-cairo \ + --disable-post-install-scripts \ || die "Configuration failed!" # Compile problems with these ... -- 2.26.2