From: Andreas Proschofsky Date: Mon, 22 Feb 2010 16:45:29 +0000 (+0000) Subject: Fix disabling of sun-templates, bug #306269 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4527d8de458775426a45615a0cf77dc5a840eb57;p=gentoo.git Fix disabling of sun-templates, bug #306269 Package-Manager: portage-2.2_rc63/cvs/Linux i686 --- diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 35bb7a8f31a3..59c4bea05d47 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.511 2010/02/22 10:11:17 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.512 2010/02/22 16:45:29 suka Exp $ + + 22 Feb 2010; Andreas Proschofsky + openoffice-3.2.0.ebuild: + Fix disabling of sun-templates, bug #306269 22 Feb 2010; Andreas Proschofsky openoffice-3.2.0.ebuild, +files/qt-use-native-backend.diff: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 88fabb0f4b0d..c961ae8290bd 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -49,6 +49,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c -EBUILD openoffice-3.2.0.ebuild 12839 RMD160 68992c1312d7a8b9b59d1a5aeff5b47d225fedc5 SHA1 90ed3fe10396e43f3f8fc70c665faf4fdd29d245 SHA256 98fec8cc3d52cc623eb99a1a22b85ef2a3c25d1b856f5b6b9bebd1b4682860a5 -MISC ChangeLog 105557 RMD160 7c907fbc9ef7688bfbe97effc65a9b891805ae51 SHA1 c0f56ef44d8cdec7b2e5a30eb939fab23ec5ecb5 SHA256 15642bb473f22321d4639e1995981ac53021c5448b1a01c9cd0d298c9f76791a +EBUILD openoffice-3.2.0.ebuild 12839 RMD160 f2db23ad13260882a143eddf228c7daf5c2400d8 SHA1 f30892a12970aee4d6459b0186e2e17286194c63 SHA256 058102cce36ba05eb4201f692795bffbca368cf477982011f32b6ceb1bac3890 +MISC ChangeLog 105684 RMD160 15e5dc9a08bb0768c884ccc3b9fddf8f93f60491 SHA1 ab9613f4bb93dcdd2de0e9dc2178c4d569f087f2 SHA256 c53ed62151e633b6a41563df15e12d9744e41fdd3463d4d294cfb709d0264ac6 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index 6de73ac5f9ac..6b8a43d3d77b 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.5 2010/02/22 10:11:17 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.6 2010/02/22 16:45:29 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -338,7 +338,7 @@ src_configure() { $(use_enable odk) \ $(use_enable pam) \ $(use_with java) \ - --disable-sun-templates \ + --without-sun-templates \ --disable-access \ --disable-post-install-scripts \ --enable-extensions \