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 1SAZ5d-0001f7-Mq for garchives@archives.gentoo.org; Thu, 22 Mar 2012 03:53:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FA74E071D; Thu, 22 Mar 2012 03:53:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 47BE5E071D for ; Thu, 22 Mar 2012 03:53:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90C671B4006 for ; Thu, 22 Mar 2012 03:53:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 54389E5403 for ; Thu, 22 Mar 2012 03:53:01 +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: <1332388371.2450e5130da4d8e3a20d227cd80cff849440b406.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/ChangeLog 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: 2450e5130da4d8e3a20d227cd80cff849440b406 X-VCS-Branch: master Date: Thu, 22 Mar 2012 03:53:01 +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: f2837a43-35c7-476c-93f4-5d75b0026e29 X-Archives-Hash: 148abaf6c0e2b7079a41aac6546a96a7 commit: 2450e5130da4d8e3a20d227cd80cff849440b406 Author: Christoph Junghans gentoo org> AuthorDate: Thu Mar 22 03:49:44 2012 +0000 Commit: Christoph Junghans gmx de> CommitDate: Thu Mar 22 03:52:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D2450e513 version bump (Portage version: 2.2.0_alpha93/git/Linux i686, unsigned Manifest commit) --- sci-physics/espresso/ChangeLog | 5 ++++- sci-physics/espresso/espresso-9999.ebuild | 20 +++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/Change= Log index e5ea3c7..cbb4514 100644 --- a/sci-physics/espresso/ChangeLog +++ b/sci-physics/espresso/ChangeLog @@ -1,7 +1,10 @@ # ChangeLog for sci-physics/espresso -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 22 Mar 2012; Christoph Junghans espresso-9999.ebui= ld: + version bump + 25 Jun 2011; Christoph Junghans espresso-9999.ebui= ld: migrate to git-2 =20 diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espr= esso/espresso-9999.ebuild index 6522b90..c8ba5bd 100644 --- a/sci-physics/espresso/espresso-9999.ebuild +++ b/sci-physics/espresso/espresso-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.0.e= build,v 1.1 2011/04/20 13:03:00 ottxor Exp $ =20 @@ -9,7 +9,7 @@ inherit autotools-utils savedconfig DESCRIPTION=3D"Extensible Simulation Package for Research on Soft matter= " HOMEPAGE=3D"http://www.espressomd.org" =20 -if [ "${PV%9999}" !=3D "${PV}" ]; then +if [[ ${PV} =3D 9999 ]]; then EGIT_REPO_URI=3D"git://git.savannah.nongnu.org/espressomd.git" EGIT_BRANCH=3D"master" inherit git-2 @@ -33,6 +33,7 @@ RDEPEND=3D" X? ( x11-libs/libX11 )" =20 DEPEND=3D"${RDEPEND} + dev-lang/python doc? ( app-doc/doxygen[-nodot] virtual/latex-base )" @@ -41,9 +42,6 @@ DOCS=3D( AUTHORS NEWS README ChangeLog ) =20 src_prepare() { autotools-utils_src_prepare - sed -i -e '/^[^S]/s/tutorials/tutorial/g' \ - -e 's/cd tutorial/&s/' doc/Makefile.am \ - || die "sed of Makefile.am failed" eautoreconf restore_config myconfig.h } @@ -60,7 +58,8 @@ src_configure() { =20 src_compile() { autotools-utils_src_compile - use doc && autotools-utils_src_compile doc + use doc && autotools-utils_src_compile ug doxygen tutorials + [[ ${PV} =3D 9999 ]] && use doc && autotools-utils_src_compile dg } =20 src_install() { @@ -74,12 +73,11 @@ src_install() { save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h =20 if use doc; then - local where=3D"." - [ "${PV%9999}" !=3D "${PV}" ] && where=3D"${AUTOTOOLS_BUILD_DIR}" - newdoc ${where}/doc/ug/ug.pdf user_guide.pdf - newdoc ${where}/doc/dg/dg.pdf developer_guide.pdf + [[ ${PV} =3D 9999 ]] && \ + newdoc ${AUTOTOOLS_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf + newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/doxygen/html/* - for i in ${where}/doc/tutorials/*/[0-9]*.pdf; do + for i in ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/*/[0-9]*.pdf; do newdoc ${i} tutorial_${i##*/} done fi