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 BCD2E138334 for ; Tue, 22 Oct 2019 10:52:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EDF7E08F2; Tue, 22 Oct 2019 10:52:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D97CCE08F2 for ; Tue, 22 Oct 2019 10:52:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1FD1B34C1B6 for ; Tue, 22 Oct 2019 10:52:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95B9372F for ; Tue, 22 Oct 2019 10:52:03 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1571741506.cad3d25dae697461e1a6d295f2bdf99e9c2f626a.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/staden/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/staden/staden-9999.ebuild X-VCS-Directories: sci-biology/staden/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: cad3d25dae697461e1a6d295f2bdf99e9c2f626a X-VCS-Branch: master Date: Tue, 22 Oct 2019 10:52:03 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 128a6b5c-0005-40b3-83b3-88bd732279d3 X-Archives-Hash: 53f1c29730e561de4d2da81214e01228 commit: cad3d25dae697461e1a6d295f2bdf99e9c2f626a Author: Martin Mokrejs fold natur cuni cz> AuthorDate: Tue Oct 22 10:51:46 2019 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Tue Oct 22 10:51:46 2019 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=cad3d25d sci-biology/staden: sourceforge moved SVN repo URL Also, somehow I cannot set "${S}" to src because svn would checkout the source tree there, so one would need ./src/src to access configure.in. Overwriting "${S}" inside each function helps. Package-Manager: Portage-2.3.75, Repoman-2.3.17 Signed-off-by: Martin Mokrejs fold.natur.cuni.cz> sci-biology/staden/staden-9999.ebuild | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sci-biology/staden/staden-9999.ebuild b/sci-biology/staden/staden-9999.ebuild index 0253c9eb5..4be43217f 100644 --- a/sci-biology/staden/staden-9999.ebuild +++ b/sci-biology/staden/staden-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -9,8 +9,7 @@ inherit autotools-utils flag-o-matic fortran-2 multilib subversion DESCRIPTION="DNA sequence assembly (gap4, gap5), editing and analysis tools (Spin)" HOMEPAGE="http://sourceforge.net/projects/staden/" -SRC_URI="" -ESVN_REPO_URI="https://staden.svn.sourceforge.net/svnroot/staden/staden/trunk/src" +ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/${PN}/trunk" LICENSE="staden" SLOT="0" @@ -42,6 +41,7 @@ RDEPEND="${DEPEND} AUTOTOOLS_IN_SOURCE_BUILD=1 src_prepare() { + cd "${WORKDIR}"/"${P}"/src || die sed \ -e 's:svnversion:false:' \ -i configure.in || die @@ -50,6 +50,8 @@ src_prepare() { } src_configure() { + cd "${WORKDIR}"/"${P}"/src || die + S="${WORKDIR}"/"${P}"/src local myeconfargs=() use X && myeconfargs+=( --with-x ) myeconfargs+=( @@ -62,7 +64,15 @@ src_configure() { sed -e "s/^SVNVERS.*/SVNVERS = "${ESVN_REVISION}"/" -i system.mk || die } +src_compile(){ + cd "${WORKDIR}"/"${P}"/src || die + S="${WORKDIR}"/"${P}"/src + default +} + src_install() { + cd "${WORKDIR}"/"${P}"/src || die + S="${WORKDIR}"/"${P}"/src autotools-utils_src_install SVN_VERSION="${ESVN_REVISION}" cat >> "${T}"/99staden <<- EOF STADENROOT="${EPREFIX}"/usr/share/staden