public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/
@ 2015-08-28  3:25 Manuel Rüger
  0 siblings, 0 replies; 3+ messages in thread
From: Manuel Rüger @ 2015-08-28  3:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d8809486846fbeaebf2e310b85793fad1b029c02
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 03:25:05 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> 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 <nahor.j@gmail.com>
-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?= <uqs@spoerlein.net>
-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 <sebastian@pipping.org>
-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 <mail@example.org>
-
-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 &noteText, 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'
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/
@ 2018-01-14 19:14 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2018-01-14 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     67cdc514c03e846d11bfd26c3252a835aa57e267
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 02:49:49 2018 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jan 14 19:14:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cdc514

dev-vcs/svn2git: Switch to Qt5

Closes: https://github.com/gentoo/gentoo/pull/6844

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/svn2git-1.0.2.1-include-path.patch       |  4 +--
 ...vn2git-9999.ebuild => svn2git-1.0.11-r1.ebuild} | 33 +++++++++++++---------
 dev-vcs/svn2git/svn2git-9999.ebuild                | 33 +++++++++++++---------
 3 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
index 2349b308083..e5c898ba973 100644
--- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
+++ b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
@@ -1,5 +1,5 @@
---- src/src.pro	2011-01-11 09:02:15.696463807 +0100
-+++ src/src.pro	2011-01-11 09:03:59.793959849 +0100
+--- a/src/src.pro	2011-01-11 09:02:15.696463807 +0100
++++ b/src/src.pro	2011-01-11 09:03:59.793959849 +0100
 @@ -3,8 +3,8 @@
  # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007
  ######################################################################

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
similarity index 64%
copy from dev-vcs/svn2git/svn2git-9999.ebuild
copy to dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
index c9fa2d78494..0fd35c4b742 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-r3
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -21,24 +20,32 @@ SLOT="0"
 IUSE=""
 # KEYWORDS way up
 
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
 RDEPEND="${DEPEND}
 	dev-vcs/git"
 
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
+
 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.10-version.patch
+	default
+
+	if [[ "${PV}" != "9999" ]]; then
+		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
 		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
+}
 
-	qt4-r2_src_prepare
+src_configure() {
+	eqmake5 fast-export2.pro
 }
 
 src_install() {
-	dodoc README.md
+	einstalldocs
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index c9fa2d78494..0fd35c4b742 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-r3
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -21,24 +20,32 @@ SLOT="0"
 IUSE=""
 # KEYWORDS way up
 
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
 RDEPEND="${DEPEND}
 	dev-vcs/git"
 
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
+
 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.10-version.patch
+	default
+
+	if [[ "${PV}" != "9999" ]]; then
+		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
 		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
+}
 
