diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-02-01 14:53:14 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-02-01 14:53:14 +0000 |
| commit | bd0a3e556b056adb5321cf13686d3628b687733e (patch) | |
| tree | bf4bc526a97bd39abb3d1db1b8f78604984420b8 /app-text | |
| parent | sci-biology/meme: Resolve file collision with app-text and sci-biology/readse... (diff) | |
| download | gentoo-2-bd0a3e556b056adb5321cf13686d3628b687733e.tar.gz gentoo-2-bd0a3e556b056adb5321cf13686d3628b687733e.tar.bz2 gentoo-2-bd0a3e556b056adb5321cf13686d3628b687733e.zip | |
app-text/tree: Resolve file collision sci-biology/meme, #455010
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/tree/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/tree/metadata.xml | 8 | ||||
| -rw-r--r-- | app-text/tree/tree-1.6.0-r1.ebuild | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/app-text/tree/ChangeLog b/app-text/tree/ChangeLog index 98e90dd223b4..7374b1bdef62 100644 --- a/app-text/tree/ChangeLog +++ b/app-text/tree/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/tree # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.104 2013/01/22 18:03:02 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.105 2013/02/01 14:53:14 jlec Exp $ + + 01 Feb 2013; Justin Lecher <jlec@gentoo.org> tree-1.6.0-r1.ebuild, + metadata.xml: + Resolve file collision sci-biology/meme, #455010 22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> -tree-1.6.0.ebuild: old diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml index 2c7916afbb38..3e22333a0f4b 100644 --- a/app-text/tree/metadata.xml +++ b/app-text/tree/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer> -<email>mr_bones_@gentoo.org</email> -<name>Michael Sterrett</name> -</maintainer> + <maintainer> + <email>mr_bones_@gentoo.org</email> + <name>Michael Sterrett</name> + </maintainer> </pkgmetadata> diff --git a/app-text/tree/tree-1.6.0-r1.ebuild b/app-text/tree/tree-1.6.0-r1.ebuild index 60ca1663b3dc..ff90a7802783 100644 --- a/app-text/tree/tree-1.6.0-r1.ebuild +++ b/app-text/tree/tree-1.6.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild,v 1.11 2012/08/20 01:40:20 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild,v 1.12 2013/02/01 14:53:14 jlec Exp $ EAPI=4 inherit toolchain-funcs flag-o-matic bash-completion-r1 @@ -14,6 +14,9 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="" +RDEPEND="!=sci-biology/meme-4.8.1" +DEPEND="" + src_prepare() { sed -i \ -e 's:LINUX:__linux__:' tree.c \ |