* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2016-07-18 19:40 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2016-07-18 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 271a9f98674f3e5d3f989553e2d3eb0df445c800
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 16:38:42 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 19:40:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271a9f98
sci-physics/espresso: version bump
Package-Manager: portage-2.2.28
sci-physics/espresso/Manifest | 1 +
sci-physics/espresso/espresso-3.3.1.ebuild | 133 +++++++++++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 638d0ca..73ae97c 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1 +1,2 @@
DIST espresso-3.3.0.tar.gz 18952622 SHA256 64ea2684e4fc0d31c11969e49ec74c25138b4f74686f67b93c7e1103833ff08f SHA512 90edbbdc8d7f7247b5179fce0fad796a9488f82a1754519918c6588c932050675397d36e0167aae770db9803b6c22f7d14d23c04cf307d10802afd3d5d5edc20 WHIRLPOOL 3e9547f2da6676edf3de415fa848301f2959c3dfeef1c3f461b4e1eb202224ead7635748b47d42edb9f661dc5d672f38168e15ab6c55a9c9d7f102ae11f8574e
+DIST espresso-3.3.1.tar.gz 18986557 SHA256 8576fc1fe59e04dec4fa0d354b7ec52365622860099624f36bddbb2b472c0c70 SHA512 3fc6e681e625f2cf98ac0aa3b1c16fbe17b9f9aa8f79f2e89926501cbb68621d171d6c6a22f42f9f60298ee31520ca712ace57d57738d2cf76f7ae2f7c0436b1 WHIRLPOOL 7075cbb8fba944cda8290a3f27650fcdd2b466495c6d4697ae3074c60ded86e08ea4ea0d9336c8ca859f7b3303cd496dba2972c9c8205a7b3cafbe36fcfc8a40
diff --git a/sci-physics/espresso/espresso-3.3.1.ebuild b/sci-physics/espresso/espresso-3.3.1.ebuild
new file mode 100644
index 0000000..7495405
--- /dev/null
+++ b/sci-physics/espresso/espresso-3.3.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 savedconfig
+
+DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
+HOMEPAGE="http://espressomd.org"
+
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
+ EGIT_BRANCH="master"
+ inherit autotools git-r3
+ KEYWORDS=""
+else
+ SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="X cuda doc examples +fftw mpi packages python test -tk"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tk? ( X )"
+
+RESTRICT="tk? ( test )"
+
+RDEPEND="
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ dev-lang/tcl:0=
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+ fftw? ( sci-libs/fftw:3.0 )
+ mpi? ( virtual/mpi )
+ packages? ( dev-tcltk/tcllib )
+ tk? ( >=dev-lang/tk-8.4.18-r1:0= )
+ X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen[dot]
+ dev-texlive/texlive-latexextra
+ virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ use cuda && cuda_src_prepare
+ default
+}
+
+src_configure() {
+ [[ ${PV} = 9999 ]] && eautoreconf
+ CXX=$(usex mpi "mpic++" "$(tc-getCXX)") econf \
+ $(use_with fftw) \
+ $(use_with cuda) \
+ $(use_with python python-interface) \
+ $(use_with mpi) \
+ $(use_with tk) \
+ $(use_with X x)
+ restore_config myconfig.hpp
+}
+
+src_compile() {
+ default
+ use doc && emake doxygen
+ [[ ${PV} = 9999 ]] && use doc && emake ug dg tutorials
+}
+
+src_install() {
+ local i
+
+ default
+
+ insinto /usr/share/${PN}
+ doins myconfig-sample.hpp
+
+ save_config src/core/myconfig-final.hpp
+
+ if use doc; then
+ if [[ ${PV} = 9999 ]] ; then
+ newdoc doc/dg/dg.pdf developer_guide.pdf
+ newdoc doc/ug/ug.pdf user_guide.pdf
+ for i in doc/tutorials/*/[0-9]*.pdf; do
+ newdoc "${i}" "tutorial_${i##*/}"
+ done
+ else
+ newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
+ for i in "${S}"/doc/tutorials/*/[0-9]*.pdf; do
+ newdoc "${i}" "tutorial_${i##*/}"
+ done
+ fi
+ dodoc -r doc/doxygen/html
+ fi
+
+ if use examples; then
+ insinto /usr/share/${PN}/examples
+ doins -r samples/*
+ fi
+
+ if use packages; then
+ insinto /usr/share/${PN}/packages
+ doins -r packages/*
+ fi
+}
+
+pkg_postinst() {
+ echo
+ elog "Please read and cite:"
+ elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
+ elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
+ echo
+ elog "If you need more features, change"
+ elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
+ elog "and reemerge with USE=savedconfig"
+ echo
+ elog "For a full feature list see:"
+ elog "/usr/share/${PN}/myconfig-sample.h"
+ echo
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2016-07-19 16:58 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2016-07-19 16:58 UTC (permalink / raw
To: gentoo-commits
commit: ddc965faf13b5bb5d69e206f4ad4c3167076ec49
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 16:57:58 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 16:58:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddc965fa
sci-physics/espresso: added live ebuild
Package-Manager: portage-2.2.28
sci-physics/espresso/espresso-9999.ebuild | 139 ++++++++++++++++++++++++++++++
1 file changed, 139 insertions(+)
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
new file mode 100644
index 0000000..01c45af
--- /dev/null
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_MAKEFILE_GENERATOR="ninja"
+
+inherit cmake-utils python-single-r1 savedconfig
+
+DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
+HOMEPAGE="http://espressomd.org"
+
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda doc examples +fftw +hdf5 packages python test -tk"
+
+REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ python? (
+ ${PYTHON_DEPS}
+ >dev-python/cython-0.22[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ dev-lang/tcl:0=
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+ fftw? ( sci-libs/fftw:3.0 )
+ dev-libs/boost:=[mpi]
+ virtual/mpi
+ hdf5? ( sci-libs/hdf5 )
+ packages? ( dev-tcltk/tcllib )
+ tk? ( >=dev-lang/tk-8.4.18-r1:0= )"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen[dot]
+ dev-texlive/texlive-latexextra
+ virtual/latex-base )"
+
+DOCS=( AUTHORS NEWS README ChangeLog )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ use cuda && cuda_src_prepare
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_CUDA=$(usex cuda)
+ -DWITH_PYTHON=$(usex python)
+ -DWITH_TESTS=$(usex test)
+ -DWITH_H5MD=$(usex hdf5)
+ -DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
+ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
+ -DCMAKE_SKIP_RPATH=YES
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_make doxygen
+ [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
+}
+
+src_install() {
+ local i
+
+ #https://github.com/espressomd/espresso/issues/733
+ #cmake-utils_src_install
+ dobin ${CMAKE_BUILD_DIR}/Espresso
+ dolib.so "${CMAKE_BUILD_DIR}"/src/core/{,*}/lib*.so
+ if use python; then
+ insinto $(python_get_sitedir)/${PN}md
+ doins -r "${CMAKE_BUILD_DIR}"/src/python/espressomd
+ fi
+
+ insinto /usr/share/${PN}/
+ doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+
+ save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+
+ if use doc; then
+ if [[ ${PV} = 9999 ]] ; then
+ newdoc ${CMAKE_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf
+ newdoc ${CMAKE_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
+ for i in ${CMAKE_BUILD_DIR}/doc/tutorials/*/*/[0-9]*.pdf; do
+ newdoc "${i}" "tutorial_${i##*/}"
+ done
+ else
+ newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
+ for i in "${S}"/doc/tutorials/*/*/[0-9]*.pdf; do
+ newdoc "${i}" "tutorial_${i##*/}"
+ done
+ fi
+ dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
+ fi
+
+ if use examples; then
+ insinto /usr/share/${PN}/examples
+ doins -r samples/*
+ fi
+
+ if use packages; then
+ insinto /usr/share/${PN}/packages
+ doins -r packages/*
+ fi
+}
+
+pkg_postinst() {
+ echo
+ elog "Please read and cite:"
+ elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
+ elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
+ echo
+ elog "If you need more features, change"
+ elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
+ elog "and reemerge with USE=savedconfig"
+ echo
+ elog "For a full feature list see:"
+ elog "/usr/share/${PN}/myconfig-sample.h"
+ echo
+}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2016-07-22 20:31 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2016-07-22 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 48013638ebb8cafa036106d6ed9c62db6e5fde77
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 20:30:05 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 20:30:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48013638
sci-physics/espresso: live ebuild update
Installed fixed in espressomd/espresso#749
Package-Manager: portage-2.2.28
sci-physics/espresso/espresso-9999.ebuild | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 01c45af..66a0214 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -69,6 +69,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
+ -DLIBDIR=$(get_libdir)
)
cmake-utils_src_configure
}
@@ -82,14 +83,7 @@ src_compile() {
src_install() {
local i
- #https://github.com/espressomd/espresso/issues/733
- #cmake-utils_src_install
- dobin ${CMAKE_BUILD_DIR}/Espresso
- dolib.so "${CMAKE_BUILD_DIR}"/src/core/{,*}/lib*.so
- if use python; then
- insinto $(python_get_sitedir)/${PN}md
- doins -r "${CMAKE_BUILD_DIR}"/src/python/espressomd
- fi
+ cmake-utils_src_install
insinto /usr/share/${PN}/
doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
@@ -134,6 +128,6 @@ pkg_postinst() {
elog "and reemerge with USE=savedconfig"
echo
elog "For a full feature list see:"
- elog "/usr/share/${PN}/myconfig-sample.h"
+ elog "/usr/share/${PN}/myconfig-sample.hpp"
echo
}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2016-08-03 18:00 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2016-08-03 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 951bafca9ed6046b5584a6d7a9b44de579fff99d
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 3 18:00:08 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Aug 3 18:00:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=951bafca
sci-physics/espresso: live ebuild update
Package-Manager: portage-2.2.28
sci-physics/espresso/espresso-9999.ebuild | 50 +++++++++++++++----------------
sci-physics/espresso/metadata.xml | 2 +-
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 66a0214..6b906a0 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -24,24 +24,25 @@ fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 packages python test -tk"
+IUSE="cuda doc examples +fftw +hdf5 packages +python tcl test"
-REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+ packages? ( tcl )
+ || ( python tcl )
+ ${PYTHON_REQUIRED_USE}"
RDEPEND="
+ ${PYTHON_DEPS}
python? (
- ${PYTHON_DEPS}
>dev-python/cython-0.22[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
)
- dev-lang/tcl:0=
+ tcl? ( dev-lang/tcl:0= )
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
- virtual/mpi
hdf5? ( sci-libs/hdf5 )
- packages? ( dev-tcltk/tcllib )
- tk? ( >=dev-lang/tk-8.4.18-r1:0= )"
+ packages? ( dev-tcltk/tcllib )"
DEPEND="${RDEPEND}
doc? (
@@ -51,10 +52,6 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS NEWS README ChangeLog )
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
src_prepare() {
use cuda && cuda_src_prepare
cmake-utils_src_prepare
@@ -63,9 +60,12 @@ src_prepare() {
src_configure() {
mycmakeargs=(
-DWITH_CUDA=$(usex cuda)
+ -DPYTHON_EXECUTABLE="${PYTHON}"
-DWITH_PYTHON=$(usex python)
+ -DWITH_TCL=$(usex tcl)
-DWITH_TESTS=$(usex test)
- -DWITH_H5MD=$(usex hdf5)
+ -DWITH_SCAFACOS=ON
+ -DINSTALL_PYPRESSO=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
@@ -81,7 +81,7 @@ src_compile() {
}
src_install() {
- local i
+ local i docdir="${S}"
cmake-utils_src_install
@@ -91,24 +91,22 @@ src_install() {
save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
if use doc; then
- if [[ ${PV} = 9999 ]] ; then
- newdoc ${CMAKE_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf
- newdoc ${CMAKE_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
- for i in ${CMAKE_BUILD_DIR}/doc/tutorials/*/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
- else
- newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${S}"/doc/tutorials/*/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
+ [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
+ newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
+ newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
+ for j in $(usev python) $(usev tcl); do
+ for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do
+ newdoc "${i}" "${j}_tutorial_${i##*/}"
done
- fi
+ done
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
fi
if use examples; then
- insinto /usr/share/${PN}/examples
- doins -r samples/*
+ for i in $(usev python) $(usev tcl); do
+ insinto "/usr/share/${PN}/examples/${i}"
+ doins -r samples/${i}/.
+ done
fi
if use packages; then
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 13db459..3d99b65 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -12,6 +12,6 @@
<use>
<flag name="cuda">Enable cuda support</flag>
<flag name="examples">Installs the examples</flag>
- <flag name="packages">Installs extra subpackages</flag>
+ <flag name="packages">Installs extra TCL subpackages</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2016-09-06 21:25 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2016-09-06 21:25 UTC (permalink / raw
To: gentoo-commits
commit: d80d2bcc2ae5878a1608c6094f1164ad86519c1e
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 21:25:06 2016 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 21:25:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80d2bcc
sci-physics/espresso: add support for python3
Package-Manager: portage-2.2.28
sci-physics/espresso/espresso-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 6b906a0..caba652 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
CMAKE_MAKEFILE_GENERATOR="ninja"
inherit cmake-utils python-single-r1 savedconfig
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2016-11-14 2:01 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2016-11-14 2:01 UTC (permalink / raw
To: gentoo-commits
commit: f6a0d3a162bfd5d496af1db2f7d7c76b616345f8
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 01:56:40 2016 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 01:56:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a0d3a1
sci-physics/espresso: update metadata
Package-Manager: portage-2.3.0
sci-physics/espresso/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 3d99b65..76b9c10 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>ottxor@gentoo.org</email>
+ <email>junghans@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
<maintainer type="project">
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2016-11-16 20:53 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2016-11-16 20:53 UTC (permalink / raw
To: gentoo-commits
commit: 2a73c4db0593360558c423674a37a147dfecb6e2
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 20:53:01 2016 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 20:53:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a73c4db
sci-physics/espresso: fix deps
Package-Manager: portage-2.3.0
sci-physics/espresso/espresso-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 48c5e8d..6a10134 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
- hdf5? ( sci-libs/hdf5 )
+ hdf5? ( sci-libs/hdf5:= )
packages? ( dev-tcltk/tcllib )"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2017-03-06 13:48 Tobias Klausmann
0 siblings, 0 replies; 18+ messages in thread
From: Tobias Klausmann @ 2017-03-06 13:48 UTC (permalink / raw
To: gentoo-commits
commit: 3958d0e342333de4972e34ade8cb60b20e8180e4
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 13:47:48 2017 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Mon Mar 6 13:47:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3958d0e3
sci-physics/espresso: Fix whitespace and drop CVS header
Package-Manager: Portage-2.3.4, Repoman-2.3.2
sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 252f74e2e5c..dc6d46c9b7c 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
@@ -91,7 +90,7 @@ src_install() {
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
+ newdoc "${i}" "tutorial_${i##*/}"
done
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
fi
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2017-06-15 17:37 Pacho Ramos
0 siblings, 0 replies; 18+ messages in thread
From: Pacho Ramos @ 2017-06-15 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 49310e382d287d466243732e6f4b2307869de878
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 17:24:13 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 17:24:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49310e38
sci-physics/espresso: Support newer python
Package-Manager: Portage-2.3.6, Repoman-2.3.2
sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 2 +-
sci-physics/espresso/espresso-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index dc6d46c9b7c..ac559653418 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
CMAKE_MAKEFILE_GENERATOR="ninja"
inherit cmake-utils python-single-r1 savedconfig
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 6bdb32dbb78..2fa536f63bd 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
CMAKE_MAKEFILE_GENERATOR="ninja"
inherit cmake-utils python-single-r1 savedconfig
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2017-07-17 14:58 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2017-07-17 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 118d8d3cc94dd0553de0fc287b7a155982368f74
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 14:52:35 2017 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 14:57:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118d8d3c
sci-physics/espresso: remove old (bug #595124, #625338)
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sci-physics/espresso/Manifest | 2 -
sci-physics/espresso/espresso-3.3.0.ebuild | 135 -----------------------------
sci-physics/espresso/espresso-3.3.1.ebuild | 132 ----------------------------
3 files changed, 269 deletions(-)
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 0b243949f69..65391c63a9d 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,3 +1 @@
-DIST espresso-3.3.0.tar.gz 18952622 SHA256 64ea2684e4fc0d31c11969e49ec74c25138b4f74686f67b93c7e1103833ff08f SHA512 90edbbdc8d7f7247b5179fce0fad796a9488f82a1754519918c6588c932050675397d36e0167aae770db9803b6c22f7d14d23c04cf307d10802afd3d5d5edc20 WHIRLPOOL 3e9547f2da6676edf3de415fa848301f2959c3dfeef1c3f461b4e1eb202224ead7635748b47d42edb9f661dc5d672f38168e15ab6c55a9c9d7f102ae11f8574e
-DIST espresso-3.3.1.tar.gz 18986557 SHA256 8576fc1fe59e04dec4fa0d354b7ec52365622860099624f36bddbb2b472c0c70 SHA512 3fc6e681e625f2cf98ac0aa3b1c16fbe17b9f9aa8f79f2e89926501cbb68621d171d6c6a22f42f9f60298ee31520ca712ace57d57738d2cf76f7ae2f7c0436b1 WHIRLPOOL 7075cbb8fba944cda8290a3f27650fcdd2b466495c6d4697ae3074c60ded86e08ea4ea0d9336c8ca859f7b3303cd496dba2972c9c8205a7b3cafbe36fcfc8a40
DIST espresso-4.0_pre20170228.tar.gz 23621395 SHA256 01e6770949db7bfad9dba3776a644dd0c0758e3781edf23363d7d2671ee14b01 SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2 WHIRLPOOL 02ef0d937726a1abe3f8df4f19ed62008b69494304cf4d569d74936d834bcb20e4a0bd5d6edff009c74c8e16f6b14f9c794ff209c8e39e6d8eed785e5356d6d6
diff --git a/sci-physics/espresso/espresso-3.3.0.ebuild b/sci-physics/espresso/espresso-3.3.0.ebuild
deleted file mode 100644
index 85a3ab47bca..00000000000
--- a/sci-physics/espresso/espresso-3.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
- EGIT_BRANCH="master"
- AUTOTOOLS_AUTORECONF=1
- inherit git-r3
- KEYWORDS=""
-else
- SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="X cuda doc examples +fftw mpi packages python test -tk"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- tk? ( X )"
-
-RESTRICT="tk? ( test )"
-
-RDEPEND="
- python? (
- ${PYTHON_DEPS}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- dev-lang/tcl:0=
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
- fftw? ( sci-libs/fftw:3.0 )
- mpi? ( virtual/mpi )
- packages? ( dev-tcltk/tcllib )
- tk? ( >=dev-lang/tk-8.4.18-r1:0= )
- X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-latexextra
- virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-PATCHES=( "${FILESDIR}/${P}-cython-0.22.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use cuda && cuda_src_prepare
- autotools-utils_src_prepare
-}
-
-src_configure() {
- myeconfargs=(
- $(use_with fftw) \
- $(use_with cuda) \
- $(use_with python python-interface) \
- $(use_with mpi) \
- $(use_with tk) \
- $(use_with X x)
- )
- CXX=$(usex mpi "mpic++" "$(tc-getCXX)") autotools-utils_src_configure
- restore_config myconfig.hpp
-}
-
-src_compile() {
- autotools-utils_src_compile
- use doc && autotools-utils_src_compile doxygen
- [[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile ug dg tutorials
-}
-
-src_install() {
- local i
-
- autotools-utils_src_install
-
- insinto /usr/share/${PN}
- doins ${AUTOTOOLS_BUILD_DIR}/myconfig-sample.hpp
-
- save_config ${AUTOTOOLS_BUILD_DIR}/src/core/myconfig-final.hpp
-
- if use doc; then
- if [[ ${PV} = 9999 ]] ; then
- newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/dg/dg.pdf developer_guide.pdf
- newdoc "${AUTOTOOLS_BUILD_DIR}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${AUTOTOOLS_BUILD_DIR}"/doc/tutorials/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
- else
- newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${S}"/doc/tutorials/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
- fi
- dohtml -r "${AUTOTOOLS_BUILD_DIR}"/doc/doxygen/html/*
- fi
-
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins -r samples/*
- fi
-
- if use packages; then
- insinto /usr/share/${PN}/packages
- doins -r packages/*
- fi
-}
-
-pkg_postinst() {
- echo
- elog "Please read and cite:"
- elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
- elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
- echo
- elog "If you need more features, change"
- elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
- elog "and reemerge with USE=savedconfig"
- echo
- elog "For a full feature list see:"
- elog "/usr/share/${PN}/myconfig-sample.h"
- echo
-}
diff --git a/sci-physics/espresso/espresso-3.3.1.ebuild b/sci-physics/espresso/espresso-3.3.1.ebuild
deleted file mode 100644
index f33992f7523..00000000000
--- a/sci-physics/espresso/espresso-3.3.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 savedconfig
-
-DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
-HOMEPAGE="http://espressomd.org"
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
- EGIT_BRANCH="master"
- inherit autotools git-r3
- KEYWORDS=""
-else
- SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="X cuda doc examples +fftw mpi packages python test -tk"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- tk? ( X )"
-
-RESTRICT="tk? ( test )"
-
-RDEPEND="
- python? (
- ${PYTHON_DEPS}
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- dev-lang/tcl:0=
- cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
- fftw? ( sci-libs/fftw:3.0 )
- mpi? ( virtual/mpi )
- packages? ( dev-tcltk/tcllib )
- tk? ( >=dev-lang/tk-8.4.18-r1:0= )
- X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen[dot]
- dev-texlive/texlive-latexextra
- virtual/latex-base )"
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- use cuda && cuda_src_prepare
- default
-}
-
-src_configure() {
- [[ ${PV} = 9999 ]] && eautoreconf
- CXX=$(usex mpi "mpic++" "$(tc-getCXX)") econf \
- $(use_with fftw) \
- $(use_with cuda) \
- $(use_with python python-interface) \
- $(use_with mpi) \
- $(use_with tk) \
- $(use_with X x)
- restore_config myconfig.hpp
-}
-
-src_compile() {
- default
- use doc && emake doxygen
- [[ ${PV} = 9999 ]] && use doc && emake ug dg tutorials
-}
-
-src_install() {
- local i
-
- default
-
- insinto /usr/share/${PN}
- doins myconfig-sample.hpp
-
- save_config src/core/myconfig-final.hpp
-
- if use doc; then
- if [[ ${PV} = 9999 ]] ; then
- newdoc doc/dg/dg.pdf developer_guide.pdf
- newdoc doc/ug/ug.pdf user_guide.pdf
- for i in doc/tutorials/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
- else
- newdoc "${S}"/doc/ug/ug.pdf user_guide.pdf
- for i in "${S}"/doc/tutorials/*/[0-9]*.pdf; do
- newdoc "${i}" "tutorial_${i##*/}"
- done
- fi
- dodoc -r doc/doxygen/html
- fi
-
- if use examples; then
- insinto /usr/share/${PN}/examples
- doins -r samples/*
- fi
-
- if use packages; then
- insinto /usr/share/${PN}/packages
- doins -r packages/*
- fi
-}
-
-pkg_postinst() {
- echo
- elog "Please read and cite:"
- elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
- elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
- echo
- elog "If you need more features, change"
- elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
- elog "and reemerge with USE=savedconfig"
- echo
- elog "For a full feature list see:"
- elog "/usr/share/${PN}/myconfig-sample.h"
- echo
-}
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2017-07-30 10:04 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2017-07-30 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 72a5dae9b0123719371a586f58ddddfafd03a70d
Author: David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Sat Jul 29 19:12:58 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 10:04:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72a5dae9
sci-physics/espresso: use HTTPS for GitHub and doc links
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 4 ++--
sci-physics/espresso/espresso-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index ac559653418..6177a3fe03f 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
HOMEPAGE="http://espressomd.org"
if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
+ EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
EGIT_BRANCH="master"
inherit git-r3
KEYWORDS=""
@@ -105,7 +105,7 @@ pkg_postinst() {
echo
elog "Please read and cite:"
elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
- elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
+ elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
echo
elog "If you need more features, change"
elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 2fa536f63bd..b841b4d4bc5 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
HOMEPAGE="http://espressomd.org"
if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="git://github.com/espressomd/espresso.git https://github.com/espressomd/espresso.git"
+ EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
EGIT_BRANCH="master"
inherit git-r3
KEYWORDS=""
@@ -118,7 +118,7 @@ pkg_postinst() {
echo
elog "Please read and cite:"
elog "ESPResSo, Comput. Phys. Commun. 174(9) ,704, 2006."
- elog "http://dx.doi.org/10.1016/j.cpc.2005.10.005"
+ elog "https://dx.doi.org/10.1016/j.cpc.2005.10.005"
echo
elog "If you need more features, change"
elog "/etc/portage/savedconfig/${CATEGORY}/${PF}"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2018-09-07 15:27 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2018-09-07 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 87ad744e3f351ce03906019a1025fa52454125af
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 7 15:27:06 2018 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Fri Sep 7 15:27:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ad744e
sci-physics/espresso: version bump
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sci-physics/espresso/Manifest | 1 +
...{espresso-9999.ebuild => espresso-4.0.0.ebuild} | 41 +++++++---------------
sci-physics/espresso/espresso-9999.ebuild | 41 +++++++---------------
sci-physics/espresso/metadata.xml | 1 -
4 files changed, 25 insertions(+), 59 deletions(-)
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index d5d5ca9efc6..2b8aa0ed6e9 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1 +1,2 @@
+DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-4.0.0.ebuild
similarity index 73%
copy from sci-physics/espresso/espresso-9999.ebuild
copy to sci-physics/espresso/espresso-4.0.0.ebuild
index b841b4d4bc5..953909c3dd7 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,35 +13,29 @@ HOMEPAGE="http://espressomd.org"
if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
- EGIT_BRANCH="master"
+ EGIT_BRANCH="python"
inherit git-r3
KEYWORDS=""
else
- SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+ SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 packages +python tcl test"
+IUSE="cuda doc examples +fftw +hdf5 test"
REQUIRED_USE="
- packages? ( tcl )
- || ( python tcl )
${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- python? (
- >dev-python/cython-0.22[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- tcl? ( dev-lang/tcl:0= )
+ >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
- hdf5? ( sci-libs/hdf5:= )
- packages? ( dev-tcltk/tcllib )"
+ hdf5? ( sci-libs/hdf5:=[mpi] )"
DEPEND="${RDEPEND}
doc? (
@@ -60,12 +54,10 @@ src_configure() {
mycmakeargs=(
-DWITH_CUDA=$(usex cuda)
-DPYTHON_EXECUTABLE="${PYTHON}"
- -DWITH_PYTHON=$(usex python)
- -DWITH_TCL=$(usex tcl)
-DWITH_TESTS=$(usex test)
- -DWITH_SCAFACOS=ON
-DINSTALL_PYPRESSO=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
+ -DWITH_HDF5=$(usex hdf5)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
-DLIBDIR=$(get_libdir)
@@ -93,24 +85,15 @@ src_install() {
[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
- for j in $(usev python) $(usev tcl); do
- for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do
- newdoc "${i}" "${j}_tutorial_${i##*/}"
- done
+ for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
+ newdoc "${i}" "tutorial_${i##*/}"
done
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
fi
if use examples; then
- for i in $(usev python) $(usev tcl); do
- insinto "/usr/share/${PN}/examples/${i}"
- doins -r samples/${i}/.
- done
- fi
-
- if use packages; then
- insinto /usr/share/${PN}/packages
- doins -r packages/*
+ insinto "/usr/share/${PN}/examples/python"
+ doins -r samples/${i}/.
fi
}
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index b841b4d4bc5..953909c3dd7 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,35 +13,29 @@ HOMEPAGE="http://espressomd.org"
if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
- EGIT_BRANCH="master"
+ EGIT_BRANCH="python"
inherit git-r3
KEYWORDS=""
else
- SRC_URI="mirror://nongnu/${PN}md/${P}.tar.gz"
+ SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
fi
LICENSE="GPL-3"
SLOT="0"
-IUSE="cuda doc examples +fftw +hdf5 packages +python tcl test"
+IUSE="cuda doc examples +fftw +hdf5 test"
REQUIRED_USE="
- packages? ( tcl )
- || ( python tcl )
${PYTHON_REQUIRED_USE}"
RDEPEND="
${PYTHON_DEPS}
- python? (
- >dev-python/cython-0.22[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- tcl? ( dev-lang/tcl:0= )
+ >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
- hdf5? ( sci-libs/hdf5:= )
- packages? ( dev-tcltk/tcllib )"
+ hdf5? ( sci-libs/hdf5:=[mpi] )"
DEPEND="${RDEPEND}
doc? (
@@ -60,12 +54,10 @@ src_configure() {
mycmakeargs=(
-DWITH_CUDA=$(usex cuda)
-DPYTHON_EXECUTABLE="${PYTHON}"
- -DWITH_PYTHON=$(usex python)
- -DWITH_TCL=$(usex tcl)
-DWITH_TESTS=$(usex test)
- -DWITH_SCAFACOS=ON
-DINSTALL_PYPRESSO=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_FFTW3=$(usex !fftw)
+ -DWITH_HDF5=$(usex hdf5)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
-DLIBDIR=$(get_libdir)
@@ -93,24 +85,15 @@ src_install() {
[[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
- for j in $(usev python) $(usev tcl); do
- for i in "${docdir}/doc/tutorials/${j}"/*/[0-9]*.pdf; do
- newdoc "${i}" "${j}_tutorial_${i##*/}"
- done
+ for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
+ newdoc "${i}" "tutorial_${i##*/}"
done
dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
fi
if use examples; then
- for i in $(usev python) $(usev tcl); do
- insinto "/usr/share/${PN}/examples/${i}"
- doins -r samples/${i}/.
- done
- fi
-
- if use packages; then
- insinto /usr/share/${PN}/packages
- doins -r packages/*
+ insinto "/usr/share/${PN}/examples/python"
+ doins -r samples/${i}/.
fi
}
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index f162adc22dc..87ef8dd6f08 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -12,7 +12,6 @@
<use>
<flag name="cuda">Enable cuda support</flag>
<flag name="examples">Installs the examples</flag>
- <flag name="packages">Installs extra TCL subpackages</flag>
</use>
<upstream>
<remote-id type="github">espressomd/espresso</remote-id>
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2020-01-16 7:03 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2020-01-16 7:03 UTC (permalink / raw
To: gentoo-commits
commit: c366d2e26eebaecef660b88afb6f76b4a3ef721c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 16 06:58:28 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 16 07:02:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c366d2e2
sci-physics/espresso: Remove Python 2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-physics/espresso/espresso-4.0.0-r1.ebuild | 2 +-
sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 2 +-
sci-physics/espresso/espresso-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
index b969b400a5e..00b53caa2ef 100644
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
CMAKE_MAKEFILE_GENERATOR="ninja"
inherit cmake-utils python-single-r1 savedconfig
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 4d969a356a2..5755eba6cdf 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
CMAKE_MAKEFILE_GENERATOR="ninja"
inherit cmake-utils python-single-r1 savedconfig
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 51c609793c3..b9d14d3937e 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
CMAKE_MAKEFILE_GENERATOR="ninja"
inherit cmake-utils python-single-r1 savedconfig
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2020-02-09 16:36 Michał Górny
0 siblings, 0 replies; 18+ messages in thread
From: Michał Górny @ 2020-02-09 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 588795db94366812e38da84d817d8a00bd7835ed
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 19:10:07 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 16:35:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588795db
sci-physics/espresso: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../espresso/{espresso-4.0.0-r1.ebuild => espresso-4.0.0-r2.ebuild} | 6 ++++--
sci-physics/espresso/espresso-4.0_pre20170228.ebuild | 6 ++++--
sci-physics/espresso/espresso-9999.ebuild | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.0.0-r1.ebuild b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
similarity index 95%
rename from sci-physics/espresso/espresso-4.0.0-r1.ebuild
rename to sci-physics/espresso/espresso-4.0.0-r2.ebuild
index 00b53caa2ef..0afbf393e9a 100644
--- a/sci-physics/espresso/espresso-4.0.0-r1.ebuild
+++ b/sci-physics/espresso/espresso-4.0.0-r2.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
diff --git a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
index 5755eba6cdf..e7c540b1629 100644
--- a/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
+++ b/sci-physics/espresso/espresso-4.0_pre20170228.ebuild
@@ -33,8 +33,10 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
- >dev-python/cython-0.22[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >dev-python/cython-0.22[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index b9d14d3937e..fcc6fbc9926 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -31,8 +31,10 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
- >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ ')
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
dev-libs/boost:=[mpi]
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2020-08-16 15:22 Christoph Junghans
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Junghans @ 2020-08-16 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 93533be3232554ddc1b0546ea1f1bde62c348bc7
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 15:21:58 2020 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 15:22:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93533be3
sci-physics/espresso: version bump
Closes: https://bugs.gentoo.org/737416
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Christoph Junghans <junghans <AT> gentoo.org>
sci-physics/espresso/Manifest | 1 +
...{espresso-9999.ebuild => espresso-4.1.3.ebuild} | 31 +++++++++++-----------
sci-physics/espresso/espresso-9999.ebuild | 31 +++++++++++-----------
sci-physics/espresso/metadata.xml | 4 ---
4 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 2b8aa0ed6e9..a4941b7d188 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,2 +1,3 @@
DIST espresso-4.0.0.tar.gz 25767191 BLAKE2B 995678496fe35b957c4a5775f79f6656efbb5f717a43e90f8c5fa406aba7847cd34b00db3f313e5a7b0a11a96b521e8182bdd58129ad68ea4881c9496e3977e5 SHA512 53eb311e8bb7db5aed32dcd3adfd5e1c63e6ae42a22cea41844edfa857fee03ffd717c0739dd46a6cdf8ca7a4c4b0952a036b208fccc4e61de3f383910e7d019
DIST espresso-4.0_pre20170228.tar.gz 23621395 BLAKE2B 6381e519c59986e50ff74fb3d81cd157f4761e1c46ea96b384487fd079b9c6f881dfa70df8f62e275fdd57bda6a4c714002630cebb02c232029186c3adbb692f SHA512 7d35648d447af3282a76d9d68cfe681734ec18794a38b09e0ae9233f63b62450c643643bcec999ea9c7d4ba070d4fc6f8dc64db8145f536ae017a67ff2d0e0e2
+DIST espresso-4.1.3.tar.gz 16947336 BLAKE2B 14d3513eda87f62a8473a0cac0c273b3590bf78ed48b96e76d10c106713f7bbd7d37de951bd3d9210062b34c02bd83a68f3aaf1ca8215ed1dcde590e4e99b113 SHA512 1fe82683eddb7bfd9bae6e446b0f42a50087d755995963905cd419473ad17b204f20049d0cf4af9264898dd6fee36f02744b38fa45cd0e33086374cf2aebd934
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
similarity index 79%
copy from sci-physics/espresso/espresso-9999.ebuild
copy to sci-physics/espresso/espresso-4.1.3.ebuild
index fcc6fbc9926..ef5f6578edc 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils python-single-r1 savedconfig
+inherit cmake python-single-r1 savedconfig
DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
HOMEPAGE="http://espressomd.org"
@@ -48,9 +48,11 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS NEWS README ChangeLog )
+S="${WORKDIR}/${PN}"
+
src_prepare() {
use cuda && cuda_src_prepare
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -63,35 +65,34 @@ src_configure() {
-DWITH_HDF5=$(usex hdf5)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
- -DLIBDIR=$(get_libdir)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_make doxygen
- [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
+ cmake_src_compile
+ use doc && cmake_build doxygen
+ [[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
}
src_install() {
local i docdir="${S}"
- cmake-utils_src_install
+ cmake_src_install
insinto /usr/share/${PN}/
- doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+ doins "${BUILD_DIR}/myconfig-sample.hpp"
- save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+ save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
if use doc; then
- [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
+ [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
newdoc "${i}" "tutorial_${i##*/}"
done
- dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
+ dodoc -r "${BUILD_DIR}/doc/doxygen/html"
fi
if use examples; then
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index fcc6fbc9926..ef5f6578edc 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_6 )
-CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils python-single-r1 savedconfig
+inherit cmake python-single-r1 savedconfig
DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
HOMEPAGE="http://espressomd.org"
@@ -48,9 +48,11 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS NEWS README ChangeLog )
+S="${WORKDIR}/${PN}"
+
src_prepare() {
use cuda && cuda_src_prepare
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -63,35 +65,34 @@ src_configure() {
-DWITH_HDF5=$(usex hdf5)
-DCMAKE_DISABLE_FIND_PACKAGE_HDF5=$(usex !hdf5)
-DCMAKE_SKIP_RPATH=YES
- -DLIBDIR=$(get_libdir)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_make doxygen
- [[ ${PV} = 9999 ]] && use doc && cmake-utils_src_make ug dg tutorials
+ cmake_src_compile
+ use doc && cmake_build doxygen
+ [[ ${PV} = 9999 ]] && use doc && cmake_build ug dg tutorials
}
src_install() {
local i docdir="${S}"
- cmake-utils_src_install
+ cmake_src_install
insinto /usr/share/${PN}/
- doins ${CMAKE_BUILD_DIR}/myconfig-sample.hpp
+ doins "${BUILD_DIR}/myconfig-sample.hpp"
- save_config ${CMAKE_BUILD_DIR}/src/core/myconfig-final.hpp
+ save_config "${BUILD_DIR}/src/config/myconfig-final.hpp"
if use doc; then
- [[ ${PV} = 9999 ]] && docdir="${CMAKE_BUILD_DIR}"
+ [[ ${PV} = 9999 ]] && docdir="${BUILD_DIR}"
newdoc "${docdir}"/doc/dg/dg.pdf developer_guide.pdf
newdoc "${docdir}"/doc/ug/ug.pdf user_guide.pdf
for i in "${docdir}/doc/tutorials/python"/*/[0-9]*.pdf; do
newdoc "${i}" "tutorial_${i##*/}"
done
- dodoc -r ${CMAKE_BUILD_DIR}/doc/doxygen/html
+ dodoc -r "${BUILD_DIR}/doc/doxygen/html"
fi
if use examples; then
diff --git a/sci-physics/espresso/metadata.xml b/sci-physics/espresso/metadata.xml
index 87ef8dd6f08..37615e72f9b 100644
--- a/sci-physics/espresso/metadata.xml
+++ b/sci-physics/espresso/metadata.xml
@@ -1,10 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>junghans@gentoo.org</email>
- <name>Christoph Junghans</name>
- </maintainer>
<maintainer type="project">
<email>sci-physics@gentoo.org</email>
<name>Gentoo Physics Project</name>
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2021-01-06 15:19 Fabian Groffen
0 siblings, 0 replies; 18+ messages in thread
From: Fabian Groffen @ 2021-01-06 15:19 UTC (permalink / raw
To: gentoo-commits
commit: a90ac558bb4731140fd89d9f8d309d05775ba765
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 15:19:35 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 15:19:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90ac558
sci-physics/espresso: drop x86-macos
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
sci-physics/espresso/espresso-4.1.3.ebuild | 4 ++--
sci-physics/espresso/espresso-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index ef5f6578edc..926982e17eb 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux"
fi
LICENSE="GPL-3"
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index ef5f6578edc..926982e17eb 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux"
fi
LICENSE="GPL-3"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2021-02-15 0:32 Sam James
0 siblings, 0 replies; 18+ messages in thread
From: Sam James @ 2021-02-15 0:32 UTC (permalink / raw
To: gentoo-commits
commit: efc046af4b3479a93b8c237dce7a78c9115fbfbc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 23:22:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 00:31:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc046af
sci-physics/espresso: fix double KEYWORDS
Double KEYWORDS lines break tools like ekeyword and Nattka.
As per PMS, blank/empty KEYWORDS is implied by not defining
the variable.
See: https://projects.gentoo.org/qa/policy-guide/ebuild-format.html#pg0105
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-physics/espresso/espresso-4.1.3.ebuild | 1 -
sci-physics/espresso/espresso-9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index 66c2b9a4c69..1ef336f2ab4 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
EGIT_BRANCH="python"
inherit git-r3
- KEYWORDS=""
else
SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index 66c2b9a4c69..1ef336f2ab4 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}md/${PN}.git"
EGIT_BRANCH="python"
inherit git-r3
- KEYWORDS=""
else
SRC_URI="https://github.com/${PN}md/${PN}/releases/download/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/
@ 2021-07-17 18:18 David Seifert
0 siblings, 0 replies; 18+ messages in thread
From: David Seifert @ 2021-07-17 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 5d48bc3167868ca93664326e445f8ac58650a1fd
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 18:17:08 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 18:17:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d48bc31
sci-physics/espresso: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sci-physics/espresso/espresso-4.1.3.ebuild | 6 +++---
sci-physics/espresso/espresso-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sci-physics/espresso/espresso-4.1.3.ebuild b/sci-physics/espresso/espresso-4.1.3.ebuild
index a60bb434ef8..19e9be04e85 100644
--- a/sci-physics/espresso/espresso-4.1.3.ebuild
+++ b/sci-physics/espresso/espresso-4.1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake cuda python-single-r1 savedconfig
@@ -31,8 +31,8 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
- >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
')
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
diff --git a/sci-physics/espresso/espresso-9999.ebuild b/sci-physics/espresso/espresso-9999.ebuild
index a60bb434ef8..19e9be04e85 100644
--- a/sci-physics/espresso/espresso-9999.ebuild
+++ b/sci-physics/espresso/espresso-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake cuda python-single-r1 savedconfig
@@ -31,8 +31,8 @@ REQUIRED_USE="
RDEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep '
- >=dev-python/cython-0.26.1[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cython-0.26.1[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
')
cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
fftw? ( sci-libs/fftw:3.0 )
^ permalink raw reply related [flat|nested] 18+ messages in thread
end of thread, other threads:[~2021-07-17 18:18 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-07 15:27 [gentoo-commits] repo/gentoo:master commit in: sci-physics/espresso/ Christoph Junghans
-- strict thread matches above, loose matches on Subject: below --
2021-07-17 18:18 David Seifert
2021-02-15 0:32 Sam James
2021-01-06 15:19 Fabian Groffen
2020-08-16 15:22 Christoph Junghans
2020-02-09 16:36 Michał Górny
2020-01-16 7:03 Michał Górny
2017-07-30 10:04 Michał Górny
2017-07-17 14:58 Christoph Junghans
2017-06-15 17:37 Pacho Ramos
2017-03-06 13:48 Tobias Klausmann
2016-11-16 20:53 Christoph Junghans
2016-11-14 2:01 Christoph Junghans
2016-09-06 21:25 Christoph Junghans
2016-08-03 18:00 Christoph Junghans
2016-07-22 20:31 Christoph Junghans
2016-07-19 16:58 Christoph Junghans
2016-07-18 19:40 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox