dev-vcs/svn2git: 1.0.8

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

5 files changed, 103 insertions, 5 deletions

diff --git a/dev-vcs/svn2git/ChangeLog b/dev-vcs/svn2git/ChangeLog
index 5e8fcdf71681..63c0a336a6e0 100644
--- a/dev-vcs/svn2git/ChangeLog
+++ b/dev-vcs/svn2git/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/svn2git
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v 1.16 2012/12/02 18:25:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v 1.17 2012/12/03 19:20:25 sping Exp $
+
+*svn2git-1.0.8 (03 Dec 2012)
+
+  03 Dec 2012; Sebastian Pipping <sping@gentoo.org> +svn2git-1.0.8.ebuild,
+  +files/svn2git-1.0.8-compile.patch, +files/svn2git-1.0.8-version.patch:
+  Bump to 1.0.8
 
 *svn2git-1.0.6 (02 Dec 2012)
 
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 9d5049d87252..2b1627255681 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -8,6 +8,8 @@ AUX svn2git-1.0.3_p1-version.patch 538 SHA256 c6aa5fab01370d75e64e1460ff6a861330
 AUX svn2git-1.0.4-version.patch 535 SHA256 47aeb7b8604cfe51c582f059757c34fd3ff95a7917d218d6e8baa9abcda53d52 SHA512 5f7b47e4913f6095ec8825203667229ab955bdd329a4fda0a84f15a1e399e1c0dbfbde68ba9747279e84e7a2afdbc2f0e0f57cb3cc53617c70a2aea0aa9325ad WHIRLPOOL 493aa8c8b911eaa59028e3e334280c92c811434e71ca994db166afe85f28b1596eb5c4fa8956d0ee306bd82f4fe9d91233cd54868cf2c09f3fd4d7d77a75be8e
 AUX svn2git-1.0.5-version.patch 535 SHA256 10703908d040eb81fa713f75cc11ccb4754e8889a9e76cee415f65b8b3770437 SHA512 8322db77c4e8e208cc721caeffb3fd9f5181bc8f6f68391c52d4c58f2a4304341ba3ea9b06425342e3798f83c2cc8f9d18c97462c5430b401b98500c469cf704 WHIRLPOOL 0ffaab3b40ce7a19c0df9e9a32eed6b0ac763d1cb84f129ac30595724f29d9bfbcdcc5b3f1a56a700d4c8f01376aed89063da9aba61eed6040ee8ed1a1db3fcb
 AUX svn2git-1.0.6-version.patch 535 SHA256 6f72c8a4be0e01c6f1eb26d3a94346e96d503352f3e59035e6ab3dfe19a271c9 SHA512 e5ef929b5bba67bbeb0aeac47ba65f9dd77534aa80be51dee27850c72f0e9cb77f5eb96a061fa0d0d8bdbfdfbb1cb7cdaa629a499b8ddb5dfab78945df5aa3e4 WHIRLPOOL a9ca0e53c3e201b86c75df31b8299ce76e69a1bf2b49be5545c53332d8ced40d0cb44ef3e8776c5a0953580f32a0591df30b2caea323b218161d28e69d375f3d
