[gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/
Date: Sun, 27 Aug 2017 20:56:02 +0000 (UTC)	[thread overview]
Message-ID: <1503867334.1574d2d030eecc9a8c37a5099ec2b92fbeae9e4e.sping@gentoo> (raw)

commit:     1574d2d030eecc9a8c37a5099ec2b92fbeae9e4e
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 20:39:19 2017 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 20:55:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1574d2d0

dev-vcs/svn2git: 1.0.11

Also bump to EAPI 5 (not 6), and sync live ebuild

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-vcs/svn2git/Manifest                                   |  1 +
 .../svn2git/{svn2git-9999.ebuild => svn2git-1.0.11.ebuild} | 14 +++++++-------
 dev-vcs/svn2git/svn2git-9999.ebuild                        | 14 +++++++-------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index c838761627a..8a9e9482e4f 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1 +1,2 @@
 DIST svn2git-1.0.10.tar.gz 26667 SHA256 1b1300144e8a0f82485f4046c4585d53deff839a274f70f7cb32d5a5a76ffe61 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49 WHIRLPOOL c3b1ada8ffc925aef666f095c1b3a8a2323980a777a6e1751cfc02e5510d3d18fc95e68d8e3a275a5061ed0e073cc1eee538279f5a01039e698af135a4b38df1
+DIST svn2git-1.0.11.tar.gz 30986 SHA256 1103d1747af7c18ca18a6a89637e3e3ab87518710ee8eecee4d402b8f445b010 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9 WHIRLPOOL 98c8a11dda0c6fab63f5792b95ca2fb6087b4d5e04f0aeaa14061f2d84a4632913515fa6dfaa3d9a1b94940dcee61eeae00d24b8f12fe110138e548232456965

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-1.0.11.ebuild
similarity index 73%
copy from dev-vcs/svn2git/svn2git-9999.ebuild
copy to dev-vcs/svn2git/svn2git-1.0.11.ebuild
index eb455c658b1..c9fa2d78494 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-2
+[ "$PV" == "9999" ] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
@@ -12,7 +12,7 @@ if [ "$PV" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -26,19 +26,19 @@ DEPEND="dev-vcs/subversion
 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
+		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
+		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
 
 	qt4-r2_src_prepare
 }
 
 src_install() {
+	dodoc README.md
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index eb455c658b1..c9fa2d78494 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-2
+[ "$PV" == "9999" ] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
@@ -12,7 +12,7 @@ if [ "$PV" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
 	KEYWORDS=""
 else
-	SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -26,19 +26,19 @@ DEPEND="dev-vcs/subversion
 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
+		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
+		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
 
 	qt4-r2_src_prepare
 }
 
 src_install() {
+	dodoc README.md
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'

next             reply	other threads:[~2017-08-27 20:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-27 20:56 Sebastian Pipping [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-01-14 19:14 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/ Sebastian Pipping
2018-06-02 16:32 Sebastian Pipping
2018-09-01 15:30 Sebastian Pipping
2019-05-10 21:33 Sebastian Pipping
2020-02-10 15:39 Sebastian Pipping
2020-04-20  8:27 Sebastian Pipping
2020-09-30 17:32 Sebastian Pipping
2022-11-29  0:43 Sebastian Pipping
2022-11-29  0:43 Sebastian Pipping
2023-11-05 17:49 Sebastian Pipping
2023-11-05 17:49 Sebastian Pipping

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c838761627 dfblob:8a9e9482e4 dfblob:eb455c658b
dfblob:c9fa2d7849 dfblob:eb455c658b dfblob:c9fa2d7849 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1503867334.1574d2d030eecc9a8c37a5099ec2b92fbeae9e4e.sping@gentoo \
    --to=sping@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox