dev-vcs/svn2git: Bump to 1.0.4

(Portage version: 2.1.9.45/cvs/Linux x86_64)

4 files changed, 72 insertions, 8 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/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