diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-10-13 10:56:12 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-10-13 10:56:12 +0000 |
| commit | d214c67edc99ecd2cf54e17f65c803361008e09c (patch) | |
| tree | ac529814018f53fa56438e9b3778b1674279f15a /games-emulation/zsnes | |
| parent | Support multilib providers for deps. (diff) | |
| download | gentoo-2-d214c67edc99ecd2cf54e17f65c803361008e09c.tar.gz gentoo-2-d214c67edc99ecd2cf54e17f65c803361008e09c.tar.bz2 gentoo-2-d214c67edc99ecd2cf54e17f65c803361008e09c.zip | |
Support multilib providers for deps. Bump to EAPI=5.
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'games-emulation/zsnes')
| -rw-r--r-- | games-emulation/zsnes/ChangeLog | 5 | ||||
| -rw-r--r-- | games-emulation/zsnes/zsnes-1.51-r4.ebuild | 34 |
2 files changed, 26 insertions, 13 deletions
diff --git a/games-emulation/zsnes/ChangeLog b/games-emulation/zsnes/ChangeLog index 46d5f56d5925..66aecd956c91 100644 --- a/games-emulation/zsnes/ChangeLog +++ b/games-emulation/zsnes/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-emulation/zsnes # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.60 2014/05/15 16:41:18 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/ChangeLog,v 1.61 2014/10/13 10:56:12 mgorny Exp $ + + 13 Oct 2014; Michał Górny <mgorny@gentoo.org> zsnes-1.51-r4.ebuild: + Support multilib providers for deps. Bump to EAPI=5. 15 May 2014; Ulrich Müller <ulm@gentoo.org> zsnes-1.51-r4.ebuild: Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to diff --git a/games-emulation/zsnes/zsnes-1.51-r4.ebuild b/games-emulation/zsnes/zsnes-1.51-r4.ebuild index b9484c6726f9..e49270b67c09 100644 --- a/games-emulation/zsnes/zsnes-1.51-r4.ebuild +++ b/games-emulation/zsnes/zsnes-1.51-r4.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r4.ebuild,v 1.7 2014/05/15 16:41:18 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/zsnes/zsnes-1.51-r4.ebuild,v 1.8 2014/10/13 10:56:12 mgorny Exp $ -EAPI=2 +EAPI=5 inherit eutils autotools flag-o-matic toolchain-funcs multilib pax-utils games DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly" @@ -14,13 +14,23 @@ SLOT="0" KEYWORDS="-* amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" IUSE="ao custom-cflags +debug opengl pax_kernel png" -RDEPEND="media-libs/libsdl[sound,video] - >=sys-libs/zlib-1.2.3-r1 - amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 ) - ao? ( media-libs/libao ) - debug? ( sys-libs/ncurses ) - opengl? ( virtual/opengl ) - png? ( media-libs/libpng )" +RDEPEND=" + || ( + ( + media-libs/libsdl[sound,video,abi_x86_32(-)] + >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] + ao? ( media-libs/libao[abi_x86_32(-)] ) + debug? ( sys-libs/ncurses[abi_x86_32(-)] ) + opengl? ( virtual/opengl[abi_x86_32(-)] ) + png? ( media-libs/libpng[abi_x86_32(-)] ) + ) + amd64? ( + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ao? ( app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + >=app-emulation/emul-linux-x86-sdl-10.1[-abi_x86_32(-)] + ) + )" DEPEND="${RDEPEND} dev-lang/nasm amd64? ( >=sys-apps/portage-2.1 )" @@ -85,12 +95,12 @@ src_configure() { } src_compile() { - emake makefile.dep || die "emake makefile.dep failed" - emake || die "emake failed" + emake makefile.dep + emake } src_install() { - dogamesbin zsnes || die "dogamesbin failed" + dogamesbin zsnes if use pax_kernel; then pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die fi |