dev-vcs/svn2git: Bump to 1.0.4

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

5 files changed, 77 insertions, 10 deletions

diff --git a/dev-vcs/svn2git/ChangeLog b/dev-vcs/svn2git/ChangeLog
index deafe0e2204a..e18ce19fccf7 100644
--- a/dev-vcs/svn2git/ChangeLog
+++ b/dev-vcs/svn2git/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2011/04/06 17:07:13 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v 1.11 2011/04/08 17:12:44 sping Exp $
+
+*svn2git-1.0.4 (08 Apr 2011)
+
+  08 Apr 2011; Sebastian Pipping <sping@gentoo.org> +svn2git-1.0.4.ebuild,
+  +files/svn2git-1.0.4-version.patch, svn2git-9999.ebuild:
+  Bump to 1.0.4, update live ebuild
 
 *svn2git-1.0.3_p1 (06 Apr 2011)
 
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 988facbe93f7..2b510edf0a83 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -2,6 +2,7 @@ AUX svn2git-1.0.2.1-include-path.patch 637 RMD160 b1ba971872b81b0f7164bf7d7060ef
 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
+AUX svn2git-1.0.4-version.patch 535 RMD160 a7919551ec8374bfb41ede20cc008bf41e5be6b5 SHA1 ec6aaddf4f90b1c87c38bc83821f7b5560902137 SHA256 47aeb7b8604cfe51c582f059757c34fd3ff95a7917d218d6e8baa9abcda53d52
 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
@@ -9,6 +10,7 @@ DIST svn2git-0_pre20100327.tar.gz 16702 RMD160 502c3a9463eeefc2c6f66f17f3cb6b70b
 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
+DIST svn2git-1.0.4.tar.gz 24190 RMD160 f75415b5895a53a08464579168f8c7b116f8ab5b SHA1 7345a5ad74b31ee2bde7987668f18dfaf731a278 SHA256 7fab1935ea7101c1c39085b3333f9d9eaa88e5d3f7edd9a04728e5031199390f
 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
@@ -16,6 +18,7 @@ EBUILD svn2git-0_pre20101008.ebuild 1044 RMD160 8c1f1f98c72abb27d1cdb109bb9d72c6
 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-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
+EBUILD svn2git-1.0.4.ebuild 1189 RMD160 ec446a035f3b158405a3451deded4a62b484c2f6 SHA1 feb9b98000b4dd24858dc349bec4ba355c309e3e SHA256 90dd6af9a41640cd480dbe51cc5916f3ebea4d66c11df76cabc169d7111950bc
+EBUILD svn2git-9999.ebuild 1188 RMD160 e47df0eb7be10dbab60ffb03e556ae5d1e9097d6 SHA1 4cfad57421f55fe00e6806d41b6bf9ff0f5f675d SHA256 fb0b1ad2fec88d20fa483a71f68a8bf734d46890b0265233eaf3537341c31e68
+MISC ChangeLog 2445 RMD160 3254d6b7d3f38d34b94e28a027fab00758ff212c SHA1 d3b7be9c49ff3a6af8bea8017c67a87c00b44090 SHA256 23c79631a9d648b5b1a900d423ee47eb948a90083a55a506d2ed46f2fac072d3
 MISC metadata.xml 257 RMD160 04e4c6e678ba8e8ffde93f57d06a40b60f9eaa69 SHA1 e3c39bf9a25beebbe626726bb94f6e22db4fa06d SHA256 b4a209de2bfbbcc5ceab61bf458a1ee79da4c60a30e4aabf54b76e9709b56db8
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.4-version.patch
new file mode 100644
index 000000000000..e59547ca6c94
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.4-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.4"
+ 
+ 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.4.ebuild b/dev-vcs/svn2git/svn2git-1.0.4.ebuild
new file mode 100644
index 000000000000..7fc89038e0e4
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.4.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.4.ebuild,v 1.1 2011/04/08 17:12:44 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"
+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.4-version.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 ee1909ba2f9c..64a4f20be857 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,21 +1,19 @@
 # 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.5 2011/04/06 17:07:13 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild,v 1.6 2011/04/08 17:12:44 sping Exp $
 
 EAPI="2"
 
-inherit versionator eutils qt4-r2
+inherit 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"
+	SRC_URI="http://gitorious.org/${PN}/${PN}/archive-tarball/${PV} -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -35,8 +33,7 @@ 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
+		epatch "${FILESDIR}"/${PN}-1.0.4-version.patch
 	fi
 
 	qt4-r2_src_prepare