summaryrefslogtreecommitdiff
path: root/dev-vcs/svn2git
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-16 17:34:21 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-16 17:34:21 +0000
commit02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch)
tree132dd60828854db4f65f30f9230f43d9602507ff /dev-vcs/svn2git
parent8be70107efbb417f839292165ee39d07a062046f (diff)
gentoo resync : 16.01.2018
Diffstat (limited to 'dev-vcs/svn2git')
-rw-r--r--dev-vcs/svn2git/Manifest8
-rw-r--r--dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch4
-rw-r--r--dev-vcs/svn2git/svn2git-1.0.10.ebuild47
-rw-r--r--dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild (renamed from dev-vcs/svn2git/svn2git-1.0.11.ebuild)33
-rw-r--r--dev-vcs/svn2git/svn2git-9999.ebuild33
5 files changed, 45 insertions, 80 deletions
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 5737c3611eef..e956f665ea4f 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,8 +1,6 @@
AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03
-AUX svn2git-1.0.2.1-include-path.patch 637 BLAKE2B d251c22b0139683dede572dbd69583fa4238b6c19bf8c78603c75eadcb4ccd37ecd376790eeac3a7b414dbbd3610f22df8c5b5f9bb0b07b3f5d6566e40192a53 SHA512 1711a6281622bfe781fdf05df3644073ff6d2240cba1744540bf28b9f8732482002cc4769e040db93f08b0f8378e4cd9b4288f8bf7db4ee759d5c5c1770b3fe3
-DIST svn2git-1.0.10.tar.gz 26667 BLAKE2B 50b8817cbdbee72622a1bf3d3f654d292366fbf8018346a4277b435769e71c94f990aae5d7bb1ec9860b3758d5daecf3b2bcd61c9d6a68a78de67d57d11f24d1 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49
+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
-EBUILD svn2git-1.0.10.ebuild 1136 BLAKE2B 99f1090d3286c845ce486c716f4d22782c74339f412a8ca35612cc4c28ceace3dfd74c401d4fdf1e50c04a19f871c39b80ab538f245a4146bba1f24668e6e83b SHA512 41533788c0db01aabe51384f3b3744f96053b26fea2a1e2d163f21211684f3c24c2ecef5b407637e53689ddc649093184e03bd88f5edb67649046ea5106a832c
-EBUILD svn2git-1.0.11.ebuild 1169 BLAKE2B 67bf677eba6cafcb34b78fe6b7c9ed0f16c859560d0d07f60023af70fec37de3b63f36d0a57944c93744ceffb2cdd84055ee7f57b403d3eb00c0f8a996c609a7 SHA512 9e1a3300a721e032b7b6ec7fda1602ea7c5ad921acd7d7e74228796915b250172a8a0f001e544f9c1d2ebb928c0101540e98ed843dbcaa62ee05a1b04b9d4e6d
-EBUILD svn2git-9999.ebuild 1169 BLAKE2B 67bf677eba6cafcb34b78fe6b7c9ed0f16c859560d0d07f60023af70fec37de3b63f36d0a57944c93744ceffb2cdd84055ee7f57b403d3eb00c0f8a996c609a7 SHA512 9e1a3300a721e032b7b6ec7fda1602ea7c5ad921acd7d7e74228796915b250172a8a0f001e544f9c1d2ebb928c0101540e98ed843dbcaa62ee05a1b04b9d4e6d
+EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
+EBUILD svn2git-9999.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
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 2349b3080835..e5c898ba9738 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-1.0.10.ebuild b/dev-vcs/svn2git/svn2git-1.0.10.ebuild
deleted file mode 100644
index d23b946dd204..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git
-
-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"
- KEYWORDS=""
-else
- SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="dev-vcs/subversion
- dev-qt/qtcore:4"
-RDEPEND="${DEPEND}
- dev-vcs/git"
-
-S=${WORKDIR}/${PN}-${PN}
-
-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
- export SVN_ALL_FAST_EXPORT_VERSION=${PVR} # for src_compile
- fi
-
- qt4-r2_src_prepare
-}
-
-src_install() {
- 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-1.0.11.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
index c9fa2d784940..0fd35c4b742f 100644
--- a/dev-vcs/svn2git/svn2git-1.0.11.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 c9fa2d784940..0fd35c4b742f 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'