diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-03-27 14:46:18 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-03-27 14:46:18 +0000 |
| commit | 6fb7ca046f9b8444398fba27e6609d3404a9d099 (patch) | |
| tree | b3685b956c252a4c9c8fc635f5f33f12343b9e77 /sys-apps/file | |
| parent | Remove libmagic.so* wrt #505936 by Graham Murray (diff) | |
| download | gentoo-2-6fb7ca046f9b8444398fba27e6609d3404a9d099.tar.gz gentoo-2-6fb7ca046f9b8444398fba27e6609d3404a9d099.tar.bz2 gentoo-2-6fb7ca046f9b8444398fba27e6609d3404a9d099.zip | |
Update blockers for libmagic.so* wrt #505936 by Graham Murray
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps/file')
| -rw-r--r-- | sys-apps/file/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-apps/file/file-5.18-r1.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog index 8b96917fabb2..7c454239cb77 100644 --- a/sys-apps/file/ChangeLog +++ b/sys-apps/file/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/file # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.272 2014/03/27 03:30:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.273 2014/03/27 14:46:18 ssuominen Exp $ + + 27 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> file-5.18-r1.ebuild: + Update blockers for libmagic.so* wrt #505936 by Graham Murray *file-5.18-r1 (27 Mar 2014) diff --git a/sys-apps/file/file-5.18-r1.ebuild b/sys-apps/file/file-5.18-r1.ebuild index e2b1f55433b9..046abcd7f746 100644 --- a/sys-apps/file/file-5.18-r1.ebuild +++ b/sys-apps/file/file-5.18-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/sys-apps/file/file-5.18-r1.ebuild,v 1.1 2014/03/27 03:30:14 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.18-r1.ebuild,v 1.2 2014/03/27 14:46:18 ssuominen Exp $ EAPI="4" PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) @@ -25,7 +25,9 @@ SLOT="0" IUSE="python static-libs zlib" DEPEND="python? ( ${PYTHON_DEPS} ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" + zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" RDEPEND="${DEPEND} python? ( !dev-python/python-magic )" |