| 1 |
jlec 13/02/01 14:53:15 |
| 2 |
|
| 3 |
Modified: tree-1.6.0-r1.ebuild metadata.xml ChangeLog |
| 4 |
Log: |
| 5 |
app-text/tree: Resolve file collision sci-biology/meme, #455010 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.12 app-text/tree/tree-1.6.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild?rev=1.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild?r1=1.11&r2=1.12 |
| 15 |
|
| 16 |
Index: tree-1.6.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/tree/tree-1.6.0-r1.ebuild,v |
| 19 |
retrieving revision 1.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- tree-1.6.0-r1.ebuild 20 Aug 2012 01:40:20 -0000 1.11 |
| 23 |
+++ tree-1.6.0-r1.ebuild 1 Feb 2013 14:53:14 -0000 1.12 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2012 Gentoo Foundation |
| 26 |
+# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI=4 |
| 32 |
inherit toolchain-funcs flag-o-matic bash-completion-r1 |
| 33 |
@@ -14,6 +14,9 @@ |
| 34 |
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" |
| 35 |
IUSE="" |
| 36 |
|
| 37 |
+RDEPEND="!=sci-biology/meme-4.8.1" |
| 38 |
+DEPEND="" |
| 39 |
+ |
| 40 |
src_prepare() { |
| 41 |
sed -i \ |
| 42 |
-e 's:LINUX:__linux__:' tree.c \ |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.3 app-text/tree/metadata.xml |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/metadata.xml?rev=1.3&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/metadata.xml?rev=1.3&content-type=text/plain |
| 50 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/metadata.xml?r1=1.2&r2=1.3 |
| 51 |
|
| 52 |
Index: metadata.xml |
| 53 |
=================================================================== |
| 54 |
RCS file: /var/cvsroot/gentoo-x86/app-text/tree/metadata.xml,v |
| 55 |
retrieving revision 1.2 |
| 56 |
retrieving revision 1.3 |
| 57 |
diff -u -r1.2 -r1.3 |
| 58 |
--- metadata.xml 25 Sep 2011 12:01:16 -0000 1.2 |
| 59 |
+++ metadata.xml 1 Feb 2013 14:53:14 -0000 1.3 |
| 60 |
@@ -1,8 +1,8 @@ |
| 61 |
<?xml version="1.0" encoding="UTF-8"?> |
| 62 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 63 |
<pkgmetadata> |
| 64 |
-<maintainer> |
| 65 |
-<email>mr_bones_@g.o</email> |
| 66 |
-<name>Michael Sterrett</name> |
| 67 |
-</maintainer> |
| 68 |
+ <maintainer> |
| 69 |
+ <email>mr_bones_@g.o</email> |
| 70 |
+ <name>Michael Sterrett</name> |
| 71 |
+ </maintainer> |
| 72 |
</pkgmetadata> |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.105 app-text/tree/ChangeLog |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/ChangeLog?rev=1.105&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/ChangeLog?rev=1.105&content-type=text/plain |
| 80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tree/ChangeLog?r1=1.104&r2=1.105 |
| 81 |
|
| 82 |
Index: ChangeLog |
| 83 |
=================================================================== |
| 84 |
RCS file: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v |
| 85 |
retrieving revision 1.104 |
| 86 |
retrieving revision 1.105 |
| 87 |
diff -u -r1.104 -r1.105 |
| 88 |
--- ChangeLog 22 Jan 2013 18:03:02 -0000 1.104 |
| 89 |
+++ ChangeLog 1 Feb 2013 14:53:14 -0000 1.105 |
| 90 |
@@ -1,6 +1,10 @@ |
| 91 |
# ChangeLog for app-text/tree |
| 92 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.104 2013/01/22 18:03:02 mr_bones_ Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/tree/ChangeLog,v 1.105 2013/02/01 14:53:14 jlec Exp $ |
| 95 |
+ |
| 96 |
+ 01 Feb 2013; Justin Lecher <jlec@g.o> tree-1.6.0-r1.ebuild, |
| 97 |
+ metadata.xml: |
| 98 |
+ Resolve file collision sci-biology/meme, #455010 |
| 99 |
|
| 100 |
22 Jan 2013; Michael Sterrett <mr_bones_@g.o> -tree-1.6.0.ebuild: |
| 101 |
old |
Archives