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

[Sebastian Pipping]

commit:     87c1902f0d8ce19de9d31b3e52660fa30f73b4aa
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 16:31:21 2018 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 16:32:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c1902f

dev-vcs/svn2git: 1.0.12 + sync 9999

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-vcs/svn2git/Manifest                             |  1 +
 .../{svn2git-9999.ebuild => svn2git-1.0.12.ebuild}   | 20 +++++++-------------
 dev-vcs/svn2git/svn2git-9999.ebuild                  | 19 ++++++-------------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 11586062ffa..30a5f7a83ee 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/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

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild 
b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
similarity index 75%
copy from dev-vcs/svn2git/svn2git-9999.ebuild
copy to dev-vcs/svn2git/svn2git-1.0.12.ebuild
index 0fd35c4b742..ab7c62035ef 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
@@ -28,20 +28,14 @@ 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
+               VERSION=${PV}
+       )
+       eqmake5 "${qmake_args[@]}" fast-export2.pro
 }
 
 src_install() {

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild 
b/dev-vcs/svn2git/svn2git-9999.ebuild
index 0fd35c4b742..77393d1e3fb 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/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() {