3 files changed, 54 insertions, 7 deletions
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index c838761627a4..8a9e9482e4f5 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1 +1,2 @@
 DIST svn2git-1.0.10.tar.gz 26667 SHA256 1b1300144e8a0f82485f4046c4585d53deff839a274f70f7cb32d5a5a76ffe61 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49 WHIRLPOOL c3b1ada8ffc925aef666f095c1b3a8a2323980a777a6e1751cfc02e5510d3d18fc95e68d8e3a275a5061ed0e073cc1eee538279f5a01039e698af135a4b38df1
+DIST svn2git-1.0.11.tar.gz 30986 SHA256 1103d1747af7c18ca18a6a89637e3e3ab87518710ee8eecee4d402b8f445b010 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9 WHIRLPOOL 98c8a11dda0c6fab63f5792b95ca2fb6087b4d5e04f0aeaa14061f2d84a4632913515fa6dfaa3d9a1b94940dcee61eeae00d24b8f12fe110138e548232456965
diff --git a/dev-vcs/svn2git/svn2git-1.0.11.ebuild b/dev-vcs/svn2git/svn2git-1.0.11.ebuild
new file mode 100644
index 000000000000..c9fa2d784940
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.11.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils qt4-r2
+[ "$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"
+	KEYWORDS=""
+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-vcs/subversion
+	dev-qt/qtcore:4"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+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
+		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
+	fi
+
+	qt4-r2_src_prepare
+}
+
+src_install() {
+	dodoc README.md
+	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-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index eb455c658b14..c9fa2d784940 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-2
+[ "$PV" == "9999" ] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
@@ -12,7 +12,7 @@ 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"
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -26,19 +26,19 @@ DEPEND="dev-vcs/subversion
 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
+		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
+		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
 
 	qt4-r2_src_prepare
 }
 
 src_install() {
+	dodoc README.md
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'