[gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/

2020-06-22 Thread Andreas Sturmlechner 
commit: cd4dbe74372202a17c8d602b3d31db774617102a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 22 21:22:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 22 18:40:19 2020 +
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  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..000
--- 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 
-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..000
--- 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?= 
-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
-+++

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/

2018-01-14 Thread Sebastian Pipping 
commit: 67cdc514c03e846d11bfd26c3252a835aa57e267
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 13 02:49:49 2018 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Jan 14 19:14:18 2018 +
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-.ebuild => svn2git-1.0.11-r1.ebuild} | 33 +-
 dev-vcs/svn2git/svn2git-.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.pro2011-01-11 09:02:15.696463807 +0100
-+++ src/src.pro2011-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-.ebuild 
b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
similarity index 64%
copy from dev-vcs/svn2git/svn2git-.ebuild
copy to dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
index c9fa2d78494..0fd35c4b742 100644
--- a/dev-vcs/svn2git/svn2git-.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" == "" ] && inherit git-r3
+inherit desktop qmake-utils
+[[ "${PV}" == "" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git;
-if [ "$PV" == "" ]; then
+if [[ "${PV}" == "" ]]; 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" != "" ]]; then
-   epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
+   default
+
+   if [[ "${PV}" != "" ]]; 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-.ebuild 
b/dev-vcs/svn2git/svn2git-.ebuild
index c9fa2d78494..0fd35c4b742 100644
--- a/dev-vcs/svn2git/svn2git-.ebuild
+++ b/dev-vcs/svn2git/svn2git-.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" == "" ] && inherit git-r3
+inherit desktop qmake-utils
+[[ "${PV}" == "" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git;
-if [ "$PV" == "" ]; then
+if [[ "${PV}" == "" ]]; 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" != "" ]]; then
-   epatch

[gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/files/, dev-vcs/svn2git/

2015-08-27 Thread Manuel Rüger 
commit: d8809486846fbeaebf2e310b85793fad1b029c02
Author: Manuel Rüger mrueg AT gentoo DOT org
AuthorDate: Fri Aug 28 03:25:05 2015 +
Commit: Manuel Rüger mrueg AT gentoo DOT org
CommitDate: Fri Aug 28 03:25:05 2015 +
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 
d5a15472e4362268734b169002f7b29d3150f8a1c9cbb60fa1addc1f44ea9d7e258bfc817557c23926e87cb76a6f77e23eed930bda8dbe0408aab749a56b
-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