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 1JjfKy-0004C0-5r for garchives@archives.gentoo.org; Wed, 09 Apr 2008 18:48:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C893E029E; Wed, 9 Apr 2008 18:47:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C340BE029E for ; Wed, 9 Apr 2008 18:47: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 6191F66F48 for ; Wed, 9 Apr 2008 18:47:58 +0000 (UTC) Received: from ingmar by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JjfKv-0006fV-1l for gentoo-commits@lists.gentoo.org; Wed, 09 Apr 2008 18:47:57 +0000 From: "Ingmar Vanhassel (ingmar)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ingmar@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qscintilla: ChangeLog qscintilla-2.1-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog qscintilla-2.1-r1.ebuild X-VCS-Directories: x11-libs/qscintilla X-VCS-Committer: ingmar X-VCS-Committer-Name: Ingmar Vanhassel Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ingmar Vanhassel Date: Wed, 09 Apr 2008 18:47: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: 9824f4af-354a-4dbc-9819-5aa3b669a06f X-Archives-Hash: e6e3688311b0b2f538bcb4b2e2c36380 ingmar 08/04/09 18:47:57 Modified: ChangeLog qscintilla-2.1-r1.ebuild Log: Make dependencies compatible with split Qt:4. (Portage version: 2.1.5_rc2) Revision Changes Path 1.7 x11-libs/qscintilla/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintill= a/ChangeLog?rev=3D1.7&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintill= a/ChangeLog?rev=3D1.7&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintill= a/ChangeLog?r1=3D1.6&r2=3D1.7 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/x11-libs/qscintilla/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 22 Mar 2008 19:54:09 -0000 1.6 +++ ChangeLog 9 Apr 2008 18:47:56 -0000 1.7 @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qscintilla # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.6 2= 008/03/22 19:54:09 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.7 2= 008/04/09 18:47:56 ingmar Exp $ + + 09 Apr 2008; Ingmar Vanhassel + qscintilla-2.1-r1.ebuild: + Make dependencies compatible with split Qt:4. =20 22 Mar 2008; Santiago M. Mola qscintilla-2.1-r1.ebuild: 1.6 x11-libs/qscintilla/qscintilla-2.1-r1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintill= a/qscintilla-2.1-r1.ebuild?rev=3D1.6&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintill= a/qscintilla-2.1-r1.ebuild?rev=3D1.6&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qscintill= a/qscintilla-2.1-r1.ebuild?r1=3D1.5&r2=3D1.6 Index: qscintilla-2.1-r1.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/x11-libs/qscintilla/qscintilla-2.1-r1.e= build,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qscintilla-2.1-r1.ebuild 22 Mar 2008 19:54:09 -0000 1.5 +++ qscintilla-2.1-r1.ebuild 9 Apr 2008 18:47:56 -0000 1.6 @@ -1,9 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.1-r1= .ebuild,v 1.5 2008/03/22 19:54:09 coldwind Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.1-r1= .ebuild,v 1.6 2008/04/09 18:47:56 ingmar Exp $ =20 EAPI=3D1 - inherit eutils toolchain-funcs multilib =20 SCINTILLA_VER=3D"1.73" @@ -20,8 +19,11 @@ KEYWORDS=3D"alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd" IUSE=3D"qt4 +python doc examples debug" =20 -RDEPEND=3D"qt4? ( =3Dx11-libs/qt-4* ) - !qt4? ( =3Dx11-libs/qt-3* )" +RDEPEND=3D" + qt4? ( || ( x11-libs/qt-gui:4 + x11-libs/qt:4 ) + ) + !qt4? ( x11-libs/qt:3 )" # dev-python/PyQt needs qscintilla to build and qscintilla's python bind= ings # need dev-python/PyQt, bug 199543 PDEPEND=3D"python? ( dev-python/qscintilla-python )" --=20 gentoo-commits@lists.gentoo.org mailing list