From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4E6DC13877A for ; Sun, 15 Jun 2014 15:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46AD5E08EF; Sun, 15 Jun 2014 15:48:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2106E08EF for ; Sun, 15 Jun 2014 15:48:48 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B319833FE13 for ; Sun, 15 Jun 2014 15:48:47 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 7FCDC2004E; Sun, 15 Jun 2014 15:48:46 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-xlibs: emul-linux-x86-xlibs-20140508.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: emul-linux-x86-xlibs-20140508.ebuild ChangeLog X-VCS-Directories: app-emulation/emul-linux-x86-xlibs X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140615154846.7FCDC2004E@flycatcher.gentoo.org> Date: Sun, 15 Jun 2014 15:48:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3c91477e-3a9f-4f55-95b1-615b054efd1a X-Archives-Hash: ebfcc8e676ad354dc6012ecabc06edb2 mgorny 14/06/15 15:48:46 Modified: emul-linux-x86-xlibs-20140508.ebuild ChangeLog Log: Move cross-emul-linux deps to !abi_x86_32?. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision Changes Path 1.2 app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild?r1=1.1&r2=1.2 Index: emul-linux-x86-xlibs-20140508.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- emul-linux-x86-xlibs-20140508.ebuild 8 May 2014 21:49:25 -0000 1.1 +++ emul-linux-x86-xlibs-20140508.ebuild 15 Jun 2014 15:48:46 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild,v 1.1 2014/05/08 21:49:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140508.ebuild,v 1.2 2014/06/15 15:48:46 mgorny Exp $ EAPI=5 inherit emul-linux-x86 @@ -11,11 +11,12 @@ IUSE="abi_x86_32 opengl" DEPEND="" -RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV} - x11-libs/libX11 - opengl? ( app-emulation/emul-linux-x86-opengl ) - +RDEPEND=" !abi_x86_32? ( + ~app-emulation/emul-linux-x86-baselibs-${PV} + x11-libs/libX11 + opengl? ( app-emulation/emul-linux-x86-opengl ) + !media-libs/fontconfig[abi_x86_32(-)] !media-libs/freetype[abi_x86_32(-)] !x11-libs/libICE[abi_x86_32(-)] 1.132 app-emulation/emul-linux-x86-xlibs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog?rev=1.132&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog?rev=1.132&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog?r1=1.131&r2=1.132 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- ChangeLog 8 May 2014 21:49:25 -0000 1.131 +++ ChangeLog 15 Jun 2014 15:48:46 -0000 1.132 @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-xlibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.131 2014/05/08 21:49:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.132 2014/06/15 15:48:46 mgorny Exp $ + + 15 Jun 2014; Michał Górny + emul-linux-x86-xlibs-20140508.ebuild: + Move cross-emul-linux deps to !abi_x86_32?. *emul-linux-x86-xlibs-20140508 (08 May 2014)