From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B77E213838B for ; Tue, 16 Sep 2014 00:27:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 195ACE0866; Tue, 16 Sep 2014 00:27:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B704EE0866 for ; Tue, 16 Sep 2014 00:27:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E22573402C5 for ; Tue, 16 Sep 2014 00:27:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9DA285A3A for ; Tue, 16 Sep 2014 00:27:03 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1410817107.5f9a85124afb7066b30fe10a74bd1cb24a6a7ec4.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-cpp/eigen/ X-VCS-Repository: proj/sci X-VCS-Files: dev-cpp/eigen/eigen-9999.ebuild X-VCS-Directories: dev-cpp/eigen/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 5f9a85124afb7066b30fe10a74bd1cb24a6a7ec4 X-VCS-Branch: master Date: Tue, 16 Sep 2014 00:27: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-Archives-Salt: 1568ad9b-0433-46ea-9dda-442817d34621 X-Archives-Hash: 2f1309c11b631949da7d33d638be0179 commit: 5f9a85124afb7066b30fe10a74bd1cb24a6a7ec4 Author: Dale Lukas Peterson gmail com> AuthorDate: Mon Sep 15 21:34:08 2014 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Mon Sep 15 21:38:27 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5f9a8512 Fix bug 522602 more properly Instead of adding src_unpack(), move vcs-snapshot to else block, thereby ensuring src_unpack() from inherit mercurial is used. --- dev-cpp/eigen/eigen-9999.ebuild | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild index fa3eb94..24a6c7d 100644 --- a/dev-cpp/eigen/eigen-9999.ebuild +++ b/dev-cpp/eigen/eigen-9999.ebuild @@ -12,6 +12,7 @@ if [[ ${PV} == "9999" ]] ; then SRC_URI="" KEYWORDS="" else + inherit vcs-snapshot SRC_URI=" http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2 https://bitbucket.org/eigen/eigen/commits/1d71b1341c03a7c485289be2c8bd906a259c0487/raw/ -> ${P}-cmake.patch @@ -20,7 +21,7 @@ else KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi -inherit alternatives-2 cmake-utils fortran-2 multilib vcs-snapshot +inherit alternatives-2 cmake-utils fortran-2 multilib DESCRIPTION="C++ template library for linear algebra" HOMEPAGE="http://eigen.tuxfamily.org/" @@ -50,11 +51,6 @@ RDEPEND=" !dev-cpp/eigen:0 ${CDEPEND}" -src_unpack() { - mercurial_src_unpack - vcs-snapshot_src_unpack -} - src_prepare() { sed -i \ -e "s:/usr:${EPREFIX}/usr:g" \