diff options
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/files/Gentoo_ODK_install.patch | 11 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.1.1.ebuild | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index bebba20f555f..a22142c09353 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.499 2009/11/25 12:32:52 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.500 2009/11/26 15:05:49 suka Exp $ + + 26 Nov 2009; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.1.1.ebuild, +files/Gentoo_ODK_install.patch: + Finally fix ODK installation, see bug #151798 25 Nov 2009; Andreas Proschofsky <suka@gentoo.org> openoffice-3.1.1.ebuild: diff --git a/app-office/openoffice/files/Gentoo_ODK_install.patch b/app-office/openoffice/files/Gentoo_ODK_install.patch new file mode 100644 index 000000000000..1e75517315e2 --- /dev/null +++ b/app-office/openoffice/files/Gentoo_ODK_install.patch @@ -0,0 +1,11 @@ +--- bin/ooinstall 2009-09-05 23:39:18.000000000 +0300 ++++ bin/ooinstall 2009-09-05 23:44:28.000000000 +0300 +@@ -156,7 +156,7 @@ + "-buildid $BUILD $destdir $strip " . + "-simple $path") && die "Failed to install: $!"; + +-if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' || $setup_vars{'VENDORNAME'} eq 'Frugalware' ) && $configure_vars{BUILD_TYPE} =~ m/ODK/) { ++if (($setup_vars{'VENDORNAME'} eq 'Novell' || $setup_vars{'VENDORNAME'} eq 'Debian' || $setup_vars{'VENDORNAME'} eq 'Mandriva' || $setup_vars{'VENDORNAME'} eq 'Frugalware' || $setup_vars{'VENDORNAME'} eq 'Gentoo') && $configure_vars{BUILD_TYPE} =~ m/ODK/) { + print "Running SDK installer\n"; + system ("cd $setup_vars{OOBUILDDIR}/instsetoo_native/util ; " . + "perl -w $configure_vars{SOLARENV}/bin/make_installer.pl " . diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild index a733fb8af754..46fc33b44208 100644 --- a/app-office/openoffice/openoffice-3.1.1.ebuild +++ b/app-office/openoffice/openoffice-3.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.20 2009/11/25 12:32:52 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.21 2009/11/26 15:05:50 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -238,6 +238,7 @@ src_prepare() { epatch "${FILESDIR}/gentoo-pythonpath.diff" epatch "${FILESDIR}/ooo-env_log.diff" epatch "${FILESDIR}/ooo-build-patchver.diff" + epatch "${FILESDIR}/Gentoo_ODK_install.patch" cp -f "${FILESDIR}/base64.diff" "${S}/patches/hotfixes" || die cp -f "${FILESDIR}/boost-undefined-references.diff" "${S}/patches/hotfixes" || die |