dev-vcs/svn2git: Bump to 1.0.3

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

6 files changed, 132 insertions, 8 deletions

diff --git a/dev-vcs/svn2git/ChangeLog b/dev-vcs/svn2git/ChangeLog
index 00c843715390..deafe0e2204a 100644
--- a/dev-vcs/svn2git/ChangeLog
+++ b/dev-vcs/svn2git/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/svn2git
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v 1.9 2011/01/11 08:43:47 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v 1.10 2011/04/06 17:07:13 sping Exp $
+
+*svn2git-1.0.3_p1 (06 Apr 2011)
+
+  06 Apr 2011; Sebastian Pipping <sping@gentoo.org> +svn2git-1.0.3_p1.ebuild,
+  +files/svn2git-1.0.3-backup-refs.patch,
+  +files/svn2git-1.0.3_p1-version.patch, svn2git-9999.ebuild:
+  Bump to 1.0.3 plus commit 584005f2e26149282aa12c4a0367d250caaf3918 by
+  upstream (creating backup refs for deleted branches), sync live ebuild
 
 *svn2git-1.0.2.1 (11 Jan 2011)
 
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 4e1c6add7f9f..988facbe93f7 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,5 +1,8 @@
 AUX svn2git-1.0.2.1-include-path.patch 637 RMD160 b1ba971872b81b0f7164bf7d7060efb451a240e8 SHA1 780286d6892f268846d570b4db174393159c490f SHA256 69edb7f9008abaef4603f03c467df47f6ce21505ee235d5f23a9e9b59dc479d8
 AUX svn2git-1.0.2.1-version.patch 546 RMD160 bc07ee6a96d72b7909f0ca98b1071cab0ff9aa2f SHA1 4c61ba2c1fc5665858f38184ece4d9a6c680c0b7 SHA256 0b0dd8dcaf3a50ef5eb27becfea33968e9c06de0810ef8614a110d24490712ec
+AUX svn2git-1.0.3-backup-refs.patch 1856 RMD160 a90b57c33aa060c6928bfc70cb7ab8088673e6ae SHA1 8952e9afff6fcc24f4695129fe02ed71525e435f SHA256 e00e6bb00f34c1e05bfcb53817c3cb9dac3a346ff7daa3847526b46383ed6787
+AUX svn2git-1.0.3_p1-version.patch 538 RMD160 8302984ba590f6168d1e134e7f595ad131287aa8 SHA1 e025f49dcad8a48d10bdde2fbc94619911b2b954 SHA256 c6aa5fab01370d75e64e1460ff6a861330df46f4b43b68cf6fc03d892879d57c
+DIST 1.0.3.tar.gz 24141 RMD160 a58132e8b53ca461eb4ac6c8b436dd2545272b1d SHA1 98616b3e18a7ecc4bff0919afc546397800bdd9f SHA256 f4f763065dc8032a7e35f81f37744c8bcddec8be442d55bd071832623b574aaa
 DIST svn2git-0_pre20100303.tar.gz 16351 RMD160 0ca273fb23e8c8d01cd9f5b287bfde2f89b97eb8 SHA1 e3b8edc9fb5c549da31dd1a673ba135d68fa0995 SHA256 e33bf51e13daa19d9389c9f4aac6bb968562bbb64b1015a7e97b45f6fe0c35c8
 DIST svn2git-0_pre20100324.tar.gz 16467 RMD160 b83f60a4491bc65b51aa04bea0cb254971eb8018 SHA1 528c4dd52fb0eeda597fdb7ae15100ef851837f4 SHA256 3db1ad47b1d2e8b1e8e658fdd14fa42121845a094b111932bcebe86439d775f7
 DIST svn2git-0_pre20100327.tar.gz 16702 RMD160 502c3a9463eeefc2c6f66f17f3cb6b70b04e5faa SHA1 6a2f0140b14f80e3f796815d2f3130b5c741109f SHA256 b8855e708e00e313bf8f6deb2ae9fb1a0e4e51a336d813f672eeb0a571be9bab
