From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1KqYt5-0003To-2x for garchives@archives.gentoo.org; Thu, 16 Oct 2008 19:51:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31FCFE0432; Thu, 16 Oct 2008 19:51:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DB474E0432 for ; Thu, 16 Oct 2008 19:51:58 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 8759C64E7C for ; Thu, 16 Oct 2008 19:51:57 +0000 (UTC) Received: from suka by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1KqYt3-0000RP-3C for gentoo-commits@lists.gentoo.org; Thu, 16 Oct 2008 19:51:57 +0000 From: "Andreas Proschofsky (suka)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, suka@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice: openoffice-3.0.0.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: openoffice-3.0.0.ebuild ChangeLog X-VCS-Directories: app-office/openoffice X-VCS-Committer: suka X-VCS-Committer-Name: Andreas Proschofsky Content-Type: text/plain; charset=utf8 Message-Id: Sender: Andreas Proschofsky Date: Thu, 16 Oct 2008 19:51:57 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6b713d02-2454-484e-b757-f47d5f8139d1 X-Archives-Hash: f59f8e245c4a406bc32da04b4714cbaf suka 08/10/16 19:51:57 Modified: openoffice-3.0.0.ebuild ChangeLog Log: Die on KDE 4.1 problem instead of just warning, bug #238539 (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo i686) Revision Changes Path 1.5 app-office/openoffice/openoffice-3.0.0.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoff= ice/openoffice-3.0.0.ebuild?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoff= ice/openoffice-3.0.0.ebuild?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoff= ice/openoffice-3.0.0.ebuild?r1=3D1.4&r2=3D1.5 Index: openoffice-3.0.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.= ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- openoffice-3.0.0.ebuild 16 Oct 2008 12:03:35 -0000 1.4 +++ openoffice-3.0.0.ebuild 16 Oct 2008 19:51:57 -0000 1.5 @@ -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 $ =20 WANT_AUTOCONF=3D"2.5" WANT_AUTOMAKE=3D"1.9" @@ -203,10 +203,20 @@ =20 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 inst= alled " + ewarn " without kdeprefix" + ewarn ewarn " Until this is resolved, either disable the kde-use-flag or " ewarn " rebuild KDE with USE=3D'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=3D'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=3D'kdeprefix'" + fi fi =20 if use nsplugin; then 1.426 app-office/openoffice/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoff= ice/ChangeLog?rev=3D1.426&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoff= ice/ChangeLog?rev=3D1.426&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoff= ice/ChangeLog?r1=3D1.425&r2=3D1.426 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v retrieving revision 1.425 retrieving revision 1.426 diff -u -r1.425 -r1.426 --- ChangeLog 16 Oct 2008 12:03:35 -0000 1.425 +++ ChangeLog 16 Oct 2008 19:51:57 -0000 1.426 @@ -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.4= 25 2008/10/16 12:03:35 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.4= 26 2008/10/16 19:51:57 suka Exp $ + + 16 Oct 2008; Andreas Proschofsky + openoffice-3.0.0.ebuild: + Die on KDE 4.1 problem instead of just warning, bug #238539 =20 16 Oct 2008; Andreas Proschofsky files/gentoo-3.0.0.diff, openoffice-3.0.0.ebuild: