commit: 67cdc514c03e846d11bfd26c3252a835aa57e267 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jan 13 02:49:49 2018 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Sun Jan 14 19:14:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cdc514
dev-vcs/svn2git: Switch to Qt5 Closes: https://github.com/gentoo/gentoo/pull/6844 Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../files/svn2git-1.0.2.1-include-path.patch | 4 +-- ...vn2git-9999.ebuild => svn2git-1.0.11-r1.ebuild} | 33 +++++++++++++--------- dev-vcs/svn2git/svn2git-9999.ebuild | 33 +++++++++++++--------- 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch index 2349b308083..e5c898ba973 100644 --- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch +++ b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch @@ -1,5 +1,5 @@ ---- src/src.pro 2011-01-11 09:02:15.696463807 +0100 -+++ src/src.pro 2011-01-11 09:03:59.793959849 +0100 +--- a/src/src.pro 2011-01-11 09:02:15.696463807 +0100 ++++ b/src/src.pro 2011-01-11 09:03:59.793959849 +0100 @@ -3,8 +3,8 @@ # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007 ###################################################################### diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild similarity index 64% copy from dev-vcs/svn2git/svn2git-9999.ebuild copy to dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild index c9fa2d78494..0fd35c4b742 100644 --- a/dev-vcs/svn2git/svn2git-9999.ebuild +++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git-r3 +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 +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" @@ -21,24 +20,32 @@ SLOT="0" IUSE="" # KEYWORDS way up -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" +DEPEND=" + dev-qt/qtcore:5 + dev-vcs/subversion" RDEPEND="${DEPEND} dev-vcs/git" +DOCS=( README.md ) + +PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch ) + 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 + default + + if [[ "${PV}" != "9999" ]]; then + eapply "${FILESDIR}"/${PN}-1.0.10-version.patch export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile fi +} - qt4-r2_src_prepare +src_configure() { + eqmake5 fast-export2.pro } src_install() { - dodoc README.md + einstalldocs insinto /usr/share/${PN}/samples doins samples/*.rules || die 'doins failed' dobin svn-all-fast-export || die 'dobin failed' diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild index c9fa2d78494..0fd35c4b742 100644 --- a/dev-vcs/svn2git/svn2git-9999.ebuild +++ b/dev-vcs/svn2git/svn2git-9999.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 -inherit eutils qt4-r2 -[ "$PV" == "9999" ] && inherit git-r3 +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 +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" @@ -21,24 +20,32 @@ SLOT="0" IUSE="" # KEYWORDS way up -DEPEND="dev-vcs/subversion - dev-qt/qtcore:4" +DEPEND=" + dev-qt/qtcore:5 + dev-vcs/subversion" RDEPEND="${DEPEND} dev-vcs/git" +DOCS=( README.md ) + +PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch ) + 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 + default + + if [[ "${PV}" != "9999" ]]; then + eapply "${FILESDIR}"/${PN}-1.0.10-version.patch export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile fi +} - qt4-r2_src_prepare +src_configure() { + eqmake5 fast-export2.pro } src_install() { - dodoc README.md + einstalldocs insinto /usr/share/${PN}/samples doins samples/*.rules || die 'doins failed' dobin svn-all-fast-export || die 'dobin failed'