+AUX svn2git-1.0.8-compile.patch 1033 SHA256 fe93ad2b23c2f554f2d7632b062bcc7f022f3983c23a48564922423f5228aef1 SHA512 785e86a784e5ce649f1d67a4a3b54638dc0b7974192bc7e8703722506ade3683e0c1a254d264cd02f900f6def313f97c611d440fe5af99abd2c02dc98c3426f5 WHIRLPOOL bf66b510fbd3ce0cd214d3b444cdd3e23427afa468da4524b1fa6b7e70ba15217965a0d4c2fc315f41dfe90f46822e0c02dee79374d45553e7f3a1cadac2db33
+AUX svn2git-1.0.8-version.patch 535 SHA256 f36a3c4252e00e6eb87476634534ea407061ad5347ea5c8d9d50f493057b107e SHA512 3bd71a46371f724bf8e77ab9eee12825ce03c1af9acc6bd578231b7e02291e99c2254e1e5177769b8dd2f6d06a3f14a7dd15552da287bf4a5c622d322ef47912 WHIRLPOOL 112bccf49c55addcbf3e23ed47fa45deb84e35fcbc000343b4e11d717bd1d47d6d72a182d063ad517dc81519146828bb78f62de9ff59de77a7c28239382b9723
 DIST svn2git-0_pre20100303.tar.gz 16351 SHA256 e33bf51e13daa19d9389c9f4aac6bb968562bbb64b1015a7e97b45f6fe0c35c8 SHA512 f279937afaa0d2b1e9474c401f48882ac61a83efe86f30ab7e7b89e57676db85fb0e488844307aa33ddc5fa57cff0512d5a9585a0cb1f02c664cbbaacc5c08a5 WHIRLPOOL d5a15472e436ffff2268734b169002f7b29d3150f8a1c9cbb60fa1addc1f44ea9d7e258bfc817557c23926e87cb76a6f77e23eed930bda8dbe0408aab749a56b
 DIST svn2git-0_pre20100324.tar.gz 16467 SHA256 3db1ad47b1d2e8b1e8e658fdd14fa42121845a094b111932bcebe86439d775f7 SHA512 a8033cea3fef356f2b705003d9a70f49e14a3165b04733f3617e848a0be97ec31eaabbee24cbfcca4215297d85a63175fb5f3d87785993b07dc1e66b79d811b1 WHIRLPOOL 116f99266acaebb0a65f4949d2eaa6dd69bc663cba477dbe997d91eca311cfeeec868373142c81a6fa538b39a31b63ff9aad0426a663da5c0a3c2915dee4dfa7
 DIST svn2git-0_pre20100327.tar.gz 16702 SHA256 b8855e708e00e313bf8f6deb2ae9fb1a0e4e51a336d813f672eeb0a571be9bab SHA512 6318c4136a829770e68e5ee76d6a75696a1c18feedc6cf72b9608463ca7faa2ff717a6dcbba6d2b76389e2c48008bf9c154d2e5e77d7358925bbc97237effe14 WHIRLPOOL c6af3ba84ac07d5a15bbd86d2c41c9d3abf332640b81e0d89e7b22efe6227b40a43e93e45598d24186756e61d9c9132be9d5d564ad5c646c2e51f98ee0b91a86
@@ -18,6 +20,7 @@ DIST svn2git-1.0.3.tar.gz 24141 SHA256 b465bb64028e641ff426aa1055899b43640d39473
 DIST svn2git-1.0.4.tar.gz 24190 SHA256 7fab1935ea7101c1c39085b3333f9d9eaa88e5d3f7edd9a04728e5031199390f SHA512 9431e9a45c7f578048bb3624cd717f86a97104c0731af4609991c0b428c6183625b8e0a25c483b319a78dd7a7d2cf09b9e02473c29dbb5c628bab50e33a00fd4 WHIRLPOOL 87fa07fee8f0c619c0594e68348475f735ee46b01d080c6b94a4aa88d10af2b1c79f823be24588c189eb47100302b02130aa255ab902b655cef0737d2bb304c2
 DIST svn2git-1.0.5.tar.gz 25677 SHA256 e6f4794f5a22044cbbb89feedaf5b1179d94b6b142df5875cdb2876819e47224 SHA512 594b70651a0c97668822adf456f9ac7f1ce814c53dabcd39efbb2fd85d63d6a4be7e708db3560234078e2dc6084ea99ccf0c4fb363c7b4864d37d4b5fb53d18f WHIRLPOOL 1ec1de336de26fa8d235ccc3b039598b8b5128b95f15af1b04c5fd79ba753ac3b02aa09d8feadf6c7ecfcfaf0fd48bc7e56fdee51d77e29909b1fefe26cfa76f
 DIST svn2git-1.0.6.tar.gz 25791 SHA256 273f2199115414bcfb454d18f2200a7f3d536da11c4ed78f9fbae354af742a7d SHA512 9f887a9085c4a3a5210e4c49cde2a326eaa92e2426ffe0842daf5a05e3b1133c4566a00b719bf04c9e6b8a31d3eaa56e75395ec732a75ce6700bc4d22e6979d7 WHIRLPOOL c6547de760f5097663d8cc3705a156540278b4d1a6892021a7292e7cbfad274cfe144c1eab886c0cae773cfb932ab60b1f6a51294aeaaebaeefb68c1eb1d0ea5
