From cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jun 2018 09:27:03 +0100 Subject: gentoo resync : 09.06.2018 --- dev-vcs/svn2git/Manifest | 4 ++- dev-vcs/svn2git/svn2git-1.0.12.ebuild | 47 +++++++++++++++++++++++++++++++++++ dev-vcs/svn2git/svn2git-9999.ebuild | 19 +++++--------- 3 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 dev-vcs/svn2git/svn2git-1.0.12.ebuild (limited to 'dev-vcs/svn2git') diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest index e956f665ea4f..961a61728733 100644 --- a/dev-vcs/svn2git/Manifest +++ b/dev-vcs/svn2git/Manifest @@ -1,6 +1,8 @@ AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03 AUX svn2git-1.0.2.1-include-path.patch 641 BLAKE2B 4df6dbbb8935377355cf9fa35c005e349f5ce5b7d7decb7fb5038db5b70bff25aa1ff91b345c1f3b3d9a3c4a7c566417a49b4385a7f7e6660dcd54f528990210 SHA512 2be52266425ba4b287eb5adde4f2a643759a65b5ece00a7ef1982256dc0f460c069afd4b7d4aee63f2e4a99ebcaabc6f24b5688dd939cb172f333c2d4755a36f DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9 +DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359 EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895 -EBUILD svn2git-9999.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895 +EBUILD svn2git-1.0.12.ebuild 1103 BLAKE2B 964d3ac156984cb4feac87159b5e9ef63bbdd2e7669fab10da459a69a9128f9c22e9ead763eed9b1fab88febaf68572be6fc231d1d79e489ad49ce4543467c5c SHA512 062419fe42725915a9c3fa5de76fe2dc9f709785ce6e909beea831a9b3db1f21eea3708a1918cffd5a59e35ca7119da7d0e276146be6d0be55969b6f4997b2e1 +EBUILD svn2git-9999.ebuild 1087 BLAKE2B 8eab32efa9f4e0a54a6a071a26bdd3aface14ffb0d6b9d621545d23b7f81fc9db41f2c299238191b40401dd2eec0b7bc010d26867705c39df4df03834beb9ce2 SHA512 36acedf8fe41f50789da0ecad078d6335ba50c10cf14eea2220ab9afa6a3c170a41cdec83acd8d6281bcd8abb3ef497917037bf95e2fcff2a778e6fb29dea508 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590 diff --git a/dev-vcs/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild new file mode 100644 index 000000000000..ab7c62035ef9 --- /dev/null +++ b/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' +} diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild index 0fd35c4b742f..77393d1e3fbe 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() { -- cgit v1.2.3