dev-vcs/svn2git: Switch to Qt5

Closes: https://github.com/gentoo/gentoo/pull/6844

Package-Manager: Portage-2.3.19, Repoman-2.3.6

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 2349b3080835ab13162754c566e18802bc1edfaa..e5c898ba9738ed28a294a3ce392cfae3ff2db662 100644 (file)
--- 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-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
new file mode 100644 (file)
index 0000000..0fd35c4
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
@@ -0,0 +1,53 @@
+# 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 )
+
+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
+}
+
+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 c9fa2d78494021157c18e3a941f2bcd832c71c89..0fd35c4b742fe877b1d8597a6a0bd3a7eb37c97f 100644 (file)
--- 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'