diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-02-17 00:50:13 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-02-17 00:50:13 +0000 |
| commit | 864c952d7ac593af8533fa3c17ccf916412f5ef3 (patch) | |
| tree | 1c910d27d256425018fc75ca40566251c0f6e3a6 /sys-devel | |
| parent | Fix file collision with new sys-devel/autoconf-archive versions; USE=autoconf... (diff) | |
| download | gentoo-2-864c952d7ac593af8533fa3c17ccf916412f5ef3.tar.gz gentoo-2-864c952d7ac593af8533fa3c17ccf916412f5ef3.tar.bz2 gentoo-2-864c952d7ac593af8533fa3c17ccf916412f5ef3.zip | |
File collision with gnome-common, bug #540138
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/autoconf-archive/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sys-devel/autoconf-archive/ChangeLog b/sys-devel/autoconf-archive/ChangeLog index a29a7c32eed1..122d037f0aaa 100644 --- a/sys-devel/autoconf-archive/ChangeLog +++ b/sys-devel/autoconf-archive/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/autoconf-archive # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/ChangeLog,v 1.71 2015/02/15 08:39:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/ChangeLog,v 1.72 2015/02/17 00:50:13 tetromino Exp $ + + 17 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + autoconf-archive-2015.02.04.ebuild: + File collision with gnome-common, bug #540138 *autoconf-archive-2015.02.04 (15 Feb 2015) diff --git a/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild index 97d3ccc63bff..5623dfc264eb 100644 --- a/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild +++ b/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild,v 1.1 2015/02/15 08:39:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-archive/autoconf-archive-2015.02.04.ebuild,v 1.2 2015/02/17 00:50:13 tetromino Exp $ EAPI=5 @@ -13,6 +13,11 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" +#file collisions, bug #540246 +RDEPEND="!=gnome-base/gnome-common-3.14.0 + !>=gnome-base/gnome-common-3.14.0-r1[-autoconf-archive(+)]" +DEPEND="" + DOCS=( AUTHORS ChangeLog NEWS README TODO ) src_install() { |