| 1 |
commit: 87c1902f0d8ce19de9d31b3e52660fa30f73b4aa |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 2 16:31:21 2018 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 16:32:05 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c1902f |
| 7 |
|
| 8 |
dev-vcs/svn2git: 1.0.12 + sync 9999 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
dev-vcs/svn2git/Manifest | 1 + |
| 13 |
.../{svn2git-9999.ebuild => svn2git-1.0.12.ebuild} | 20 +++++++------------- |
| 14 |
dev-vcs/svn2git/svn2git-9999.ebuild | 19 ++++++------------- |
| 15 |
3 files changed, 14 insertions(+), 26 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest |
| 18 |
index 11586062ffa..30a5f7a83ee 100644 |
| 19 |
--- a/dev-vcs/svn2git/Manifest |
| 20 |
+++ b/dev-vcs/svn2git/Manifest |
| 21 |
@@ -1 +1,2 @@ |
| 22 |
DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9 |
| 23 |
+DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359 |
| 24 |
|
| 25 |
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild |
| 26 |
similarity index 75% |
| 27 |
copy from dev-vcs/svn2git/svn2git-9999.ebuild |
| 28 |
copy to dev-vcs/svn2git/svn2git-1.0.12.ebuild |
| 29 |
index 0fd35c4b742..ab7c62035ef 100644 |
| 30 |
--- a/dev-vcs/svn2git/svn2git-9999.ebuild |
| 31 |
+++ b/dev-vcs/svn2git/svn2git-1.0.12.ebuild |
| 32 |
@@ -28,20 +28,14 @@ RDEPEND="${DEPEND} |
| 33 |
|
| 34 |
DOCS=( README.md ) |
| 35 |
|
| 36 |
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch ) |
| 37 |
- |
| 38 |
-src_prepare() { |
| 39 |
- # Note: patching order matters |
| 40 |
- default |
| 41 |
- |
| 42 |
- if [[ "${PV}" != "9999" ]]; then |
| 43 |
- eapply "${FILESDIR}"/${PN}-1.0.10-version.patch |
| 44 |
- export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile |
| 45 |
- fi |
| 46 |
-} |
| 47 |
- |
| 48 |
src_configure() { |
| 49 |
- eqmake5 fast-export2.pro |
| 50 |
+ local qmake_args=( |
| 51 |
+ APR_INCLUDE=/usr/include/apr-1 |
| 52 |
+ PREFIX=/usr |
| 53 |
+ SVN_INCLUDE=/usr/include/subversion-1 |
| 54 |
+ VERSION=${PV} |
| 55 |
+ ) |
| 56 |
+ eqmake5 "${qmake_args[@]}" fast-export2.pro |
| 57 |
} |
| 58 |
|
| 59 |
src_install() { |
| 60 |
|
| 61 |
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild |
| 62 |
index 0fd35c4b742..77393d1e3fb 100644 |
| 63 |
--- a/dev-vcs/svn2git/svn2git-9999.ebuild |
| 64 |
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild |
| 65 |
@@ -28,20 +28,13 @@ RDEPEND="${DEPEND} |
| 66 |
|
| 67 |
DOCS=( README.md ) |
| 68 |
|
| 69 |
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch ) |
| 70 |
- |
| 71 |
-src_prepare() { |
| 72 |
- # Note: patching order matters |
| 73 |
- default |
| 74 |
- |
| 75 |
- if [[ "${PV}" != "9999" ]]; then |
| 76 |
- eapply "${FILESDIR}"/${PN}-1.0.10-version.patch |
| 77 |
- export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile |
| 78 |
- fi |
| 79 |
-} |
| 80 |
- |
| 81 |
src_configure() { |
| 82 |
- eqmake5 fast-export2.pro |
| 83 |
+ local qmake_args=( |
| 84 |
+ APR_INCLUDE=/usr/include/apr-1 |
| 85 |
+ PREFIX=/usr |
| 86 |
+ SVN_INCLUDE=/usr/include/subversion-1 |
| 87 |
+ ) |
| 88 |
+ eqmake5 "${qmake_args[@]}" fast-export2.pro |
| 89 |
} |
| 90 |
|
| 91 |
src_install() { |
Archives