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 B280213877A for ; Wed, 25 Jun 2014 13:28:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE114E08E5; Wed, 25 Jun 2014 13:28:14 +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 4EC9AE08E5 for ; Wed, 25 Jun 2014 13:28:14 +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 4B13333F195 for ; Wed, 25 Jun 2014 13:28:13 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 1BE4D2004E; Wed, 25 Jun 2014 13:28:12 +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 games-action/swordandsworcery: swordandsworcery-1.02.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: swordandsworcery-1.02.ebuild ChangeLog X-VCS-Directories: games-action/swordandsworcery X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140625132812.1BE4D2004E@flycatcher.gentoo.org> Date: Wed, 25 Jun 2014 13:28:12 +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: 08b986cf-05eb-45b9-9684-ba43b1e76b31 X-Archives-Hash: 02663e003f3fba38b17ab8e33799734b mgorny 14/06/25 13:28:12 Modified: swordandsworcery-1.02.ebuild ChangeLog Log: Support multilib dependencies aside to emul-linux-x86. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) Revision Changes Path 1.5 games-action/swordandsworcery/swordandsworcery-1.02.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild?r1=1.4&r2=1.5 Index: swordandsworcery-1.02.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- swordandsworcery-1.02.ebuild 15 May 2014 16:25:05 -0000 1.4 +++ swordandsworcery-1.02.ebuild 25 Jun 2014 13:28:11 -0000 1.5 @@ -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/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v 1.4 2014/05/15 16:25:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/swordandsworcery-1.02.ebuild,v 1.5 2014/06/25 13:28:11 mgorny Exp $ # TODO: unbundle liblua-5.1 when available for multilib @@ -26,11 +26,54 @@ RDEPEND=" virtual/opengl amd64? ( - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs[alsa] - app-emulation/emul-linux-x86-xlibs + || ( + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ( + dev-libs/openssl[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + !bundled-libs? ( + net-misc/curl[abi_x86_32(-)] + ) + ) + ) + || ( + app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] + ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + ) + !bundled-libs? ( + || ( + app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] + media-libs/libsdl[X,sound,video,opengl,joystick,abi_x86_32(-)] + ) + ) + || ( + app-emulation/emul-linux-x86-soundlibs[alsa,-abi_x86_32(-)] + ( + media-libs/alsa-lib[abi_x86_32(-)] + media-libs/flac[abi_x86_32(-)] + media-libs/libogg[abi_x86_32(-)] + media-libs/libsndfile[abi_x86_32(-)] + media-libs/libvorbis[abi_x86_32(-)] + media-sound/pulseaudio[abi_x86_32(-)] + ) + ) + || ( + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + ( + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXtst[abi_x86_32(-)] + ) + ) ) x86? ( dev-libs/openssl 1.4 games-action/swordandsworcery/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/ChangeLog?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/ChangeLog?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/swordandsworcery/ChangeLog?r1=1.3&r2=1.4 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ChangeLog 15 May 2014 16:25:05 -0000 1.3 +++ ChangeLog 25 Jun 2014 13:28:11 -0000 1.4 @@ -1,6 +1,9 @@ # ChangeLog for games-action/swordandsworcery # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/ChangeLog,v 1.3 2014/05/15 16:25:05 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/swordandsworcery/ChangeLog,v 1.4 2014/06/25 13:28:11 mgorny Exp $ + + 25 Jun 2014; Michał Górny swordandsworcery-1.02.ebuild: + Support multilib dependencies aside to emul-linux-x86. 15 May 2014; Ulrich Müller swordandsworcery-1.02.ebuild: Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to