summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2013-07-30 22:14:29 +0000
committerAlexis Ballier <aballier@gentoo.org>2013-07-30 22:14:29 +0000
commitf7ed306a5003458c1d5c222ab5b2371268cd0862 (patch)
tree3cf2a2ea83bd3fc80f1147c0754df6f4cd7632bc /dev-libs/udis86
parentFix MULTILIB_USEDEP on zlib, make emul-libs blockers so that it is slatted fo... (diff)
downloadgentoo-2-f7ed306a5003458c1d5c222ab5b2371268cd0862.tar.gz
gentoo-2-f7ed306a5003458c1d5c222ab5b2371268cd0862.tar.bz2
gentoo-2-f7ed306a5003458c1d5c222ab5b2371268cd0862.zip
improve the emul-libs blocker so that it is stacked for baselibs -r2.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'dev-libs/udis86')
-rw-r--r--dev-libs/udis86/ChangeLog5
-rw-r--r--dev-libs/udis86/udis86-1.7-r2.ebuild5
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-libs/udis86/ChangeLog b/dev-libs/udis86/ChangeLog
index 7720da21e517..62bf0a2e8e88 100644
--- a/dev-libs/udis86/ChangeLog
+++ b/dev-libs/udis86/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/udis86
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/ChangeLog,v 1.18 2013/07/11 22:44:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/ChangeLog,v 1.19 2013/07/30 22:14:29 aballier Exp $
+
+ 30 Jul 2013; Alexis Ballier <aballier@gentoo.org> udis86-1.7-r2.ebuild:
+ improve the emul-libs blocker so that it is stacked for baselibs -r2.
*udis86-1.7-r2 (11 Jul 2013)
diff --git a/dev-libs/udis86/udis86-1.7-r2.ebuild b/dev-libs/udis86/udis86-1.7-r2.ebuild
index 9bfaa4324f4f..1337acf5f75b 100644
--- a/dev-libs/udis86/udis86-1.7-r2.ebuild
+++ b/dev-libs/udis86/udis86-1.7-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7-r2.ebuild,v 1.1 2013/07/11 22:44:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/udis86/udis86-1.7-r2.ebuild,v 1.2 2013/07/30 22:14:29 aballier Exp $
EAPI=5
@@ -21,7 +21,8 @@ DEPEND="test? (
x86? ( dev-lang/yasm )
x86-fbsd? ( dev-lang/yasm )
)"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )"
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
PATCHES=(
"${FILESDIR}"/${P}-yasm.patch