| 1 |
suka 08/10/16 19:51:57 |
| 2 |
|
| 3 |
Modified: openoffice-3.0.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Die on KDE 4.1 problem instead of just warning, bug #238539 |
| 6 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.5 app-office/openoffice/openoffice-3.0.0.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?rev=1.5&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?rev=1.5&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild?r1=1.4&r2=1.5 |
| 14 |
|
| 15 |
Index: openoffice-3.0.0.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v |
| 18 |
retrieving revision 1.4 |
| 19 |
retrieving revision 1.5 |
| 20 |
diff -u -r1.4 -r1.5 |
| 21 |
--- openoffice-3.0.0.ebuild 16 Oct 2008 12:03:35 -0000 1.4 |
| 22 |
+++ openoffice-3.0.0.ebuild 16 Oct 2008 19:51:57 -0000 1.5 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.4 2008/10/16 12:03:35 suka Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.5 2008/10/16 19:51:57 suka Exp $ |
| 28 |
|
| 29 |
WANT_AUTOCONF="2.5" |
| 30 |
WANT_AUTOMAKE="1.9" |
| 31 |
@@ -203,10 +203,20 @@ |
| 32 |
|
| 33 |
if use kde; then |
| 34 |
ewarn " Please note that this version of OpenOffice.org will NOT build " |
| 35 |
- ewarn " if you have KDE 4.1.x installed without kdeprefix. " |
| 36 |
+ ewarn " if you have kde-base/kdelibs or kde-base/kdepimlibs 4.1.x installed " |
| 37 |
+ ewarn " without kdeprefix" |
| 38 |
+ ewarn |
| 39 |
ewarn " Until this is resolved, either disable the kde-use-flag or " |
| 40 |
ewarn " rebuild KDE with USE='kdeprefix'. " |
| 41 |
ewarn |
| 42 |
+ |
| 43 |
+ if has_version kde-base/kdelibs:4.1; then |
| 44 |
+ built_with_use kde-base/kdelibs:4.1 kdeprefix || die "rebuild kde-4.1 with USE='kdeprefix'" |
| 45 |
+ fi |
| 46 |
+ |
| 47 |
+ if has_version kde-base/kdepimlibs:4.1; then |
| 48 |
+ built_with_use kde-base/kdepimlibs:4.1 kdeprefix || die "rebuild kde-4.1 with USE='kdeprefix'" |
| 49 |
+ fi |
| 50 |
fi |
| 51 |
|
| 52 |
if use nsplugin; then |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
1.426 app-office/openoffice/ChangeLog |
| 57 |
|
| 58 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.426&view=markup |
| 59 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.426&content-type=text/plain |
| 60 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.425&r2=1.426 |
| 61 |
|
| 62 |
Index: ChangeLog |
| 63 |
=================================================================== |
| 64 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v |
| 65 |
retrieving revision 1.425 |
| 66 |
retrieving revision 1.426 |
| 67 |
diff -u -r1.425 -r1.426 |
| 68 |
--- ChangeLog 16 Oct 2008 12:03:35 -0000 1.425 |
| 69 |
+++ ChangeLog 16 Oct 2008 19:51:57 -0000 1.426 |
| 70 |
@@ -1,6 +1,10 @@ |
| 71 |
# ChangeLog for app-office/openoffice |
| 72 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 73 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.425 2008/10/16 12:03:35 suka Exp $ |
| 74 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.426 2008/10/16 19:51:57 suka Exp $ |
| 75 |
+ |
| 76 |
+ 16 Oct 2008; Andreas Proschofsky <suka@g.o> |
| 77 |
+ openoffice-3.0.0.ebuild: |
| 78 |
+ Die on KDE 4.1 problem instead of just warning, bug #238539 |
| 79 |
|
| 80 |
16 Oct 2008; Andreas Proschofsky <suka@g.o> |
| 81 |
files/gentoo-3.0.0.diff, openoffice-3.0.0.ebuild: |
Archives