Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/
Date: Sun, 27 Aug 2017 20:56:08
Message-Id: 1503867334.1574d2d030eecc9a8c37a5099ec2b92fbeae9e4e.sping@gentoo
1 commit: 1574d2d030eecc9a8c37a5099ec2b92fbeae9e4e
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 27 20:39:19 2017 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 27 20:55:34 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1574d2d0
7
8 dev-vcs/svn2git: 1.0.11
9
10 Also bump to EAPI 5 (not 6), and sync live ebuild
11
12 Package-Manager: Portage-2.3.8, Repoman-2.3.3
13
14 dev-vcs/svn2git/Manifest | 1 +
15 .../svn2git/{svn2git-9999.ebuild => svn2git-1.0.11.ebuild} | 14 +++++++-------
16 dev-vcs/svn2git/svn2git-9999.ebuild | 14 +++++++-------
17 3 files changed, 15 insertions(+), 14 deletions(-)
18
19 diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
20 index c838761627a..8a9e9482e4f 100644
21 --- a/dev-vcs/svn2git/Manifest
22 +++ b/dev-vcs/svn2git/Manifest
23 @@ -1 +1,2 @@
24 DIST svn2git-1.0.10.tar.gz 26667 SHA256 1b1300144e8a0f82485f4046c4585d53deff839a274f70f7cb32d5a5a76ffe61 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49 WHIRLPOOL c3b1ada8ffc925aef666f095c1b3a8a2323980a777a6e1751cfc02e5510d3d18fc95e68d8e3a275a5061ed0e073cc1eee538279f5a01039e698af135a4b38df1
25 +DIST svn2git-1.0.11.tar.gz 30986 SHA256 1103d1747af7c18ca18a6a89637e3e3ab87518710ee8eecee4d402b8f445b010 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9 WHIRLPOOL 98c8a11dda0c6fab63f5792b95ca2fb6087b4d5e04f0aeaa14061f2d84a4632913515fa6dfaa3d9a1b94940dcee61eeae00d24b8f12fe110138e548232456965
26
27 diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-1.0.11.ebuild
28 similarity index 73%
29 copy from dev-vcs/svn2git/svn2git-9999.ebuild
30 copy to dev-vcs/svn2git/svn2git-1.0.11.ebuild
31 index eb455c658b1..c9fa2d78494 100644
32 --- a/dev-vcs/svn2git/svn2git-9999.ebuild
33 +++ b/dev-vcs/svn2git/svn2git-1.0.11.ebuild
34 @@ -1,10 +1,10 @@
35 -# Copyright 1999-2015 Gentoo Foundation
36 +# Copyright 1999-2017 Gentoo Foundation
37 # Distributed under the terms of the GNU General Public License v2
38
39 -EAPI="2"
40 +EAPI="5"
41
42 inherit eutils qt4-r2
43 -[ "$PV" == "9999" ] && inherit git-2
44 +[ "$PV" == "9999" ] && inherit git-r3
45
46 DESCRIPTION="Tool for one-time conversion from svn to git"
47 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
48 @@ -12,7 +12,7 @@ if [ "$PV" == "9999" ]; then
49 EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
50 KEYWORDS=""
51 else
52 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
53 + SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
54 KEYWORDS="~amd64 ~x86"
55 fi
56
57 @@ -26,19 +26,19 @@ DEPEND="dev-vcs/subversion
58 RDEPEND="${DEPEND}
59 dev-vcs/git"
60
61 -S=${WORKDIR}/${PN}-${PN}
62 -
63 src_prepare() {
64 # Note: patching order matters
65 epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
66 if [[ "$PV" != "9999" ]]; then
67 - epatch "${FILESDIR}"/${P}-version.patch
68 + epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
69 + export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile
70 fi
71
72 qt4-r2_src_prepare
73 }
74
75 src_install() {
76 + dodoc README.md
77 insinto /usr/share/${PN}/samples
78 doins samples/*.rules || die 'doins failed'
79 dobin svn-all-fast-export || die 'dobin failed'
80
81 diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
82 index eb455c658b1..c9fa2d78494 100644
83 --- a/dev-vcs/svn2git/svn2git-9999.ebuild
84 +++ b/dev-vcs/svn2git/svn2git-9999.ebuild
85 @@ -1,10 +1,10 @@
86 -# Copyright 1999-2015 Gentoo Foundation
87 +# Copyright 1999-2017 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89
90 -EAPI="2"
91 +EAPI="5"
92
93 inherit eutils qt4-r2
94 -[ "$PV" == "9999" ] && inherit git-2
95 +[ "$PV" == "9999" ] && inherit git-r3
96
97 DESCRIPTION="Tool for one-time conversion from svn to git"
98 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
99 @@ -12,7 +12,7 @@ if [ "$PV" == "9999" ]; then
100 EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
101 KEYWORDS=""
102 else
103 - SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
104 + SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
105 KEYWORDS="~amd64 ~x86"
106 fi
107
108 @@ -26,19 +26,19 @@ DEPEND="dev-vcs/subversion
109 RDEPEND="${DEPEND}
110 dev-vcs/git"
111
112 -S=${WORKDIR}/${PN}-${PN}
113 -
114 src_prepare() {
115 # Note: patching order matters
116 epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
117 if [[ "$PV" != "9999" ]]; then
118 - epatch "${FILESDIR}"/${P}-version.patch
119 + epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
120 + export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile
121 fi
122
123 qt4-r2_src_prepare
124 }
125
126 src_install() {
127 + dodoc README.md
128 insinto /usr/share/${PN}/samples
129 doins samples/*.rules || die 'doins failed'
130 dobin svn-all-fast-export || die 'dobin failed'