dev-vcs/svn2git: Bump to 1.0.2.1

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

6 files changed, 102 insertions, 10 deletions

diff --git a/dev-vcs/svn2git/ChangeLog b/dev-vcs/svn2git/ChangeLog
index 1c594c4da25b..00c843715390 100644
--- a/dev-vcs/svn2git/ChangeLog
+++ b/dev-vcs/svn2git/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/svn2git
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v 1.8 2010/11/02 10:13:07 sping Exp $
+# 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 $
+
+*svn2git-1.0.2.1 (11 Jan 2011)
+
+  11 Jan 2011; Sebastian Pipping <sping@gentoo.org> +svn2git-1.0.2.1.ebuild,
+  +files/svn2git-1.0.2.1-include-path.patch,
+  +files/svn2git-1.0.2.1-version.patch, svn2git-9999.ebuild:
+  Bump to 1.0.2.1, sync live ebuild
 
 *svn2git-0_pre20101101 (02 Nov 2010)
 
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index d9858b4de5bc..4e1c6add7f9f 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,13 +1,17 @@
+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
 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
 DIST svn2git-0_pre20101008.tar.gz 22620 RMD160 79e9049a4cd6de127db2a662561fc4f50b5bd6d2 SHA1 7b2bce2b256d4a1175e8b68432920ae13211236e SHA256 460425d86e9d07514f70660c9409eacc7c58e0d9a236f421d98bc4b2b858e82d
 DIST svn2git-0_pre20101101.tar.gz 22615 RMD160 2391ee757e786d4ae4bb30e323453f144e03c9a8 SHA1 9da328eade78999576b344359c8acd58d20e59fe SHA256 8af3076b49750e31ec4b6ea821afe38c8859dbf2789a70bbe932ffd00b4e9488
+DIST svn2git-1.0.2.1.tar.gz 23784 RMD160 e374c0e76e8bd47aa89b03c83e1c787179714afd SHA1 023c361190bdc6bfe98b27564148c46ff46f9de6 SHA256 94e5def41df26c03e63423aba3ee70d3ee3ce21fdedca3ce3cb93ba576170fa2
 EBUILD svn2git-0_pre20100303.ebuild 1047 RMD160 fd1a6b56fbc9ee218ca3ac610b5b4fe5c533c2e1 SHA1 a1c1c90def95609979b8967b48355cabd9e614de SHA256 4d1cbd5abd82dda2d1956471e4ffc79766aca6091244e7f30423a8aafb10e091
 EBUILD svn2git-0_pre20100324.ebuild 1047 RMD160 fc4ee1c87ca73e1929d094fdf5a7f20041315c7d SHA1 d3180cd65f8b451f6f284fdb5043d861c8880585 SHA256 66da2fa562b92aa1cc7175ce8c1db7fb3b5bc8e5e51866f8fa6e8f81395b7034
 EBUILD svn2git-0_pre20100327.ebuild 1047 RMD160 dea9343c5f889f6538791c1286319a4acc0a713e SHA1 7f23c4ba5efbd596f0c9d160d386ddae1fa2190d SHA256 7a423ccb8bc67797dd2c43a3148a5e6bcaae934700096bde5f07d570293fb9b1
 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-9999.ebuild 1038 RMD160 92fd987207be1f4f85954171f7cb680118b28515 SHA1 61cf47a0c79d427610c5335cc9ec9537a25e0ba9 SHA256 6c37e68c6a244d2dbe5ac6ce29ada93e5141e079b14d783382cdd3baade577d0
-MISC ChangeLog 1630 RMD160 376efeb157c9e5aec01ac6ffde83a61f83677c03 SHA1 31835e1685fc7c4172987c236ba2fba89da2e99e SHA256 d03e064abe7cd948175e9ec6a762c97f31fb242f1a35548902c9c28f34565eb9
+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
 MISC metadata.xml 257 RMD160 04e4c6e678ba8e8ffde93f57d06a40b60f9eaa69 SHA1 e3c39bf9a25beebbe626726bb94f6e22db4fa06d SHA256 b4a209de2bfbbcc5ceab61bf458a1ee79da4c60a30e4aabf54b76e9709b56db8
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
new file mode 100644
index 000000000000..2349b3080835
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
@@ -0,0 +1,13 @@
+--- src/src.pro	2011-01-11 09:02:15.696463807 +0100
++++ 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
+ ######################################################################
+ 
+-SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1
+-APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1
++SVN_INCLUDE = /usr/include/subversion-1
++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)
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-version.patch
new file mode 100644
index 000000000000..0ca442bfc589
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.2.1-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.2-1-gebac099"
+ 
+ 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.2.1.ebuild b/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild
new file mode 100644
index 000000000000..f48e100edebc
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.2.1.ebuild
@@ -0,0 +1,47 @@
+# 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.2.1.ebuild,v 1.1 2011/01/11 08:43:47 sping Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2
+[ "$PV" == "9999" ] && inherit git
+
+MY_PV="1.0.2-1-gebac099"
+
+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} -> ${P}.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
+	[ "$PV" != "9999" ] && epatch "${FILESDIR}"/${PN}-1.0.2.1-version.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'
+}
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index ac59e306fbe9..a97dd08528f3 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.3 2010/06/22 18:51:38 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild,v 1.4 2011/01/11 08:43:47 sping Exp $
 
 EAPI="2"
 
-inherit qt4-r2
+inherit eutils qt4-r2
 [ "$PV" == "9999" ] && inherit git
 
-DESCRIPTION="Importer for one time conversion from svn to git."
+MY_PV="1.0.2-1-gebac099"
+
+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://www.hartwork.org/public/${P}.tar.gz"
+	SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/${MY_PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -27,8 +29,13 @@ DEPEND="dev-vcs/subversion
 RDEPEND="${DEPEND}
 	dev-vcs/git"
 
+S=${WORKDIR}/${PN}-${PN}
+
 src_prepare() {
-	sed -i 's|^\(APR_INCLUDE = /usr/include/apr-1\)\.0|\1|' "${S}"/src/src.pro
+	# 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
+
 	qt4-r2_src_prepare
 }