diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2008-10-16 19:51:57 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2008-10-16 19:51:57 +0000 |
| commit | f0fcfff12a438994fb9d546a0d8dc27631ef15ec (patch) | |
| tree | 1ba8c35bfdcdbd12f7d080f9b56cecbd654c2607 /app-office/openoffice | |
| parent | Version bump. Bug #232233 (diff) | |
| download | historical-f0fcfff12a438994fb9d546a0d8dc27631ef15ec.tar.gz historical-f0fcfff12a438994fb9d546a0d8dc27631ef15ec.tar.bz2 historical-f0fcfff12a438994fb9d546a0d8dc27631ef15ec.zip | |
Die on KDE 4.1 problem instead of just warning, bug #238539
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo i686
Diffstat (limited to 'app-office/openoffice')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.0.0.ebuild | 14 |
3 files changed, 19 insertions, 5 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 4356af188122..84b730447c1d 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.425 2008/10/16 12:03:35 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.426 2008/10/16 19:51:57 suka Exp $ + + 16 Oct 2008; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.0.0.ebuild: + Die on KDE 4.1 problem instead of just warning, bug #238539 16 Oct 2008; Andreas Proschofsky <suka@gentoo.org> files/gentoo-3.0.0.diff, openoffice-3.0.0.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 538f297a9137..60075b979d97 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -39,6 +39,6 @@ DIST scsolver.2008-10-07.tar.bz2 230102 RMD160 f14539950ca5bd0c25a37f5f1504460b7 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94 EBUILD openoffice-2.4.1.ebuild 12597 RMD160 cfeb6649376b401d6a24d46c989526e042044b06 SHA1 7c88d424b6de8ef1d041b15df6b219cd017a4dd4 SHA256 402e684acf7565024b645c024f0cce4f8f56579f3fe50b9120fe7db0eccaa7a8 -EBUILD openoffice-3.0.0.ebuild 12313 RMD160 d22c2c15769b54ed2c74b8f66cadfcc46eda8367 SHA1 b844bb8561e54971fd0464fed9f22d01a31078a6 SHA256 6d370ecd32ec254eec36e1c2b607cc5e5ce8579e75532d681b0d94876946a501 -MISC ChangeLog 89156 RMD160 62ff36bb3a411c1f0d8e12c095645803e7c30157 SHA1 9c44956a4efc5645b423f10320c8c0b79526d306 SHA256 eaaf80b559562c5e283867aeb55df850466dad8aea0d5005838f27091dba7284 +EBUILD openoffice-3.0.0.ebuild 12663 RMD160 431db1223090e4c42d7d4b3f7ea755564f51e47c SHA1 a646d0a764fc65eae7f8402a741bbb817ffe0251 SHA256 ac5b64fd5ef9c6688291f7271eaf1b9821897eeda81ea75cfb00da254a317b27 +MISC ChangeLog 89299 RMD160 300eee13389eec982ffb33b118f6922d7e300316 SHA1 17aa77e89e3d6d0db86e2b385d181727eb81012c SHA256 8e2b8381b669f97f4e07e92f1f32ed6068948fb02cdc037a18482b0dc4218cc3 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild index 3e54d1ad9aeb..859f1d076098 100644 --- a/app-office/openoffice/openoffice-3.0.0.ebuild +++ b/app-office/openoffice/openoffice-3.0.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-3.0.0.ebuild,v 1.4 2008/10/16 12:03:35 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.5 2008/10/16 19:51:57 suka Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.9" @@ -203,10 +203,20 @@ pkg_setup() { if use kde; then ewarn " Please note that this version of OpenOffice.org will NOT build " - ewarn " if you have KDE 4.1.x installed without kdeprefix. " + ewarn " if you have kde-base/kdelibs or kde-base/kdepimlibs 4.1.x installed " + ewarn " without kdeprefix" + ewarn ewarn " Until this is resolved, either disable the kde-use-flag or " ewarn " rebuild KDE with USE='kdeprefix'. " ewarn + + if has_version kde-base/kdelibs:4.1; then + built_with_use kde-base/kdelibs:4.1 kdeprefix || die "rebuild kde-4.1 with USE='kdeprefix'" + fi + + if has_version kde-base/kdepimlibs:4.1; then + built_with_use kde-base/kdepimlibs:4.1 kdeprefix || die "rebuild kde-4.1 with USE='kdeprefix'" + fi fi if use nsplugin; then |