[gentoo-commits] gentoo-x86 commit in dev-vcs/svn2git: svn2git-9999.ebuild ChangeLog svn2git-1.0.4.ebuild

[gentoo-commits] gentoo-x86 commit in dev-vcs/svn2git: svn2git-9999.ebuild ChangeLog svn2git-1.0.4.ebuild

[Sebastian Pipping (sping)]

sping       11/04/08 17:12:44

  Modified:             svn2git-9999.ebuild ChangeLog
  Added:                svn2git-1.0.4.ebuild
  Log:
  dev-vcs/svn2git: Bump to 1.0.4
  
  (Portage version: 2.1.9.45/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  dev-vcs/svn2git/svn2git-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild?r1=1.5&r2=1.6

Index: svn2git-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/svn2git-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svn2git-9999.ebuild	6 Apr 2011 17:07:13 -0000	1.5
+++ svn2git-9999.ebuild	8 Apr 2011 17:12:44 -0000	1.6
@@ -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 @@
 	# 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



1.11                 dev-vcs/svn2git/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/svn2git/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	6 Apr 2011 17:07:13 -0000	1.10
+++ ChangeLog	8 Apr 2011 17:12:44 -0000	1.11
@@ -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)
 



1.1                  dev-vcs/svn2git/svn2git-1.0.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/svn2git-1.0.4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/svn2git/svn2git-1.0.4.ebuild?rev=1.1&content-type=text/plain

Index: svn2git-1.0.4.ebuild
===================================================================
# 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'
}