+DIST svn2git-1.0.8.tar.gz 26667 SHA256 ba66e9ad88a23acb65cf56661dd7ca81cfb5b429bb2349278dc8906c0239a4c2 SHA512 a6c5eb87cebf98404f0579f9ca9ab8f565dfd2bac2ca7824f964a73ebcfb362688bc5149a7c2e2d152ff5e28b84cc1b1deb2fdca1bceabbeed25f6d2c27a4a8d WHIRLPOOL c36ac03378048a6117d1c47ada993477f5d2822a40c7a2850e0a356753bfc003fbaef8477a8e9849fc752432cdb369cffacc1c38bbe6d7e0434e8a07a71196a4
 EBUILD svn2git-0_pre20100303.ebuild 1051 SHA256 0b16dd4060fba1a8441f1368987830c13f0dcacb0f174e9114833458032e8332 SHA512 77b6f5792b092c417af0efa0a5ebdd1d777196d733afaf179bdf7a509d925c27bfa4c484b4a304c6c793a37d76d59c57167280fb2a90be6339f9fdc699276450 WHIRLPOOL d0a53178bc4086a9afd9ee9c1294e94098744e0e8641132c45e81dedfa00a377df8b26ffe06f38198324e50375159731ad057f4c0a2a5f84340092d34b813aac
 EBUILD svn2git-0_pre20100324.ebuild 1051 SHA256 66931be57cba6504ab56713ffb256fff0e800efdd4c9bd0ca3a1cf19cce635ca SHA512 fee6455de8edb9f3c23927cfeec1099b9782d94997b3894d5f56bc2ab8548cad7c5f91130c64c55f815143e5ae82f6ae2256af62908b687581495cb9f973a2a6 WHIRLPOOL 8e6caaaeabb9c272e5149aae787edb3cccc27aa96848b4769c4715519d9da79e0b42b999c5cf6afa97789524d7df9721f9c55a60aacf522b6dd3208afc5c13ef
 EBUILD svn2git-0_pre20100327.ebuild 1051 SHA256 3cebf0cdfb0b6f418299358f01d15772d521c7bf2a37073aceefff553df3c52b SHA512 95a7a171feddb190419368cf775f596b325f7b7283f29fc544716ec677b7e4a9d031b6bc2b61f7b67eb8ce1cfe161164764cc49d4272e14adc3184e2953b0c11 WHIRLPOOL ccb9c19c91e682cdd34ffa341658033183d26c7c1a14a09e5426ffdc8b9c6f1f68a4f3b286cf62e49b6fc9108cb48cc930cd6bb8bf7923214112cd5d1c61a093
