dev-vcs/svn2git: Bump to 1.0.5

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

5 files changed, 79 insertions, 11 deletions

diff --git a/dev-vcs/svn2git/ChangeLog b/dev-vcs/svn2git/ChangeLog
index 4767b8e0946f..6841f28067b4 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.13 2011/09/21 08:30:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v 1.14 2011/11/10 11:28:22 sping Exp $
+
+*svn2git-1.0.5 (10 Nov 2011)
+
+  10 Nov 2011; Sebastian Pipping <sping@gentoo.org> +svn2git-1.0.5.ebuild,
+  +files/svn2git-1.0.5-version.patch, svn2git-9999.ebuild:
+  Bump to 1.0.5, looks trivial
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> svn2git-9999.ebuild:
   Migrate to git-2.
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 9e73040d77cf..1252fa7cb3ea 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
 AUX svn2git-1.0.4-version.patch 535 RMD160 a7919551ec8374bfb41ede20cc008bf41e5be6b5 SHA1 ec6aaddf4f90b1c87c38bc83821f7b5560902137 SHA256 47aeb7b8604cfe51c582f059757c34fd3ff95a7917d218d6e8baa9abcda53d52
+AUX svn2git-1.0.5-version.patch 535 RMD160 89e039ee8782c1462d0a35aef18e55df1ab51c49 SHA1 508b7309c3ee758caffeaf07a2cfd81be011aa7c SHA256 10703908d040eb81fa713f75cc11ccb4754e8889a9e76cee415f65b8b3770437
 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
@@ -14,6 +15,7 @@ DIST svn2git-0_pre20101101.tar.gz 22615 RMD160 2391ee757e786d4ae4bb30e323453f144
 DIST svn2git-1.0.2.1.tar.gz 23784 RMD160 e374c0e76e8bd47aa89b03c83e1c787179714afd SHA1 023c361190bdc6bfe98b27564148c46ff46f9de6 SHA256 94e5def41df26c03e63423aba3ee70d3ee3ce21fdedca3ce3cb93ba576170fa2
 DIST svn2git-1.0.3.tar.gz 24141 RMD160 afdd1443c4eddd631d0957e346a61bb9dc36b338 SHA1 b309eb0476027c15d34829148c6df493012d92de SHA256 b465bb64028e641ff426aa1055899b43640d394738d8919b9dd4235bf5842886
 DIST svn2git-1.0.4.tar.gz 24190 RMD160 f75415b5895a53a08464579168f8c7b116f8ab5b SHA1 7345a5ad74b31ee2bde7987668f18dfaf731a278 SHA256 7fab1935ea7101c1c39085b3333f9d9eaa88e5d3f7edd9a04728e5031199390f
+DIST svn2git-1.0.5.tar.gz 25677 RMD160 a93efe2b29416b3ff52534a78dc6bb369374b0be SHA1 58030525b6883fb33d92e55a045856f9578647ed SHA256 e6f4794f5a22044cbbb89feedaf5b1179d94b6b142df5875cdb2876819e47224
 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
@@ -22,15 +24,14 @@ EBUILD svn2git-0_pre20101101.ebuild 1044 RMD160 7cb2fbf802d34d0be4f9fb5c3765c9b2
 EBUILD svn2git-1.0.2.1.ebuild 1208 RMD160 648798cf03a3bba7fc30cb6ecaab9a244b57061f SHA1 6ce38073705ab52d916187c19a4494717de1dee3 SHA256 e94f03cce651dbd52a8d79ab351be35fdc486d2679bad814e8510814eaf2d1e4
 EBUILD svn2git-1.0.3_p1.ebuild 1315 RMD160 6a4a20c2a1d5c5b2e8164d5db8b15cd414e71a4c SHA1 cdef56d3dcc27a72eb64efae7c4da65e768fc0eb SHA256 5821a6a75a47e10fa10f9668a82012171f1a9a85219be0b38f934c2b55afa6c2
 EBUILD svn2git-1.0.4.ebuild 1189 RMD160 ec446a035f3b158405a3451deded4a62b484c2f6 SHA1 feb9b98000b4dd24858dc349bec4ba355c309e3e SHA256 90dd6af9a41640cd480dbe51cc5916f3ebea4d66c11df76cabc169d7111950bc
