diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-12-26 16:13:10 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-12-26 16:13:10 +0000 |
| commit | 75a1f7ece6b451ae295e8928cda9f72059cdda6e (patch) | |
| tree | cb1c1c23cf739e682102ed17579baef84635a1f8 /x11-themes/gtk-engines-xfce | |
| parent | Add multilib gtk-engines-xfce:3 (diff) | |
| download | gentoo-2-75a1f7ece6b451ae295e8928cda9f72059cdda6e.tar.gz gentoo-2-75a1f7ece6b451ae295e8928cda9f72059cdda6e.tar.bz2 gentoo-2-75a1f7ece6b451ae295e8928cda9f72059cdda6e.zip | |
Fix file collision with emul-linux-x86-gtklibs
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'x11-themes/gtk-engines-xfce')
| -rw-r--r-- | x11-themes/gtk-engines-xfce/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/x11-themes/gtk-engines-xfce/ChangeLog b/x11-themes/gtk-engines-xfce/ChangeLog index 4239ebae46c9..be694c76363d 100644 --- a/x11-themes/gtk-engines-xfce/ChangeLog +++ b/x11-themes/gtk-engines-xfce/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-themes/gtk-engines-xfce # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog,v 1.168 2014/12/23 16:14:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/ChangeLog,v 1.169 2014/12/26 16:13:10 tetromino Exp $ + + 26 Dec 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + gtk-engines-xfce-3.0.1-r301.ebuild: + Fix file collision with emul-linux-x86-gtklibs *gtk-engines-xfce-3.0.1-r301 (23 Dec 2014) diff --git a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild index 9f7c4ce7b210..a7a75e4cab8c 100644 --- a/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild +++ b/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.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/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild,v 1.1 2014/12/23 16:14:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines-xfce/gtk-engines-xfce-3.0.1-r301.ebuild,v 1.2 2014/12/26 16:13:10 tetromino Exp $ EAPI=5 MY_PN=gtk-xfce-engine @@ -15,9 +15,14 @@ SLOT="3" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" IUSE="debug" -RDEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}] +COMMON_DEPEND=">=dev-libs/glib-2.24[${MULTILIB_USEDEP}] >=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-gtklibs-20140508-r5 + !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] + )" +DEPEND="${COMMON_DEPEND} virtual/pkgconfig[${MULTILIB_USEDEP}]" S=${WORKDIR}/${MY_PN}-${PV} |