summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-07 15:25:54 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-07 15:25:54 +0000
commit7c0b35ddc6bb16fda8d1e7b1b6c556b3f98fef16 (patch)
tree18792623b02010c97c6b095dfde18e412e8bd9a2
parentMask multilib libofa & respective medialibs bump. (diff)
downloadgentoo-2-7c0b35ddc6bb16fda8d1e7b1b6c556b3f98fef16.tar.gz
gentoo-2-7c0b35ddc6bb16fda8d1e7b1b6c556b3f98fef16.tar.bz2
gentoo-2-7c0b35ddc6bb16fda8d1e7b1b6c556b3f98fef16.zip
Add proper blocker on emul-linux-x86-medialibs.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
-rw-r--r--media-libs/taglib/ChangeLog5
-rw-r--r--media-libs/taglib/taglib-1.9.1-r1.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/media-libs/taglib/ChangeLog b/media-libs/taglib/ChangeLog
index b33fbf18f5b1..01ed536ead81 100644
--- a/media-libs/taglib/ChangeLog
+++ b/media-libs/taglib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/taglib
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.148 2014/06/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.149 2014/06/07 15:25:54 mgorny Exp $
+
+ 07 Jun 2014; Michał Górny <mgorny@gentoo.org> taglib-1.9.1-r1.ebuild:
+ Add proper blocker on emul-linux-x86-medialibs.
*taglib-1.9.1-r1 (07 Jun 2014)
diff --git a/media-libs/taglib/taglib-1.9.1-r1.ebuild b/media-libs/taglib/taglib-1.9.1-r1.ebuild
index f843a9690d7c..cc21dd15f4de 100644
--- a/media-libs/taglib/taglib-1.9.1-r1.ebuild
+++ b/media-libs/taglib/taglib-1.9.1-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/taglib/taglib-1.9.1-r1.ebuild,v 1.1 2014/06/07 11:55:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.9.1-r1.ebuild,v 1.2 2014/06/07 15:25:54 mgorny Exp $
EAPI=5
@@ -20,6 +20,9 @@ DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
test? ( dev-util/cppunit[${MULTILIB_USEDEP}] )
"
+RDEPEND="${RDEPEND}
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-install-examples.patch