diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-04-18 14:58:35 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-04-18 14:58:35 +0000 |
commit | bc973aff422d9d4430a6c04193f7ed8636e834d8 (patch) | |
tree | 5f5fc86996102ae54c14a9ee02fef46f1f4a5a62 /media-libs/imlib | |
parent | dev-java/tomcat-native: removed old versions (diff) | |
download | gentoo-2-bc973aff422d9d4430a6c04193f7ed8636e834d8.tar.gz gentoo-2-bc973aff422d9d4430a6c04193f7ed8636e834d8.tar.bz2 gentoo-2-bc973aff422d9d4430a6c04193f7ed8636e834d8.zip |
add app-emulation/emul-linux-x86-gtklibs blocker
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'media-libs/imlib')
-rw-r--r-- | media-libs/imlib/ChangeLog | 5 | ||||
-rw-r--r-- | media-libs/imlib/imlib-1.9.15-r4.ebuild | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/media-libs/imlib/ChangeLog b/media-libs/imlib/ChangeLog index 017e5f167671..1b5b67540f8f 100644 --- a/media-libs/imlib/ChangeLog +++ b/media-libs/imlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/imlib # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.79 2014/04/18 14:49:42 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/ChangeLog,v 1.80 2014/04/18 14:58:35 hasufell Exp $ + + 18 Apr 2014; Julian Ospald <hasufell@gentoo.org> imlib-1.9.15-r4.ebuild: + add app-emulation/emul-linux-x86-gtklibs blocker *imlib-1.9.15-r4 (18 Apr 2014) diff --git a/media-libs/imlib/imlib-1.9.15-r4.ebuild b/media-libs/imlib/imlib-1.9.15-r4.ebuild index 3225005b94f1..d5ba6deeb673 100644 --- a/media-libs/imlib/imlib-1.9.15-r4.ebuild +++ b/media-libs/imlib/imlib-1.9.15-r4.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/imlib/imlib-1.9.15-r4.ebuild,v 1.1 2014/04/18 14:49:42 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r4.ebuild,v 1.2 2014/04/18 14:58:35 hasufell Exp $ EAPI=4 inherit autotools eutils multilib-minimal @@ -22,7 +22,11 @@ RDEPEND=">=media-libs/tiff-3.5.5[${MULTILIB_USEDEP}] virtual/jpeg[${MULTILIB_USEDEP}] x11-libs/libICE[${MULTILIB_USEDEP}] x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}]" + x11-libs/libXext[${MULTILIB_USEDEP}] + abi_x86_32? ( + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + !<=app-emulation/emul-linux-x86-gtklibs-20140406 + )" DEPEND="${RDEPEND}" src_prepare() { |