diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-01-28 04:33:05 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-01-28 04:33:05 +0000 |
| commit | 532ac93f7e41e37457ae0115625d7204c6635075 (patch) | |
| tree | a5dbfc10a38e7524d5a176a27fdd2b466e7dc07f /media-libs | |
| parent | Increase version of emul-linux-x86-baselibs blocker to prevent collision on /... (diff) | |
| download | gentoo-2-532ac93f7e41e37457ae0115625d7204c6635075.tar.gz gentoo-2-532ac93f7e41e37457ae0115625d7204c6635075.tar.bz2 gentoo-2-532ac93f7e41e37457ae0115625d7204c6635075.zip | |
Correct previous change.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/libmng/ChangeLog | 6 | ||||
| -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, 9 insertions, 5 deletions
diff --git a/media-libs/libmng/ChangeLog b/media-libs/libmng/ChangeLog index 9f419d7d0a58..077b3ca28455 100644 --- a/media-libs/libmng/ChangeLog +++ b/media-libs/libmng/ChangeLog @@ -1,6 +1,10 @@ # 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.87 2014/01/28 04:29:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/ChangeLog,v 1.88 2014/01/28 04:33:05 floppym Exp $ + + 28 Jan 2014; Mike Gilbert <floppym@gentoo.org> libmng-2.0.2-r1.ebuild, + libmng-2.0.2.ebuild: + Correct previous change. 28 Jan 2014; Mike Gilbert <floppym@gentoo.org> libmng-2.0.2-r1.ebuild, libmng-2.0.2.ebuild: diff --git a/media-libs/libmng/libmng-2.0.2-r1.ebuild b/media-libs/libmng/libmng-2.0.2-r1.ebuild index aa7a3bbaabab..6eaa56992cf1 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.2 2014/01/28 04:29:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-2.0.2-r1.ebuild,v 1.3 2014/01/28 04:33:05 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-r9 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-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 17ff587921c8..e4c92810cbf4 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.2 2014/01/28 04:29:21 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libmng/libmng-2.0.2.ebuild,v 1.3 2014/01/28 04:33:05 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-r9 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" DEPEND="${RDEPEND}" |