From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A420F138334 for ; Sat, 2 Jun 2018 16:32:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1B7DE085D; Sat, 2 Jun 2018 16:32:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6D023E085D for ; Sat, 2 Jun 2018 16:32:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B0A2335C76 for ; Sat, 2 Jun 2018 16:32:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 75B6C291 for ; Sat, 2 Jun 2018 16:32:42 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1527957125.87c1902f0d8ce19de9d31b3e52660fa30f73b4aa.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/svn2git/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/svn2git/Manifest dev-vcs/svn2git/svn2git-1.0.12.ebuild dev-vcs/svn2git/svn2git-9999.ebuild X-VCS-Directories: dev-vcs/svn2git/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 87c1902f0d8ce19de9d31b3e52660fa30f73b4aa X-VCS-Branch: master Date: Sat, 2 Jun 2018 16:32:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fcc8d548-567f-4d7e-bfb7-5f7216737a18 X-Archives-Hash: 225999f3dfe98f2c20d7cd26e5429527 commit: 87c1902f0d8ce19de9d31b3e52660fa30f73b4aa Author: Sebastian Pipping gentoo org> AuthorDate: Sat Jun 2 16:31:21 2018 +0000 Commit: Sebastian Pipping gentoo 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() {