Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/
Date: Fri, 28 Aug 2015 03:25:28
Message-Id: 1440732305.d8809486846fbeaebf2e310b85793fad1b029c02.mrueg@gentoo
1 commit: d8809486846fbeaebf2e310b85793fad1b029c02
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 28 03:25:05 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 28 03:25:05 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8809486
7
8 dev-vcs/svn2git: Remove old
9
10 Package-Manager: portage-2.2.20.1
11
12 dev-vcs/svn2git/Manifest | 11 -----
13 .../svn2git/files/svn2git-1.0.2.1-version.patch | 14 ------
14 .../svn2git/files/svn2git-1.0.3-backup-refs.patch | 45 -------------------
15 .../svn2git/files/svn2git-1.0.3_p1-version.patch | 14 ------
16 dev-vcs/svn2git/files/svn2git-1.0.4-version.patch | 14 ------
17 dev-vcs/svn2git/files/svn2git-1.0.5-version.patch | 14 ------
18 dev-vcs/svn2git/files/svn2git-1.0.6-version.patch | 14 ------
19 dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch | 26 -----------
20 .../files/svn2git-1.0.8-utf8-author-names.patch | 51 ----------------------
21 dev-vcs/svn2git/files/svn2git-1.0.8-version.patch | 14 ------
22 dev-vcs/svn2git/svn2git-0_pre20100303.ebuild | 40 -----------------
23 dev-vcs/svn2git/svn2git-0_pre20100324.ebuild | 40 -----------------
24 dev-vcs/svn2git/svn2git-0_pre20100327.ebuild | 40 -----------------
25 dev-vcs/svn2git/svn2git-0_pre20101008.ebuild | 40 -----------------
26 dev-vcs/svn2git/svn2git-0_pre20101101.ebuild | 40 -----------------
27 dev-vcs/svn2git/svn2git-1.0.2.1.ebuild | 47 --------------------
28 dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild | 50 ---------------------
29 dev-vcs/svn2git/svn2git-1.0.4.ebuild | 47 --------------------
30 dev-vcs/svn2git/svn2git-1.0.5.ebuild | 47 --------------------
31 dev-vcs/svn2git/svn2git-1.0.6.ebuild | 47 --------------------
32 dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild | 49 ---------------------
33 21 files changed, 704 deletions(-)
34
35 diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
36 index f244ecc..c838761 100644
37 --- a/dev-vcs/svn2git/Manifest
38 +++ b/dev-vcs/svn2git/Manifest
39 @@ -1,12 +1 @@
40 -DIST svn2git-0_pre20100303.tar.gz 16351 SHA256 e33bf51e13daa19d9389c9f4aac6bb968562bbb64b1015a7e97b45f6fe0c35c8 SHA512 f279937afaa0d2b1e9474c401f48882ac61a83efe86f30ab7e7b89e57676db85fb0e488844307aa33ddc5fa57cff0512d5a9585a0cb1f02c664cbbaacc5c08a5 WHIRLPOOL d5a15472e436ffff2268734b169002f7b29d3150f8a1c9cbb60fa1addc1f44ea9d7e258bfc817557c23926e87cb76a6f77e23eed930bda8dbe0408aab749a56b
41 -DIST svn2git-0_pre20100324.tar.gz 16467 SHA256 3db1ad47b1d2e8b1e8e658fdd14fa42121845a094b111932bcebe86439d775f7 SHA512 a8033cea3fef356f2b705003d9a70f49e14a3165b04733f3617e848a0be97ec31eaabbee24cbfcca4215297d85a63175fb5f3d87785993b07dc1e66b79d811b1 WHIRLPOOL 116f99266acaebb0a65f4949d2eaa6dd69bc663cba477dbe997d91eca311cfeeec868373142c81a6fa538b39a31b63ff9aad0426a663da5c0a3c2915dee4dfa7
42 -DIST svn2git-0_pre20100327.tar.gz 16702 SHA256 b8855e708e00e313bf8f6deb2ae9fb1a0e4e51a336d813f672eeb0a571be9bab SHA512 6318c4136a829770e68e5ee76d6a75696a1c18feedc6cf72b9608463ca7faa2ff717a6dcbba6d2b76389e2c48008bf9c154d2e5e77d7358925bbc97237effe14 WHIRLPOOL c6af3ba84ac07d5a15bbd86d2c41c9d3abf332640b81e0d89e7b22efe6227b40a43e93e45598d24186756e61d9c9132be9d5d564ad5c646c2e51f98ee0b91a86
43 -DIST svn2git-0_pre20101008.tar.gz 22620 SHA256 460425d86e9d07514f70660c9409eacc7c58e0d9a236f421d98bc4b2b858e82d SHA512 a7be70cc6b91ae17732046cd4f29915dee626576a772f796ddeec08c9e8cd3ef2eb7f8713299272f9e8760f4be2ce924421a3594791a357afdb676fc7d2477ef WHIRLPOOL 7291c44a7c58b555171696c8cd5d887b4ebf5c9c0589bc336db897759bd520031474012b2d4a15a4d838bfa559e978965bcd8f7034a23c69fab0c5e97626d9b4
44 -DIST svn2git-0_pre20101101.tar.gz 22615 SHA256 8af3076b49750e31ec4b6ea821afe38c8859dbf2789a70bbe932ffd00b4e9488 SHA512 bd581fdb2d97329515c3e91393c5c6be2c70e9d5828239fdf71acdf790e4b0b3b596818720827c522b7fe461b83ff40a60ac439c8850fdee7f84edcef413a3be WHIRLPOOL 4cc0fd8baa15d13fdba0fb2db8a74e5c76eec9a17ab0cd555acca890746f243d9f757c18487bcd68ba88bb2e545fdf49ed7d07e155093740fd2a9fe8fd8b0fc4
45 DIST svn2git-1.0.10.tar.gz 26667 SHA256 1b1300144e8a0f82485f4046c4585d53deff839a274f70f7cb32d5a5a76ffe61 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49 WHIRLPOOL c3b1ada8ffc925aef666f095c1b3a8a2323980a777a6e1751cfc02e5510d3d18fc95e68d8e3a275a5061ed0e073cc1eee538279f5a01039e698af135a4b38df1
46 -DIST svn2git-1.0.2.1.tar.gz 23784 SHA256 94e5def41df26c03e63423aba3ee70d3ee3ce21fdedca3ce3cb93ba576170fa2 SHA512 877458c7be998123e5b4ee1f60991edcb3dc740c3a8780bb56bb354f9937355635c7943421a60fd3d773d5f7ccc3bbb236bd58abf2c7afc7b40b819ce4c6c923 WHIRLPOOL 26f7d729de6888c621de899d591502792b55d410ed340832c53a47546da8586ae17ac85915f69707b6ba3ff424ce8207fd364fda80e951d82b0b82ff2083ba99
47 -DIST svn2git-1.0.3.tar.gz 24141 SHA256 b465bb64028e641ff426aa1055899b43640d394738d8919b9dd4235bf5842886 SHA512 e9d575777dada2d3f492a7428542744ac38881b3695c048d13ab65156b5f3ebc48ed3983952f59280c4618df0b7f53f154ee914f8f78e743c32fde31bb352356 WHIRLPOOL 4db8551567f4d3e43a4a9ab54953afbc82c7d0d6108fb5fad2581c822de8cef243725dcc3c94e7aba05efd7f0a9dcf1c0305e5a082963587372495136c3488c5
48 -DIST svn2git-1.0.4.tar.gz 24190 SHA256 7fab1935ea7101c1c39085b3333f9d9eaa88e5d3f7edd9a04728e5031199390f SHA512 9431e9a45c7f578048bb3624cd717f86a97104c0731af4609991c0b428c6183625b8e0a25c483b319a78dd7a7d2cf09b9e02473c29dbb5c628bab50e33a00fd4 WHIRLPOOL 87fa07fee8f0c619c0594e68348475f735ee46b01d080c6b94a4aa88d10af2b1c79f823be24588c189eb47100302b02130aa255ab902b655cef0737d2bb304c2
49 -DIST svn2git-1.0.5.tar.gz 25677 SHA256 e6f4794f5a22044cbbb89feedaf5b1179d94b6b142df5875cdb2876819e47224 SHA512 594b70651a0c97668822adf456f9ac7f1ce814c53dabcd39efbb2fd85d63d6a4be7e708db3560234078e2dc6084ea99ccf0c4fb363c7b4864d37d4b5fb53d18f WHIRLPOOL 1ec1de336de26fa8d235ccc3b039598b8b5128b95f15af1b04c5fd79ba753ac3b02aa09d8feadf6c7ecfcfaf0fd48bc7e56fdee51d77e29909b1fefe26cfa76f
50 -DIST svn2git-1.0.6.tar.gz 25791 SHA256 273f2199115414bcfb454d18f2200a7f3d536da11c4ed78f9fbae354af742a7d SHA512 9f887a9085c4a3a5210e4c49cde2a326eaa92e2426ffe0842daf5a05e3b1133c4566a00b719bf04c9e6b8a31d3eaa56e75395ec732a75ce6700bc4d22e6979d7 WHIRLPOOL c6547de760f5097663d8cc3705a156540278b4d1a6892021a7292e7cbfad274cfe144c1eab886c0cae773cfb932ab60b1f6a51294aeaaebaeefb68c1eb1d0ea5
51 -DIST svn2git-1.0.8.tar.gz 26667 SHA256 ba66e9ad88a23acb65cf56661dd7ca81cfb5b429bb2349278dc8906c0239a4c2 SHA512 a6c5eb87cebf98404f0579f9ca9ab8f565dfd2bac2ca7824f964a73ebcfb362688bc5149a7c2e2d152ff5e28b84cc1b1deb2fdca1bceabbeed25f6d2c27a4a8d WHIRLPOOL c36ac03378048a6117d1c47ada993477f5d2822a40c7a2850e0a356753bfc003fbaef8477a8e9849fc752432cdb369cffacc1c38bbe6d7e0434e8a07a71196a4
52
53 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-version.patch
54 deleted file mode 100644
55 index 0ca442b..0000000
56 --- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-version.patch
57 +++ /dev/null
58 @@ -1,14 +0,0 @@
59 ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100
60 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100
61 -@@ -7,10 +7,7 @@
62 - APR_INCLUDE = /usr/include/apr-1
63 - exists(local-config.pri):include(local-config.pri)
64 -
65 --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
66 -- !isEmpty(VERSION){
67 -- VERSION = $${VERSION}
68 -- }
69 -+VERSION = "1.0.2-1-gebac099"
70 -
71 - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
72 - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
73
74 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch b/dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch
75 deleted file mode 100644
76 index 6241bb7..0000000
77 --- a/dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch
78 +++ /dev/null
79 @@ -1,45 +0,0 @@
80 -From 584005f2e26149282aa12c4a0367d250caaf3918 Mon Sep 17 00:00:00 2001
81 -From: Jehan Bing <nahor.j@×××××.com>
82 -Date: Thu, 10 Mar 2011 10:54:52 -0800
83 -Subject: [PATCH] Create backup reference before deletion of the original branch
84 -
85 -Ensure that the backup reference is created before deleting the original
86 -branch. As it was, the deletion was executed earlier causing the backup
87 -reference to point to a non-existing branch so was not created.
88 ----
89 - src/repository.cpp | 7 ++++---
90 - 1 files changed, 4 insertions(+), 3 deletions(-)
91 -
92 -diff --git a/src/repository.cpp b/src/repository.cpp
93 -index 7de840f..2c70bf3 100644
94 ---- a/src/repository.cpp
95 -+++ b/src/repository.cpp
96 -@@ -349,11 +349,12 @@ int Repository::resetBranch(const QString &branch, int revnum, int mark, const Q
97 - branchRef.prepend("refs/heads/");
98 -
99 - Branch &br = branches[branch];
100 -+ QByteArray backupCmd;
101 - if (br.created && br.created != revnum && !br.marks.isEmpty() && br.marks.last()) {
102 - QByteArray backupBranch = "refs/backups/r" + QByteArray::number(revnum) + branchRef.mid(4);
103 - qWarning() << "WARN: backing up branch" << branch << "to" << backupBranch;
104 -
105 -- resetBranches.append("reset " + backupBranch + "\nfrom " + branchRef + "\n\n");
106 -+ backupCmd = "reset " + backupBranch + "\nfrom " + branchRef + "\n\n";
107 - }
108 -
109 - br.created = revnum;
110 -@@ -365,9 +366,9 @@ int Repository::resetBranch(const QString &branch, int revnum, int mark, const Q
111 - + " branch " + branch.toUtf8() + " = :" + QByteArray::number(mark)
112 - + " # " + comment + "\n\n";
113 - if(comment == "delete")
114 -- deletedBranches.append(cmd);
115 -+ deletedBranches.append(backupCmd).append(cmd);
116 - else
117 -- resetBranches.append(cmd);
118 -+ resetBranches.append(backupCmd).append(cmd);
119 -
120 - return EXIT_SUCCESS;
121 - }
122 ---
123 -1.7.4.1
124 -
125
126 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.3_p1-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.3_p1-version.patch
127 deleted file mode 100644
128 index 78efb87..0000000
129 --- a/dev-vcs/svn2git/files/svn2git-1.0.3_p1-version.patch
130 +++ /dev/null
131 @@ -1,14 +0,0 @@
132 ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100
133 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100
134 -@@ -7,10 +7,7 @@
135 - APR_INCLUDE = /usr/include/apr-1
136 - exists(local-config.pri):include(local-config.pri)
137 -
138 --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
139 -- !isEmpty(VERSION){
140 -- VERSION = $${VERSION}
141 -- }
142 -+VERSION = "1.0.3_p1"
143 -
144 - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
145 - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
146
147 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch
148 deleted file mode 100644
149 index e59547c..0000000
150 --- a/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch
151 +++ /dev/null
152 @@ -1,14 +0,0 @@
153 ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100
154 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100
155 -@@ -7,10 +7,7 @@
156 - APR_INCLUDE = /usr/include/apr-1
157 - exists(local-config.pri):include(local-config.pri)
158 -
159 --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
160 -- !isEmpty(VERSION){
161 -- VERSION = $${VERSION}
162 -- }
163 -+VERSION = "1.0.4"
164 -
165 - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
166 - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
167
168 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch
169 deleted file mode 100644
170 index 7247f4b..0000000
171 --- a/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch
172 +++ /dev/null
173 @@ -1,14 +0,0 @@
174 ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100
175 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100
176 -@@ -7,10 +7,7 @@
177 - APR_INCLUDE = /usr/include/apr-1
178 - exists(local-config.pri):include(local-config.pri)
179 -
180 --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
181 -- !isEmpty(VERSION){
182 -- VERSION = $${VERSION}
183 -- }
184 -+VERSION = "1.0.5"
185 -
186 - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
187 - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
188
189 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.6-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.6-version.patch
190 deleted file mode 100644
191 index 00d6773..0000000
192 --- a/dev-vcs/svn2git/files/svn2git-1.0.6-version.patch
193 +++ /dev/null
194 @@ -1,14 +0,0 @@
195 ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100
196 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100
197 -@@ -7,10 +7,7 @@
198 - APR_INCLUDE = /usr/include/apr-1
199 - exists(local-config.pri):include(local-config.pri)
200 -
201 --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
202 -- !isEmpty(VERSION){
203 -- VERSION = $${VERSION}
204 -- }
205 -+VERSION = "1.0.6"
206 -
207 - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
208 - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
209
210 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch b/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch
211 deleted file mode 100644
212 index 730c51c..0000000
213 --- a/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch
214 +++ /dev/null
215 @@ -1,26 +0,0 @@
216 -From b5c3d3aa55621c44db439e4a73884e0d0bf9612c Mon Sep 17 00:00:00 2001
217 -From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uqs@×××××××××.net>
218 -Date: Wed, 28 Nov 2012 21:58:44 +0100
219 -Subject: [PATCH] Fix compilation, the last rebase/merge went wrong.
220 -
221 -Noticed by: Andy Pilate
222 ----
223 - src/svn.cpp | 2 +-
224 - 1 files changed, 1 insertions(+), 1 deletions(-)
225 -
226 -diff --git a/src/svn.cpp b/src/svn.cpp
227 -index 1aadce9..b2fe2a2 100644
228 ---- a/src/svn.cpp
229 -+++ b/src/svn.cpp
230 -@@ -896,7 +896,7 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change,
231 - rev_from, changes, current, *match, matchRules, dirpool) == EXIT_FAILURE)
232 - return EXIT_FAILURE;
233 - } else {
234 -- if (dirent->kind == svn_node_dir) {
235 -+ if (i.value() == svn_node_dir) {
236 - qDebug() << current << "rev" << revnum
237 - << "did not match any rules; auto-recursing";
238 - if (recurse(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(),
239 ---
240 -1.7.1
241 -
242
243 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.8-utf8-author-names.patch b/dev-vcs/svn2git/files/svn2git-1.0.8-utf8-author-names.patch
244 deleted file mode 100644
245 index a5a94a1..0000000
246 --- a/dev-vcs/svn2git/files/svn2git-1.0.8-utf8-author-names.patch
247 +++ /dev/null
248 @@ -1,51 +0,0 @@
249 -From 6f931cd4535ba3e0d4dda31a0a5ab4a7f33b3221 Mon Sep 17 00:00:00 2001
250 -From: Sebastian Pipping <sebastian@×××××××.org>
251 -Date: Thu, 9 May 2013 00:45:27 +0200
252 -Subject: [PATCH] Stop unintended re-encoding of author names from UTF-8 to
253 - ASCII
254 -MIME-Version: 1.0
255 -Content-Type: text/plain; charset=UTF-8
256 -Content-Transfer-Encoding: 8bit
257 -
258 -To see the bug in action, use an author map with umlauts, e.g.
259 -
260 - nickname = Hällo Wörld from UTF-8 <mail@×××××××.org>
261 -
262 -and check "git log" after the conversion.
263 -
264 -What is happening?
265 -QByteArray "author" is first decoded as UTF-8 into a QString.
266 -That QString is passed to QByteArray::append(const QString &)
267 -which internally encodes the QString to ASCII byte data using
268 -QString::toAscii(). "git fast-import" expects UTF-8 input
269 -from us, so the original QByteArray with UTF-8 content is just
270 -what we need.
271 ----
272 - src/repository.cpp | 4 ++--
273 - 1 file changed, 2 insertions(+), 2 deletions(-)
274 -
275 -diff --git a/src/repository.cpp b/src/repository.cpp
276 -index 779dd28..f3b06e8 100644
277 ---- a/src/repository.cpp
278 -+++ b/src/repository.cpp
279 -@@ -685,7 +685,7 @@ void Repository::Transaction::commitNote(const QByteArray &noteText, bool append
280 - QByteArray s("");
281 - s.append("commit refs/notes/commits\n");
282 - s.append("mark :" + QByteArray::number(maxMark + 1) + "\n");
283 -- s.append("committer " + QString::fromUtf8(author) + " " + QString::number(datetime) + " +0000" + "\n");
284 -+ s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " +0000" + "\n");
285 - s.append("data " + QString::number(message.length()) + "\n");
286 - s.append(message + "\n");
287 - s.append("N inline " + commitRef + "\n");
288 -@@ -736,7 +736,7 @@ void Repository::Transaction::commit()
289 - QByteArray s("");
290 - s.append("commit " + branchRef + "\n");
291 - s.append("mark :" + QByteArray::number(mark) + "\n");
292 -- s.append("committer " + QString::fromUtf8(author) + " " + QString::number(datetime) + " +0000" + "\n");
293 -+ s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " +0000" + "\n");
294 - s.append("data " + QString::number(message.length()) + "\n");
295 - s.append(message + "\n");
296 - repository->fastImport.write(s);
297 ---
298 -1.8.2.1
299 -
300
301 diff --git a/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch
302 deleted file mode 100644
303 index 3eed1cb..0000000
304 --- a/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch
305 +++ /dev/null
306 @@ -1,14 +0,0 @@
307 ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100
308 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100
309 -@@ -7,10 +7,7 @@
310 - APR_INCLUDE = /usr/include/apr-1
311 - exists(local-config.pri):include(local-config.pri)
312 -
313 --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
314 -- !isEmpty(VERSION){
315 -- VERSION = $${VERSION}
316 -- }
317 -+VERSION = "1.0.8"
318 -
319 - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string
320 - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
321
322 diff --git a/dev-vcs/svn2git/svn2git-0_pre20100303.ebuild b/dev-vcs/svn2git/svn2git-0_pre20100303.ebuild
323 deleted file mode 100644
324 index 795ae14..0000000
325 --- a/dev-vcs/svn2git/svn2git-0_pre20100303.ebuild
326 +++ /dev/null
327 @@ -1,40 +0,0 @@
328 -# Copyright 1999-2015 Gentoo Foundation
329 -# Distributed under the terms of the GNU General Public License v2
330 -# $Id$
331 -
332 -EAPI="2"
333 -
334 -inherit qt4-r2
335 -[ "$PV" == "9999" ] && inherit git
336 -
337 -DESCRIPTION="Importer for one time conversion from svn to git"
338 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
339 -if [ "$PV" == "9999" ]; then
340 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
341 - KEYWORDS=""
342 -else
343 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
344 - KEYWORDS="~amd64 ~x86"
345 -fi
346 -
347 -LICENSE="GPL-3"
348 -SLOT="0"
349 -IUSE=""
350 -# KEYWORDS way up
351 -
352 -DEPEND="dev-vcs/subversion
353 - dev-qt/qtcore:4"
354 -RDEPEND="${DEPEND}
355 - dev-vcs/git"
356 -
357 -src_prepare() {
358 - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro
359 - qt4-r2_src_prepare
360 -}
361 -
362 -src_install() {
363 - insinto /usr/share/${PN}/samples
364 - doins samples/*.rules || die 'doins failed'
365 - dobin svn-all-fast-export || die 'dobin failed'
366 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
367 -}
368
369 diff --git a/dev-vcs/svn2git/svn2git-0_pre20100324.ebuild b/dev-vcs/svn2git/svn2git-0_pre20100324.ebuild
370 deleted file mode 100644
371 index 795ae14..0000000
372 --- a/dev-vcs/svn2git/svn2git-0_pre20100324.ebuild
373 +++ /dev/null
374 @@ -1,40 +0,0 @@
375 -# Copyright 1999-2015 Gentoo Foundation
376 -# Distributed under the terms of the GNU General Public License v2
377 -# $Id$
378 -
379 -EAPI="2"
380 -
381 -inherit qt4-r2
382 -[ "$PV" == "9999" ] && inherit git
383 -
384 -DESCRIPTION="Importer for one time conversion from svn to git"
385 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
386 -if [ "$PV" == "9999" ]; then
387 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
388 - KEYWORDS=""
389 -else
390 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
391 - KEYWORDS="~amd64 ~x86"
392 -fi
393 -
394 -LICENSE="GPL-3"
395 -SLOT="0"
396 -IUSE=""
397 -# KEYWORDS way up
398 -
399 -DEPEND="dev-vcs/subversion
400 - dev-qt/qtcore:4"
401 -RDEPEND="${DEPEND}
402 - dev-vcs/git"
403 -
404 -src_prepare() {
405 - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro
406 - qt4-r2_src_prepare
407 -}
408 -
409 -src_install() {
410 - insinto /usr/share/${PN}/samples
411 - doins samples/*.rules || die 'doins failed'
412 - dobin svn-all-fast-export || die 'dobin failed'
413 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
414 -}
415
416 diff --git a/dev-vcs/svn2git/svn2git-0_pre20100327.ebuild b/dev-vcs/svn2git/svn2git-0_pre20100327.ebuild
417 deleted file mode 100644
418 index 795ae14..0000000
419 --- a/dev-vcs/svn2git/svn2git-0_pre20100327.ebuild
420 +++ /dev/null
421 @@ -1,40 +0,0 @@
422 -# Copyright 1999-2015 Gentoo Foundation
423 -# Distributed under the terms of the GNU General Public License v2
424 -# $Id$
425 -
426 -EAPI="2"
427 -
428 -inherit qt4-r2
429 -[ "$PV" == "9999" ] && inherit git
430 -
431 -DESCRIPTION="Importer for one time conversion from svn to git"
432 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
433 -if [ "$PV" == "9999" ]; then
434 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
435 - KEYWORDS=""
436 -else
437 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
438 - KEYWORDS="~amd64 ~x86"
439 -fi
440 -
441 -LICENSE="GPL-3"
442 -SLOT="0"
443 -IUSE=""
444 -# KEYWORDS way up
445 -
446 -DEPEND="dev-vcs/subversion
447 - dev-qt/qtcore:4"
448 -RDEPEND="${DEPEND}
449 - dev-vcs/git"
450 -
451 -src_prepare() {
452 - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro
453 - qt4-r2_src_prepare
454 -}
455 -
456 -src_install() {
457 - insinto /usr/share/${PN}/samples
458 - doins samples/*.rules || die 'doins failed'
459 - dobin svn-all-fast-export || die 'dobin failed'
460 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
461 -}
462
463 diff --git a/dev-vcs/svn2git/svn2git-0_pre20101008.ebuild b/dev-vcs/svn2git/svn2git-0_pre20101008.ebuild
464 deleted file mode 100644
465 index 795ae14..0000000
466 --- a/dev-vcs/svn2git/svn2git-0_pre20101008.ebuild
467 +++ /dev/null
468 @@ -1,40 +0,0 @@
469 -# Copyright 1999-2015 Gentoo Foundation
470 -# Distributed under the terms of the GNU General Public License v2
471 -# $Id$
472 -
473 -EAPI="2"
474 -
475 -inherit qt4-r2
476 -[ "$PV" == "9999" ] && inherit git
477 -
478 -DESCRIPTION="Importer for one time conversion from svn to git"
479 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
480 -if [ "$PV" == "9999" ]; then
481 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
482 - KEYWORDS=""
483 -else
484 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
485 - KEYWORDS="~amd64 ~x86"
486 -fi
487 -
488 -LICENSE="GPL-3"
489 -SLOT="0"
490 -IUSE=""
491 -# KEYWORDS way up
492 -
493 -DEPEND="dev-vcs/subversion
494 - dev-qt/qtcore:4"
495 -RDEPEND="${DEPEND}
496 - dev-vcs/git"
497 -
498 -src_prepare() {
499 - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro
500 - qt4-r2_src_prepare
501 -}
502 -
503 -src_install() {
504 - insinto /usr/share/${PN}/samples
505 - doins samples/*.rules || die 'doins failed'
506 - dobin svn-all-fast-export || die 'dobin failed'
507 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
508 -}
509
510 diff --git a/dev-vcs/svn2git/svn2git-0_pre20101101.ebuild b/dev-vcs/svn2git/svn2git-0_pre20101101.ebuild
511 deleted file mode 100644
512 index 795ae14..0000000
513 --- a/dev-vcs/svn2git/svn2git-0_pre20101101.ebuild
514 +++ /dev/null
515 @@ -1,40 +0,0 @@
516 -# Copyright 1999-2015 Gentoo Foundation
517 -# Distributed under the terms of the GNU General Public License v2
518 -# $Id$
519 -
520 -EAPI="2"
521 -
522 -inherit qt4-r2
523 -[ "$PV" == "9999" ] && inherit git
524 -
525 -DESCRIPTION="Importer for one time conversion from svn to git"
526 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
527 -if [ "$PV" == "9999" ]; then
528 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
529 - KEYWORDS=""
530 -else
531 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
532 - KEYWORDS="~amd64 ~x86"
533 -fi
534 -
535 -LICENSE="GPL-3"
536 -SLOT="0"
537 -IUSE=""
538 -# KEYWORDS way up
539 -
540 -DEPEND="dev-vcs/subversion
541 - dev-qt/qtcore:4"
542 -RDEPEND="${DEPEND}
543 - dev-vcs/git"
544 -
545 -src_prepare() {
546 - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro
547 - qt4-r2_src_prepare
548 -}
549 -
550 -src_install() {
551 - insinto /usr/share/${PN}/samples
552 - doins samples/*.rules || die 'doins failed'
553 - dobin svn-all-fast-export || die 'dobin failed'
554 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
555 -}
556
557 diff --git a/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild b/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild
558 deleted file mode 100644
559 index 004f553..0000000
560 --- a/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild
561 +++ /dev/null
562 @@ -1,47 +0,0 @@
563 -# Copyright 1999-2015 Gentoo Foundation
564 -# Distributed under the terms of the GNU General Public License v2
565 -# $Id$
566 -
567 -EAPI="2"
568 -
569 -inherit eutils qt4-r2
570 -[ "$PV" == "9999" ] && inherit git
571 -
572 -MY_PV="1.0.2-1-gebac099"
573 -
574 -DESCRIPTION="Tool for one-time conversion from svn to git"
575 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
576 -if [ "$PV" == "9999" ]; then
577 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
578 - KEYWORDS=""
579 -else
580 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
581 - KEYWORDS="~amd64 ~x86"
582 -fi
583 -
584 -LICENSE="GPL-3"
585 -SLOT="0"
586 -IUSE=""
587 -# KEYWORDS way up
588 -
589 -DEPEND="dev-vcs/subversion
590 - dev-qt/qtcore:4"
591 -RDEPEND="${DEPEND}
592 - dev-vcs/git"
593 -
594 -S=${WORKDIR}/${PN}-${PN}
595 -
596 -src_prepare() {
597 - # Note: patching order matters
598 - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
599 - [ "$PV" != "9999" ] && epatch "${FILESDIR}"/${PN}-1.0.2.1-version.patch
600 -
601 - qt4-r2_src_prepare
602 -}
603 -
604 -src_install() {
605 - insinto /usr/share/${PN}/samples
606 - doins samples/*.rules || die 'doins failed'
607 - dobin svn-all-fast-export || die 'dobin failed'
608 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
609 -}
610
611 diff --git a/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild b/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild
612 deleted file mode 100644
613 index c003040..0000000
614 --- a/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild
615 +++ /dev/null
616 @@ -1,50 +0,0 @@
617 -# Copyright 1999-2015 Gentoo Foundation
618 -# Distributed under the terms of the GNU General Public License v2
619 -# $Id$
620 -
621 -EAPI="2"
622 -
623 -inherit versionator eutils qt4-r2
624 -[ "$PV" == "9999" ] && inherit git
625 -
626 -MY_PV=$(get_version_component_range 1-3)
627 -
628 -DESCRIPTION="Tool for one-time conversion from svn to git"
629 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
630 -if [ "$PV" == "9999" ]; then
631 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
632 - KEYWORDS=""
633 -else
634 - SRC_URI="https://www.hartwork.org/public/${PN}-${MY_PV}.tar.gz"
635 - KEYWORDS="~amd64 ~x86"
636 -fi
637 -
638 -LICENSE="GPL-3"
639 -SLOT="0"
640 -IUSE=""
641 -# KEYWORDS way up
642 -
643 -DEPEND="dev-vcs/subversion
644 - dev-qt/qtcore:4"
645 -RDEPEND="${DEPEND}
646 - dev-vcs/git"
647 -
648 -S=${WORKDIR}/${PN}-${PN}
649 -
650 -src_prepare() {
651 - # Note: patching order matters
652 - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
653 - if [[ "$PV" != "9999" ]]; then
654 - epatch "${FILESDIR}"/${PN}-1.0.3_p1-version.patch
655 - epatch "${FILESDIR}"/${PN}-1.0.3-backup-refs.patch
656 - fi
657 -
658 - qt4-r2_src_prepare
659 -}
660 -
661 -src_install() {
662 - insinto /usr/share/${PN}/samples
663 - doins samples/*.rules || die 'doins failed'
664 - dobin svn-all-fast-export || die 'dobin failed'
665 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
666 -}
667
668 diff --git a/dev-vcs/svn2git/svn2git-1.0.4.ebuild b/dev-vcs/svn2git/svn2git-1.0.4.ebuild
669 deleted file mode 100644
670 index ba6331f..0000000
671 --- a/dev-vcs/svn2git/svn2git-1.0.4.ebuild
672 +++ /dev/null
673 @@ -1,47 +0,0 @@
674 -# Copyright 1999-2015 Gentoo Foundation
675 -# Distributed under the terms of the GNU General Public License v2
676 -# $Id$
677 -
678 -EAPI="2"
679 -
680 -inherit eutils qt4-r2
681 -[ "$PV" == "9999" ] && inherit git
682 -
683 -DESCRIPTION="Tool for one-time conversion from svn to git"
684 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
685 -if [ "$PV" == "9999" ]; then
686 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
687 - KEYWORDS=""
688 -else
689 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
690 - KEYWORDS="~amd64 ~x86"
691 -fi
692 -
693 -LICENSE="GPL-3"
694 -SLOT="0"
695 -IUSE=""
696 -# KEYWORDS way up
697 -
698 -DEPEND="dev-vcs/subversion
699 - dev-qt/qtcore:4"
700 -RDEPEND="${DEPEND}
701 - dev-vcs/git"
702 -
703 -S=${WORKDIR}/${PN}-${PN}
704 -
705 -src_prepare() {
706 - # Note: patching order matters
707 - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
708 - if [[ "$PV" != "9999" ]]; then
709 - epatch "${FILESDIR}"/${PN}-1.0.4-version.patch
710 - fi
711 -
712 - qt4-r2_src_prepare
713 -}
714 -
715 -src_install() {
716 - insinto /usr/share/${PN}/samples
717 - doins samples/*.rules || die 'doins failed'
718 - dobin svn-all-fast-export || die 'dobin failed'
719 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
720 -}
721
722 diff --git a/dev-vcs/svn2git/svn2git-1.0.5.ebuild b/dev-vcs/svn2git/svn2git-1.0.5.ebuild
723 deleted file mode 100644
724 index bd17728..0000000
725 --- a/dev-vcs/svn2git/svn2git-1.0.5.ebuild
726 +++ /dev/null
727 @@ -1,47 +0,0 @@
728 -# Copyright 1999-2015 Gentoo Foundation
729 -# Distributed under the terms of the GNU General Public License v2
730 -# $Id$
731 -
732 -EAPI="2"
733 -
734 -inherit eutils qt4-r2
735 -[ "$PV" == "9999" ] && inherit git
736 -
737 -DESCRIPTION="Tool for one-time conversion from svn to git"
738 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
739 -if [ "$PV" == "9999" ]; then
740 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
741 - KEYWORDS=""
742 -else
743 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
744 - KEYWORDS="~amd64 ~x86"
745 -fi
746 -
747 -LICENSE="GPL-3"
748 -SLOT="0"
749 -IUSE=""
750 -# KEYWORDS way up
751 -
752 -DEPEND="dev-vcs/subversion
753 - dev-qt/qtcore:4"
754 -RDEPEND="${DEPEND}
755 - dev-vcs/git"
756 -
757 -S=${WORKDIR}/${PN}-${PN}
758 -
759 -src_prepare() {
760 - # Note: patching order matters
761 - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
762 - if [[ "$PV" != "9999" ]]; then
763 - epatch "${FILESDIR}"/${P}-version.patch
764 - fi
765 -
766 - qt4-r2_src_prepare
767 -}
768 -
769 -src_install() {
770 - insinto /usr/share/${PN}/samples
771 - doins samples/*.rules || die 'doins failed'
772 - dobin svn-all-fast-export || die 'dobin failed'
773 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
774 -}
775
776 diff --git a/dev-vcs/svn2git/svn2git-1.0.6.ebuild b/dev-vcs/svn2git/svn2git-1.0.6.ebuild
777 deleted file mode 100644
778 index bd17728..0000000
779 --- a/dev-vcs/svn2git/svn2git-1.0.6.ebuild
780 +++ /dev/null
781 @@ -1,47 +0,0 @@
782 -# Copyright 1999-2015 Gentoo Foundation
783 -# Distributed under the terms of the GNU General Public License v2
784 -# $Id$
785 -
786 -EAPI="2"
787 -
788 -inherit eutils qt4-r2
789 -[ "$PV" == "9999" ] && inherit git
790 -
791 -DESCRIPTION="Tool for one-time conversion from svn to git"
792 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
793 -if [ "$PV" == "9999" ]; then
794 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
795 - KEYWORDS=""
796 -else
797 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
798 - KEYWORDS="~amd64 ~x86"
799 -fi
800 -
801 -LICENSE="GPL-3"
802 -SLOT="0"
803 -IUSE=""
804 -# KEYWORDS way up
805 -
806 -DEPEND="dev-vcs/subversion
807 - dev-qt/qtcore:4"
808 -RDEPEND="${DEPEND}
809 - dev-vcs/git"
810 -
811 -S=${WORKDIR}/${PN}-${PN}
812 -
813 -src_prepare() {
814 - # Note: patching order matters
815 - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
816 - if [[ "$PV" != "9999" ]]; then
817 - epatch "${FILESDIR}"/${P}-version.patch
818 - fi
819 -
820 - qt4-r2_src_prepare
821 -}
822 -
823 -src_install() {
824 - insinto /usr/share/${PN}/samples
825 - doins samples/*.rules || die 'doins failed'
826 - dobin svn-all-fast-export || die 'dobin failed'
827 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
828 -}
829
830 diff --git a/dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild
831 deleted file mode 100644
832 index c556034..0000000
833 --- a/dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild
834 +++ /dev/null
835 @@ -1,49 +0,0 @@
836 -# Copyright 1999-2015 Gentoo Foundation
837 -# Distributed under the terms of the GNU General Public License v2
838 -# $Id$
839 -
840 -EAPI="2"
841 -
842 -inherit eutils qt4-r2
843 -[ "$PV" == "9999" ] && inherit git
844 -
845 -DESCRIPTION="Tool for one-time conversion from svn to git"
846 -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
847 -if [ "$PV" == "9999" ]; then
848 - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
849 - KEYWORDS=""
850 -else
851 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
852 - KEYWORDS="~amd64 ~x86"
853 -fi
854 -
855 -LICENSE="GPL-3"
856 -SLOT="0"
857 -IUSE=""
858 -# KEYWORDS way up
859 -
860 -DEPEND="dev-vcs/subversion
861 - dev-qt/qtcore:4"
862 -RDEPEND="${DEPEND}
863 - dev-vcs/git"
864 -
865 -S=${WORKDIR}/${PN}-${PN}
866 -
867 -src_prepare() {
868 - # Note: patching order matters
869 - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
870 - if [[ "$PV" != "9999" ]]; then
871 - epatch "${FILESDIR}"/${P}-version.patch
872 - fi
873 - epatch "${FILESDIR}"/${P}-compile.patch
874 - epatch "${FILESDIR}"/${P}-utf8-author-names.patch
875 -
876 - qt4-r2_src_prepare
877 -}
878 -
879 -src_install() {
880 - insinto /usr/share/${PN}/samples
881 - doins samples/*.rules || die 'doins failed'
882 - dobin svn-all-fast-export || die 'dobin failed'
883 - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
884 -}