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 9BCF91381F3 for ; Tue, 23 Jul 2013 10:08:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36336E09A5; Tue, 23 Jul 2013 10:08:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ACBDDE09A5 for ; Tue, 23 Jul 2013 10:08:34 +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 980F833E986 for ; Tue, 23 Jul 2013 10:08:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3134FE5458 for ; Tue, 23 Jul 2013 10:08:32 +0000 (UTC) From: "Honza Macháček" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Honza Macháček" Message-ID: <1374574079.b9d88dde8cf6f0e052f600ce5b196c2a2bed6b94.honza_machacek@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/nwchem/files/, sci-chemistry/nwchem/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/nwchem/ChangeLog sci-chemistry/nwchem/files/nwchem-6.1.1-python_makefile.patch sci-chemistry/nwchem/files/nwchem-6.3-html_doc.patch sci-chemistry/nwchem/files/nwchem-6.3-r1-html_doc.patch sci-chemistry/nwchem/nwchem-6.3-r1.ebuild sci-chemistry/nwchem/nwchem-6.3.ebuild X-VCS-Directories: sci-chemistry/nwchem/files/ sci-chemistry/nwchem/ X-VCS-Committer: honza_machacek X-VCS-Committer-Name: Honza Macháček X-VCS-Revision: b9d88dde8cf6f0e052f600ce5b196c2a2bed6b94 X-VCS-Branch: master Date: Tue, 23 Jul 2013 10:08:32 +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: 7a05e9ef-b2c7-497a-8816-117f64c34f91 X-Archives-Hash: af60b49bee31a38c2a0f46b614228b05 commit: b9d88dde8cf6f0e052f600ce5b196c2a2bed6b94 Author: Honza Macháček centrum cz> AuthorDate: Tue Jul 23 10:07:59 2013 +0000 Commit: Honza Macháček centrum cz> CommitDate: Tue Jul 23 10:07:59 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b9d88dde sci-chemistry/nwchem updated to 6.3-r1, python makefile patch cosmetically improved, the python support linked properly to python2. Package-Manager: portage-2.1.12.13 --- sci-chemistry/nwchem/ChangeLog | 10 +++ .../files/nwchem-6.1.1-python_makefile.patch | 10 +-- .../nwchem/files/nwchem-6.3-html_doc.patch | 82 ---------------------- .../nwchem/files/nwchem-6.3-r1-html_doc.patch | 13 ++++ .../{nwchem-6.3.ebuild => nwchem-6.3-r1.ebuild} | 10 +-- 5 files changed, 33 insertions(+), 92 deletions(-) diff --git a/sci-chemistry/nwchem/ChangeLog b/sci-chemistry/nwchem/ChangeLog index 01bbf79..1f80267 100644 --- a/sci-chemistry/nwchem/ChangeLog +++ b/sci-chemistry/nwchem/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*nwchem-6.3-r1 (23 Jul 2013) + + 23 Jul 2013; Honza Macháček -nwchem-6.3.ebuild, + +nwchem-6.3-r1.ebuild, files/nwchem-6.1.1-adjust-dir-length.patch, + files/nwchem-6.1.1-makefile.patch, files/nwchem-6.1.1-nwchemrc.patch, + files/nwchem-6.1.1-python_makefile.patch, -files/nwchem-6.3-html_doc.patch, + +files/nwchem-6.3-r1-html_doc.patch: + Updated to 6.3-r1, python makefile patch cosmetically improved, the python + support linked properly to python2. + 16 Jun 2013; Justin Lecher -nwchem-6.1.1.ebuild, nwchem-6.3.ebuild: Drop old; drop virtual/fortran as the eclass depends on it diff --git a/sci-chemistry/nwchem/files/nwchem-6.1.1-python_makefile.patch b/sci-chemistry/nwchem/files/nwchem-6.1.1-python_makefile.patch index 7753d8f..16973b6 100644 --- a/sci-chemistry/nwchem/files/nwchem-6.1.1-python_makefile.patch +++ b/sci-chemistry/nwchem/files/nwchem-6.1.1-python_makefile.patch @@ -1,12 +1,12 @@ --- src/config/makefile.h 2011-12-04 12:00:52.000000000 +0100 +++ src/config/makefile.h 2011-12-04 12:01:56.000000000 +0100 @@ -2133,7 +2133,7 @@ - # + endif ifdef USE_PYTHON64 -- CORE_LIBS += $(PYTHONHOME)/lib64/python$(PYTHONVERSION)/config/libpython$(PYTHONVERSION).a -+ CORE_LIBS += $(PYTHONHOME)/lib/libpython$(PYTHONVERSION).a +- CORE_LIBS += $(PYTHONHOME)/lib64/python$(PYTHONVERSION)/config/libpython$(PYTHONVERSION).$(PYTHONLIBTYPE) ++ CORE_LIBS += $(PYTHONHOME)/lib64/libpython$(PYTHONVERSION).$(PYTHONLIBTYPE) else -- CORE_LIBS += $(PYTHONHOME)/lib/python$(PYTHONVERSION)/config/libpython$(PYTHONVERSION).a -+ CORE_LIBS += $(PYTHONHOME)/lib/libpython$(PYTHONVERSION).a +- CORE_LIBS += $(PYTHONHOME)/lib/python$(PYTHONVERSION)/config/libpython$(PYTHONVERSION).$(PYTHONLIBTYPE) ++ CORE_LIBS += $(PYTHONHOME)/lib/libpython$(PYTHONVERSION).$(PYTHONLIBTYPE) endif endif diff --git a/sci-chemistry/nwchem/files/nwchem-6.3-html_doc.patch b/sci-chemistry/nwchem/files/nwchem-6.3-html_doc.patch deleted file mode 100644 index fa0e8fa..0000000 --- a/sci-chemistry/nwchem/files/nwchem-6.3-html_doc.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -Naurp old/doc/update_www new/doc/update_www ---- doc/update_www 2013-05-18 00:40:51.000000000 +0000 -+++ doc/update_www 2013-05-22 12:15:27.543414281 +0000 -@@ -16,7 +16,8 @@ set document = $argv[1] - echo Updating WWW pages for $document.tex - #............... public - #foreach WWWDIR (/msrc/www/pub/docs/nwchem/doc) --foreach WWWDIR (/msrc/emslweb/docs/nwchem/doc) -+#foreach WWWDIR (/msrc/emslweb/docs/nwchem/doc) -+foreach WWWDIR ("${NWCHEM_TOP}"/html) - # - # Now copy the revised source into the EMSL public WWW tree - echo "update_www: Public pages .. " -diff -Naurp old/user/geometry.tex new/user/geometry.tex ---- user/geometry.tex 2013-05-18 00:40:51.000000000 +0000 -+++ user/geometry.tex 2013-05-23 13:00:44.234316049 +0000 -@@ -472,11 +472,11 @@ and angles. - \ifx\pdfoutput\undefined - \includegraphics[angle=270,width=6in]{zmat1.eps} - \else --\includegraphics[angle=0,width=6in]{zmat1.pdf} -+\includegraphics[angle=0,width=6in,bburx=509,bbury=201]{zmat1.pdf} - \fi - \end{latexonly} - \begin{htmlonly} --\psfig{figure=zmat1.eps,angle=270,width=6in} -+\epsfig{figure=zmat1.eps,angle=270,width=6in} - \end{htmlonly} - \caption{\label{fig:zmat1} Relationships between the centers, bond angle - and dihedral angle in Z-matrix input.} -@@ -488,11 +488,11 @@ and dihedral angle in Z-matrix input.} - \ifx\pdfoutput\undefined - \includegraphics[angle=270,width=6in]{zmat2.eps} - \else --\includegraphics[angle=270,width=6in]{zmat2.pdf} -+\includegraphics[angle=270,width=6in,bburx=266,bbury=485]{zmat2.pdf} - \fi - \end{latexonly} - \begin{htmlonly} --\psfig{figure=zmat2.eps,angle=270,width=6in} -+\epsfig{figure=zmat2.eps,angle=270,width=6in} - \end{htmlonly} - - \caption{\label{fig:zmat2} Relationships between the centers and two -@@ -505,11 +505,11 @@ and dihedral angle in Z-matrix input.} - \ifx\pdfoutput\undefined - \includegraphics[angle=270,width=6in]{zmat3.eps} - \else --\includegraphics[angle=270,width=6in]{zmat3.pdf} -+\includegraphics[angle=270,width=6in,bburx=266,bbury=482]{zmat3.pdf} - \fi - \end{latexonly} - \begin{htmlonly} --\psfig{figure=zmat3.eps,angle=270,width=6in} -+\epsfig{figure=zmat3.eps,angle=270,width=6in} - \end{htmlonly} - \caption{\label{fig:zmat3} Relationships between the centers and two - bond angles in Z-matrix input with optional parameter specified as $-1$.} -diff -Naurp old/user/titlepage.tex new/user/titlepage.tex ---- user/titlepage.tex 2013-05-18 00:40:51.000000000 +0000 -+++ user/titlepage.tex 2013-05-23 13:01:07.304152791 +0000 -@@ -19,7 +19,7 @@ - {\bf\Large \nwchemmonth \ \nwchemyear}\\[1.0in] - - --%\psfig{figure=zsm.major.ps,height=4in,width=4in} -+%\epsfig{figure=zsm.major.ps,height=4in,width=4in} - - - \end{centering} -diff -Naurp old/user/user.tex new/user/user.tex ---- user/user.tex 2013-05-18 00:40:51.000000000 +0000 -+++ user/user.tex 2013-05-23 13:00:04.961296411 +0000 -@@ -2,7 +2,7 @@ - \input{top} - \usepackage[dvips]{graphicx} - \begin{htmlonly} --\usepackage{psfig} -+\usepackage{epsfig} - \end{htmlonly} - - diff --git a/sci-chemistry/nwchem/files/nwchem-6.3-r1-html_doc.patch b/sci-chemistry/nwchem/files/nwchem-6.3-r1-html_doc.patch new file mode 100644 index 0000000..de7377b --- /dev/null +++ b/sci-chemistry/nwchem/files/nwchem-6.3-r1-html_doc.patch @@ -0,0 +1,13 @@ +diff -Naurp old/doc/update_www new/doc/update_www +--- doc/update_www 2013-05-18 00:40:51.000000000 +0000 ++++ doc/update_www 2013-05-22 12:15:27.543414281 +0000 +@@ -16,7 +16,8 @@ set document = $argv[1] + echo Updating WWW pages for $document.tex + #............... public + #foreach WWWDIR (/msrc/www/pub/docs/nwchem/doc) +-foreach WWWDIR (/msrc/emslweb/docs/nwchem/doc) ++#foreach WWWDIR (/msrc/emslweb/docs/nwchem/doc) ++foreach WWWDIR ("${NWCHEM_TOP}"/web) + # + # Now copy the revised source into the EMSL public WWW tree + echo "update_www: Public pages .. " diff --git a/sci-chemistry/nwchem/nwchem-6.3.ebuild b/sci-chemistry/nwchem/nwchem-6.3-r1.ebuild similarity index 92% rename from sci-chemistry/nwchem/nwchem-6.3.ebuild rename to sci-chemistry/nwchem/nwchem-6.3-r1.ebuild index 4395d15..4ff053b 100644 --- a/sci-chemistry/nwchem/nwchem-6.3.ebuild +++ b/sci-chemistry/nwchem/nwchem-6.3-r1.ebuild @@ -8,11 +8,11 @@ PYTHON_COMPAT=( python{2_6,2_7} ) inherit eutils fortran-2 multilib python-single-r1 toolchain-funcs -DATE="2013-05-17" +DATE="2013-05-28" DESCRIPTION="Delivering High-Performance Computational Chemistry to Science" HOMEPAGE="http://www.nwchem-sw.org/index.php/Main_Page" -SRC_URI="http://www.nwchem-sw.org/images/Nwchem-${PV}-src.${DATE}.tar.gz" +SRC_URI="http://www.nwchem-sw.org/images/Nwchem-${PV}.revision${PR#r}-src.${DATE}.tar.gz" LICENSE="ECL-2.0" SLOT="0" @@ -44,7 +44,7 @@ src_prepare() { "${FILESDIR}"/nwchem-6.1.1-nwchemrc.patch \ "${FILESDIR}"/nwchem-6.1.1-adjust-dir-length.patch use python && epatch "${FILESDIR}"/nwchem-6.1.1-python_makefile.patch - use doc && epatch "${FILESDIR}"/nwchem-6.3-html_doc.patch + use doc && epatch "${FILESDIR}"/nwchem-6.3-r1-html_doc.patch sed \ -e "s:DBASIS_LIBRARY=\"'\$(SRCDIR)'\":DBASIS_LIBRARY=\"'${EPREFIX}/usr/share/NWChem'\":g" \ @@ -90,7 +90,7 @@ src_compile() { export USE_PYTHON64=yes fi export PYTHONHOME=/usr - export PYTHONVERSION=$(eselect python show|awk -Fpython '{ print $2 }') + export PYTHONVERSION=$(eselect python show --python2 |awk -Fpython '{ print $2 }') export PYTHONPATH="./:${S}/contrib/python/" export NWCHEM_MODULES="all python" else @@ -137,7 +137,7 @@ src_install() { use doc && \ insinto /usr/share/doc/"${P}" && \ doins -r doc/nwahtml && \ - doins -r html + doins -r web }