-EBUILD svn2git-9999.ebuild 1231 RMD160 5f2920f8166b56e2c796ec716e22b37cf0f169c6 SHA1 5fb59ca6da33a8e5c2d75cf3ef234bf1a01f54cd SHA256 d319704696f9efa53c8f97d5286f1802d41815134bbfcb6a164dd9cc3f9b29ad
-MISC ChangeLog 2652 RMD160 6f227c1a4f246e1a7fd0e4485267480cd67fb445 SHA1 28176367dfe4dfccd9caab04e57a94e476c00a27 SHA256 d3ae27d8ba4d3f599935c19df0245f05a6dab44979b4471364e29a038f9f80bd
+EBUILD svn2git-1.0.5.ebuild 1182 RMD160 843978c3abdc8701f7e47ab81fc16fdf3fb7fe4f SHA1 978fccf790d88776c601926f0f4bc235add4211e SHA256 1331e2b9767125abfdf4ba34443c2d73984e8de7cbe5c38ad23debc43df966a6
+EBUILD svn2git-9999.ebuild 1223 RMD160 1d3b0d277502b7798fb7fdbdea8aaeda1e0f792f SHA1 22831ca42c533a4d98a3107dbf123ac4808dc067 SHA256 fdc0db274913adbe934e885d12d18bcc68214b1bda2ab84e0eb9f5d12f6876b1
+MISC ChangeLog 2847 RMD160 a203add56850c76f98845078366e280339cc03b7 SHA1 27c791d9bf0d20add2fdb3ae131bd77eaf60145c SHA256 97174c5e0f8cc5278bc067e458985b8d66edd44882280c18d933550c35516f38
 MISC metadata.xml 235 RMD160 e964157be48c204555d79827e1bf79c9d9fb23a5 SHA1 767b5eb408113ae55d84adcb94d44a692285d175 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59nKYACgkQfXuS5UK5QB2iNQQAnYFtwm70G/bGXX5TblkOYtOv
-jqyeUtR55e7rVef0+GZ8ithHy+AmtcRl3WiamQhArKhvwnVPYPX6jrOImaZUKgFE
-g8kaVyhhkZ3cgp5pIjDrEo9ktecH2f/6/cEYDgdrYRwzD3h1y3S4awfAcRonzXEl
-De3pS0GGgVAIhucz1Yo=
-=HN85
+iEYEARECAAYFAk67tVsACgkQsAvGakAaFgCxzACgoYQC6A3//mXOOZGjkx7jeBkC
+KuMAn0gSllvOVA3rnGzuGCAPViGIE9WX
+=V60k
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch b/dev-vcs/svn2git/files/svn2git-1.0.5-version.patch
new file mode 100644
index 000000000000..7247f4b96e7a
--- /dev/null
+++ b/dev-vcs/svn2git/files/svn2git-1.0.5-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.5"
+ 
+ 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.5.ebuild b/dev-vcs/svn2git/svn2git-1.0.5.ebuild
new file mode 100644
index 000000000000..b931f36cbc6f
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.5.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.5.ebuild,v 1.1 2011/11/10 11:28:22 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}"/${P}-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 8f3eba1e6d38..a4b6ebeb6705 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2011/09/21 08:30:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild,v 1.8 2011/11/10 11:28:22 sping Exp $
 
 EAPI="2"
 
@@ -34,7 +34,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.4-version.patch
+		epatch "${FILESDIR}"/${P}-version.patch
 	fi
 
 	qt4-r2_src_prepare