From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QEpjP-0000AP-NR for garchives@archives.gentoo.org; Tue, 26 Apr 2011 21:23:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EB8D1C02C; Tue, 26 Apr 2011 21:23:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D5B6E1C02C for ; Tue, 26 Apr 2011 21:23:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 30F071BC02A for ; Tue, 26 Apr 2011 21:23:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 921E480505 for ; Tue, 26 Apr 2011 21:23:31 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <380b480785c38e8ec3e82cb3ece9b8cac62cbcd7.kleiner_otti@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/espresso/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/espresso/espresso-9999.ebuild X-VCS-Directories: sci-physics/espresso/ X-VCS-Committer: kleiner_otti X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 380b480785c38e8ec3e82cb3ece9b8cac62cbcd7 Date: Tue, 26 Apr 2011 21:23:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 43a8492698011e56c66079f29a9b9443 commit: 380b480785c38e8ec3e82cb3ece9b8cac62cbcd7 Author: Christoph Junghans gentoo org> AuthorDate: Tue Apr 26 21:23:06 2011 +0000 Commit: Christoph Junghans gmx de> CommitDate: Tue Apr 26 21:23:26 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D380b4807 [sci-physics/espresso] live ebuild update (Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with ke= y C2000586) --- sci-physics/espresso/espresso-9999.ebuild | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espr= esso/espresso-9999.ebuild index caaf854..55908dd 100644 --- a/sci-physics/espresso/espresso-9999.ebuild +++ b/sci-physics/espresso/espresso-9999.ebuild @@ -4,19 +4,26 @@ =20 EAPI=3D"4" =20 -inherit autotools-utils git savedconfig +inherit autotools-utils savedconfig =20 DESCRIPTION=3D"Extensible Simulation Package for Research on Soft matter= " HOMEPAGE=3D"http://www.espressomd.org" -SRC_URI=3D"" =20 -EGIT_REPO_URI=3D"git://git.savannah.nongnu.org/espressomd.git" -EGIT_BRANCH=3D"master" +if [ "${PV%9999}" !=3D "${PV}" ]; then + EGIT_REPO_URI=3D"git://git.savannah.nongnu.org/espressomd.git" + EGIT_BRANCH=3D"master" + inherit git +else + SRC_URI=3D"mirror://nongnu/${PN}md/${P}.tar.gz" +fi =20 LICENSE=3D"GPL-3" SLOT=3D"0" KEYWORDS=3D"~x86" IUSE=3D"X doc examples fftw mpi packages test -tk" +REQUIRED_USE=3D"tk? ( X )" + +RESTRICT=3D"tk? ( test )" =20 RDEPEND=3D"dev-lang/tcl X? ( x11-libs/libX11 ) @@ -62,9 +69,11 @@ src_install() { save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h =20 if use doc; then - newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf + local where=3D"." + [ "${PV%9999}" !=3D "${PV}" ] && where=3D"${AUTOTOOLS_BUILD_DIR}" + newdoc ${where}/doc/ug/ug.pdf user_guide.pdf dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/dg/html/* - newdoc ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/tut2/tut2.pdf tutorial.pdf + newdoc ${where}/doc/tutorials/tut2/tut2.pdf tutorial.pdf fi =20 if use examples; then