From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9CA7E1385CB for ; Fri, 28 Aug 2015 03:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02F6F141EA; Fri, 28 Aug 2015 03:25:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36E33141EA for ; Fri, 28 Aug 2015 03:25:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED44F340940 for ; Fri, 28 Aug 2015 03:25:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A240C162 for ; Fri, 28 Aug 2015 03:25:20 +0000 (UTC) From: "Manuel Rüger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" Message-ID: <1440732305.d8809486846fbeaebf2e310b85793fad1b029c02.mrueg@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/svn2git/Manifest dev-vcs/svn2git/files/svn2git-1.0.2.1-version.patch dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch dev-vcs/svn2git/files/svn2git-1.0.3_p1-version.patch dev-vcs/svn2git/files/svn2git-1.0.4-version.patch dev-vcs/svn2git/files/svn2git-1.0.5-version.patch dev-vcs/svn2git/files/svn2git-1.0.6-version.patch dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch dev-vcs/svn2git/files/svn2git-1.0.8-utf8-author-names.patch dev-vcs/svn2git/files/svn2git-1.0.8-version.patch dev-vcs/svn2git/svn2git-0_pre20100303.ebuild dev-vcs/svn2git/svn2git-0_pre20100324.ebuild dev-vcs/svn2git/svn2git-0_pre20100327.ebuild dev-vcs/svn2git/svn2git-0_pre20101008.ebuild dev-vcs/svn2git/svn2git-0_pre20101101.ebuild dev-vcs/svn2git/svn2git-1.0.2.1.ebuild dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild dev-vcs/svn2git/svn2git-1.0.4.ebuild dev-vcs/svn2git/svn2git-1.0.5.ebuild dev-vcs/svn2git/svn2git-1.0.6.ebuild dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild X-VCS-Directories: dev-vcs/svn2git/ dev-vcs/svn2git/files/ X-VCS-Committer: mrueg X-VCS-Committer-Name: Manuel Rüger X-VCS-Revision: d8809486846fbeaebf2e310b85793fad1b029c02 X-VCS-Branch: master Date: Fri, 28 Aug 2015 03:25:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ab80cd1-a8cc-4c07-834d-b92d65cf9dcc X-Archives-Hash: e21bd691a67d6dec1d23748e2de7f1a7 commit: d8809486846fbeaebf2e310b85793fad1b029c02 Author: Manuel Rüger gentoo org> AuthorDate: Fri Aug 28 03:25:05 2015 +0000 Commit: Manuel Rüger gentoo org> CommitDate: Fri Aug 28 03:25:05 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8809486 dev-vcs/svn2git: Remove old Package-Manager: portage-2.2.20.1 dev-vcs/svn2git/Manifest | 11 ----- .../svn2git/files/svn2git-1.0.2.1-version.patch | 14 ------ .../svn2git/files/svn2git-1.0.3-backup-refs.patch | 45 ------------------- .../svn2git/files/svn2git-1.0.3_p1-version.patch | 14 ------ dev-vcs/svn2git/files/svn2git-1.0.4-version.patch | 14 ------ dev-vcs/svn2git/files/svn2git-1.0.5-version.patch | 14 ------ dev-vcs/svn2git/files/svn2git-1.0.6-version.patch | 14 ------ dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch | 26 ----------- .../files/svn2git-1.0.8-utf8-author-names.patch | 51 ---------------------- dev-vcs/svn2git/files/svn2git-1.0.8-version.patch | 14 ------ dev-vcs/svn2git/svn2git-0_pre20100303.ebuild | 40 ----------------- dev-vcs/svn2git/svn2git-0_pre20100324.ebuild | 40 ----------------- dev-vcs/svn2git/svn2git-0_pre20100327.ebuild | 40 ----------------- dev-vcs/svn2git/svn2git-0_pre20101008.ebuild | 40 ----------------- dev-vcs/svn2git/svn2git-0_pre20101101.ebuild | 40 ----------------- dev-vcs/svn2git/svn2git-1.0.2.1.ebuild | 47 -------------------- dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild | 50 --------------------- dev-vcs/svn2git/svn2git-1.0.4.ebuild | 47 -------------------- dev-vcs/svn2git/svn2git-1.0.5.ebuild | 47 -------------------- dev-vcs/svn2git/svn2git-1.0.6.ebuild | 47 -------------------- dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild | 49 --------------------- 21 files changed, 704 deletions(-) diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest index f244ecc..c838761 100644 --- a/dev-vcs/svn2git/Manifest +++ b/dev-vcs/svn2git/Manifest @@ -1,12 +1 @@ -DIST svn2git-0_pre20100303.tar.gz 16351 SHA256 e33bf51e13daa19d9389c9f4aac6bb968562bbb64b1015a7e97b45f6fe0c35c8 SHA512 f279937afaa0d2b1e9474c401f48882ac61a83efe86f30ab7e7b89e57676db85fb0e488844307aa33ddc5fa57cff0512d5a9585a0cb1f02c664cbbaacc5c08a5 WHIRLPOOL d5a15472e436ffff2268734b169002f7b29d3150f8a1c9cbb60fa1addc1f44ea9d7e258bfc817557c23926e87cb76a6f77e23eed930bda8dbe0408aab749a56b -DIST svn2git-0_pre20100324.tar.gz 16467 SHA256 3db1ad47b1d2e8b1e8e658fdd14fa42121845a094b111932bcebe86439d775f7 SHA512 a8033cea3fef356f2b705003d9a70f49e14a3165b04733f3617e848a0be97ec31eaabbee24cbfcca4215297d85a63175fb5f3d87785993b07dc1e66b79d811b1 WHIRLPOOL 116f99266acaebb0a65f4949d2eaa6dd69bc663cba477dbe997d91eca311cfeeec868373142c81a6fa538b39a31b63ff9aad0426a663da5c0a3c2915dee4dfa7 -DIST svn2git-0_pre20100327.tar.gz 16702 SHA256 b8855e708e00e313bf8f6deb2ae9fb1a0e4e51a336d813f672eeb0a571be9bab SHA512 6318c4136a829770e68e5ee76d6a75696a1c18feedc6cf72b9608463ca7faa2ff717a6dcbba6d2b76389e2c48008bf9c154d2e5e77d7358925bbc97237effe14 WHIRLPOOL c6af3ba84ac07d5a15bbd86d2c41c9d3abf332640b81e0d89e7b22efe6227b40a43e93e45598d24186756e61d9c9132be9d5d564ad5c646c2e51f98ee0b91a86 -DIST svn2git-0_pre20101008.tar.gz 22620 SHA256 460425d86e9d07514f70660c9409eacc7c58e0d9a236f421d98bc4b2b858e82d SHA512 a7be70cc6b91ae17732046cd4f29915dee626576a772f796ddeec08c9e8cd3ef2eb7f8713299272f9e8760f4be2ce924421a3594791a357afdb676fc7d2477ef WHIRLPOOL 7291c44a7c58b555171696c8cd5d887b4ebf5c9c0589bc336db897759bd520031474012b2d4a15a4d838bfa559e978965bcd8f7034a23c69fab0c5e97626d9b4 -DIST svn2git-0_pre20101101.tar.gz 22615 SHA256 8af3076b49750e31ec4b6ea821afe38c8859dbf2789a70bbe932ffd00b4e9488 SHA512 bd581fdb2d97329515c3e91393c5c6be2c70e9d5828239fdf71acdf790e4b0b3b596818720827c522b7fe461b83ff40a60ac439c8850fdee7f84edcef413a3be WHIRLPOOL 4cc0fd8baa15d13fdba0fb2db8a74e5c76eec9a17ab0cd555acca890746f243d9f757c18487bcd68ba88bb2e545fdf49ed7d07e155093740fd2a9fe8fd8b0fc4 DIST svn2git-1.0.10.tar.gz 26667 SHA256 1b1300144e8a0f82485f4046c4585d53deff839a274f70f7cb32d5a5a76ffe61 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49 WHIRLPOOL c3b1ada8ffc925aef666f095c1b3a8a2323980a777a6e1751cfc02e5510d3d18fc95e68d8e3a275a5061ed0e073cc1eee538279f5a01039e698af135a4b38df1 -DIST svn2git-1.0.2.1.tar.gz 23784 SHA256 94e5def41df26c03e63423aba3ee70d3ee3ce21fdedca3ce3cb93ba576170fa2 SHA512 877458c7be998123e5b4ee1f60991edcb3dc740c3a8780bb56bb354f9937355635c7943421a60fd3d773d5f7ccc3bbb236bd58abf2c7afc7b40b819ce4c6c923 WHIRLPOOL 26f7d729de6888c621de899d591502792b55d410ed340832c53a47546da8586ae17ac85915f69707b6ba3ff424ce8207fd364fda80e951d82b0b82ff2083ba99 -DIST svn2git-1.0.3.tar.gz 24141 SHA256 b465bb64028e641ff426aa1055899b43640d394738d8919b9dd4235bf5842886 SHA512 e9d575777dada2d3f492a7428542744ac38881b3695c048d13ab65156b5f3ebc48ed3983952f59280c4618df0b7f53f154ee914f8f78e743c32fde31bb352356 WHIRLPOOL 4db8551567f4d3e43a4a9ab54953afbc82c7d0d6108fb5fad2581c822de8cef243725dcc3c94e7aba05efd7f0a9dcf1c0305e5a082963587372495136c3488c5 -DIST svn2git-1.0.4.tar.gz 24190 SHA256 7fab1935ea7101c1c39085b3333f9d9eaa88e5d3f7edd9a04728e5031199390f SHA512 9431e9a45c7f578048bb3624cd717f86a97104c0731af4609991c0b428c6183625b8e0a25c483b319a78dd7a7d2cf09b9e02473c29dbb5c628bab50e33a00fd4 WHIRLPOOL 87fa07fee8f0c619c0594e68348475f735ee46b01d080c6b94a4aa88d10af2b1c79f823be24588c189eb47100302b02130aa255ab902b655cef0737d2bb304c2 -DIST svn2git-1.0.5.tar.gz 25677 SHA256 e6f4794f5a22044cbbb89feedaf5b1179d94b6b142df5875cdb2876819e47224 SHA512 594b70651a0c97668822adf456f9ac7f1ce814c53dabcd39efbb2fd85d63d6a4be7e708db3560234078e2dc6084ea99ccf0c4fb363c7b4864d37d4b5fb53d18f WHIRLPOOL 1ec1de336de26fa8d235ccc3b039598b8b5128b95f15af1b04c5fd79ba753ac3b02aa09d8feadf6c7ecfcfaf0fd48bc7e56fdee51d77e29909b1fefe26cfa76f -DIST svn2git-1.0.6.tar.gz 25791 SHA256 273f2199115414bcfb454d18f2200a7f3d536da11c4ed78f9fbae354af742a7d SHA512 9f887a9085c4a3a5210e4c49cde2a326eaa92e2426ffe0842daf5a05e3b1133c4566a00b719bf04c9e6b8a31d3eaa56e75395ec732a75ce6700bc4d22e6979d7 WHIRLPOOL c6547de760f5097663d8cc3705a156540278b4d1a6892021a7292e7cbfad274cfe144c1eab886c0cae773cfb932ab60b1f6a51294aeaaebaeefb68c1eb1d0ea5 -DIST svn2git-1.0.8.tar.gz 26667 SHA256 ba66e9ad88a23acb65cf56661dd7ca81cfb5b429bb2349278dc8906c0239a4c2 SHA512 a6c5eb87cebf98404f0579f9ca9ab8f565dfd2bac2ca7824f964a73ebcfb362688bc5149a7c2e2d152ff5e28b84cc1b1deb2fdca1bceabbeed25f6d2c27a4a8d WHIRLPOOL c36ac03378048a6117d1c47ada993477f5d2822a40c7a2850e0a356753bfc003fbaef8477a8e9849fc752432cdb369cffacc1c38bbe6d7e0434e8a07a71196a4 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 deleted file mode 100644 index 0ca442b..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-version.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100 -@@ -7,10 +7,7 @@ - APR_INCLUDE = /usr/include/apr-1 - exists(local-config.pri):include(local-config.pri) - --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -- !isEmpty(VERSION){ -- VERSION = $${VERSION} -- } -+VERSION = "1.0.2-1-gebac099" - - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string 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 deleted file mode 100644 index 6241bb7..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 584005f2e26149282aa12c4a0367d250caaf3918 Mon Sep 17 00:00:00 2001 -From: Jehan Bing -Date: Thu, 10 Mar 2011 10:54:52 -0800 -Subject: [PATCH] Create backup reference before deletion of the original branch - -Ensure that the backup reference is created before deleting the original -branch. As it was, the deletion was executed earlier causing the backup -reference to point to a non-existing branch so was not created. ---- - src/repository.cpp | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/repository.cpp b/src/repository.cpp -index 7de840f..2c70bf3 100644 ---- a/src/repository.cpp -+++ b/src/repository.cpp -@@ -349,11 +349,12 @@ int Repository::resetBranch(const QString &branch, int revnum, int mark, const Q - branchRef.prepend("refs/heads/"); - - Branch &br = branches[branch]; -+ QByteArray backupCmd; - if (br.created && br.created != revnum && !br.marks.isEmpty() && br.marks.last()) { - QByteArray backupBranch = "refs/backups/r" + QByteArray::number(revnum) + branchRef.mid(4); - qWarning() << "WARN: backing up branch" << branch << "to" << backupBranch; - -- resetBranches.append("reset " + backupBranch + "\nfrom " + branchRef + "\n\n"); -+ backupCmd = "reset " + backupBranch + "\nfrom " + branchRef + "\n\n"; - } - - br.created = revnum; -@@ -365,9 +366,9 @@ int Repository::resetBranch(const QString &branch, int revnum, int mark, const Q - + " branch " + branch.toUtf8() + " = :" + QByteArray::number(mark) - + " # " + comment + "\n\n"; - if(comment == "delete") -- deletedBranches.append(cmd); -+ deletedBranches.append(backupCmd).append(cmd); - else -- resetBranches.append(cmd); -+ resetBranches.append(backupCmd).append(cmd); - - return EXIT_SUCCESS; - } --- -1.7.4.1 - 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 deleted file mode 100644 index 78efb87..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.3_p1-version.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100 -@@ -7,10 +7,7 @@ - APR_INCLUDE = /usr/include/apr-1 - exists(local-config.pri):include(local-config.pri) - --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -- !isEmpty(VERSION){ -- VERSION = $${VERSION} -- } -+VERSION = "1.0.3_p1" - - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string diff --git a/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch deleted file mode 100644 index e59547c..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100 -@@ -7,10 +7,7 @@ - APR_INCLUDE = /usr/include/apr-1 - exists(local-config.pri):include(local-config.pri) - --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -- !isEmpty(VERSION){ -- VERSION = $${VERSION} -- } -+VERSION = "1.0.4" - - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string diff --git a/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch deleted file mode 100644 index 7247f4b..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100 -@@ -7,10 +7,7 @@ - APR_INCLUDE = /usr/include/apr-1 - exists(local-config.pri):include(local-config.pri) - --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -- !isEmpty(VERSION){ -- VERSION = $${VERSION} -- } -+VERSION = "1.0.5" - - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string diff --git a/dev-vcs/svn2git/files/svn2git-1.0.6-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.6-version.patch deleted file mode 100644 index 00d6773..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.6-version.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100 -@@ -7,10 +7,7 @@ - APR_INCLUDE = /usr/include/apr-1 - exists(local-config.pri):include(local-config.pri) - --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -- !isEmpty(VERSION){ -- VERSION = $${VERSION} -- } -+VERSION = "1.0.6" - - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string diff --git a/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch b/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch deleted file mode 100644 index 730c51c..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b5c3d3aa55621c44db439e4a73884e0d0bf9612c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= -Date: Wed, 28 Nov 2012 21:58:44 +0100 -Subject: [PATCH] Fix compilation, the last rebase/merge went wrong. - -Noticed by: Andy Pilate ---- - src/svn.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/svn.cpp b/src/svn.cpp -index 1aadce9..b2fe2a2 100644 ---- a/src/svn.cpp -+++ b/src/svn.cpp -@@ -896,7 +896,7 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change, - rev_from, changes, current, *match, matchRules, dirpool) == EXIT_FAILURE) - return EXIT_FAILURE; - } else { -- if (dirent->kind == svn_node_dir) { -+ if (i.value() == svn_node_dir) { - qDebug() << current << "rev" << revnum - << "did not match any rules; auto-recursing"; - if (recurse(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(), --- -1.7.1 - 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 deleted file mode 100644 index a5a94a1..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.8-utf8-author-names.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6f931cd4535ba3e0d4dda31a0a5ab4a7f33b3221 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Thu, 9 May 2013 00:45:27 +0200 -Subject: [PATCH] Stop unintended re-encoding of author names from UTF-8 to - ASCII -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -To see the bug in action, use an author map with umlauts, e.g. - - nickname = Hällo Wörld from UTF-8 - -and check "git log" after the conversion. - -What is happening? -QByteArray "author" is first decoded as UTF-8 into a QString. -That QString is passed to QByteArray::append(const QString &) -which internally encodes the QString to ASCII byte data using -QString::toAscii(). "git fast-import" expects UTF-8 input -from us, so the original QByteArray with UTF-8 content is just -what we need. ---- - src/repository.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/repository.cpp b/src/repository.cpp -index 779dd28..f3b06e8 100644 ---- a/src/repository.cpp -+++ b/src/repository.cpp -@@ -685,7 +685,7 @@ void Repository::Transaction::commitNote(const QByteArray ¬eText, bool append - QByteArray s(""); - s.append("commit refs/notes/commits\n"); - s.append("mark :" + QByteArray::number(maxMark + 1) + "\n"); -- s.append("committer " + QString::fromUtf8(author) + " " + QString::number(datetime) + " +0000" + "\n"); -+ s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " +0000" + "\n"); - s.append("data " + QString::number(message.length()) + "\n"); - s.append(message + "\n"); - s.append("N inline " + commitRef + "\n"); -@@ -736,7 +736,7 @@ void Repository::Transaction::commit() - QByteArray s(""); - s.append("commit " + branchRef + "\n"); - s.append("mark :" + QByteArray::number(mark) + "\n"); -- s.append("committer " + QString::fromUtf8(author) + " " + QString::number(datetime) + " +0000" + "\n"); -+ s.append("committer " + author + " " + QString::number(datetime).toUtf8() + " +0000" + "\n"); - s.append("data " + QString::number(message.length()) + "\n"); - s.append(message + "\n"); - repository->fastImport.write(s); --- -1.8.2.1 - diff --git a/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch deleted file mode 100644 index 3eed1cb..0000000 --- a/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/src.pro 2011-01-11 09:27:21.530166986 +0100 -+++ src/src.pro 2011-01-11 09:30:55.743128934 +0100 -@@ -7,10 +7,7 @@ - APR_INCLUDE = /usr/include/apr-1 - exists(local-config.pri):include(local-config.pri) - --VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -- !isEmpty(VERSION){ -- VERSION = $${VERSION} -- } -+VERSION = "1.0.8" - - VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string - DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string diff --git a/dev-vcs/svn2git/svn2git-0_pre20100303.ebuild b/dev-vcs/svn2git/svn2git-0_pre20100303.ebuild deleted file mode 100644 index 795ae14..0000000 --- a/dev-vcs/svn2git/svn2git-0_pre20100303.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Importer for one time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -src_prepare() { - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-0_pre20100324.ebuild b/dev-vcs/svn2git/svn2git-0_pre20100324.ebuild deleted file mode 100644 index 795ae14..0000000 --- a/dev-vcs/svn2git/svn2git-0_pre20100324.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Importer for one time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -src_prepare() { - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-0_pre20100327.ebuild b/dev-vcs/svn2git/svn2git-0_pre20100327.ebuild deleted file mode 100644 index 795ae14..0000000 --- a/dev-vcs/svn2git/svn2git-0_pre20100327.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Importer for one time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -src_prepare() { - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-0_pre20101008.ebuild b/dev-vcs/svn2git/svn2git-0_pre20101008.ebuild deleted file mode 100644 index 795ae14..0000000 --- a/dev-vcs/svn2git/svn2git-0_pre20101008.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Importer for one time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -src_prepare() { - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-0_pre20101101.ebuild b/dev-vcs/svn2git/svn2git-0_pre20101101.ebuild deleted file mode 100644 index 795ae14..0000000 --- a/dev-vcs/svn2git/svn2git-0_pre20101101.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Importer for one time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -src_prepare() { - sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild b/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild deleted file mode 100644 index 004f553..0000000 --- a/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git - -MY_PV="1.0.2-1-gebac099" - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -S=${WORKDIR}/${PN}-${PN} - -src_prepare() { - # Note: patching order matters - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch - [ "$PV" != "9999" ] && epatch "${FILESDIR}"/${PN}-1.0.2.1-version.patch - - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild b/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild deleted file mode 100644 index c003040..0000000 --- a/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit versionator eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git - -MY_PV=$(get_version_component_range 1-3) - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${PN}-${MY_PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -S=${WORKDIR}/${PN}-${PN} - -src_prepare() { - # Note: patching order matters - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch - if [[ "$PV" != "9999" ]]; then - epatch "${FILESDIR}"/${PN}-1.0.3_p1-version.patch - epatch "${FILESDIR}"/${PN}-1.0.3-backup-refs.patch - fi - - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-1.0.4.ebuild b/dev-vcs/svn2git/svn2git-1.0.4.ebuild deleted file mode 100644 index ba6331f..0000000 --- a/dev-vcs/svn2git/svn2git-1.0.4.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -S=${WORKDIR}/${PN}-${PN} - -src_prepare() { - # Note: patching order matters - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch - if [[ "$PV" != "9999" ]]; then - epatch "${FILESDIR}"/${PN}-1.0.4-version.patch - fi - - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-1.0.5.ebuild b/dev-vcs/svn2git/svn2git-1.0.5.ebuild deleted file mode 100644 index bd17728..0000000 --- a/dev-vcs/svn2git/svn2git-1.0.5.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -S=${WORKDIR}/${PN}-${PN} - -src_prepare() { - # Note: patching order matters - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch - if [[ "$PV" != "9999" ]]; then - epatch "${FILESDIR}"/${P}-version.patch - fi - - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-1.0.6.ebuild b/dev-vcs/svn2git/svn2git-1.0.6.ebuild deleted file mode 100644 index bd17728..0000000 --- a/dev-vcs/svn2git/svn2git-1.0.6.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -S=${WORKDIR}/${PN}-${PN} - -src_prepare() { - # Note: patching order matters - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch - if [[ "$PV" != "9999" ]]; then - epatch "${FILESDIR}"/${P}-version.patch - fi - - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -} diff --git a/dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild deleted file mode 100644 index c556034..0000000 --- a/dev-vcs/svn2git/svn2git-1.0.8-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git - -DESCRIPTION="Tool for one-time conversion from svn to git" -HOMEPAGE="https://github.com/svn-all-fast-export/svn2git" -if [ "$PV" == "9999" ]; then - EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git" - KEYWORDS="" -else - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" -# KEYWORDS way up - -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" -RDEPEND="${DEPEND} - dev-vcs/git" - -S=${WORKDIR}/${PN}-${PN} - -src_prepare() { - # Note: patching order matters - epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch - if [[ "$PV" != "9999" ]]; then - epatch "${FILESDIR}"/${P}-version.patch - fi - epatch "${FILESDIR}"/${P}-compile.patch - epatch "${FILESDIR}"/${P}-utf8-author-names.patch - - qt4-r2_src_prepare -} - -src_install() { - insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' -}