@@ -28,13 +31,14 @@ EBUILD svn2git-1.0.3_p1.ebuild 1322 SHA256 88e1b5fcc3b13d351ffb0cfb1264a30740ec6
 EBUILD svn2git-1.0.4.ebuild 1196 SHA256 32804272d06ae3ffdb3b8db7f3f6f183f4b43c5509910671ea2cc524275b801e SHA512 71fb5b017b6e21759d9c2d7a6ade1c24041cf0caef405e17a31c2559de7e05dd45f2fe720c50de6d11bdc6190a644d2e2e555d5fdcf8a0e02660dee0a0b1eaac WHIRLPOOL f8f95c1532b18ab16e79171f271ae75d7f70c4a2e83e1038d580c2fe9e5908d389e50df13a4e5838286a9b4eaed39ba0070934610bb010583e4be861cabc1621
 EBUILD svn2git-1.0.5.ebuild 1189 SHA256 a027b94afedcb9ae08d80bf93b3aac51697467688f57e259b3cd161e9d40b61c SHA512 61ee528b20f28af0ce3ae012fc55685f7978710d9ca6ab78a70e7d36b124f53885489646c5ec37578decd0eb0c3e91e496b85ee32430408b79ca3c485e97e0fb WHIRLPOOL 44c78adfc0e0b0d45edc94bc0181c2784fe1abc02b6517c3f385f51910a5053c014520439304df6fe28ded801ce043a8c7152902366d51d0736c5a6eaf4d4ee9
 EBUILD svn2git-1.0.6.ebuild 1184 SHA256 e0d7a6127d77e6b0df51e9805d5abd21cf24e49ef3b0ea4fa6abdb58b4b98f3e SHA512 cadc64591c34c93b94151de41f8ee2c802b97e4a2d0c07b3005c716cc56307cb7afb4ad857fdc6d41cd6a62528a11dd74c320e58f48e687613b54e141c780b10 WHIRLPOOL e3c87684092b9ee9e056a4664ebdcca92c7339a1888a7bc9eca4dee7d21a69f444f02455bf8d210dd736d9b8e81cf61f6447d1bb9706456ffc8644c52c21aafa
+EBUILD svn2git-1.0.8.ebuild 1225 SHA256 80c0e60b4cb001cf9d7646a503f2dc003b987a68eb44a7eae775a8c9dad0c352 SHA512 0e863f699ed48251285005f7e0d6e32497f250b7854d920705ce102032d0cc7e0f550e542f25e529d1a2f034c0bad53524893a8c3a4cf896f2b09d679ab4816e WHIRLPOOL 8bb15cce8f576a709a3e5b8f8b8501a487330e2b9a26960deb83dcd64979b2edf5374527ef725ced12370b169af73e63b4234cd4a2dbcabf8e376e2fd504a469
 EBUILD svn2git-9999.ebuild 1230 SHA256 21e76ace345d65a2d60f1274f52ec38451a8619ac8371a4df6c08ed2610f126a SHA512 6f79c7d113f243b264337aa815f5358ef76e68f7a36e621e99baa1785c9b6dd26b90436e730cd5957f87893260eb0d9dc5ddc933c16ff7617f8aeed3dfb0cafc WHIRLPOOL 1499e37a449eb7fe69b08f921a43e644a7bbbd4ca9b799836ea4870661f913ea8e3b603f9d8b9aec0e6ceefc665e5871a7cc43b7ea9501eb6cbaa6defa9fcd4d
