diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-01-28 04:29:21 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-01-28 04:29:21 +0000 |
| commit | 813c439a8951d64c35977fdf59ef144da3bcb292 (patch) | |
| tree | 6bfb0fe45943ba89043b637d8f7123149a326869 /media-libs/libmng | |
| parent | now with a better fix for bug 498272 (diff) | |
| download | gentoo-2-813c439a8951d64c35977fdf59ef144da3bcb292.tar.gz gentoo-2-813c439a8951d64c35977fdf59ef144da3bcb292.tar.bz2 gentoo-2-813c439a8951d64c35977fdf59ef144da3bcb292.zip | |
Increase version of emul-linux-x86-baselibs blocker to prevent collision on /usr/lib32/libmng.so.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'media-libs/libmng')
| -rw-r--r-- | media-libs/libmng/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libmng/libmng-2.0.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/libmng/libmng-2.0.2.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog index 9ad7f384bee7..9f419d7d0a58 100644 --- a/media-libs/libmng/ChangeLog +++ b/media-libs/libmng/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libmng # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.86 2014/01/27 18:12:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.87 2014/01/28 04:29:21 floppym Exp $ + + 28 Jan 2014; Mike Gilbert <floppym@gentoo.org> libmng-2.0.2-r1.ebuild, + libmng-2.0.2.ebuild: + Increase version of emul-linux-x86-baselibs blocker to prevent collision on + /usr/lib32/libmng.so. *libmng-2.0.2-r1 (27 Jan 2014) diff --git a/media-libs/libmng/libmng-2.0.2-r1.ebuild b/media-libs/libmng/libmng-2.0.2-r1.ebuild index 92a5bf4d0ca8..aa7a3bbaabab 100644 --- a/media-libs/libmng/libmng-2.0.2-r1.ebuild +++ b/media-libs/libmng/libmng-2.0.2-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/libmng/libmng-2.0.2-r1.ebuild,v 1.1 2014/01/27 18:12:40 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-2.0.2-r1.ebuild,v 1.2 2014/01/28 04:29:21 floppym Exp $ EAPI=5 inherit eutils autotools-multilib @@ -17,7 +17,7 @@ IUSE="lcms static-libs" RDEPEND="virtual/jpeg:0[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND}" diff --git a/media-libs/libmng/libmng-2.0.2.ebuild b/media-libs/libmng/libmng-2.0.2.ebuild index 339dca89b8c8..17ff587921c8 100644 --- a/media-libs/libmng/libmng-2.0.2.ebuild +++ b/media-libs/libmng/libmng-2.0.2.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/libmng/libmng-2.0.2.ebuild,v 1.1 2014/01/27 13:09:46 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-2.0.2.ebuild,v 1.2 2014/01/28 04:29:21 floppym Exp $ EAPI=5 inherit autotools-multilib @@ -17,7 +17,7 @@ IUSE="lcms static-libs" RDEPEND="virtual/jpeg:0[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}] lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND}" |