diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-08-10 17:44:41 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-10 17:44:41 +0000 |
| commit | 786f5889f58c451bb40703e8efd4fcbb31081215 (patch) | |
| tree | 7d0c307f400438d974bac59df68e23e3e28f5b69 /dev-libs/glib | |
| parent | Version bump to 2.02. Fixes bug #450080, reported by Adam Randall, 7v5w7go9ub... (diff) | |
| download | gentoo-2-786f5889f58c451bb40703e8efd4fcbb31081215.tar.gz gentoo-2-786f5889f58c451bb40703e8efd4fcbb31081215.tar.bz2 gentoo-2-786f5889f58c451bb40703e8efd4fcbb31081215.zip | |
Add blockers on emul-libs so that it is stacked for baselibs r10
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.36.3-r2.ebuild | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index b6c97f825bda..5a0df61625aa 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.566 2013/08/10 14:24:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.567 2013/08/10 17:44:41 aballier Exp $ + + 10 Aug 2013; Alexis Ballier <aballier@gentoo.org> glib-2.36.3-r2.ebuild: + Add blockers on emul-libs so that it is stacked for baselibs r10 *glib-2.36.3-r2 (10 Aug 2013) diff --git a/dev-libs/glib/glib-2.36.3-r2.ebuild b/dev-libs/glib/glib-2.36.3-r2.ebuild index 004ad8b48a3c..ea4698194fd7 100644 --- a/dev-libs/glib/glib-2.36.3-r2.ebuild +++ b/dev-libs/glib/glib-2.36.3-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/glib/glib-2.36.3-r2.ebuild,v 1.1 2013/08/10 14:24:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r2.ebuild,v 1.2 2013/08/10 17:44:41 aballier Exp $ EAPI="5" PYTHON_COMPAT=( python2_{5,6,7} ) @@ -28,6 +28,10 @@ RDEPEND=" utils? ( ${PYTHON_DEPS} >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) " DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.1.2 |