-	qt4-r2_src_prepare
+src_configure() {
+	eqmake5 fast-export2.pro
 }
 
 src_install() {
-	dodoc README.md
+	einstalldocs
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/
@ 2020-06-22 18:40 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-06-22 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     cd4dbe74372202a17c8d602b3d31db774617102a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 21:22:55 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 18:40:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd4dbe74

dev-vcs/svn2git: Drop <=1.0.13-r1

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-vcs/svn2git/Manifest                           |  3 --
 dev-vcs/svn2git/files/svn2git-1.0.10-version.patch | 23 ----------
 dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch | 23 ----------
 .../files/svn2git-1.0.2.1-include-path.patch       | 13 ------
 dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild           | 53 ----------------------
 dev-vcs/svn2git/svn2git-1.0.12.ebuild              | 47 -------------------
 dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild           | 51 ---------------------
 dev-vcs/svn2git/svn2git-1.0.13.ebuild              | 47 -------------------
 8 files changed, 260 deletions(-)

diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 55b1f116f66..95e7a8d4c47 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,6 +1,3 @@
-DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
-DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359
-DIST svn2git-1.0.13.tar.gz 43738 BLAKE2B 97e9b90402d3c7eedf0fafd3b68429c99d93522dcfe190f88e64b744cb86e5fec0bdd0fabfef39018e290a425a53a2089df88250ff03e447f2963e2ad99fa0e0 SHA512 7cc9a9d70da285533f7f34672fb8f6571cb031d2dd4fc9df904b9e3acf64d97f42027a19bed82478c75a237febf3c8e12ba27a1abcd98403fe24247e5a26a96a
 DIST svn2git-1.0.16.tar.gz 44489 BLAKE2B 0be673592a6032b0f46f7ab80e50862e6979a6540d17eadb2c0e4c3f40737283fb17cc51340810bbfc17dba7ee258537d5618de95da3843851e20ae843a47626 SHA512 11289c98fcae98ec2137b778c064e73f47957c987a8d413946a8cde44d679565eae878e69e3a60b5c48c0753dd4935d001eb6ba28253cea995ee4fd40379b583
 DIST svn2git-1.0.17.tar.gz 46473 BLAKE2B ab862a310f8d21b33d49f5152df458fb1524abe2e353e6395d7b20d80ee3967338ca04ff5e282623937ca13b38e9018ba81d4c3e89f3c69e1002bff7ddd8621a SHA512 6d02ffa0923bcc80878c08e5a4f2f00476485e34d1c7361ddfa8bdfd521c0d36a22b46e7cd872e617ecd604f2d724166ea95008338bba41ee7e1200dc919baf4
 DIST svn2git-1.0.18.tar.gz 53514 BLAKE2B 1e40318e484df4eee9ab3586b73cc6a7d9599f8f04e31531e2591dc0bb6f84190d35fb6b9128dd512bab59648e838f479fd81894f97cfce7af4365e0932b26e4 SHA512 ff851a5c3a225c8b6efa9fbf90bd72439bc1303f8138384c2bac779d6cfe52c77125ec3b80b320205e08bbee9910c5203a95c112909c3336750938d2271c2517

diff --git a/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch
deleted file mode 100644
index 894cf2c2a10..00000000000
--- a/dev-vcs/svn2git/files/svn2git-1.0.10-version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d8b1c8c774a61666e7c62bf5beb8f0f1b4a3e01a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 21 May 2013 23:11:25 +0200
-Subject: [PATCH] Stop using Git SHA1 version string
-
-diff --git a/src/src.pro b/src/src.pro
-index da6d40d..2626a6f 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,10 +6,7 @@ SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
- APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/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 = $$(SVN_ALL_FAST_EXPORT_VERSION)
- 
- VERSTR = '\\"$${VERSION}\\"'  # place quotes around the version string
- DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
--- 
-1.8.2.1

diff --git a/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch b/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch
deleted file mode 100644
index 74ee4306b3c..00000000000
--- a/dev-vcs/svn2git/files/svn2git-1.0.13-src-pro.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 59a038796e6bb55b11b6d82f7d5aae42399da38a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= <Bjoern@Kautler.net>
-Date: Fri, 12 Apr 2019 01:39:51 +0200
-Subject: [PATCH] Fix evaluation of emptyness of SVN_LIBDIR that sometimes
- always gives false, sometime always true, but never what is intended
-
----
- src/src.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/src.pro b/src/src.pro
-index 426d304..cfbd865 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -28,7 +28,7 @@ DEPENDPATH += .
- QT = core
- 
- INCLUDEPATH += . $$SVN_INCLUDE $$APR_INCLUDE
--!isEmpty($$SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR
-+!isEmpty(SVN_LIBDIR): LIBS += -L$$SVN_LIBDIR
- LIBS += -lsvn_fs-1 -lsvn_repos-1 -lapr-1 -lsvn_subr-1
- 
- # Input

diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
deleted file mode 100644
index e5c898ba973..00000000000
--- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/src.pro	2011-01-11 09:02:15.696463807 +0100
-+++ b/src/src.pro	2011-01-11 09:03:59.793959849 +0100
-@@ -3,8 +3,8 @@
- # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007
- ######################################################################
- 
--SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
--APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
-+SVN_INCLUDE = /usr/include/subversion-1
-+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)

diff --git a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
deleted file mode 100644
index 5df2948ca14..00000000000
--- a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-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"
-else
-	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-vcs/subversion"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=( README.md )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
-
-src_prepare() {
-	# Note: patching order matters
-	default
-
-	if [[ "${PV}" != "9999" ]]; then
-		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-}
-
-src_configure() {
-	eqmake5 fast-export2.pro
-}
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules
-	dobin svn-all-fast-export
-	dosym svn-all-fast-export /usr/bin/svn2git
-}

diff --git a/dev-vcs/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
deleted file mode 100644
index f9d80383124..00000000000
--- a/dev-vcs/svn2git/svn2git-1.0.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-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"
-else
-	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-vcs/subversion"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=( README.md )
-
-src_configure() {
-	local qmake_args=(
-		APR_INCLUDE=/usr/include/apr-1
-		PREFIX=/usr
-		SVN_INCLUDE=/usr/include/subversion-1
-		VERSION=${PV}
-	)
-	eqmake5 "${qmake_args[@]}" fast-export2.pro
-}
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules
-	dobin svn-all-fast-export
-	dosym svn-all-fast-export /usr/bin/svn2git
-}

diff --git a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild
deleted file mode 100644
index 7ff0f668cf4..00000000000
--- a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-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"
-else
-	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-vcs/subversion"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=( README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-src-pro.patch
-)
-
-src_configure() {
-	local qmake_args=(
-		APR_INCLUDE=/usr/include/apr-1
-		PREFIX=/usr
-		SVN_INCLUDE=/usr/include/subversion-1
-		VERSION=${PV}
-	)
-	eqmake5 "${qmake_args[@]}" fast-export2.pro
-}
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules
-	dobin svn-all-fast-export
-	dosym svn-all-fast-export /usr/bin/svn2git
-}

diff --git a/dev-vcs/svn2git/svn2git-1.0.13.ebuild b/dev-vcs/svn2git/svn2git-1.0.13.ebuild
deleted file mode 100644
index f9d80383124..00000000000
--- a/dev-vcs/svn2git/svn2git-1.0.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop qmake-utils
-[[ "${PV}" == "9999" ]] && inherit git-r3
-
-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"
-else
-	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-vcs/subversion"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-DOCS=( README.md )
-
-src_configure() {
-	local qmake_args=(
-		APR_INCLUDE=/usr/include/apr-1
-		PREFIX=/usr
-		SVN_INCLUDE=/usr/include/subversion-1
-		VERSION=${PV}
-	)
-	eqmake5 "${qmake_args[@]}" fast-export2.pro
-}
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules
-	dobin svn-all-fast-export
-	dosym svn-all-fast-export /usr/bin/svn2git
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-22 18:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-14 19:14 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2020-06-22 18:40 Andreas Sturmlechner
2015-08-28  3:25 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox