diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2011-02-08 21:12:02 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2011-02-08 21:12:02 +0000 |
| commit | ef21b8f079c4ce3e4f5a59b1de2a8c1dc3a99dc5 (patch) | |
| tree | 03fb2621f6fe8c6f6c4814bea4731107611b47d7 /app-office | |
| parent | Let libtool find & install the proper scanpci binary. Fix bugs 354145 and 353... (diff) | |
| download | historical-ef21b8f079c4ce3e4f5a59b1de2a8c1dc3a99dc5.tar.gz historical-ef21b8f079c4ce3e4f5a59b1de2a8c1dc3a99dc5.tar.bz2 historical-ef21b8f079c4ce3e4f5a59b1de2a8c1dc3a99dc5.zip | |
Until we have a better fix, disable extensions for -java build, preventing breakage, bug #352812
Package-Manager: portage-2.1.9.37/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.3.0.ebuild | 22 |
3 files changed, 20 insertions, 12 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index d24be8bc5c4b..868f9695c60b 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.10 2011/02/05 21:35:16 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.11 2011/02/08 21:12:02 suka Exp $ + + 08 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild: + Until we have a better fix, disable extensions for -java build, preventing + breakage, bug #352812 05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild, +files/libreoffice-3.3-prefix.patch: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index d1e289ce799d..e31b7b4090af 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -86,6 +86,6 @@ DIST libreoffice-testing-3.3.0.4.tar.bz2 50947353 RMD160 1ea2c0dc0a3bf4a0ddc9e5b DIST libreoffice-ure-3.3.0.4.tar.bz2 6163547 RMD160 f52347c5224afd29869030b466e05e722f0bdd64 SHA1 723af233415c9ed7611973e9b89df6a8cfeac911 SHA256 301a3d57f9c46f991298529af606dcb79999717b4e1c5ac6907d1e315dcc1bca DIST libreoffice-writer-3.3.0.4.tar.bz2 6775537 RMD160 aa4d0d35ed376bbf7903aa444c396973defbd709 SHA1 353cd9adad81428702bb7b8f22c0c9209799f036 SHA256 11e8656ca7e9761a8e2ea3d4526622be1fb1cdc4b2c7a72721e65e8444919bec DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -EBUILD libreoffice-3.3.0.ebuild 17961 RMD160 676bc1615df172130e3e80e9fb44abe78c18170f SHA1 18bd2449b2ccb783056f97022539b5bf7fd4ca3e SHA256 bffd44aee5a9e2851a40352f4f630eca10fa39d36065fc43d94e617a8faeec84 -MISC ChangeLog 2246 RMD160 f8d044784fdd70268b6b96581e6a05b5e88a6313 SHA1 824db4342e94ffd83392464e66cf824c34b1adf9 SHA256 2a3f259990124520936beeff88bae7bab8f25dd1038d41bc7f37a6271b21cad5 +EBUILD libreoffice-3.3.0.ebuild 18126 RMD160 ba9cf0c83822b511c118213491c493290eaab484 SHA1 9a64596a396ee54e2839c28371883d1d6f7dcf57 SHA256 1bed74488eee7ae2e0cd7cc88d67def046365261dae4a996dd2fa31a0edd7dd0 +MISC ChangeLog 2427 RMD160 71b4abf471132a064ea2e15f0b24de253f30fd85 SHA1 739013e64477b43cbc2687c34a01be71896f52a7 SHA256 8b622b0d5b9def457f500c36a1247d60c879e7ba08827a33c3a6b06a4c8ec03f MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4 diff --git a/app-office/libreoffice/libreoffice-3.3.0.ebuild b/app-office/libreoffice/libreoffice-3.3.0.ebuild index 59f367969807..6515d55c35e6 100644 --- a/app-office/libreoffice/libreoffice-3.3.0.ebuild +++ b/app-office/libreoffice/libreoffice-3.3.0.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/libreoffice-3.3.0.ebuild,v 1.7 2011/02/05 21:35:16 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.8 2011/02/08 21:12:02 suka Exp $ EAPI="3" @@ -275,7 +275,7 @@ src_prepare() { epatch "${FILESDIR}/scrap-pixmap-links.diff" epatch "${FILESDIR}/enable-startup-notification.diff" epatch "${FILESDIR}/libreoffice-3.3-prefix.patch" - cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes" || die + use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes" #Use flag checks if use java ; then @@ -309,12 +309,16 @@ src_prepare() { echo $(use_enable debug crashdump) >> ${CONFFILE} echo $(use_enable debug strip-solver) >> ${CONFFILE} - # Extension stuff - echo "--with-extension-integration" >> ${CONFFILE} - echo "--enable-pdfimport" >> ${CONFFILE} - echo "--enable-minimizer" >> ${CONFFILE} - echo "--enable-presenter-console" >> ${CONFFILE} - echo "--enable-presenter-extra-ui" >> ${CONFFILE} + # Extension stuff, disabled when building without java for bug #352812 + if use java; then + echo "--with-extension-integration" >> ${CONFFILE} + echo "--enable-pdfimport" >> ${CONFFILE} + echo "--enable-minimizer" >> ${CONFFILE} + echo "--enable-presenter-console" >> ${CONFFILE} + echo "--enable-presenter-extra-ui" >> ${CONFFILE} + #still necessary + echo "--enable-presenter-screen" >> ${CONFFILE} + fi # Misc stuff echo "--disable-graphite" >> ${CONFFILE} @@ -388,7 +392,7 @@ src_configure() { $(use_with templates sun-templates) \ --disable-access \ --disable-post-install-scripts \ - --enable-extensions \ + $(use_enable java extensions) \ --without-system-libwpd \ --without-system-libwpg \ --mandir="${EPREFIX}"/usr/share/man \ |