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: Sat,  2 Jun 2018 16:32:42 +0000 (UTC)	[thread overview]
Message-ID: <1527957125.87c1902f0d8ce19de9d31b3e52660fa30f73b4aa.sping@gentoo> (raw)

commit:     87c1902f0d8ce19de9d31b3e52660fa30f73b4aa
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 16:31:21 2018 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 16:32:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c1902f

dev-vcs/svn2git: 1.0.12 + sync 9999

Package-Manager: Portage-2.3.40, Repoman-2.3.9

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

diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 11586062ffa..30a5f7a83ee 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1 +1,2 @@
 DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
+DIST svn2git-1.0.12.tar.gz 43591 BLAKE2B b771c85c664e5721a345fa3437262ca80bf97b12fbeb45186973b878185b067b94145ba21e515acd55c44056ef2e5389f18a6ed63f3b7130dd35b672ef2af39b SHA512 f8248b2bb7c21bd9803c33e070e1627e5b536eb5d50b239cedf8496979f7fe66aa55e298f92b777c1b28036ca6001f936b569238e5dd7a2dfc8282a06b2b7359

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
similarity index 75%
copy from dev-vcs/svn2git/svn2git-9999.ebuild
copy to dev-vcs/svn2git/svn2git-1.0.12.ebuild
index 0fd35c4b742..ab7c62035ef 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-1.0.12.ebuild
@@ -28,20 +28,14 @@ RDEPEND="${DEPEND}
 
 DOCS=( README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
-
-src_prepare() {
-	# Note: patching order matters
-	default
-
-	if [[ "${PV}" != "9999" ]]; then
-		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-}
-
 src_configure() {
-	eqmake5 fast-export2.pro
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+		VERSION=${PV}
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
 }
 
 src_install() {

diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index 0fd35c4b742..77393d1e3fb 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -28,20 +28,13 @@ RDEPEND="${DEPEND}
 
 DOCS=( README.md )
 
-PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
-
-src_prepare() {
-	# Note: patching order matters
-	default
-
-	if [[ "${PV}" != "9999" ]]; then
-		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-}
-
 src_configure() {
-	eqmake5 fast-export2.pro
+	local qmake_args=(
+		APR_INCLUDE=/usr/include/apr-1
+		PREFIX=/usr
+		SVN_INCLUDE=/usr/include/subversion-1
+	)
+	eqmake5 "${qmake_args[@]}" fast-export2.pro
 }
 
 src_install() {


             reply	other threads:[~2018-06-02 16:32 UTC|newest]

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

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=1527957125.87c1902f0d8ce19de9d31b3e52660fa30f73b4aa.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