Merge lp:~gagern/bzr-gentoo-overlay/trac-bzr into lp:~malept/bzr-gentoo-overlay/overlay-main
- trac-bzr
- Merge into overlay-main
Proposed by
Martin von Gagern
Status: | Merged |
---|---|
Merged at revision: | 362 |
Proposed branch: | lp:~gagern/bzr-gentoo-overlay/trac-bzr |
Merge into: | lp:~malept/bzr-gentoo-overlay/overlay-main |
Diff against target: |
284 lines (+72/-94) 18 files modified
app-vim/vcscommand/Manifest (+3/-3) app-vim/vcscommand/metadata.xml (+1/-1) app-vim/vcscommand/vcscommand-1.99.37.ebuild (+2/-2) dev-vcs/bzr-bash-completion/ChangeLog (+10/-0) dev-vcs/bzr-bash-completion/Manifest (+4/-0) dev-vcs/bzr-bash-completion/bzr-bash-completion-1.0.2.ebuild (+37/-0) dev-vcs/bzr-bash-completion/metadata.xml (+9/-0) dev-vcs/bzr-explorer/Manifest (+0/-3) dev-vcs/bzr-explorer/bzr-explorer-1.0.1.ebuild (+0/-26) dev-vcs/bzr-explorer/metadata.xml (+0/-9) dev-vcs/bzr-hg/Manifest (+1/-1) dev-vcs/bzr-hg/bzr-hg-0.1.ebuild (+1/-1) dev-vcs/bzr-rewrite/Manifest (+0/-3) dev-vcs/bzr-rewrite/bzr-rewrite-0.5.5.ebuild (+0/-22) dev-vcs/bzr-rewrite/metadata.xml (+0/-9) dev-vcs/bzr/Manifest (+2/-2) www-apps/trac-bzr/ChangeLog (+0/-9) www-apps/trac-bzr/Manifest (+2/-3) |
To merge this branch: | bzr merge lp:~gagern/bzr-gentoo-overlay/trac-bzr |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mark Lee | Approve | ||
Review via email: mp+20910@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
- 305. By Martin von Gagern
-
trac-bzr: Added forgotten ChangeLog entry
- 306. By Martin von Gagern
-
trac-bzr: merge from bzr-overlay-dev dropping ChangeLog
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'app-vim/vcscommand/Manifest' | |||
2 | --- app-vim/vcscommand/Manifest 2010-03-05 09:15:13 +0000 | |||
3 | +++ app-vim/vcscommand/Manifest 2010-03-31 07:43:25 +0000 | |||
4 | @@ -1,3 +1,3 @@ | |||
8 | 1 | DIST vcscommand-1.99.31.zip 48010 RMD160 018dda491b9fc22e9c8346546e099ccacedfdba2 SHA1 031dd2d9f02a7bc2c5ae68d4ce9edbfac080d7c4 SHA256 077a41623ef26a5d6920f5352c6a170b08810aaefd9f1947edab36f3c8c0cb55 | 1 | DIST vcscommand-1.99.37.zip 48713 RMD160 4c4b55080244aa7c54bf5f0ad569375f4f4fc678 SHA1 0bdaf63759ed1df10e4057a27713324b5b3dec0f SHA256 c58430d006b99938192ef57c2d4e8e4ed87421ea37ad4264c30be6a793ea07bb |
9 | 2 | EBUILD vcscommand-1.99.31.ebuild 1483 RMD160 0384fc13cf0f80543e7d9f2f2a660214cf0b3aeb SHA1 e03350e2ddab98167eb8e9f3e201a272eb3013ca SHA256 81c663c9fff5363bfc13dc28ef55ea99b09957ea23f95e815219dae8620872c7 | 2 | EBUILD vcscommand-1.99.37.ebuild 1481 RMD160 13f9d1390b6e250f3e99ee8c7c9ad0d304b8ad29 SHA1 05939ee21922d192ec2b6d05f5b1e061bc6e1193 SHA256 b457c9ae9441223ad2959f464b5674505faa8ed3ab0db91a4556371b61ddd169 |
10 | 3 | MISC metadata.xml 504 RMD160 3a974997f7f52e5e53559b89f305bf8fc1523370 SHA1 136dc36152fb10cd9cce5af12902ca861073dfeb SHA256 599b76668782595e5f9c67516c6b4781f1b81c17384226704a6f9cf8591a9aad | 3 | MISC metadata.xml 503 RMD160 5a54a15bdada6eb29a18a2565a76680328e24c55 SHA1 24f6dcb138d110ae4cadf116f42a2775ce4fdcc9 SHA256 8d02b42ff921d7ab415dbc1175f1736f0abe54152cba31eacc61b42fa8f80577 |
11 | 4 | 4 | ||
12 | === modified file 'app-vim/vcscommand/metadata.xml' | |||
13 | --- app-vim/vcscommand/metadata.xml 2010-03-05 09:15:13 +0000 | |||
14 | +++ app-vim/vcscommand/metadata.xml 2010-03-31 07:43:25 +0000 | |||
15 | @@ -9,6 +9,6 @@ | |||
16 | 9 | <use> | 9 | <use> |
17 | 10 | <flag name='bzr'>Enable support for <pkg>dev-vcs/bzr</pkg></flag> | 10 | <flag name='bzr'>Enable support for <pkg>dev-vcs/bzr</pkg></flag> |
18 | 11 | <flag name='svk'>Enable support for <pkg>dev-util/svk</pkg></flag> | 11 | <flag name='svk'>Enable support for <pkg>dev-util/svk</pkg></flag> |
20 | 12 | <flag name='git'>Enable support for <pkg>dev-util/git</pkg></flag> | 12 | <flag name='git'>Enable support for <pkg>dev-vcs/git</pkg></flag> |
21 | 13 | </use> | 13 | </use> |
22 | 14 | </pkgmetadata> | 14 | </pkgmetadata> |
23 | 15 | 15 | ||
24 | === renamed file 'app-vim/vcscommand/vcscommand-1.99.31.ebuild' => 'app-vim/vcscommand/vcscommand-1.99.37.ebuild' | |||
25 | --- app-vim/vcscommand/vcscommand-1.99.31.ebuild 2010-03-05 09:15:13 +0000 | |||
26 | +++ app-vim/vcscommand/vcscommand-1.99.37.ebuild 2010-03-31 07:43:25 +0000 | |||
27 | @@ -18,9 +18,9 @@ | |||
28 | 18 | RDEPEND="cvs? ( dev-util/cvs ) | 18 | RDEPEND="cvs? ( dev-util/cvs ) |
29 | 19 | subversion? ( dev-util/subversion ) | 19 | subversion? ( dev-util/subversion ) |
30 | 20 | svk? ( dev-util/svk ) | 20 | svk? ( dev-util/svk ) |
32 | 21 | git? ( dev-util/git ) | 21 | git? ( dev-vcs/git ) |
33 | 22 | bzr? ( dev-vcs/bzr ) | 22 | bzr? ( dev-vcs/bzr ) |
35 | 23 | mercurial? ( dev-util/mercurial ) | 23 | mercurial? ( dev-vcs/mercurial ) |
36 | 24 | !app-vim/bzr-vim | 24 | !app-vim/bzr-vim |
37 | 25 | !app-vim/cvscommand | 25 | !app-vim/cvscommand |
38 | 26 | !app-vim/calendar" # conflict, bug 62677 | 26 | !app-vim/calendar" # conflict, bug 62677 |
39 | 27 | 27 | ||
40 | === added directory 'dev-vcs/bzr-bash-completion' | |||
41 | === added file 'dev-vcs/bzr-bash-completion/ChangeLog' | |||
42 | --- dev-vcs/bzr-bash-completion/ChangeLog 1970-01-01 00:00:00 +0000 | |||
43 | +++ dev-vcs/bzr-bash-completion/ChangeLog 2010-03-31 07:43:25 +0000 | |||
44 | @@ -0,0 +1,10 @@ | |||
45 | 1 | # ChangeLog for dev-vcs/bzr-bash-completion | ||
46 | 2 | # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 | ||
47 | 3 | # $Header: $ | ||
48 | 4 | |||
49 | 5 | *bzr-bash-completion-1.0.2 (15 Mar 2010) | ||
50 | 6 | |||
51 | 7 | 15 Mar 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net> | ||
52 | 8 | +bzr-bash-completion-1.0.2.ebuild, +metadata.xml: | ||
53 | 9 | Initial ebuild. | ||
54 | 10 | |||
55 | 0 | 11 | ||
56 | === added file 'dev-vcs/bzr-bash-completion/Manifest' | |||
57 | --- dev-vcs/bzr-bash-completion/Manifest 1970-01-01 00:00:00 +0000 | |||
58 | +++ dev-vcs/bzr-bash-completion/Manifest 2010-03-31 07:43:25 +0000 | |||
59 | @@ -0,0 +1,4 @@ | |||
60 | 1 | DIST bzr-bash-completion-1.0.2.tar.gz 7603 RMD160 f6be64105921655923083f89e1cb381cd8069032 SHA1 7e0b5764121b9ac6937cff36ad414c6743a21850 SHA256 37c3bbc8e0a0f76c4aee87db7dc887a5a78b9a0a5096922992d46a2606905943 | ||
61 | 2 | EBUILD bzr-bash-completion-1.0.2.ebuild 1037 RMD160 97b57b0038e81513cc486c3313e4b2f3562b62ea SHA1 c220826a2d659bb4faccf1a34337b62abd6798c9 SHA256 dc46c62b349cbca433c35e0aa02d30f6ac0532d36a589390eda71abc80be9268 | ||
62 | 3 | MISC ChangeLog 305 RMD160 054a5f333b70cd190edb3be7432e75084ea8f939 SHA1 81b138463e4b072df41085291aa00d9180a5bb70 SHA256 b17015bf99b4bedb0b0b393efe13ba700450cd4dbd232a656346cdb653f15718 | ||
63 | 4 | MISC metadata.xml 313 RMD160 5037f6aeced048ad62d0272cec44453ca30ff6f8 SHA1 3e6242d576c2421aa19b7afbda6b27536a16103a SHA256 69c8b1939eb2abfa9f8e01cdb75c66185ac7430130f6aedcb82217d7d8a441f0 | ||
64 | 0 | 5 | ||
65 | === added file 'dev-vcs/bzr-bash-completion/bzr-bash-completion-1.0.2.ebuild' | |||
66 | --- dev-vcs/bzr-bash-completion/bzr-bash-completion-1.0.2.ebuild 1970-01-01 00:00:00 +0000 | |||
67 | +++ dev-vcs/bzr-bash-completion/bzr-bash-completion-1.0.2.ebuild 2010-03-31 07:43:25 +0000 | |||
68 | @@ -0,0 +1,37 @@ | |||
69 | 1 | # Copyright 1999-2010 Gentoo Foundation | ||
70 | 2 | # Distributed under the terms of the GNU General Public License v2 | ||
71 | 3 | # $Header: $ | ||
72 | 4 | |||
73 | 5 | EAPI=2 | ||
74 | 6 | |||
75 | 7 | inherit distutils | ||
76 | 8 | |||
77 | 9 | DESCRIPTION="Bash completion for the bazaar bzr command" | ||
78 | 10 | HOMEPAGE="https://launchpad.net/${PN}" | ||
79 | 11 | SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.gz" | ||
80 | 12 | |||
81 | 13 | LICENSE="GPL2" | ||
82 | 14 | SLOT="0" | ||
83 | 15 | KEYWORDS="~amd64 ~x86" | ||
84 | 16 | IUSE="" | ||
85 | 17 | |||
86 | 18 | DEPEND="" | ||
87 | 19 | RDEPEND=">=app-shells/bash-completion-1.1-r5 | ||
88 | 20 | dev-vcs/bzr[-bash-completion]" | ||
89 | 21 | |||
90 | 22 | src_prepare() { | ||
91 | 23 | distutils_src_prepare || die "Failed to prepare python code" | ||
92 | 24 | |||
93 | 25 | # Other bash-completion functions don't set progcomp either | ||
94 | 26 | sed -i '/^shopt -s progcomp$/d' lazy.sh | ||
95 | 27 | } | ||
96 | 28 | |||
97 | 29 | src_install() { | ||
98 | 30 | distutils_src_install || die "Failed to install python code" | ||
99 | 31 | |||
100 | 32 | # we cannot use dobashcompletion from bash-completion.eclass, as | ||
101 | 33 | # that eclass assumes a bash-completion IUSE, which we don't want. | ||
102 | 34 | # So we have to copy its functionality. All two lines of it. :-) | ||
103 | 35 | insinto /usr/share/bash-completion | ||
104 | 36 | newins lazy.sh bzr || die "Failed to install lazy completion script" | ||
105 | 37 | } | ||
106 | 0 | 38 | ||
107 | === added file 'dev-vcs/bzr-bash-completion/metadata.xml' | |||
108 | --- dev-vcs/bzr-bash-completion/metadata.xml 1970-01-01 00:00:00 +0000 | |||
109 | +++ dev-vcs/bzr-bash-completion/metadata.xml 2010-03-31 07:43:25 +0000 | |||
110 | @@ -0,0 +1,9 @@ | |||
111 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
112 | 2 | <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
113 | 3 | <pkgmetadata> | ||
114 | 4 | <herd>no-herd</herd> | ||
115 | 5 | <maintainer> | ||
116 | 6 | <email>Martin.vGagern@gmx.net</email> | ||
117 | 7 | <description>bzr-bash-completion maintainer and Gentoo user</description> | ||
118 | 8 | </maintainer> | ||
119 | 9 | </pkgmetadata> | ||
120 | 0 | 10 | ||
121 | === removed directory 'dev-vcs/bzr-explorer' | |||
122 | === removed file 'dev-vcs/bzr-explorer/Manifest' | |||
123 | --- dev-vcs/bzr-explorer/Manifest 2010-03-19 15:51:23 +0000 | |||
124 | +++ dev-vcs/bzr-explorer/Manifest 1970-01-01 00:00:00 +0000 | |||
125 | @@ -1,3 +0,0 @@ | |||
126 | 1 | DIST bzr-explorer-1.0.1.tar.gz 1325713 RMD160 ee0e35a596b41dcde76bf8d22c828cd7656173fc SHA1 96fe9fe4b1c144b52699e15164e942852cadaa87 SHA256 1d5d1d74ac1910820de7fb76a3ba17f454d066201fa44de2921f4de5c8642a2c | ||
127 | 2 | EBUILD bzr-explorer-1.0.1.ebuild 586 RMD160 5dfa256dc978baebc415a8d0f0a77253eac285b2 SHA1 e4af0d37fa4d2d1ddcfc0affc8a2b623ba7ad76f SHA256 c58eb19d480925f65424c5ab4851a31fba5834b6e34057452c5d921d6c649b9f | ||
128 | 3 | MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4 | ||
129 | 4 | 0 | ||
130 | === removed file 'dev-vcs/bzr-explorer/bzr-explorer-1.0.1.ebuild' | |||
131 | --- dev-vcs/bzr-explorer/bzr-explorer-1.0.1.ebuild 2010-03-19 15:51:23 +0000 | |||
132 | +++ dev-vcs/bzr-explorer/bzr-explorer-1.0.1.ebuild 1970-01-01 00:00:00 +0000 | |||
133 | @@ -1,26 +0,0 @@ | |||
134 | 1 | # Copyright 1999-2009 Gentoo Foundation | ||
135 | 2 | # Distributed under the terms of the GNU General Public License v2 | ||
136 | 3 | # $Header: $ | ||
137 | 4 | |||
138 | 5 | inherit distutils versionator | ||
139 | 6 | |||
140 | 7 | MY_PV=${PV/_beta/b} | ||
141 | 8 | MY_PV=${MY_PV/_rc/rc} | ||
142 | 9 | LPV=${MY_PV} | ||
143 | 10 | MY_P=${PN}-${MY_PV} | ||
144 | 11 | |||
145 | 12 | DESCRIPTION="A high level interface to all commonly used Bazaar features" | ||
146 | 13 | HOMEPAGE="https://launchpad.net/bzr-explorer" | ||
147 | 14 | SRC_URI="http://launchpad.net/${PN}/1.0/${LPV}/+download/${MY_P}.tar.gz" | ||
148 | 15 | LICENSE="GPL-2" | ||
149 | 16 | |||
150 | 17 | SLOT="0" | ||
151 | 18 | KEYWORDS="~x86" | ||
152 | 19 | IUSE="gtk" | ||
153 | 20 | |||
154 | 21 | DEPEND="" | ||
155 | 22 | RDEPEND=">=dev-vcs/bzr-1.14 | ||
156 | 23 | >=dev-util/qbzr-0.13 | ||
157 | 24 | gtk? ( dev-vcs/bzr-gtk )" | ||
158 | 25 | |||
159 | 26 | S="${WORKDIR}"/${MY_P} | ||
160 | 27 | 0 | ||
161 | === removed file 'dev-vcs/bzr-explorer/metadata.xml' | |||
162 | --- dev-vcs/bzr-explorer/metadata.xml 2009-09-08 11:03:04 +0000 | |||
163 | +++ dev-vcs/bzr-explorer/metadata.xml 1970-01-01 00:00:00 +0000 | |||
164 | @@ -1,9 +0,0 @@ | |||
165 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
166 | 2 | <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
167 | 3 | <pkgmetadata> | ||
168 | 4 | <herd>no-herd</herd> | ||
169 | 5 | <maintainer> | ||
170 | 6 | <email>maintainer-wanted@gentoo.org</email> | ||
171 | 7 | <name>Default assignee for new packages</name> | ||
172 | 8 | </maintainer> | ||
173 | 9 | </pkgmetadata> | ||
174 | 10 | 0 | ||
175 | === modified file 'dev-vcs/bzr-hg/Manifest' | |||
176 | --- dev-vcs/bzr-hg/Manifest 2010-03-05 08:17:58 +0000 | |||
177 | +++ dev-vcs/bzr-hg/Manifest 2010-03-31 07:43:25 +0000 | |||
178 | @@ -1,3 +1,3 @@ | |||
179 | 1 | DIST bzr-hg-0.1.tar.gz 20503 RMD160 f436bc14ffb6b04aaccb247cc2b9a0cce83b9ad9 SHA1 04a470a7dfb7d9e72bb70bc7c3a521e415ae6004 SHA256 5498103bda42b0efd585e5d3f4ca9cd051ef500ead8a176d875a1426b52cd058 | 1 | DIST bzr-hg-0.1.tar.gz 20503 RMD160 f436bc14ffb6b04aaccb247cc2b9a0cce83b9ad9 SHA1 04a470a7dfb7d9e72bb70bc7c3a521e415ae6004 SHA256 5498103bda42b0efd585e5d3f4ca9cd051ef500ead8a176d875a1426b52cd058 |
181 | 2 | EBUILD bzr-hg-0.1.ebuild 491 RMD160 a650278574b895eb2d84bb84e7f48cabe9dabaee SHA1 179365597d70bbc8b79713a1910201325b67400e SHA256 f92255cc0cbad05ab31aacb3b16fb62e370c46cb4042141bdba6308bfdcb7511 | 2 | EBUILD bzr-hg-0.1.ebuild 490 RMD160 c82bbcc5f7cf0a9daa8555982a17717e2cbab91a SHA1 6738f8206b9d0546ab2f85e4c435738b47403907 SHA256 0107dc34c8b84205a863a41ebf5e656e3b4dd8056351a6c39bfde4d38253ce96 |
182 | 3 | MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4 | 3 | MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4 |
183 | 4 | 4 | ||
184 | === modified file 'dev-vcs/bzr-hg/bzr-hg-0.1.ebuild' | |||
185 | --- dev-vcs/bzr-hg/bzr-hg-0.1.ebuild 2010-03-05 08:17:58 +0000 | |||
186 | +++ dev-vcs/bzr-hg/bzr-hg-0.1.ebuild 2010-03-31 07:43:25 +0000 | |||
187 | @@ -19,5 +19,5 @@ | |||
188 | 19 | RDEPEND="${DEPEND} | 19 | RDEPEND="${DEPEND} |
189 | 20 | >=dev-vcs/bzr-1.16 | 20 | >=dev-vcs/bzr-1.16 |
190 | 21 | <dev-vcs/bzr-2.1.0_beta1 | 21 | <dev-vcs/bzr-2.1.0_beta1 |
192 | 22 | >=dev-util/mercurial-1.3.1" | 22 | >=dev-vcs/mercurial-1.3.1" |
193 | 23 | 23 | ||
194 | 24 | 24 | ||
195 | === removed directory 'dev-vcs/bzr-rewrite' | |||
196 | === removed file 'dev-vcs/bzr-rewrite/Manifest' | |||
197 | --- dev-vcs/bzr-rewrite/Manifest 2010-03-05 08:17:58 +0000 | |||
198 | +++ dev-vcs/bzr-rewrite/Manifest 1970-01-01 00:00:00 +0000 | |||
199 | @@ -1,3 +0,0 @@ | |||
200 | 1 | DIST bzr-rewrite-0.5.5.tar.gz 30688 RMD160 958c887eb4c28ddf527927e9890d438792917d35 SHA1 c7de2e5fb07153d52aaf7f8a4d556dded075a3f4 SHA256 fb100a9b8259deeaeb2d22bd6ed7c3230c9756a08571ffd33c406c811f6e4dc4 | ||
201 | 2 | EBUILD bzr-rewrite-0.5.5.ebuild 501 RMD160 1473b9f15b4d4f5a610f3255d113a5ecfcf9647d SHA1 ccdfe6b2096fe120aef5229127b2003ad45a9a93 SHA256 0d7ff96a0954a1ad2a6c0837f92f83ea3ce15b3153d0d2a6de1735c8e5b03097 | ||
202 | 3 | MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4 | ||
203 | 4 | 0 | ||
204 | === removed file 'dev-vcs/bzr-rewrite/bzr-rewrite-0.5.5.ebuild' | |||
205 | --- dev-vcs/bzr-rewrite/bzr-rewrite-0.5.5.ebuild 2010-03-05 08:17:58 +0000 | |||
206 | +++ dev-vcs/bzr-rewrite/bzr-rewrite-0.5.5.ebuild 1970-01-01 00:00:00 +0000 | |||
207 | @@ -1,22 +0,0 @@ | |||
208 | 1 | # Copyright 1999-2009 Gentoo Foundation | ||
209 | 2 | # Distributed under the terms of the GNU General Public License v2 | ||
210 | 3 | # $Header: $ | ||
211 | 4 | |||
212 | 5 | EAPI=2 | ||
213 | 6 | |||
214 | 7 | inherit distutils eutils | ||
215 | 8 | |||
216 | 9 | DESCRIPTION="Bazaar plugin that adds support for rebasing, similar to the \ | ||
217 | 10 | rebase functionality in git" | ||
218 | 11 | HOMEPAGE="http://bazaar-vcs.org/Rebase" | ||
219 | 12 | SRC_URI="http://samba.org/~jelmer/bzr/${P}.tar.gz" | ||
220 | 13 | |||
221 | 14 | LICENSE="GPL-3" | ||
222 | 15 | SLOT="0" | ||
223 | 16 | KEYWORDS="~amd64 ~x86" | ||
224 | 17 | IUSE="" | ||
225 | 18 | |||
226 | 19 | DEPEND=">=dev-vcs/bzr-1.14 | ||
227 | 20 | !dev-vcs/bzr-rebase" | ||
228 | 21 | RDEPEND="${DEPEND} | ||
229 | 22 | !<dev-vcs/bzr-svn-0.6" | ||
230 | 23 | 0 | ||
231 | === removed file 'dev-vcs/bzr-rewrite/metadata.xml' | |||
232 | --- dev-vcs/bzr-rewrite/metadata.xml 2009-03-08 02:01:25 +0000 | |||
233 | +++ dev-vcs/bzr-rewrite/metadata.xml 1970-01-01 00:00:00 +0000 | |||
234 | @@ -1,9 +0,0 @@ | |||
235 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
236 | 2 | <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> | ||
237 | 3 | <pkgmetadata> | ||
238 | 4 | <herd>no-herd</herd> | ||
239 | 5 | <maintainer> | ||
240 | 6 | <email>maintainer-wanted@gentoo.org</email> | ||
241 | 7 | <name>Default assignee for new packages</name> | ||
242 | 8 | </maintainer> | ||
243 | 9 | </pkgmetadata> | ||
244 | 10 | 0 | ||
245 | === modified file 'dev-vcs/bzr/Manifest' | |||
246 | --- dev-vcs/bzr/Manifest 2010-03-05 09:16:31 +0000 | |||
247 | +++ dev-vcs/bzr/Manifest 2010-03-31 07:43:25 +0000 | |||
248 | @@ -1,6 +1,6 @@ | |||
249 | 1 | AUX 71bzr-gentoo.el 83 RMD160 409d99a9841616acedb77766074f65fe02c71ef0 SHA1 41ed64ffdbf3ab80a3fd054ca868ed82f3622da2 SHA256 4c60e63d561d32420b34d6749fed1b93dbfca7f235ec1c46402fc368ca707d1c | 1 | AUX 71bzr-gentoo.el 83 RMD160 409d99a9841616acedb77766074f65fe02c71ef0 SHA1 41ed64ffdbf3ab80a3fd054ca868ed82f3622da2 SHA256 4c60e63d561d32420b34d6749fed1b93dbfca7f235ec1c46402fc368ca707d1c |
250 | 2 | AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec | 2 | AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec |
251 | 3 | AUX bzr-0.90-tests-sgid.patch 611 RMD160 09a40cb4424e7dc86b48a577152cc7297c6333db SHA1 b7c42cb9b5cd5de4ebe11378870c6cf8eae52591 SHA256 e7514aa51c23405ba619c323b1bd6dbafffe5c584d8274d4e1df0c2347fd55a7 | 3 | AUX bzr-0.90-tests-sgid.patch 611 RMD160 09a40cb4424e7dc86b48a577152cc7297c6333db SHA1 b7c42cb9b5cd5de4ebe11378870c6cf8eae52591 SHA256 e7514aa51c23405ba619c323b1bd6dbafffe5c584d8274d4e1df0c2347fd55a7 |
254 | 4 | DIST bzr-2.1.0.tar.gz 6787494 RMD160 c54ca16aca7811fc34b71ff852199afab3f19519 SHA1 cc7137c657d7918e833e64d77a267f8162d3a05d SHA256 7a1e9353eeabdc0f7ff540fb095994a93a6022e03063c9750faaf2d459277125 | 4 | DIST bzr-2.1.1.tar.gz 6786377 RMD160 a1c6e91907954d2bbaa117eafccaa69d70d0c337 SHA1 f8628ef1a9e9b7a397a8d673cef677e5449f6e95 SHA256 b87d2974d0f6dc58701958ded82d56b45d566af8eedf2d8580f3c887cd86d651 |
255 | 5 | EBUILD bzr-2.1.0.ebuild 4462 RMD160 4652a58231f4f05af87cc3d6219650de4ae82338 SHA1 56a24ad8d65907b3706ebe00592b7f3039c630ef SHA256 ac488b3ffba2b23ba495ecb9f058ad3917370466c5459f4aee10b490f7f611fe | 5 | EBUILD bzr-2.1.1.ebuild 4462 RMD160 4652a58231f4f05af87cc3d6219650de4ae82338 SHA1 56a24ad8d65907b3706ebe00592b7f3039c630ef SHA256 ac488b3ffba2b23ba495ecb9f058ad3917370466c5459f4aee10b490f7f611fe |
256 | 6 | EBUILD bzr-9999.ebuild 2944 RMD160 f787e49248f41949fe5c8c97d21197d6adca8a21 SHA1 c2ef3875c514dbeb000a1ae1dd469cf3503c221b SHA256 bb3be1a0ca656f02d95fadcc57cf345efd1078a1a17b3274466e404b4e8d5b93 | 6 | EBUILD bzr-9999.ebuild 2944 RMD160 f787e49248f41949fe5c8c97d21197d6adca8a21 SHA1 c2ef3875c514dbeb000a1ae1dd469cf3503c221b SHA256 bb3be1a0ca656f02d95fadcc57cf345efd1078a1a17b3274466e404b4e8d5b93 |
257 | 7 | 7 | ||
258 | === renamed file 'dev-vcs/bzr/bzr-2.1.0.ebuild' => 'dev-vcs/bzr/bzr-2.1.1.ebuild' | |||
259 | === removed file 'www-apps/trac-bzr/ChangeLog' | |||
260 | --- www-apps/trac-bzr/ChangeLog 2010-01-06 13:31:32 +0000 | |||
261 | +++ www-apps/trac-bzr/ChangeLog 1970-01-01 00:00:00 +0000 | |||
262 | @@ -1,9 +0,0 @@ | |||
263 | 1 | # ChangeLog for www-apps/trac-bzr | ||
264 | 2 | # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 | ||
265 | 3 | # $Header: $ | ||
266 | 4 | |||
267 | 5 | *trac-bzr-0.3.0 (06 Jan 2009) | ||
268 | 6 | |||
269 | 7 | 06 Jan 2010; Martin von Gagern (MvG) <Martin.vGagern@gmx.net> | ||
270 | 8 | +trac-bzr-0.3.0.ebuild: | ||
271 | 9 | Initial import. | ||
272 | 10 | 0 | ||
273 | === modified file 'www-apps/trac-bzr/Manifest' | |||
274 | --- www-apps/trac-bzr/Manifest 2010-01-06 13:31:32 +0000 | |||
275 | +++ www-apps/trac-bzr/Manifest 2010-03-31 07:43:25 +0000 | |||
276 | @@ -1,4 +1,3 @@ | |||
280 | 1 | DIST TracBzr-0.3.0.tar.gz 24882 RMD160 eb703d2188fabd8fd5b68371d23bb32be34f27a4 SHA1 1574428030900df1eee5ae9e73d9c84d617178e3 SHA256 ed42655fb976b31355eca3de4c4cc66fd9c25706fe006103750e6416a88ce14d | 1 | DIST TracBzr-0.3.2.tar.gz 26107 RMD160 48a5d54bf5cb12b38a8c91c18015dc3a3ebe3361 SHA1 3dfd8fe145c51816c1fb65609d9958c3c342b607 SHA256 e88e8b494e4285489042e7e3d56a9830690c023f279bb36aede01e492023df73 |
281 | 2 | EBUILD trac-bzr-0.3.0.ebuild 475 RMD160 6b23797e2b04a773d4f1499d9880ce104d732206 SHA1 716d3d5f50e7b7b7c105bbb7e3794881b7261463 SHA256 badd2ee3b32ddca45ac9b13ac01f889ea94e80e2b7f10b9db3f240d5ba1e5a14 | 2 | EBUILD trac-bzr-0.3.2.ebuild 475 RMD160 6b23797e2b04a773d4f1499d9880ce104d732206 SHA1 716d3d5f50e7b7b7c105bbb7e3794881b7261463 SHA256 badd2ee3b32ddca45ac9b13ac01f889ea94e80e2b7f10b9db3f240d5ba1e5a14 |
279 | 3 | MISC ChangeLog 257 RMD160 95adca7b885b5f8c8fe7d1eafa02fcfd99bc6499 SHA1 068be3f2bb9518ade14857c1e1e780c7c5483a6d SHA256 ac045fb3cd4921c62bce54b6a8faec3b22728dae0abbd5031b221245935042d2 | ||
282 | 4 | MISC metadata.xml 302 RMD160 f7f00ac86e9287aed9e2ab7b93ac533420cfa707 SHA1 0723594916425f1503729b08624fa026ddfcd517 SHA256 3e2c82529f40a2abc2e403e16c76a066f60fe9e74d46eb2e3d0c403f2f960943 | 3 | MISC metadata.xml 302 RMD160 f7f00ac86e9287aed9e2ab7b93ac533420cfa707 SHA1 0723594916425f1503729b08624fa026ddfcd517 SHA256 3e2c82529f40a2abc2e403e16c76a066f60fe9e74d46eb2e3d0c403f2f960943 |
283 | 5 | 4 | ||
284 | === renamed file 'www-apps/trac-bzr/trac-bzr-0.3.0.ebuild' => 'www-apps/trac-bzr/trac-bzr-0.3.2.ebuild' |
Merged by inference (as it was already merged in the bzr-overlay-dev branch).