@@ -12,6 +15,7 @@ EBUILD svn2git-0_pre20100327.ebuild 1047 RMD160 dea9343c5f889f6538791c1286319a4a
 EBUILD svn2git-0_pre20101008.ebuild 1044 RMD160 8c1f1f98c72abb27d1cdb109bb9d72c655a97298 SHA1 8392b77293fcd7cbbaa272c749a2a190ea587284 SHA256 f00be97bd288ed43d0d325441a6cdb445197f7cac5e469c23a5305c3b18426f0
 EBUILD svn2git-0_pre20101101.ebuild 1044 RMD160 7cb2fbf802d34d0be4f9fb5c3765c9b2a18c1af8 SHA1 38a3d132a7f69dc5ba0a21d32a7b7d6e984abe34 SHA256 f486597f6bb5c041272306fa831444933a778a6ea90f65a442951555046482e4
 EBUILD svn2git-1.0.2.1.ebuild 1208 RMD160 648798cf03a3bba7fc30cb6ecaab9a244b57061f SHA1 6ce38073705ab52d916187c19a4494717de1dee3 SHA256 e94f03cce651dbd52a8d79ab351be35fdc486d2679bad814e8510814eaf2d1e4
-EBUILD svn2git-9999.ebuild 1205 RMD160 309a01722159f74d26a77b0172077693dfd65ce7 SHA1 fb830e901e11f2ed5ebeecc6ee85b629c4a372a4 SHA256 1128d3129395d50e6504799744734ef9767af47f2a7b16989bfb76fc0f11319e
-MISC ChangeLog 1882 RMD160 18e5fddf0ab2bd6c9cb219adf49a1eb64e1b7e57 SHA1 166b0a996fa14b1f551353229561d7449382ed96 SHA256 f457e6b9819c7ed7452454e6954d114247d1dffe580850324214876d5ea54063
+EBUILD svn2git-1.0.3_p1.ebuild 1309 RMD160 ace502ab231e7ce76e6a1a665727d763a40ebeba SHA1 9cd1b3da733967dfb0e06bea50b8ce657591a1b1 SHA256 f607c13cbdf5cf049333cb05e20910fc19f3cc4a415bc607f385ac4450c93739
+EBUILD svn2git-9999.ebuild 1305 RMD160 67699969014859110bc347036f540f3ab4af860b SHA1 ad213abbe0d302f0769fe298f89e55193850ea48 SHA256 341d1f53b62fef4f7c4b900e46baf1e9ea1ace76e9cda76702a1dfe3a9431981
+MISC ChangeLog 2244 RMD160 e0e08577a3656aa8a6462298045b93102a75dd0a SHA1 d0e0f2a8b56aa0855354755a75faaf98cf82decd SHA256 be882a2acdbcebe69ca346a98b15ad0bb1dc142f6d485dccbd09c4f7249bb07c
 MISC metadata.xml 257 RMD160 04e4c6e678ba8e8ffde93f57d06a40b60f9eaa69 SHA1 e3c39bf9a25beebbe626726bb94f6e22db4fa06d SHA256 b4a209de2bfbbcc5ceab61bf458a1ee79da4c60a30e4aabf54b76e9709b56db8
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch b/dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch
new file mode 100644
index 000000000000..6241bb765331
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.3-backup-refs.patch
@@ -0,0 +1,45 @@
+From 584005f2e26149282aa12c4a0367d250caaf3918 Mon Sep 17 00:00:00 2001
+From: Jehan Bing <nahor.j@gmail.com>
+Date: Thu, 10 Mar 2011 10:54:52 -0800
+Subject: [PATCH] Create backup reference before deletion of the original branch
+
+Ensure that the backup reference is created before deleting the original
+branch. As it was, the deletion was executed earlier causing the backup
+reference to point to a non-existing branch so was not created.
+---
+ src/repository.cpp |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/repository.cpp b/src/repository.cpp
+index 7de840f..2c70bf3 100644
+--- a/src/repository.cpp
++++ b/src/repository.cpp
+@@ -349,11 +349,12 @@ int Repository::resetBranch(const QString &branch, int revnum, int mark, const Q
+         branchRef.prepend("refs/heads/");
+ 
+     Branch &br = branches[branch];
++    QByteArray backupCmd;
+     if (br.created && br.created != revnum && !br.marks.isEmpty() && br.marks.last()) {
+         QByteArray backupBranch = "refs/backups/r" + QByteArray::number(revnum) + branchRef.mid(4);
+         qWarning() << "WARN: backing up branch" << branch << "to" << backupBranch;
+ 
+-        resetBranches.append("reset " + backupBranch + "\nfrom " + branchRef + "\n\n");
++        backupCmd = "reset " + backupBranch + "\nfrom " + branchRef + "\n\n";
+     }
+ 
+     br.created = revnum;
+@@ -365,9 +366,9 @@ int Repository::resetBranch(const QString &branch, int revnum, int mark, const Q
+                      + " branch " + branch.toUtf8() + " = :" + QByteArray::number(mark)
+                      + " # " + comment + "\n\n";
+     if(comment == "delete")
+-        deletedBranches.append(cmd);
++        deletedBranches.append(backupCmd).append(cmd);
+     else
+-        resetBranches.append(cmd);
++        resetBranches.append(backupCmd).append(cmd);
+ 
+     return EXIT_SUCCESS;
+ }
+-- 
+1.7.4.1
+
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.3_p1-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.3_p1-version.patch
new file mode 100644
index 000000000000..78efb87c5696
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.3_p1-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.3_p1"
+ 
+ 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.3_p1.ebuild b/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild
new file mode 100644
index 000000000000..dc49c852906c
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-1.0.3_p1.ebuild,v 1.1 2011/04/06 17:07:13 sping Exp $
+
+EAPI="2"
+
+inherit versionator eutils qt4-r2
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV=$(get_version_component_range 1-3)
+
+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/${MY_PV} -> ${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="dev-vcs/subversion
+	x11-libs/qt-core"
+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.3_p1-version.patch
+		epatch "${FILESDIR}"/${PN}-1.0.3-backup-refs.patch
+	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-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index a97dd08528f3..ee1909ba2f9c 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild,v 1.4 2011/01/11 08:43:47 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild,v 1.5 2011/04/06 17:07:13 sping Exp $
 
 EAPI="2"
 
-inherit eutils qt4-r2
+inherit versionator eutils qt4-r2
 [ "$PV" == "9999" ] && inherit git
 
-MY_PV="1.0.2-1-gebac099"
+MY_PV=$(get_version_component_range 1-3)
 
 DESCRIPTION="Tool for one-time conversion from svn to git."
 HOMEPAGE="http://gitorious.org/svn2git/svn2git"
@@ -15,7 +15,7 @@ if [ "$PV" == "9999" ]; then
 	EGIT_REPO_URI="git://gitorious.org/svn2git/svn2git.git"
 	KEYWORDS=""
 else
-	SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/${MY_PV} -> ${P}.tar.gz"
+	SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/${MY_PV} -> ${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -34,7 +34,10 @@ S=${WORKDIR}/${PN}-${PN}
 src_prepare() {
 	# Note: patching order matters
 	epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
-	[ "$PV" != "9999" ] && epatch "${FILESDIR}"/${PN}-1.0.2.1-version.patch
+	if [[ "$PV" != "9999" ]]; then
+		epatch "${FILESDIR}"/${PN}-1.0.3_p1-version.patch
+		epatch "${FILESDIR}"/${PN}-1.0.3-backup-refs.patch
+	fi
 
 	qt4-r2_src_prepare
 }