-MISC ChangeLog 3374 SHA256 fab15e9e83358b99061fdaa2eea281bf7cc2ce2341a59e47f71b4f2ee40d362c SHA512 f081bac3ed9edc4d892d8be56bed0e3e7a5003901cd723d7bf55f481c6a48a14b4a8e5be14543f7be19db12070a4a3ce2e912d234738e4eb3d69eca7f97ae11a WHIRLPOOL 7a893d306e8ddade0f1cb5d7795fdf8c3aa821cccc93afae37c903a6c47e82baac299b164e887bf65f628128db6a645e2f58bdd8e588efbb65f07cb494b51961
+MISC ChangeLog 3570 SHA256 8c0a5acb0c526908491895a874bc0ff40746afebc26e6bbcd3844e0b37d883e4 SHA512 b3e5f9241d1ef8f9bc55bdf222921bcae29937a9eff6e501606406ad271e80b081c1eb439f64f9d2e7ab3b385da3900b5629077c66d3c217f30e7af43fb28643 WHIRLPOOL 5d223fab58a444ae381a7bc3c231ecd464a84540765e20b09b8762a42ea19ab265f9b87c66d2884dcd22fa2e848928c1a57e0b3bafa018775f4386939ebd4e44
 MISC metadata.xml 235 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe SHA512 52fe834d5150301a0247d32806e487fa9838f30eb94e3d6cc2f10f2b574e95a113accdd2dd4097c2033a0dfc6da06948a3ea6e13f593f038c0d0e9e13ecbfdf5 WHIRLPOOL e070f37f0eab35b3b21bba900e3d710592720cdcf57f02bd9dcc8f7af418a152c36b22022af50d40d7267b7bf041739031135d65e66c6e9b9b31597d920d4364
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC7nTwACgkQsAvGakAaFgAsIQCfTIEKj/n5RXB9A4ttqYS8KpQr
-VkIAnjNAtHybde7aKXxUmG6JQwkyvQ9s
-=wk5y
+iEYEAREIAAYFAlC8+4cACgkQsAvGakAaFgCMhQCgmQSgK4zvN6CP5luzsN9mQCFY
+uL4AnR4DbPlCcnjtO/mEppOMPkgn2FTI
+=ASKQ
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch b/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch
new file mode 100644
index 000000000000..730c51c9fb3f
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.8-compile.patch
@@ -0,0 +1,26 @@
+From b5c3d3aa55621c44db439e4a73884e0d0bf9612c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= <uqs@spoerlein.net>
+Date: Wed, 28 Nov 2012 21:58:44 +0100
+Subject: [PATCH] Fix compilation, the last rebase/merge went wrong.
+
+Noticed by:	Andy Pilate
+---
+ src/svn.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/svn.cpp b/src/svn.cpp
+index 1aadce9..b2fe2a2 100644
+--- a/src/svn.cpp
++++ b/src/svn.cpp
+@@ -896,7 +896,7 @@ int SvnRevision::recurse(const char *path, const svn_fs_path_change_t *change,
+                                rev_from, changes, current, *match, matchRules, dirpool) == EXIT_FAILURE)
+                 return EXIT_FAILURE;
+         } else {
+-            if (dirent->kind == svn_node_dir) {
++            if (i.value() == svn_node_dir) {
+                 qDebug() << current << "rev" << revnum
+                          << "did not match any rules; auto-recursing";
+                 if (recurse(entry, change, entryFrom.isNull() ? 0 : entryFrom.constData(),
+-- 
+1.7.1
+
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch
new file mode 100644
index 000000000000..3eed1cb5bbcc
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.8-version.patch
@@ -0,0 +1,14 @@
+--- src/src.pro	2011-01-11 09:27:21.530166986 +0100
++++ src/src.pro	2011-01-11 09:30:55.743128934 +0100
+@@ -7,10 +7,7 @@
+ APR_INCLUDE = /usr/include/apr-1
+ exists(local-config.pri):include(local-config.pri)
+ 
+-VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40)
+-    !isEmpty(VERSION){
+-      VERSION = $${VERSION}
+-    }
++VERSION = "1.0.8"
+ 
+ VERSTR = '\\"$${VERSION}\\"'  # place quotes around the version string
+ DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string
diff --git a/dev-vcs/svn2git/svn2git-1.0.8.ebuild b/dev-vcs/svn2git/svn2git-1.0.8.ebuild
new file mode 100644
index 000000000000..efc390b3f03a
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-1.0.8.ebuild,v 1.1 2012/12/03 19:20:25 sping Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2
+[ "$PV" == "9999" ] && inherit git
+
+DESCRIPTION="Tool for one-time conversion from svn to git."
+HOMEPAGE="http://gitorious.org/svn2git/svn2git"
+if [ "$PV" == "9999" ]; then
+	EGIT_REPO_URI="git://gitorious.org/svn2git/svn2git.git"
+	KEYWORDS=""
+else
+	SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="dev-vcs/subversion
+	x11-libs/qt-core: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}"/${P}-version.patch
+	fi
+	epatch "${FILESDIR}"/${P}-compile.patch
+
+	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'
+}