dev-vcs/svn2git: 1.0.12 + sync 9999

Package-Manager: Portage-2.3.40, Repoman-2.3.9

dev-vcs/svn2git/Manifest

@@ -1 +1,2 @@
 DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
+DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359

dev-vcs/svn2git/svn2git-1.0.12.ebuild

@@ -0,0 +1,47 @@
+# 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 || die 'doins failed'
+	dobin svn-all-fast-export || die 'dobin failed'
+	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+}

dev-vcs/svn2git/svn2git-9999.ebuild

@@ -28,20 +28,13 @@ RDEPEND="${DEPEND}
 
 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
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
 }
 
 src_install() {