summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-04-18 20:25:38 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-04-18 20:25:38 +0000
commitccb5580eadbf91e829e793f7a36595025403c059 (patch)
tree511a869ce43811a6e0f14877b6262e8de8046afb /media-libs/sdl-net
parentadd multilib support (diff)
downloadgentoo-2-ccb5580eadbf91e829e793f7a36595025403c059.tar.gz
gentoo-2-ccb5580eadbf91e829e793f7a36595025403c059.tar.bz2
gentoo-2-ccb5580eadbf91e829e793f7a36595025403c059.zip
add emul-blocker
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'media-libs/sdl-net')
-rw-r--r--media-libs/sdl-net/ChangeLog5
-rw-r--r--media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild9
2 files changed, 11 insertions, 3 deletions
diff --git a/media-libs/sdl-net/ChangeLog b/media-libs/sdl-net/ChangeLog
index 83229f91b42e..c55905d8605e 100644
--- a/media-libs/sdl-net/ChangeLog
+++ b/media-libs/sdl-net/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/sdl-net
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-net/ChangeLog,v 1.47 2014/04/18 20:21:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-net/ChangeLog,v 1.48 2014/04/18 20:25:38 hasufell Exp $
+
+ 18 Apr 2014; Julian Ospald <hasufell@gentoo.org> sdl-net-1.2.8-r1.ebuild:
+ add emul-blocker
*sdl-net-1.2.8-r1 (18 Apr 2014)
diff --git a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
index 9e65644c0c12..c0ccf33f7ea3 100644
--- a/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
+++ b/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild
@@ -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/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild,v 1.1 2014/04/18 20:21:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-net/sdl-net-1.2.8-r1.ebuild,v 1.2 2014/04/18 20:25:38 hasufell Exp $
EAPI=5
inherit multilib-minimal
@@ -15,7 +15,12 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="static-libs"
-RDEPEND=">=media-libs/libsdl-1.2.14[${MULTILIB_USEDEP}]"
+RDEPEND="
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+ !<=app-emulation/emul-linux-x86-sdl-20140406
+ )
+ >=media-libs/libsdl-1.2.14[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}