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 | a323ee7ba4c7c292444e8a6ea72ee2f3415033b0 (patch) | |
| tree | 7dfa5a9a1f31decbf5160b74d33c32ea94c1da3c /app-office/openoffice | |
| parent | Version bump. Bug #232233 (diff) | |
| download | gentoo-2-a323ee7ba4c7c292444e8a6ea72ee2f3415033b0.tar.gz gentoo-2-a323ee7ba4c7c292444e8a6ea72ee2f3415033b0.tar.bz2 gentoo-2-a323ee7ba4c7c292444e8a6ea72ee2f3415033b0.zip | |
Die on KDE 4.1 problem instead of just warning, bug #238539
(Portage version: 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/openoffice-3.0.0.ebuild | 14 |
2 files changed, 17 insertions, 3 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/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 |